diff options
| -rw-r--r-- | misc/kdepimlibs4/Makefile | 4 | ||||
| -rw-r--r-- | misc/kdepimlibs4/PLIST | 72 | ||||
| -rw-r--r-- | misc/kdepimlibs4/buildlink3.mk | 7 | ||||
| -rw-r--r-- | misc/kdepimlibs4/distinfo | 4 | ||||
| -rw-r--r-- | misc/kdepimlibs4/patches/patch-gpgmexx_CMakeLists.txt | 15 | ||||
| -rw-r--r-- | misc/kdepimlibs4/patches/patch-gpgmexx_interfaces_CMakeLists.txt | 13 |
6 files changed, 75 insertions, 40 deletions
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile index eae93e94c6e..f31c05a68b4 100644 --- a/misc/kdepimlibs4/Makefile +++ b/misc/kdepimlibs4/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.77 2017/04/30 01:21:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.78 2017/08/06 06:35:35 markd Exp $ DISTNAME= kdepimlibs-4.14.10 PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= misc COMMENT= Support libraries for PIM for the KDE integrated X11 desktop MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.04.3/src/} diff --git a/misc/kdepimlibs4/PLIST b/misc/kdepimlibs4/PLIST index f286ada00f5..b8ed5e5e316 100644 --- a/misc/kdepimlibs4/PLIST +++ b/misc/kdepimlibs4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2016/01/10 19:33:04 markd Exp $ +@comment $NetBSD: PLIST,v 1.13 2017/08/06 06:35:35 markd Exp $ bin/akonadi2xml bin/akonaditest include/KDE/Akonadi/AgentBase @@ -657,41 +657,41 @@ include/akonadi/xml/xmldocument.h include/akonadi/xml/xmlreader.h include/akonadi/xml/xmlwritejob.h include/akonadi/xml/xmlwriter.h -include/gpgme++/assuanresult.h -include/gpgme++/configuration.h -include/gpgme++/context.h -include/gpgme++/data.h -include/gpgme++/decryptionresult.h -include/gpgme++/defaultassuantransaction.h -include/gpgme++/editinteractor.h -include/gpgme++/encryptionresult.h -include/gpgme++/engineinfo.h -include/gpgme++/error.h -include/gpgme++/eventloopinteractor.h -include/gpgme++/exception.h -include/gpgme++/global.h -include/gpgme++/gpgadduserideditinteractor.h -include/gpgme++/gpgagentgetinfoassuantransaction.h -include/gpgme++/gpgme++_export.h -include/gpgme++/gpgmefw.h -include/gpgme++/gpgsetexpirytimeeditinteractor.h -include/gpgme++/gpgsetownertrusteditinteractor.h -include/gpgme++/gpgsignkeyeditinteractor.h -include/gpgme++/importresult.h -include/gpgme++/interfaces/assuantransaction.h -include/gpgme++/interfaces/dataprovider.h -include/gpgme++/interfaces/passphraseprovider.h -include/gpgme++/interfaces/progressprovider.h -include/gpgme++/key.h -include/gpgme++/keygenerationresult.h -include/gpgme++/keylistresult.h -include/gpgme++/notation.h -include/gpgme++/result.h -include/gpgme++/scdgetinfoassuantransaction.h -include/gpgme++/signingresult.h -include/gpgme++/trustitem.h -include/gpgme++/verificationresult.h -include/gpgme++/vfsmountresult.h +include/KDE/gpgme++/assuanresult.h +include/KDE/gpgme++/configuration.h +include/KDE/gpgme++/context.h +include/KDE/gpgme++/data.h +include/KDE/gpgme++/decryptionresult.h +include/KDE/gpgme++/defaultassuantransaction.h +include/KDE/gpgme++/editinteractor.h +include/KDE/gpgme++/encryptionresult.h +include/KDE/gpgme++/engineinfo.h +include/KDE/gpgme++/error.h +include/KDE/gpgme++/eventloopinteractor.h +include/KDE/gpgme++/exception.h +include/KDE/gpgme++/global.h +include/KDE/gpgme++/gpgadduserideditinteractor.h +include/KDE/gpgme++/gpgagentgetinfoassuantransaction.h +include/KDE/gpgme++/gpgme++_export.h +include/KDE/gpgme++/gpgmefw.h +include/KDE/gpgme++/gpgsetexpirytimeeditinteractor.h +include/KDE/gpgme++/gpgsetownertrusteditinteractor.h +include/KDE/gpgme++/gpgsignkeyeditinteractor.h +include/KDE/gpgme++/importresult.h +include/KDE/gpgme++/interfaces/assuantransaction.h +include/KDE/gpgme++/interfaces/dataprovider.h +include/KDE/gpgme++/interfaces/passphraseprovider.h +include/KDE/gpgme++/interfaces/progressprovider.h +include/KDE/gpgme++/key.h +include/KDE/gpgme++/keygenerationresult.h +include/KDE/gpgme++/keylistresult.h +include/KDE/gpgme++/notation.h +include/KDE/gpgme++/result.h +include/KDE/gpgme++/scdgetinfoassuantransaction.h +include/KDE/gpgme++/signingresult.h +include/KDE/gpgme++/trustitem.h +include/KDE/gpgme++/verificationresult.h +include/KDE/gpgme++/vfsmountresult.h include/kabc/address.h include/kabc/addressbook.h include/kabc/addressee.h diff --git a/misc/kdepimlibs4/buildlink3.mk b/misc/kdepimlibs4/buildlink3.mk index 87fc242dfce..4f2705624c2 100644 --- a/misc/kdepimlibs4/buildlink3.mk +++ b/misc/kdepimlibs4/buildlink3.mk @@ -1,10 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.52 2017/04/30 01:21:23 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.53 2017/08/06 06:35:35 markd Exp $ BUILDLINK_TREE+= kdepimlibs .if !defined(KDEPIMLIBS_BUILDLINK3_MK) KDEPIMLIBS_BUILDLINK3_MK:= +# Hack to not find wrong gpgme++ +pre-configure: kdepimlibs4-preconfigure +kdepimlibs4-preconfigure: + mv ${BUILDLINK_DIR}/include/gpgme++ ${BUILDLINK_DIR}/include/gpgme++.xxx + BUILDLINK_API_DEPENDS.kdepimlibs+= kdepimlibs4>=4.0.0 BUILDLINK_ABI_DEPENDS.kdepimlibs+= kdepimlibs4>=4.14.10nb5 BUILDLINK_PKGSRCDIR.kdepimlibs?= ../../misc/kdepimlibs4 diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo index 0ab692b4f31..fa9353941c4 100644 --- a/misc/kdepimlibs4/distinfo +++ b/misc/kdepimlibs4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2016/02/18 20:55:45 jperkin Exp $ +$NetBSD: distinfo,v 1.35 2017/08/06 06:35:35 markd Exp $ SHA1 (kdepimlibs-4.14.10.tar.xz) = 8db2f59b8a33f4d1bbebfdff8b772d30669c9932 RMD160 (kdepimlibs-4.14.10.tar.xz) = 4df52569c41b3af12aaf6f457e213f31feb78343 @@ -10,7 +10,9 @@ SHA1 (patch-akonadi_resourcebase.cpp) = b0195b6f6ec2a56d7fdcd2bf79a87236d601da32 SHA1 (patch-akonadi_resourcebase.h) = e0a6910c198ace215631dffb380cb67e15061927 SHA1 (patch-akonadi_tests_itemsynctest.cpp) = 309873e79d59ae81021a88db725ce63769ec0160 SHA1 (patch-cmake_modules_FindLdap.cmake) = 686bf45bb4c9ffb7a56b670547d1ba67d702ac19 +SHA1 (patch-gpgmexx_CMakeLists.txt) = 6ef41aedeb3445764aba3d684a9ad321c6ff290e SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c +SHA1 (patch-gpgmexx_interfaces_CMakeLists.txt) = d7d8a039deed83df8c742fec41a4093d5cc3b057 SHA1 (patch-kblog_CMakeLists.txt) = b03068672c39492ef4883125c65f7951c7cc8f01 SHA1 (patch-kimap_loginjob.cpp) = 8a0fe3c1779b981d9c9ca6cb34121219f2f97c9f SHA1 (patch-kldap_ber.cpp) = 8f2cf67ee39f744b2114b6cba503f9bcdb2efacc diff --git a/misc/kdepimlibs4/patches/patch-gpgmexx_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-gpgmexx_CMakeLists.txt new file mode 100644 index 00000000000..1fbdcc8c43e --- /dev/null +++ b/misc/kdepimlibs4/patches/patch-gpgmexx_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-gpgmexx_CMakeLists.txt,v 1.1 2017/08/06 06:35:35 markd Exp $ + +Don't clash with gpgme>=1.8 + +--- gpgme++/CMakeLists.txt.orig 2015-06-24 12:43:14.000000000 +0000 ++++ gpgme++/CMakeLists.txt +@@ -143,7 +143,7 @@ if ( GPGME_FOUND ) + gpgagentgetinfoassuantransaction.h + configuration.h + ${CMAKE_CURRENT_BINARY_DIR}/gpgme++_export.h vfsmountresult.h +- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ COMPONENT Devel ++ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/gpgme++ COMPONENT Devel + ) + + install( diff --git a/misc/kdepimlibs4/patches/patch-gpgmexx_interfaces_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-gpgmexx_interfaces_CMakeLists.txt new file mode 100644 index 00000000000..f43d1abc69c --- /dev/null +++ b/misc/kdepimlibs4/patches/patch-gpgmexx_interfaces_CMakeLists.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-gpgmexx_interfaces_CMakeLists.txt,v 1.1 2017/08/06 06:35:35 markd Exp $ + +Don't clash with gpgme>=1.8 + +--- gpgme++/interfaces/CMakeLists.txt.orig 2015-06-24 12:43:14.000000000 +0000 ++++ gpgme++/interfaces/CMakeLists.txt +@@ -4,5 +4,5 @@ install( FILES + passphraseprovider.h + progressprovider.h + assuantransaction.h +- DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++/interfaces COMPONENT Devel) ++ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/gpgme++/interfaces COMPONENT Devel) + |