summaryrefslogtreecommitdiff
path: root/libre/kdebase-runtime
diff options
context:
space:
mode:
Diffstat (limited to 'libre/kdebase-runtime')
-rw-r--r--libre/kdebase-runtime/PKGBUILD6
-rw-r--r--libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch90
2 files changed, 3 insertions, 93 deletions
diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD
index 1730098c3..7b4e97854 100644
--- a/libre/kdebase-runtime/PKGBUILD
+++ b/libre/kdebase-runtime/PKGBUILD
@@ -5,8 +5,8 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=kdebase-runtime
-pkgver=17.04.0
-pkgrel=2.parabola1
+pkgver=17.04.1
+pkgrel=1.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/'
@@ -22,7 +22,7 @@ source=("https://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-
'duckduckgo_lite.desktop'
kdebase-runtime-no-html-thumbnails.patch
kdebase-runtime-no-kdewebkit.patch)
-sha256sums=('9695c7acf0560e66b2eb19ac3ee9ff8acde9fefc30055b48ec4d2d4cabae0d5e'
+sha256sums=('14a01d4b7e0ca4bcb3f95a40baf2d15412b89a51adf7f3c3b4c35601bd6d2a67'
'SKIP'
'31910ab7393e67609f15e04a57f6406f63e6dae58b01bce0787741bc5958f292'
'40466a9dad7075f2525e9e024720da7d7b49a22892b6fca8b81cc0e6408d2f7d'
diff --git a/libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch b/libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch
deleted file mode 100644
index aec10e738..000000000
--- a/libre/kdebase-runtime/kdebase-runtime-gpgme-1.7.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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
-