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 /security/gpgme | |
| parent | b54959cb77fe42564ba05c921b56bc748a477520 (diff) | |
| download | ports-983a022252fa536c76d4b032b300c030220220c6.tar.gz ports-983a022252fa536c76d4b032b300c030220220c6.zip | |
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)
Notes
Notes:
svn path=/head/; revision=426897
Diffstat (limited to 'security/gpgme')
| -rw-r--r-- | security/gpgme/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index fdcef245ed63..3553b1c1f856 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -70,7 +70,6 @@ LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp 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" |