Date: Wed, 23 Nov 2016 12:15:39 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426897 - in head: deskutils/kdepim4 deskutils/kdepimlibs4 deskutils/kdepimlibs4/files finance/kmymoney-kde4 net-im/kopete-kde4 security/gpgme security/gpgme-qt5 x11/kde4-runtime Message-ID: <201611231215.uANCFdiE014296@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Wed Nov 23 12:15:38 2016 New Revision: 426897 URL: https://svnweb.freebsd.org/changeset/ports/426897 Log: Fix conflict between libqgpgme from deskutils/kdepimlibs4 and security/qgpgme-qt5 Install the kde4 version of libqgpgme as libqgpgme4. * Bump revision in affected dependencies -- not all ports using USE_KDE=pimlibs actually link against libqgpgme. * Remove conflict from security/gpgme-qt5 * Drop KDE3 hunks from patch-cmake__modules__FindQGpgme.cmake PR: 212886 Reviewed by: rakuco Approved by: rakuco (mentor) Added: head/deskutils/kdepimlibs4/files/patch-qgpgme_CMakeLists.txt (contents, props changed) Modified: head/deskutils/kdepim4/Makefile head/deskutils/kdepimlibs4/Makefile head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake head/deskutils/kdepimlibs4/pkg-plist head/finance/kmymoney-kde4/Makefile head/net-im/kopete-kde4/Makefile head/security/gpgme-qt5/Makefile head/security/gpgme/Makefile head/x11/kde4-runtime/Makefile Modified: head/deskutils/kdepim4/Makefile ============================================================================== --- head/deskutils/kdepim4/Makefile Wed Nov 23 11:43:13 2016 (r426896) +++ head/deskutils/kdepim4/Makefile Wed Nov 23 12:15:38 2016 (r426897) @@ -3,6 +3,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_KDELIBS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Modified: head/deskutils/kdepimlibs4/Makefile ============================================================================== --- head/deskutils/kdepimlibs4/Makefile Wed Nov 23 11:43:13 2016 (r426896) +++ head/deskutils/kdepimlibs4/Makefile Wed Nov 23 12:15:38 2016 (r426897) @@ -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} Modified: head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake ============================================================================== --- head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake Wed Nov 23 11:43:13 2016 (r426896) +++ head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake Wed Nov 23 12:15:38 2016 (r426897) @@ -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 Added: head/deskutils/kdepimlibs4/files/patch-qgpgme_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kdepimlibs4/files/patch-qgpgme_CMakeLists.txt Wed Nov 23 12:15:38 2016 (r426897) @@ -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}) Modified: head/deskutils/kdepimlibs4/pkg-plist ============================================================================== --- head/deskutils/kdepimlibs4/pkg-plist Wed Nov 23 11:43:13 2016 (r426896) +++ head/deskutils/kdepimlibs4/pkg-plist Wed Nov 23 12:15:38 2016 (r426897) @@ -1209,9 +1209,9 @@ lib/libmailtransport.so.%%KDE4_KDELIBS_V 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%% Modified: head/finance/kmymoney-kde4/Makefile ============================================================================== --- head/finance/kmymoney-kde4/Makefile Wed Nov 23 11:43:13 2016 (r426896) +++ head/finance/kmymoney-kde4/Makefile Wed Nov 23 12:15:38 2016 (r426897) @@ -2,7 +2,7 @@ PORTNAME= kmymoney PORTVERSION= 4.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src Modified: head/net-im/kopete-kde4/Makefile ============================================================================== --- head/net-im/kopete-kde4/Makefile Wed Nov 23 11:43:13 2016 (r426896) +++ head/net-im/kopete-kde4/Makefile Wed Nov 23 12:15:38 2016 (r426897) @@ -2,7 +2,7 @@ PORTNAME= kopete PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im kde kde-kde4 MAINTAINER= kde@FreeBSD.org Modified: head/security/gpgme-qt5/Makefile ============================================================================== --- head/security/gpgme-qt5/Makefile Wed Nov 23 11:43:13 2016 (r426896) +++ head/security/gpgme-qt5/Makefile Wed Nov 23 12:15:38 2016 (r426897) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= -${SLAVEPORT} MAINTAINER= jhale@FreeBSD.org Modified: head/security/gpgme/Makefile ============================================================================== --- head/security/gpgme/Makefile Wed Nov 23 11:43:13 2016 (r426896) +++ head/security/gpgme/Makefile Wed Nov 23 12:15:38 2016 (r426897) @@ -70,7 +70,6 @@ LIB_DEPENDS+= libgpgmepp.so:security/gpg CONFIGURE_ARGS+=--enable-languages="cpp qt" USES+= compiler:c++11-lib pkgconfig USE_QT5= buildtools_build core testlib -CONFLICTS_INSTALL= kdepimlibs-4.* . endif . if ${SLAVEPORT} == "python" Modified: head/x11/kde4-runtime/Makefile ============================================================================== --- head/x11/kde4-runtime/Makefile Wed Nov 23 11:43:13 2016 (r426896) +++ head/x11/kde4-runtime/Makefile Wed Nov 23 12:15:38 2016 (r426897) @@ -2,7 +2,7 @@ PORTNAME= kde-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 kde kde-kde4 MAINTAINER= kde@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611231215.uANCFdiE014296>