pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kde-runtime4: drop dependency on kdepimlibs4



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Thu Feb 1 08:52:46 2018 +1300
Changeset:	59658d8f7fde1f2b36a06b6a4afbdbb26687d10d

Modified Files:
	kde-runtime4/Makefile
	kde-runtime4/distinfo
Added Files:
	kde-runtime4/patches/patch-kwalletd_CMakeLists.txt

Log Message:
kde-runtime4: drop dependency on kdepimlibs4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=59658d8f7fde1f2b36a06b6a4afbdbb26687d10d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kde-runtime4/Makefile                              |  1 -
 kde-runtime4/distinfo                              |  1 +
 kde-runtime4/patches/patch-kwalletd_CMakeLists.txt | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diffs:
diff --git a/kde-runtime4/Makefile b/kde-runtime4/Makefile
index c57920e0ae..099cebce2d 100644
--- a/kde-runtime4/Makefile
+++ b/kde-runtime4/Makefile
@@ -85,7 +85,6 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 # not the libssh the package wants
 #.include "../../security/libssh/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
-.include "../../misc/kdepimlibs4/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
diff --git a/kde-runtime4/distinfo b/kde-runtime4/distinfo
index 4e244053ee..053cad4914 100644
--- a/kde-runtime4/distinfo
+++ b/kde-runtime4/distinfo
@@ -15,6 +15,7 @@ SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89
 SHA1 (patch-doc_kcontrol_CMakeLists.txt) = c6300735d29c009322e4fdb4d58a606940fb0c62
 SHA1 (patch-kioslave_nfs_rpc__nfs2__prot__xdr.c) = f1d8dc8224e68ef323f06602bf4b856c785f15e4
 SHA1 (patch-kioslave_thumbnail_CMakeLists.txt) = ce0ff3d346ebf093bbb35a7edbfc069809472d6f
+SHA1 (patch-kwalletd_CMakeLists.txt) = 002a32ce12f19a560568ed92e046956daa856ef7
 SHA1 (patch-kwalletd_backend_blowfish.h) = 23bd9bf9671a770d203a10c46dc602145d2b9457
 SHA1 (patch-plasma_declarativeimports_CMakeLists.txt) = 0f5a7747cd207598ca92f5200b7d79ba537fcba5
 SHA1 (patch-plasma_declarativeimports_graphicswidgets_graphicswidgetsbindingsplugin.cpp) = 6b0852831f56207f7b55454a29ca95ad408fd120
diff --git a/kde-runtime4/patches/patch-kwalletd_CMakeLists.txt b/kde-runtime4/patches/patch-kwalletd_CMakeLists.txt
new file mode 100644
index 0000000000..b03b10edde
--- /dev/null
+++ b/kde-runtime4/patches/patch-kwalletd_CMakeLists.txt
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Don't define HAVE_QGPGME if we dont.
+
+--- kwalletd/CMakeLists.txt.orig	2017-10-01 01:02:55.000000000 +0000
++++ kwalletd/CMakeLists.txt
+@@ -10,11 +10,11 @@ find_package(Gpgmepp) # provided by gpgm
+ endif (NOT QGPGME_FOUND)
+ 
+ if ((GPGME_FOUND AND QGPGME_FOUND) OR Gpgmepp_FOUND)
+-    add_definitions(-DHAVE_QGPGME)
+     include_directories(${GPGME_INCLUDES})
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ endif((GPGME_FOUND AND QGPGME_FOUND) OR Gpgmepp_FOUND)
+ if (GPGME_FOUND AND QGPGME_FOUND)
++    add_definitions(-DHAVE_QGPGME)
+     include_directories(${QGPGME_INCLUDE_DIR})
+ endif (GPGME_FOUND AND QGPGME_FOUND)
+ if (Gpgmepp_FOUND)


Home | Main Index | Thread Index | Old Index