From 21299da70ddaa6f4239a3cf940e15a5c3f2b89ea Mon Sep 17 00:00:00 2001
From: poyraz76 <ergunsalman@hotmail.com>
Date: Tue, 13 Dec 2016 16:30:23 +0200
Subject: [PATCH] calamares nad kpmcore version bump

---
 desktop/kde/applications/kpmcore/pspec.xml | 13 ++++++++++---
 system/installer/Calamares/actions.py      |  3 +--
 system/installer/Calamares/pspec.xml       | 13 +++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/desktop/kde/applications/kpmcore/pspec.xml b/desktop/kde/applications/kpmcore/pspec.xml
index b6e225a92e..712a2ea464 100644
--- a/desktop/kde/applications/kpmcore/pspec.xml
+++ b/desktop/kde/applications/kpmcore/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:gui</IsA>
         <Summary>Library for managing partitions.</Summary>
         <Description>Library for managing partitions.</Description>
-        <Archive sha1sum="81a0a251fa2c132e0dcdd55f7f21ebbeac273f5d" type="tarxz">mirrors://kde/stable/kpmcore/2.2.1/src/kpmcore-2.2.1.tar.xz</Archive>
+        <Archive sha1sum="a35942c03a7d750d6a709ab5f045dac273292ed3" type="targz">https://sourceforge.net/projects/pisi-source/files/kpmcore-2.9.91.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>libatasmart-devel</Dependency>
@@ -72,9 +72,16 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2016-12-13</Date>
+            <Version>2.9.91</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2016-10-12</Date>
-            <Version>2.2.1</Version>
+            <Version>2.1.1</Version>
             <Comment>Release bump</Comment>
             <Name>Stefan Gronewold</Name>
             <Email>groni@pisilinux.org</Email>
@@ -94,4 +101,4 @@
             <Email>yusuf.aydemir@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
\ No newline at end of file
+</PISI>
diff --git a/system/installer/Calamares/actions.py b/system/installer/Calamares/actions.py
index eb0c385641..f8965f2bce 100644
--- a/system/installer/Calamares/actions.py
+++ b/system/installer/Calamares/actions.py
@@ -15,9 +15,8 @@ def setup():
     
     cmaketools.configure("-DCMAKE_BUILD_TYPE=Debug \
                           -DCMAKE_INSTALL_PREFIX=/usr \
-                          -DWITH_PARTITIONMANAGER=1 \
                           -DCMAKE_INSTALL_LIBDIR=lib \
-                          -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo", \
+                          -DWITH_CRASHREPORTER=ON", \
                           sourceDir=".." )
     
 def build():
diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml
index d80f3a3e1f..39d4689d1f 100644
--- a/system/installer/Calamares/pspec.xml
+++ b/system/installer/Calamares/pspec.xml
@@ -11,7 +11,7 @@
         <License>LGPLv2</License>
         <Summary>A distribution independent installer framework</Summary>
         <Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description>
-        <Archive sha1sum="628119c94741fe5d7a75720069f6d0875580f949" type="targz">https://github.com/calamares/calamares/releases/download/v2.2/calamares-2.2.tar.gz</Archive>
+        <Archive sha1sum="bc8437198a907e30e2f8ce24de02d89a5cc34e9d" type="targz">https://sourceforge.net/projects/pisi-source/files/calamares-2.4.81.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gettext-devel</Dependency>
             <Dependency>yaml-cpp</Dependency>
@@ -30,6 +30,7 @@
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>polkit-qt-devel</Dependency>
             <Dependency>qt5-webkit-devel</Dependency>
+            <Dependency>qt5-webengine-devel</Dependency>
             <Dependency>libatasmart-devel</Dependency>
             <Dependency>kcoreaddons-devel</Dependency>
             <Dependency>qt5-designer-devel</Dependency>
@@ -51,7 +52,7 @@
             <Dependency>kparts-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">pisi_locale.patch</Patch>
+<!--             <Patch level="1">pisi_locale.patch</Patch> -->
             <Patch level="1">pisi_set_hostname.patch</Patch>
             <Patch level="1">mudur_module.patch</Patch>
             <Patch level="1">no_fsck_and_pymouth.patch</Patch>
@@ -88,6 +89,7 @@
             <Dependency>util-linux</Dependency>
             <Dependency>kpmcore</Dependency>
             <Dependency>partitionmanager</Dependency>
+            <Dependency>qt5-webengine</Dependency>
             <Dependency>kiconthemes</Dependency>
             <Dependency>kio</Dependency>
             <Dependency>kservice</Dependency>
@@ -113,6 +115,13 @@
     </Package>
     
     <History>
+        <Update release="3">
+            <Date>2016-12-13</Date>
+            <Version>2.4.81</Version>
+            <Comment>First Release.</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>Poyraz76@pisilinux.org</Email>
+        </Update>
         <Update release="2">
             <Date>2016-06-08</Date>
             <Version>2.2</Version>