[arch-commits] Commit in kdebase-runtime/trunk (2 files)

[Antonio Rojas]

    Date: Thursday, October 27, 2016 @ 21:41:51
  Author: arojas
Revision: 279356

Build against gpgme++ from gpgme 1.7

Added:
  kdebase-runtime/trunk/kdebase-runtime-gpgme-1.7.patch
Modified:
  kdebase-runtime/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   20 +++++---
 kdebase-runtime-gpgme-1.7.patch |   90 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-27 20:44:41 UTC (rev 279355)
+++ PKGBUILD	2016-10-27 21:41:51 UTC (rev 279356)
@@ -5,22 +5,27 @@
 
 pkgname=kdebase-runtime
 pkgver=16.08.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins and applications necessary for the running of KDE applications"
 arch=('i686' 'x86_64')
 url='https://www.kde.org/'
 license=('GPL' 'LGPL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager' 'boost')
-depends=('libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp' 'kdepimlibs4')
-optdepends=('gdb: needed by DrKonqi to generate backtrace' 'khelpcenter: to display applications documentation')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager' 'boost' 'kdepimlibs')
+depends=('libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp' 'exiv2' 'gpgme')
+optdepends=('kdepimlibs4: for DrKonqi' 'gdb: needed by DrKonqi to generate backtrace' 'khelpcenter: to display applications documentation')
 provides=(notification-daemon)
 conflicts=(kdesu4)
 replaces=(kdesu4)
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('966c5706318f6f8f09aa77332d4088a379cb1914')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" kdebase-runtime-gpgme-1.7.patch)
+sha1sums=('966c5706318f6f8f09aa77332d4088a379cb1914'
+          'a9261cc182da51ed86155e5068a845b9d490b784')
 
 prepare() {
   mkdir -p build
+
+# Build against gpgme's gpgme++
+  cd kde-runtime-$pkgver
+  patch -p1 -i ../kdebase-runtime-gpgme-1.7.patch
 }
 
 build() {
@@ -36,7 +41,8 @@
     -DBUILD_khelpcenter=OFF \
     -DBUILD_kglobalaccel=OFF \
     -DBUILD_kuiserver=OFF \
-    -DBUILD_doc=OFF
+    -DBUILD_doc=OFF \
+    -DWITH_QGpgme=ON
   make
 }
 

Added: kdebase-runtime-gpgme-1.7.patch
===================================================================
--- kdebase-runtime-gpgme-1.7.patch	                        (rev 0)
+++ kdebase-runtime-gpgme-1.7.patch	2016-10-27 21:41:51 UTC (rev 279356)
@@ -0,0 +1,90 @@
+diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt
+index 73aec82..4fd511d 100644
+--- a/kwalletd/CMakeLists.txt
++++ b/kwalletd/CMakeLists.txt
+@@ -3,13 +3,14 @@ project(kwalletd)
+ ########### find needed packages ######
+ find_package(Gpgme)  # Called by FindQGpgme, but since we call some gpgme
+                      # functions ourselves we need to link against it directly.
+-find_package(QGpgme) # provided by kdepimlibs
++find_package(Gpgmepp)
++set(GPGMEPP_LIBS Gpgmepp)
+ 
+-if (GPGME_FOUND AND QGPGME_FOUND)
++if (Gpgmepp_FOUND)
+     add_definitions(-DHAVE_QGPGME)
+-    include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
++    include_directories(${GPGME_INCLUDES})
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-endif(GPGME_FOUND AND QGPGME_FOUND)
++endif(Gpgmepp_FOUND)
+ 
+ ########### build backends #########
+ add_subdirectory(backend)
+@@ -37,7 +38,7 @@ kde4_add_ui_files(kwalletd_KDEINIT_SRCS
+    kwalletwizardpagepassword.ui
+ )
+ 
+-if (GPGME_FOUND AND QGPGME_FOUND)
++if (Gpgmepp_FOUND)
+     set(kwalletd_KDEINIT_SRCS
+         ${kwalletd_KDEINIT_SRCS}
+         knewwalletdialog.cpp
+@@ -48,7 +49,7 @@ if (GPGME_FOUND AND QGPGME_FOUND)
+         knewwalletdialogintro.ui
+         knewwalletdialoggpg.ui
+     )
+-endif(GPGME_FOUND AND QGPGME_FOUND)
++endif(Gpgmepp_FOUND)
+ 
+ find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} )
+ 
+@@ -57,9 +58,9 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD )
+ kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} )
+ 
+ target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend )
+-if (GPGME_FOUND AND QGPGME_FOUND)
+-    target_link_libraries(kdeinit_kwalletd ${QGPGME_LIBRARIES} )
+-endif(GPGME_FOUND AND QGPGME_FOUND)
++if (Gpgmepp_FOUND)
++    target_link_libraries(kdeinit_kwalletd ${GPGMEPP_LIBS} )
++endif(Gpgmepp_FOUND)
+ 
+ install(TARGETS kdeinit_kwalletd  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+--- a/kwalletd/backend/CMakeLists.txt
++++ b/kwalletd/backend/CMakeLists.txt
+@@ -20,9 +20,9 @@ set(kwalletbackend_LIB_SRCS
+ kde4_add_library(kwalletbackend SHARED ${kwalletbackend_LIB_SRCS})
+ 
+ target_link_libraries(kwalletbackend ${KDE4_KDEUI_LIBS} ${LIBGCRYPT_LIBRARIES})
+-if(QGPGME_FOUND)
+-target_link_libraries(kwalletbackend ${QGPGME_LIBRARIES} )
+-endif(QGPGME_FOUND)
++if(Gpgmepp_FOUND)
++target_link_libraries(kwalletbackend ${GPGMEPP_LIBS} )
++endif(Gpgmepp_FOUND)
+ 
+ # link with advapi32 on windows
+ if(WIN32 AND NOT WINCE)
+--- a/kwalletd/backend/backendpersisthandler.cpp
++++ b/kwalletd/backend/backendpersisthandler.cpp
+@@ -33,6 +33,7 @@
+ #include <gpgme++/data.h>
+ #include <gpgme++/encryptionresult.h>
+ #include <gpgme++/decryptionresult.h>
++#include <boost/shared_ptr.hpp>
+ #endif
+ #include "backendpersisthandler.h"
+ #include "kwalletbackend.h"
+--- a/kwalletd/kwalletwizard.cpp
++++ b/kwalletd/kwalletwizard.cpp
+@@ -40,6 +40,7 @@
+ #include <kdebug.h>
+ #include <kmessagebox.h>
+ #include <gpgme.h>
++#include <boost/shared_ptr.hpp>
+ #endif
+ 
+ class PageIntro : public QWizardPage
+