summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-11-08 22:45:34 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-11-08 22:59:46 -0300
commitfc938b4925dbc8e86e751f65b1dd1e0b5c461b00 (patch)
tree3c61f66d77cdc5425eaad44181fed26e9bc9788d /libre
parentea00372c0ba6243c14ccd255047b3cb95aae1ae3 (diff)
downloadabslibre-fc938b4925dbc8e86e751f65b1dd1e0b5c461b00.tar.gz
abslibre-fc938b4925dbc8e86e751f65b1dd1e0b5c461b00.tar.bz2
abslibre-fc938b4925dbc8e86e751f65b1dd1e0b5c461b00.zip
kdebase-runtime-16.08.2-3.parabola1: bump to Arch's revision
* build against gpgme++ from gpgme 1.7 * don't build drkonqi, use KF5 version
Diffstat (limited to 'libre')
-rw-r--r--libre/kdebase-runtime/PKGBUILD19
-rw-r--r--libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch90
2 files changed, 105 insertions, 4 deletions
diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD
index 0f9c202ad..b0490b05c 100644
--- a/libre/kdebase-runtime/PKGBUILD
+++ b/libre/kdebase-runtime/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 278584 2016-10-13 15:30:27Z arojas $
+# $Id: PKGBUILD 279462 2016-10-29 23:26:54Z arojas $
# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
@@ -6,21 +6,23 @@
pkgname=kdebase-runtime
pkgver=16.08.2
-pkgrel=1.parabola1
+pkgrel=3.parabola1
pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search engines"
arch=('i686' 'x86_64' 'armv7h')
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')
+depends=('libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp' 'exiv2' 'gpgme')
+optdepends=('drkonqi: crash report tool' '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"
+ 'kdebase-runtime-gpgme-1.7.patch'
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
sha1sums=('966c5706318f6f8f09aa77332d4088a379cb1914'
+ 'a9261cc182da51ed86155e5068a845b9d490b784'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
@@ -29,6 +31,12 @@ prepare() {
cd kde-runtime-${pkgver}
+ # Build against gpgme's gpgme++
+ patch -p1 -i ../kdebase-runtime-gpgme-1.7.patch
+
+ # Don't build drkonqi
+ sed -e '/drkonqi/d' -i CMakeLists.txt
+
# Removing non-privacy search providers
rm -v kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,google_shopping,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
@@ -63,6 +71,9 @@ package() {
rm "$pkgdir"/usr/share/icons/hicolor/index.theme
ln -s /usr/lib/kde4/libexec/kdesu "$pkgdir"/usr/bin/kdesu4
+# Use KF5 drkonqi
+ ln -s /usr/lib/drkonqi "$pkgdir"/usr/lib/kde4/libexec/
+
# FS#36668
chown :nobody "$pkgdir"/usr/lib/kde4/libexec/kdesud
chmod g+s "$pkgdir"/usr/lib/kde4/libexec/kdesud
diff --git a/libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch b/libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch
new file mode 100644
index 000000000..aec10e738
--- /dev/null
+++ b/libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch
@@ -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
+