Build fixes by macieks

3 files changed, 87 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ea855c6f09e..7b60ab035a96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 4.2.1
-# Mon Jun  8 18:37:36 UTC 2015
+# Generated by makepkg 5.0.1
+# Sun May  8 10:14:28 UTC 2016
 pkgbase = kqrcode
 	pkgdesc = A little program that is meant to encode/decode data to/from QR codes.
 	pkgver = 0.6.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://kde-apps.org/content/show.php?content=143544
 	arch = i686
 	arch = x86_64
@@ -17,10 +17,12 @@ pkgbase = kqrcode
 	source = kqrcode-plugins-0.6.0.tar.gz::http://sourceforge.net/projects/kqrcode/files/kqrcode-plugins-0.6.0.tar.gz/download
 	source = kqrcode-dev-0.6.0.tar.gz::http://sourceforge.net/projects/kqrcode/files/kqrcode-dev-0.6.0.tar.gz/download
 	source = kqrcode-cmake.patch
-	md5sums = dbd5d951783020a0de6a923c29009781
-	md5sums = 22d023ab3b86fdd760e5d13ac33b87db
-	md5sums = d421dd9cd2d0f3932161a65e18c29e92
-	md5sums = e3f158f0512db2620b052d2796c43057
+	source = kqrcode-plugins-cmake.patch
+	sha256sums = c89f4d6efa0a758fa1ce7f5f926f0a3d03348e943d22bfdc0c994152c4ef248b
+	sha256sums = 28bd604b550db4849e261ea146f3eba69b6407398cd0ef6e65c5a04ca1928a5e
+	sha256sums = 7e5100616969291541b7a14530f7445b9af09d2de3d8a7c64b1cfc4c4dc3471f
+	sha256sums = dd1c9757193456f07a3566b03eadc5a5bcaba8c173cf94c0c069c78c948379ed
+	sha256sums = 108b3cc82d41b875df7da4bed9b88999755e923b9bec5674dc218b3f20a9eb7b
 
 pkgname = kqrcode
 
diff --git a/PKGBUILD b/PKGBUILD
index 41eb6a0c2858..220e0ce7a81c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,42 @@
-#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
-#Mantaince: Tilo Brueckner <blueperil @ gmx.de>
-
 pkgname=kqrcode
 pkgver=0.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A little program that is meant to encode/decode data to/from QR codes."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php?content=143544"
-license="GPL"
+license=("GPL")
 makedepends=('cmake')
 depends=('kdelibs' 'qrencode' 'zbar-qt' 'automoc4')
 source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/kqrcode/files/${pkgname}-${pkgver}.tar.gz/download
         ${pkgname}-plugins-${pkgver}.tar.gz::http://sourceforge.net/projects/kqrcode/files/${pkgname}-plugins-${pkgver}.tar.gz/download
         ${pkgname}-dev-${pkgver}.tar.gz::http://sourceforge.net/projects/kqrcode/files/${pkgname}-dev-${pkgver}.tar.gz/download
-        kqrcode-cmake.patch)
-md5sums=('dbd5d951783020a0de6a923c29009781'
-         '22d023ab3b86fdd760e5d13ac33b87db'
-         'd421dd9cd2d0f3932161a65e18c29e92'
-         'e3f158f0512db2620b052d2796c43057')
+        kqrcode-cmake.patch 
+        kqrcode-plugins-cmake.patch)
+sha256sums=('c89f4d6efa0a758fa1ce7f5f926f0a3d03348e943d22bfdc0c994152c4ef248b'
+            '28bd604b550db4849e261ea146f3eba69b6407398cd0ef6e65c5a04ca1928a5e'
+            '7e5100616969291541b7a14530f7445b9af09d2de3d8a7c64b1cfc4c4dc3471f'
+            'dd1c9757193456f07a3566b03eadc5a5bcaba8c173cf94c0c069c78c948379ed'
+            '108b3cc82d41b875df7da4bed9b88999755e923b9bec5674dc218b3f20a9eb7b')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}/
+prepare() {
+  cd ${srcdir}/${pkgname}-plugins-${pkgver}
+
+  patch -Np1 < ${srcdir}/kqrcode-plugins-cmake.patch
+
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   patch -Np1 < ${srcdir}/kqrcode-cmake.patch
 
+  cp -a ${srcdir}/${pkgname}-dev-${pkgver}/*.h ${srcdir}/${pkgname}-${pkgver}/
+  cp -a ${srcdir}/${pkgname}-plugins-${pkgver}/{qrcontact,qremail,qrsms,qrweblink,qrwifi} ${srcdir}/${pkgname}-${pkgver}/
+
   rm -rf build
   mkdir -p build
   cd build || return 1
+}
 
-  mv ${srcdir}/${pkgname}-dev-${pkgver}/*.h ${srcdir}/${pkgname}-${pkgver}/
-  mv ${srcdir}/${pkgname}-plugins-${pkgver}/qrcontact ${srcdir}/${pkgname}-${pkgver}/
-  mv ${srcdir}/${pkgname}-plugins-${pkgver}/qremail ${srcdir}/${pkgname}-${pkgver}/
-  mv ${srcdir}/${pkgname}-plugins-${pkgver}/qrsms ${srcdir}/${pkgname}-${pkgver}/
-  mv ${srcdir}/${pkgname}-plugins-${pkgver}/qrweblink ${srcdir}/${pkgname}-${pkgver}/
-  mv ${srcdir}/${pkgname}-plugins-${pkgver}/qrwifi ${srcdir}/${pkgname}-${pkgver}/
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}/build
 
   cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` || return 1
   make || return 1
@@ -41,5 +44,6 @@ build() {
 
 package(){
   cd ${srcdir}/${pkgname}-${pkgver}/build
+
   make DESTDIR=${pkgdir} install || return 1
 }
diff --git a/kqrcode-plugins-cmake.patch b/kqrcode-plugins-cmake.patch
new file mode 100644
index 000000000000..7a5b5938ceae
--- /dev/null
+++ b/kqrcode-plugins-cmake.patch
@@ -0,0 +1,55 @@
+diff -ur kqrcode-plugins-0.6.0_orig/qrcontact/CMakeLists.txt kqrcode-plugins-0.6.0/qrcontact/CMakeLists.txt
+--- kqrcode-plugins-0.6.0_orig/qrcontact/CMakeLists.txt	2011-08-08 00:36:06.000000000 +0200
++++ kqrcode-plugins-0.6.0/qrcontact/CMakeLists.txt	2016-05-06 22:07:17.451048080 +0200
+@@ -1,7 +1,3 @@
+-project(qrcontact-plugin)
+-
+-cmake_minimum_required(VERSION 2.6.2) # may be lower
+-
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+diff -ur kqrcode-plugins-0.6.0_orig/qremail/CMakeLists.txt kqrcode-plugins-0.6.0/qremail/CMakeLists.txt
+--- kqrcode-plugins-0.6.0_orig/qremail/CMakeLists.txt	2011-08-08 00:50:54.000000000 +0200
++++ kqrcode-plugins-0.6.0/qremail/CMakeLists.txt	2016-05-06 22:07:08.012010649 +0200
+@@ -1,7 +1,3 @@
+-project(qremail-plugin)
+-
+-cmake_minimum_required(VERSION 2.6.2) # may be lower
+-
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+diff -ur kqrcode-plugins-0.6.0_orig/qrsms/CMakeLists.txt kqrcode-plugins-0.6.0/qrsms/CMakeLists.txt
+--- kqrcode-plugins-0.6.0_orig/qrsms/CMakeLists.txt	2011-08-08 00:51:09.000000000 +0200
++++ kqrcode-plugins-0.6.0/qrsms/CMakeLists.txt	2016-05-06 22:07:10.236019510 +0200
+@@ -1,7 +1,3 @@
+-project(qrsms-plugin)
+-
+-cmake_minimum_required(VERSION 2.6.2) # may be lower
+-
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+diff -ur kqrcode-plugins-0.6.0_orig/qrweblink/CMakeLists.txt kqrcode-plugins-0.6.0/qrweblink/CMakeLists.txt
+--- kqrcode-plugins-0.6.0_orig/qrweblink/CMakeLists.txt	2011-08-08 00:52:55.000000000 +0200
++++ kqrcode-plugins-0.6.0/qrweblink/CMakeLists.txt	2016-05-06 22:07:12.571028785 +0200
+@@ -1,7 +1,3 @@
+-project(qrweblink-plugin)
+-
+-cmake_minimum_required(VERSION 2.6.2) # may be lower
+-
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)
+diff -ur kqrcode-plugins-0.6.0_orig/qrwifi/CMakeLists.txt kqrcode-plugins-0.6.0/qrwifi/CMakeLists.txt
+--- kqrcode-plugins-0.6.0_orig/qrwifi/CMakeLists.txt	2011-08-08 00:51:30.000000000 +0200
++++ kqrcode-plugins-0.6.0/qrwifi/CMakeLists.txt	2016-05-06 22:07:14.777037523 +0200
+@@ -1,7 +1,3 @@
+-project(qrwifi-plugin)
+-
+-cmake_minimum_required(VERSION 2.6.2) # may be lower
+-
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+ include(MacroLibrary)