Revision: 111894 https://trac.macports.org/changeset/111894 Author: nicos@macports.org Date: 2013-10-05 02:25:52 -0700 (Sat, 05 Oct 2013) Log Message: ----------- kde base ports: update to 4.11.2, clean up old unused patches Modified Paths: -------------- trunk/dports/kde/kactivities/Portfile trunk/dports/kde/kde4-baseapps/Portfile trunk/dports/kde/kde4-runtime/Portfile trunk/dports/kde/kdepimlibs4/Portfile trunk/dports/kde/nepomuk-core/Portfile trunk/dports/kde/nepomuk-widgets/Portfile trunk/dports/kde/oxygen-icons/Portfile Added Paths: ----------- trunk/dports/kde/kde4-runtime/files/ trunk/dports/kde/kde4-runtime/files/patch-kwalletd.diff Removed Paths: ------------- trunk/dports/kde/kactivities/files/ trunk/dports/kde/nepomuk-core/files/Info.plist.template trunk/dports/kde/nepomuk-core/files/patch-CMakeLists.diff Modified: trunk/dports/kde/kactivities/Portfile =================================================================== --- trunk/dports/kde/kactivities/Portfile 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/kactivities/Portfile 2013-10-05 09:25:52 UTC (rev 111894) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name kactivities -version 4.11.1 +version 4.11.2 categories kde kde4 maintainers nicos openmaintainer license GPL-2+ LGPL-2+ GFDL-1.2 @@ -16,8 +16,8 @@ master_sites kde:stable/${version}/src/ use_xz yes distname ${name}-${version} -checksums rmd160 3d44cc61f11664ea79d222b6a52660f421f42d8b \ - sha256 1edfc79b9c8948d6733860d1d8765764169642f96a27f206449724ab9b0c1397 +checksums rmd160 07a9eece4bfaef77664fadf90451bfb3f3a95010 \ + sha256 dd128953b977099451a0547836906ef6f56a0622af0e56706ac2e64345133f8e #Binaries do not link to openssl, nor use the ssl backend of kdelibs4 license_noconflict openssl Modified: trunk/dports/kde/kde4-baseapps/Portfile =================================================================== --- trunk/dports/kde/kde4-baseapps/Portfile 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/kde4-baseapps/Portfile 2013-10-05 09:25:52 UTC (rev 111894) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name kde4-baseapps -version 4.11.1 +version 4.11.2 categories kde kde4 maintainers nicos license GPL-2+ LGPL-2+ GFDL-1.2 @@ -22,8 +22,8 @@ #nor links to libkimap or libmailtransport from kdepimlibs4 license_noconflict openssl -checksums rmd160 1ec7884aa2299d717caf4067dd60a014d9f38666 \ - sha256 f382f84d34dbb696533b026aa082987a9603584b5e92874ab94df9764a69fd91 +checksums rmd160 59d90e7d1dc34f8b4be8d7d285d3e85e5d164701 \ + sha256 9d086ae35dd028c24c70aa0931218a3ca99980ce3160386ffc09f5716c7efccd depends_lib-append port:kdelibs4 \ port:qimageblitz \ Modified: trunk/dports/kde/kde4-runtime/Portfile =================================================================== --- trunk/dports/kde/kde4-runtime/Portfile 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/kde4-runtime/Portfile 2013-10-05 09:25:52 UTC (rev 111894) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name kde4-runtime -version 4.11.1 +version 4.11.2 categories kde kde4 maintainers nicos license GPL-2+ LGPL-2.1+ @@ -18,13 +18,16 @@ use_xz yes distname kde-runtime-${version} -checksums rmd160 c756f9957aa41667d6f670d7bb7c088b22371269 \ - sha256 639c397946e2bebf84bd9e49d4724b0dcf3b1e418873753adeed09505d556173 +checksums rmd160 a0fd77fd81b6d01daf5a0f01bff85aece0b4fd5c \ + sha256 045f38375be1c6c0753a6fc85e7211d3d2dadc974ffc3848920ebfa5d0569df0 #Binaries do not link directly to openssl, nor use the ssl backend of kdelibs4, #nor links to libkimap or libmailtransport from kdepimlibs4 license_noconflict openssl +#Fully removing X11 only function to prevent automoc to include it +patchfiles patch-kwalletd.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 Added: trunk/dports/kde/kde4-runtime/files/patch-kwalletd.diff =================================================================== --- trunk/dports/kde/kde4-runtime/files/patch-kwalletd.diff (rev 0) +++ trunk/dports/kde/kde4-runtime/files/patch-kwalletd.diff 2013-10-05 09:25:52 UTC (rev 111894) @@ -0,0 +1,12 @@ +--- kwalletd/kwalletd.h.orig 2013-10-04 23:16:16.000000000 +0900 ++++ kwalletd/kwalletd.h 2013-10-04 23:16:26.000000000 +0900 +@@ -183,9 +183,6 @@ + void notifyFailures(); + void processTransactions(); + void activatePasswordDialog(); +-#ifdef Q_WS_X11 +- void connectToScreenSaver(); +-#endif + + private: + // Internal - open a wallet Modified: trunk/dports/kde/kdepimlibs4/Portfile =================================================================== --- trunk/dports/kde/kdepimlibs4/Portfile 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/kdepimlibs4/Portfile 2013-10-05 09:25:52 UTC (rev 111894) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name kdepimlibs4 -version 4.11.1 +version 4.11.2 categories kde kde4 maintainers nicos license GPL-2+ LGPL-2+ BSD @@ -17,8 +17,8 @@ use_xz yes distname kdepimlibs-${version} -checksums rmd160 cab43cb8a76cc7c08610686169aefc8e9bab5f78 \ - sha256 0618dc3003a53b7a0c5088e7406ef03f1a0ea35d7896b99c19774bad2bd455ea +checksums rmd160 d3c8cad92842b518680d469778fef210e5d94c36 \ + sha256 87bac1c49018222b433073cd26412778edc1a527bef272d8a85bf193e867b64f #The only binaries linking to openssl (through QtNetwork) are libkimap.dylib #and libmailtransport.dylib, which are purely LPGL, thus not conflicting with Modified: trunk/dports/kde/nepomuk-core/Portfile =================================================================== --- trunk/dports/kde/nepomuk-core/Portfile 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/nepomuk-core/Portfile 2013-10-05 09:25:52 UTC (rev 111894) @@ -5,8 +5,7 @@ PortGroup kde4 1.1 name nepomuk-core -version 4.11.1 -revision 2 +version 4.11.2 categories kde kde4 maintainers nicos openmaintainer license GPL-2+ LGPL-2.1+ @@ -18,8 +17,8 @@ homepage http://www.kde.org master_sites kde:stable/${version}/src/ use_xz yes -checksums rmd160 adf0a89c08929e9ef9fec073042d7237a54659c0 \ - sha256 1ed245662b7224f147097d38dc50dd900897ff3e650c08ddd6abee0f3eb1ec60 +checksums rmd160 7b597064212cf44967ce19e76f13693fd13c2f81 \ + sha256 343287f484f216d46c2f9c5dcd49a3ccc73eb7640ac916e9b8eafcd5e05124d0 patchfiles patch-nepomukctl.diff Deleted: trunk/dports/kde/nepomuk-core/files/Info.plist.template =================================================================== --- trunk/dports/kde/nepomuk-core/files/Info.plist.template 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/nepomuk-core/files/Info.plist.template 2013-10-05 09:25:52 UTC (rev 111894) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> - <key>CFBundleGetInfoString</key> - <string>${MACOSX_BUNDLE_INFO_STRING}</string> - <key>CFBundleIconFile</key> - <string>${MACOSX_BUNDLE_ICON_FILE}</string> - <key>CFBundleIdentifier</key> - <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleLongVersionString</key> - <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> - <key>CFBundleName</key> - <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string> - <key>CFBundleVersion</key> - <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string> - <key>CSResourcesFileMapped</key> - <true/> - <key>LSRequiresCarbon</key> - <true/> - <key>LSUIElement</key> - <string>1</string> - <key>NSHumanReadableCopyright</key> - <string>${MACOSX_BUNDLE_COPYRIGHT}</string> -</dict> -</plist> \ No newline at end of file Deleted: trunk/dports/kde/nepomuk-core/files/patch-CMakeLists.diff =================================================================== --- trunk/dports/kde/nepomuk-core/files/patch-CMakeLists.diff 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/nepomuk-core/files/patch-CMakeLists.diff 2013-10-05 09:25:52 UTC (rev 111894) @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2012-08-13 18:38:39.000000000 +0900 -+++ CMakeLists.txt 2012-11-11 22:19:06.000000000 +0900 -@@ -69,7 +69,7 @@ - add_subdirectory(removed-services) - add_subdirectory(includes) - add_subdirectory(tests) --add_subdirectory(autotests) -+#add_subdirectory(autotests) - - macro_display_feature_log() - Modified: trunk/dports/kde/nepomuk-widgets/Portfile =================================================================== --- trunk/dports/kde/nepomuk-widgets/Portfile 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/nepomuk-widgets/Portfile 2013-10-05 09:25:52 UTC (rev 111894) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name nepomuk-widgets -version 4.11.1 +version 4.11.2 categories kde kde4 maintainers nicos openmaintainer license LGPL-2+ @@ -16,8 +16,8 @@ homepage http://www.kde.org master_sites kde:stable/${version}/src/ use_xz yes -checksums rmd160 b192ee88573a20e4eb6a949c56964e5a27976a40 \ - sha256 7fa3ff3530c1ae60d1f7399cb154f55a16fbab538c0ae3a73b2cf0c6c7bb000e +checksums rmd160 2a35472e4beb09b3853276ee10677d030f016176 \ + sha256 eb79598d4d27248766a4268094747c72d96ecfedf95a8f8018ff1117a028e7a5 depends_lib-append port:kdelibs4 \ port:nepomuk-core Modified: trunk/dports/kde/oxygen-icons/Portfile =================================================================== --- trunk/dports/kde/oxygen-icons/Portfile 2013-10-05 09:14:22 UTC (rev 111893) +++ trunk/dports/kde/oxygen-icons/Portfile 2013-10-05 09:25:52 UTC (rev 111894) @@ -5,7 +5,7 @@ PortGroup kde4 1.1 name oxygen-icons -version 4.11.1 +version 4.11.2 categories kde kde4 maintainers nicos license LGPL-3+ @@ -15,8 +15,8 @@ homepage http://www.kde.org master_sites kde:stable/${version}/src/ use_xz yes -checksums rmd160 34feb61ddb83cc602c36d549dfa5a310d08d1475 \ - sha256 e7c2131d815f7ea937abffbd4df9572c53119439a195e1c08257eb045011e007 +checksums rmd160 38cce5182df3b7d35b9067d6b7b9720ee6b6178f \ + sha256 7f1ba797b573335a4e815dab9d339116f7177eea72e5551913f23934efecc905 supported_archs noarch