diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-11-23 12:15:38 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-11-23 12:15:38 +0000 |
| commit | 983a022252fa536c76d4b032b300c030220220c6 (patch) | |
| tree | dbbda119c58b35b7c2785a1adb3fda927e8f2139 /deskutils/kdepimlibs4 | |
| parent | b54959cb77fe42564ba05c921b56bc748a477520 (diff) | |
| download | ports-983a022252fa536c76d4b032b300c030220220c6.tar.gz ports-983a022252fa536c76d4b032b300c030220220c6.zip | |
Notes
Diffstat (limited to 'deskutils/kdepimlibs4')
| -rw-r--r-- | deskutils/kdepimlibs4/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake | 23 | ||||
| -rw-r--r-- | deskutils/kdepimlibs4/files/patch-qgpgme_CMakeLists.txt | 12 | ||||
| -rw-r--r-- | deskutils/kdepimlibs4/pkg-plist | 6 |
4 files changed, 26 insertions, 17 deletions
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile index 62ed005eff3d..8afc72249318 100644 --- a/deskutils/kdepimlibs4/Makefile +++ b/deskutils/kdepimlibs4/Makefile @@ -3,7 +3,7 @@ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_KDELIBS_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake index 67d17cc2334c..c0fed2a7b252 100644 --- a/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake +++ b/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake @@ -1,16 +1,13 @@ ---- ./cmake/modules/FindQGpgme.cmake.orig 2009-05-06 14:13:19.000000000 +0400 -+++ ./cmake/modules/FindQGpgme.cmake 2010-05-21 23:58:20.499901479 +0400 -@@ -17,11 +17,11 @@ +As we install libqgpgme as libqgpgme4, we have to search for 'gpgme4'. + +--- cmake/modules/FindQGpgme.cmake.orig 2015-06-24 12:43:14 UTC ++++ cmake/modules/FindQGpgme.cmake +@@ -20,7 +20,7 @@ if(GPGME_FOUND) HINTS ${GPGME_LIBRARY_DIR}) - else ( WIN32 ) - find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread -- HINTS ${GPGME_LIBRARY_DIR}) -+ HINTS ${GPGME_LIBRARY_DIR} %%KDE_PREFIX%%/lib) endif() - - find_library(QGPGME_LIBRARY qgpgme -- HINTS ${GPGME_LIBRARY_DIR}) -+ HINTS ${GPGME_LIBRARY_DIR} %%KDE_PREFIX%%/lib) - + +- find_library(QGPGME_LIBRARY qgpgme ++ find_library(QGPGME_LIBRARY qgpgme4 + HINTS ${GPGME_LIBRARY_DIR}) + if (QGPGME_LIBRARY) - # get the libdirectory and then go one up diff --git a/deskutils/kdepimlibs4/files/patch-qgpgme_CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-qgpgme_CMakeLists.txt new file mode 100644 index 000000000000..d129049b2f55 --- /dev/null +++ b/deskutils/kdepimlibs4/files/patch-qgpgme_CMakeLists.txt @@ -0,0 +1,12 @@ +Install libqgpgme as libqgpgme4 to not conflict with security/gpgme-qt5 + +--- qgpgme/CMakeLists.txt.orig 2016-11-19 14:44:57 UTC ++++ qgpgme/CMakeLists.txt +@@ -49,6 +49,7 @@ if ( _any_gpgme_found ) + set_target_properties( qgpgme PROPERTIES + VERSION ${_qgpgme_version} + SOVERSION ${_qgpgme_soversion} ++ OUTPUT_NAME qgpgme4 + ) + + install( TARGETS qgpgme EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist index 134e03723f62..80b494af56a0 100644 --- a/deskutils/kdepimlibs4/pkg-plist +++ b/deskutils/kdepimlibs4/pkg-plist @@ -1209,9 +1209,9 @@ lib/libmailtransport.so.%%KDE4_KDELIBS_VERSION%% lib/libmicroblog.so lib/libmicroblog.so.4 lib/libmicroblog.so.%%KDE4_KDELIBS_VERSION%% -lib/libqgpgme.so -lib/libqgpgme.so.1 -lib/libqgpgme.so.1.0.1 +lib/libqgpgme4.so +lib/libqgpgme4.so.1 +lib/libqgpgme4.so.1.0.1 lib/libsyndication.so lib/libsyndication.so.4 lib/libsyndication.so.%%KDE4_KDELIBS_VERSION%% |