[153563] trunk/dports/kde
nicos at macports.org
nicos at macports.org
Tue Oct 4 16:06:21 CEST 2016
Revision: 153563
https://trac.macports.org/changeset/153563
Author: nicos at macports.org
Date: 2016-10-04 07:06:21 -0700 (Tue, 04 Oct 2016)
Log Message:
-----------
kde4-runtime, kdepim4, kget: fix compilation after change in kdepimlibs4 in r153162 (ticket #52481)
Revision Links:
--------------
https://trac.macports.org/changeset/153162
Modified Paths:
--------------
trunk/dports/kde/kde4-runtime/Portfile
trunk/dports/kde/kdepim4/Portfile
trunk/dports/kde/kget/Portfile
Added Paths:
-----------
trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff
trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff
trunk/dports/kde/kget/files/patch-gpgme.diff
Modified: trunk/dports/kde/kde4-runtime/Portfile
===================================================================
--- trunk/dports/kde/kde4-runtime/Portfile 2016-10-04 13:59:59 UTC (rev 153562)
+++ trunk/dports/kde/kde4-runtime/Portfile 2016-10-04 14:06:21 UTC (rev 153563)
@@ -10,7 +10,7 @@
name kde4-runtime
version 4.14.4.20150225
-revision 5
+revision 6
categories kde kde4
maintainers nicos
license GPL-2+ LGPL-2.1+
@@ -30,7 +30,8 @@
patchfiles patch-support-for-lldb.diff \
patch-make-kioexec-agent.diff \
- patch-phonon-cmakelists.diff
+ patch-phonon-cmakelists.diff \
+ patch-gpgme.diff
#Blacklist gcc42 and llvm-gcc-42 (does not build with gcc, ticket #37574)
compiler.blacklist gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
@@ -71,6 +72,11 @@
-DKDEBASE_DISABLE_MULTIMEDIA=OFF \
-DKDERUNTIME_BUILD_NEPOMUK=ON
+pre-configure {
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/kwalletd/CMakeLists.txt
+}
+
variant xine description "Enable xine support" {
# Unsupported. Don't report bugs, unless it comes with a patch :-)
depends_lib-append port:xine-lib
Added: trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff
===================================================================
--- trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff (rev 0)
+++ trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff 2016-10-04 14:06:21 UTC (rev 153563)
@@ -0,0 +1,11 @@
+--- kwalletd/CMakeLists.txt.orig 2016-10-03 22:09:25.000000000 +0900
++++ kwalletd/CMakeLists.txt 2016-10-03 22:13:23.000000000 +0900
+@@ -7,6 +7,8 @@
+
+ if (GPGME_FOUND AND QGPGME_FOUND)
+ add_definitions(-DHAVE_QGPGME)
++ #Force include directory
++ set(GPGME_INCLUDES "%PREFIX%/include/kde4")
+ include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ endif(GPGME_FOUND AND QGPGME_FOUND)
Modified: trunk/dports/kde/kdepim4/Portfile
===================================================================
--- trunk/dports/kde/kdepim4/Portfile 2016-10-04 13:59:59 UTC (rev 153562)
+++ trunk/dports/kde/kdepim4/Portfile 2016-10-04 14:06:21 UTC (rev 153563)
@@ -7,7 +7,7 @@
name kdepim4
version 4.14.3
-revision 1
+revision 2
categories kde kde4
maintainers intevation.de:bjoern.ricks nicos
license GPL-2+ LGPL-2+
@@ -40,10 +40,21 @@
#emulate-addTitle: Preventing menu crash in kmail (https://trac.macports.org/ticket/44798)
patchfiles-append patch-ktimetracker.diff \
patch-emulate-addTitle.diff \
- patch-CMakeLists-disableKleo.diff
+ patch-CMakeLists-disableKleo.diff \
+ patch-internal-gpgme.diff
+
#Disabling kleopatra which does not build with boost >= 1.57.
#See https://bugs.kde.org/show_bug.cgi?id=341355
+pre-configure {
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/libkleo/CMakeLists.txt
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/kaddressbook/CMakeLists.txt
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/messagecomposer/CMakeLists.txt
+}
+
if {![variant_isset docs]} {
depends_lib-delete port:dblatex
patchfiles-append patch-CMakeLists.diff
Added: trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff
===================================================================
--- trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff (rev 0)
+++ trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff 2016-10-04 14:06:21 UTC (rev 153563)
@@ -0,0 +1,34 @@
+Only in ../kdepim-4.14.3-orig/kaddressbook: .DS_Store
+diff -ur ../kdepim-4.14.3-orig/kaddressbook/CMakeLists.txt ./kaddressbook/CMakeLists.txt
+--- ../kdepim-4.14.3-orig/kaddressbook/CMakeLists.txt 2016-10-04 00:15:35.000000000 +0900
++++ ./kaddressbook/CMakeLists.txt 2016-10-04 00:15:53.000000000 +0900
+@@ -29,6 +29,7 @@
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+ if(QGPGME_FOUND)
++ include_directories( %PREFIX%/include/KDE4 )
+ add_definitions(-DQGPGME_FOUND)
+ endif()
+
+Only in ../kdepim-4.14.3-orig/libkleo: .DS_Store
+diff -ur ../kdepim-4.14.3-orig/libkleo/CMakeLists.txt ./libkleo/CMakeLists.txt
+--- ../kdepim-4.14.3-orig/libkleo/CMakeLists.txt 2016-10-03 23:59:04.000000000 +0900
++++ ./libkleo/CMakeLists.txt 2016-10-03 23:59:57.000000000 +0900
+@@ -1,4 +1,4 @@
+-include_directories( ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
++include_directories( %PREFIX%/include/KDE4 ${Boost_INCLUDE_DIR} )
+ KDE4_NO_ENABLE_FINAL(libkleo)
+ if (KDEPIM_ONLY_KLEO)
+ add_definitions( -DKDEPIM_ONLY_KLEO )
+Only in ../kdepim-4.14.3-orig/messagecomposer: .DS_Store
+diff -ur ../kdepim-4.14.3-orig/messagecomposer/CMakeLists.txt ./messagecomposer/CMakeLists.txt
+--- ../kdepim-4.14.3-orig/messagecomposer/CMakeLists.txt 2016-10-04 00:27:43.000000000 +0900
++++ ./messagecomposer/CMakeLists.txt 2016-10-04 00:28:47.000000000 +0900
+@@ -109,6 +109,7 @@
+ settings/messagecomposersettings_base.kcfgc
+ )
+
++include_directories( %PREFIX%/include/KDE4 )
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
Modified: trunk/dports/kde/kget/Portfile
===================================================================
--- trunk/dports/kde/kget/Portfile 2016-10-04 13:59:59 UTC (rev 153562)
+++ trunk/dports/kde/kget/Portfile 2016-10-04 14:06:21 UTC (rev 153563)
@@ -6,7 +6,7 @@
name kget
version 4.14.3
-revision 3
+revision 4
categories kde kde4
license GPL-2+ LGPL-2+
maintainers nicos openmaintainer
@@ -40,10 +40,16 @@
configure.args-append -DWITH_KDE4Workspace=OFF
+patchfiles-append patch-gpgme.diff
+
if {![variant_isset docs]} {
- patchfiles patch-CMakeLists.diff
+ patchfiles-append patch-CMakeLists.diff
}
+pre-configure {
+ reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/CMakeLists.txt
+}
+
pre-activate {
#Deactivate hack for when kdenetwork4 port has been fragmented into small ports
if {[file exists ${prefix}/lib/kde4/sambausershareplugin.so]
Added: trunk/dports/kde/kget/files/patch-gpgme.diff
===================================================================
--- trunk/dports/kde/kget/files/patch-gpgme.diff (rev 0)
+++ trunk/dports/kde/kget/files/patch-gpgme.diff 2016-10-04 14:06:21 UTC (rev 153563)
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2016-10-04 20:59:03.000000000 +0900
++++ CMakeLists.txt 2016-10-04 21:13:43.000000000 +0900
+@@ -92,6 +92,7 @@
+ include_directories(
+ ${Boost_INCLUDE_DIRS}
+ ${QGPGME_INCLUDE_DIR}
++ %PREFIX%/include/kde4
+ )
+ endif(QGPGME_FOUND)
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161004/8afacaa0/attachment-0002.html>
More information about the macports-changes
mailing list