[153292] trunk/dports/kde/kdepimlibs4
nicos at macports.org
nicos at macports.org
Wed Sep 28 08:27:58 PDT 2016
Revision: 153292
https://trac.macports.org/changeset/153292
Author: nicos at macports.org
Date: 2016-09-28 08:27:58 -0700 (Wed, 28 Sep 2016)
Log Message:
-----------
kdepimlibs4: resolving conflict with gpgme port (ticket #52342)
Modified Paths:
--------------
trunk/dports/kde/kdepimlibs4/Portfile
Added Paths:
-----------
trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff
trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff
trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff
Modified: trunk/dports/kde/kdepimlibs4/Portfile
===================================================================
--- trunk/dports/kde/kdepimlibs4/Portfile 2016-09-28 13:02:53 UTC (rev 153291)
+++ trunk/dports/kde/kdepimlibs4/Portfile 2016-09-28 15:27:58 UTC (rev 153292)
@@ -6,7 +6,7 @@
name kdepimlibs4
version 4.14.3
-revision 3
+revision 4
categories kde kde4
maintainers nicos
license GPL-2+ LGPL-2+ BSD
@@ -41,10 +41,23 @@
port:gpgme
#Suppress build of kioslaves which conflict with openssl
-patchfiles-append patch-CMakeLists.diff
+patchfiles-append patch-CMakeLists.diff \
+ patch-gpgme.diff \
+ patch-qgpgme.diff \
+ patch-testqgpgme.diff
configure.args-append -DMAILTRANSPORT_INPROCESS_SMTP=Off
+pre-configure {
+ #Deactivating gpgme++ to avoid conflict with gpgme port
+ reinplace "s|add_subdirectory(gpgme++)|#add_subdirectory(gpgme++)|g" \
+ ${worksrcpath}/CMakeLists.txt
+ reinplace "s|%PREFIX%|${prefix}/lib|g" \
+ ${worksrcpath}/qgpgme/CMakeLists.txt
+ reinplace "s|%PREFIX%|${prefix}/lib|g" \
+ ${worksrcpath}/qgpgme/tests/CMakeLists.txt
+}
+
pre-activate {
if {[file exists ${applications_dir}/KDE4/akonadi2xml.app/Contents/Info.plist]
&& ![catch {set vers [lindex [registry_active kdepim4-runtime] 0]}]
Added: trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff
===================================================================
--- trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff (rev 0)
+++ trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff 2016-09-28 15:27:58 UTC (rev 153292)
@@ -0,0 +1,48 @@
+diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/eventloopinteractor.h ./gpgme++/eventloopinteractor.h
+--- ../kdepimlibs-4.14.3-orig/./gpgme++/eventloopinteractor.h 2014-11-05 06:19:27.000000000 +0900
++++ ./gpgme++/eventloopinteractor.h 2016-09-28 00:32:48.000000000 +0900
+@@ -24,7 +24,7 @@
+ #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
+ #define __GPGMEPP_EVENTLOOPINTERACTOR_H__
+
+-#include <gpgme++/gpgme++_export.h>
++#include <gpgme++/gpgmepp_export.h>
+
+ namespace GpgME {
+
+diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/global.h ./gpgme++/global.h
+--- ../kdepimlibs-4.14.3-orig/./gpgme++/global.h 2014-11-05 06:19:27.000000000 +0900
++++ ./gpgme++/global.h 2016-09-28 00:33:02.000000000 +0900
+@@ -25,7 +25,7 @@
+ #define __GPGMEPP_GLOBAL_H__
+
+ #include <gpgme++/gpgmefw.h>
+-#include <gpgme++/gpgme++_export.h>
++#include <gpgme++/gpgmepp_export.h>
+
+ #include <iosfwd>
+
+diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/interfaces/dataprovider.h ./gpgme++/interfaces/dataprovider.h
+--- ../kdepimlibs-4.14.3-orig/./gpgme++/interfaces/dataprovider.h 2014-11-05 06:19:27.000000000 +0900
++++ ./gpgme++/interfaces/dataprovider.h 2016-09-28 00:30:40.000000000 +0900
+@@ -25,7 +25,7 @@
+
+ #include <sys/types.h>
+
+-#include <gpgme++/gpgme++_export.h>
++#include <gpgme++/gpgmepp_export.h>
+
+ #include <gpg-error.h>
+
+diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/verificationresult.h ./gpgme++/verificationresult.h
+--- ../kdepimlibs-4.14.3-orig/./gpgme++/verificationresult.h 2014-11-05 06:19:27.000000000 +0900
++++ ./gpgme++/verificationresult.h 2016-09-28 00:34:27.000000000 +0900
+@@ -25,7 +25,7 @@
+
+ #include <gpgme++/gpgmefw.h>
+ #include <gpgme++/result.h>
+-#include <gpgme++/gpgme++_export.h>
++#include <gpgme++/gpgmepp_export.h>
+
+ #include <time.h>
+
Added: trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff
===================================================================
--- trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff (rev 0)
+++ trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff 2016-09-28 15:27:58 UTC (rev 153292)
@@ -0,0 +1,11 @@
+--- qgpgme/CMakeLists.txt.orig 2016-09-28 23:37:35.000000000 +0900
++++ qgpgme/CMakeLists.txt 2016-09-29 00:05:38.000000000 +0900
+@@ -44,7 +44,7 @@
+ add_library( qgpgme ${LIBRARY_TYPE} ${qgpgme_LIB_SRCS} )
+ generate_export_header(qgpgme)
+
+- target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )
++ target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} %PREFIX%/libgpgme-pthread.dylib %PREFIX%/libgpgmepp.dylib )
+
+ set_target_properties( qgpgme PROPERTIES
+ VERSION ${_qgpgme_version}
Added: trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff
===================================================================
--- trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff (rev 0)
+++ trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff 2016-09-28 15:27:58 UTC (rev 153292)
@@ -0,0 +1,11 @@
+--- qgpgme/tests/CMakeLists.txt.orig 2016-09-29 00:13:50.000000000 +0900
++++ qgpgme/tests/CMakeLists.txt 2016-09-29 00:15:01.000000000 +0900
+@@ -29,7 +29,7 @@
+ if (WIN32) # what's up?
+ target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
+ else()
+- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
++ target_link_libraries( "${_qgpgme_test}" qgpgme %PREFIX%/libgpgme-pthread.dylib %PREFIX%/libgpgmepp.dylib gpgme gpg-error ${QT_QTCORE_LIBRARY} )
+ endif()
+ endforeach( _qgpgme_test )
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160928/d76b75f8/attachment.html>
More information about the macports-changes
mailing list