[75549] trunk/dports/kde

29 Jan 2011

Revision: 75549
          http://trac.macports.org/changeset/75549
Author:   snc@macports.org
Date:     2011-01-29 11:46:54 -0800 (Sat, 29 Jan 2011)
Log Message:
-----------
KDE 4.6.6

Modified Paths:
--------------
    trunk/dports/kde/kdebase4/Portfile
    trunk/dports/kde/kdebase4-runtime/Portfile
    trunk/dports/kde/kdeedu4/Portfile
    trunk/dports/kde/kdegraphics4/Portfile
    trunk/dports/kde/kdelibs4/Portfile
    trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch
    trunk/dports/kde/kdemultimedia4/Portfile
    trunk/dports/kde/kdenetwork4/Portfile
    trunk/dports/kde/kdepimlibs4/Portfile
    trunk/dports/kde/kdesdk4/Portfile
    trunk/dports/kde/kdetoys4/Portfile
    trunk/dports/kde/kdeutils4/Portfile
    trunk/dports/kde/oxygen-icons/Portfile

Modified: trunk/dports/kde/kdebase4/Portfile
===================================================================

--- trunk/dports/kde/kdebase4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdebase4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdebase4
-version             4.5.5
+version             4.6.0
 categories			kde kde4
 maintainers         snc sharky
 description         KDE4 applications and libraries from the base package
@@ -16,8 +16,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdebase-${version}
-checksums           sha1    fa5a89dad13743c03831e930af978b593ad6ec6c \
-                    rmd160  98579c8266b79d1f9909766dba0772760a55deb8
+checksums           sha1    887ddea760aaabb277082f9e8c0b2f8905e318b8 \
+                    rmd160  603cd17f9541ef98d6362e22ca13ef6eb9890573
 
 depends_lib-append  port:kdelibs4 \
                     port:qimageblitz \

Modified: trunk/dports/kde/kdebase4-runtime/Portfile
===================================================================
--- trunk/dports/kde/kdebase4-runtime/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdebase4-runtime/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdebase4-runtime
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky michaelld
 description         Shared data needed by KDE4 programs
@@ -16,8 +16,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdebase-runtime-${version}
-checksums           sha1    3827a38727e077a2aef6d63f38e68ec72bd01a84 \
-                    rmd160  dae7b41b4cd7e5c13357b283fe2bf97863e306db
+checksums           sha1    024b7035a410f7c08e501ea1250553e746a469d2 \
+                    rmd160  a43be9a893bf88ffc99b73b9991bcd2fe752045d
 
 depends_lib-append  port:kdelibs4 \
                     port:libssh \
@@ -35,6 +35,8 @@
                         -DXINE_INCLUDE_DIR=\"\" \
                         -DXINE_LIBRARY=\"\" \
                         -DWITH_ALSA=OFF \
+                        -DWITH_QNtrack=OFF \
+                        -DWITH_Samba=OFF \
                         -DKDEBASE_DISABLE_MULTIMEDIA=ON
 
 variant xine description "Enable xine support" {

Modified: trunk/dports/kde/kdeedu4/Portfile
===================================================================
--- trunk/dports/kde/kdeedu4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdeedu4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeedu4
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky
 description         Education based applications for the KDE4 platform
@@ -15,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdeedu-${version}
-checksums           sha1    c43db1c4689b18b7eda12810f05d9d3ca12055c2 \
-                    rmd160  98837a2944fe4f31f6b8c17dbe5a1b02b8a55bea
+checksums           sha1    790acbf29ad76d25c1156ce31c28b4fbd8baaa7e \
+                    rmd160  9c835b93af35268685f766c43a4e2cffb49211c9
 
 depends_lib-append  port:kdelibs4 port:kdebase4 \
                     port:ocaml port:openbabel \
@@ -27,6 +27,7 @@
 
 configure.args-append   ${qt_cmake_defines} \
                         -DWITH_Avogadro=OFF -DWITH_BoostPython=OFF \
+                        -DBUILD_kstars=OFF \
                         -DWITH_Libfacile=OFF -DWITH_R=OFF
 
 patch {

Modified: trunk/dports/kde/kdegraphics4/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdegraphics4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdegraphics4
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky michaelld
 description         KDE4 graphics applications
@@ -15,13 +15,14 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdegraphics-${version}
-checksums           sha1    7e7c81ac691aacbfea6c1e1860cd098294bf5e15 \
-                    rmd160  5eda3a5b6d62e260063eb33918283b1d89359d8e
+checksums           sha1    bef8ebfa33f66405975e4e1b5c327fa144c3e40e \
+                    rmd160  15a88c995972ab79f6bb53adb3b5a95020349826
 
 depends_lib-append  port:kdebase4-runtime \
                     port:exiv2 port:poppler \
                     port:djvulibre port:chmlib \
                     port:libspectre port:qca \
+                    port:ebook-tools \
                     port:sane-backends port:gphoto2
 
 pre-configure {

Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdelibs4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,8 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdelibs4
-version             4.5.5
-revision            3
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky michaelld
 description         KDE4 core libraries
@@ -16,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdelibs-${version}
-checksums           sha1    127a2b50fe31ff345e05660dd50f7c55ae78d854 \
-                    rmd160  7c33afa12379119fbf7d70e8895c3f2ada9a2eba
+checksums           sha1    6ea3fc69f98fa91c5159ccd743d4d548e801c7bc \
+                    rmd160  acb64c0da9db3381b3f688dc0d5e63422f461459
 
 depends_build-append port:flex port:gmake
 

Modified: trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2011-01-29 19:46:54 UTC (rev 75549)
@@ -1,6 +1,6 @@
---- kdelibs-4.5.5/kinit/kinit.cpp.weee	2011-01-13 21:53:22.000000000 -0500
-+++ kdelibs-4.5.5/kinit/kinit.cpp	2011-01-13 21:53:58.000000000 -0500
-@@ -534,6 +534,14 @@
+--- kdelibs-4.6.0/kinit/kinit.cpp.wee	2011-01-28 11:33:58.000000000 -0500
++++ kdelibs-4.6.0/kinit/kinit.cpp	2011-01-28 11:34:54.000000000 -0500
+@@ -537,6 +537,14 @@
        init_startup_info( startup_id, name, envc, envs );
  #endif
  
@@ -15,15 +15,15 @@
    d.errorMsg = 0;
    d.fork = fork();
    switch(d.fork) {
-@@ -559,7 +567,6 @@
-      if (cwd && *cwd) {
-          (void)chdir(cwd);
-      } else {
+@@ -565,7 +573,6 @@
+          // on Maemo5, documentPath() is on the SD card, setting it as working directory would block
+          // USB mass storage access
+ #ifndef Q_WS_MAEMO_5
 -         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
           (void)chdir(docPath.constData());
+ #endif
       }
- 
-@@ -595,10 +602,9 @@
+@@ -602,10 +609,9 @@
       {
         int r;
         QByteArray procTitle;
@@ -35,7 +35,7 @@
         if (!argvexe.isEmpty()) {
            QByteArray cstr = argvexe.toLocal8Bit();
            kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
-@@ -674,7 +680,6 @@
+@@ -681,7 +687,6 @@
  
          QByteArray executable = execpath;
  #ifdef Q_WS_MAC
@@ -43,7 +43,7 @@
          if (!bundlepath.isEmpty())
             executable = QFile::encodeName(bundlepath);
  #endif
-@@ -688,25 +693,13 @@
+@@ -695,25 +700,13 @@
          exit(255);
       }
  
@@ -74,7 +74,7 @@
       if (d.debug_wait)
       {
          fprintf(stderr, "kdeinit4: Suspending process\n"
-@@ -720,8 +713,18 @@
+@@ -727,8 +720,18 @@
          setup_tty( tty );
       }
  
@@ -94,71 +94,3 @@
       break;
    }
    default:
-Index: kdelibs-4.3.2/kinit/CMakeLists.txt
-===================================================================
---- kdelibs-4.3.2.orig/kinit/CMakeLists.txt	2009-10-14 18:47:04.000000000 +0200
-+++ kdelibs-4.3.2/kinit/CMakeLists.txt	2009-10-14 19:10:14.000000000 +0200
-@@ -53,6 +53,16 @@
- 
- install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
-+########### kdeinit4_helper ###############
-+
-+set(kdeinit4_helper_SRCS helper.cpp)
-+
-+kde4_add_executable(kdeinit4_helper NOGUI ${kdeinit4_helper_SRCS})
-+
-+target_link_libraries(kdeinit4_helper ${QT_QTCORE_LIBRARY})
-+
-+install(TARGETS kdeinit4_helper DESTINATION ${LIBEXEC_INSTALL_DIR} )
-+
- ########### kwrapper4 ###############
- if (WIN32)
-   set(kwrapper_SRCS kwrapper_win.cpp  )
-Index: kdelibs-4.3.2/kinit/helper.cpp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kdelibs-4.3.2/kinit/helper.cpp	2009-10-14 19:11:06.000000000 +0200
-@@ -0,0 +1,42 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include <QFile>
-+#include <QLibrary>
-+
-+typedef int (*handler) (int, char *[]);
-+
-+int main(int argc, char *argv[])
-+{
-+    if (argc < 2)
-+    {
-+        fprintf(stderr, "Too few arguments\n");
-+        exit(1);
-+    }
-+
-+    QString libpath = QFile::decodeName(argv[argc-1]);
-+    QLibrary l(libpath);
-+
-+    if (!libpath.isEmpty() && (!l.load() || !l.isLoaded()))
-+    {
-+        QString ltdlError = l.errorString();
-+        fprintf(stderr, "Could not open library %s: %s\n", qPrintable(libpath), qPrintable(ltdlError) );
-+        exit(1);
-+    }
-+
-+    void * sym = l.resolve( "kdeinitmain");
-+    if (!sym)
-+    {
-+        sym = l.resolve( "kdemain" );
-+        if ( !sym )
-+        {
-+            QString ltdlError = l.errorString();
-+            fprintf(stderr, "Could not find kdemain: %s\n", qPrintable(ltdlError) );
-+            exit(1);
-+        }
-+    }
-+
-+    handler func = (int (*)(int, char *[])) sym;
-+    exit( func(argc - 1, argv)); /* Launch! */
-+}
-+

Modified: trunk/dports/kde/kdemultimedia4/Portfile
===================================================================
--- trunk/dports/kde/kdemultimedia4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdemultimedia4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -6,7 +6,7 @@
 
 name                kdemultimedia4
 conflicts           kdelibs4-experimental
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky
 description         KDE4 multimedia applications
@@ -16,8 +16,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdemultimedia-${version}
-checksums           sha1    fe3f30a5491d3384298c4f68ebed136bc83ba8a6 \
-                    rmd160  40184bc6023bdd61b9a876c14bc0b997b43fb683
+checksums           sha1    704b5bc12c5d3c64809824b433dabeb101008825 \
+                    rmd160  0848c987e79b97720dd510a7d3e1024a22f40540
 
 depends_lib-append  port:kdebase4-runtime \
                     port:libogg \
@@ -29,6 +29,10 @@
                         -DBUILD_juk=ON \
                         -DBUILD_kmix=OFF \
                         -DWITH_Taglib=ON \
+                        -DWITH_PulseAudio=OFF \
+                        -DWITH_MusicBrainz3=OFF \
+                        -DWITH_Xine=OFF \
+                        -DWITH_TunePimp=OFF \
                         -DWITH_Cdparanoia=OFF
 universal_variant   no
 

Modified: trunk/dports/kde/kdenetwork4/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdenetwork4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdenetwork4
-version             4.5.5
+version             4.6.0
 categories          kde kde4 network
 maintainers         snc sharky
 description         KDE4 networking applications
@@ -16,8 +16,8 @@
 master_sites        kde:stable/${version}/src
 use_bzip2           yes
 distname            kdenetwork-${version}
-checksums           sha1    2c7dd0bc1809ac477f46ddb966f232ca3f60bc0a \
-                    rmd160  769829e255830bf360d9796c0ea9dcb12faeac0b
+checksums           sha1    c69dcc48c8fc4064e183136b6d85e6379978925f \
+                    rmd160  d87f7e33136e718dba0a617b5eab5adf90e70e80
 
 depends_lib-append  port:kdebase4-runtime \
                     port:meanwhile \
@@ -34,7 +34,13 @@
 depends_run-append  port:qca-ossl
 
 configure.args-append   -DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \
-                        -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto
+                        -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto \
+                        -DWITH_Alsa=OFF \
+                        -DWITH_KDE4Workspace=OFF \
+                        -DWITH_Libgadu=OFF \
+                        -DWITH_msiLBC=OFF \
+                        -DWITH_LiboRTP=OFF \
+                        -DWITH_Mediastreamer=OFF
 
 universal_variant   no
 

Modified: trunk/dports/kde/kdepimlibs4/Portfile
===================================================================
--- trunk/dports/kde/kdepimlibs4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdepimlibs4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdepimlibs4
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky
 description         KDE4 core PIM libraries
@@ -15,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdepimlibs-${version}
-checksums           sha1    436fd7897586294f327395981a714ae0695f4ee2 \
-                    rmd160  6e9e54fcf8fa2f1da1c76004a3998f9426a30f4c
+checksums           sha1    14624960410d270077df530d70d34e270260b3c4 \
+                    rmd160  713dd56a6c820f7bd9dcd6a7df753812e87a7572
 
 depends_lib-append  port:kdelibs4 \
                     port:akonadi \

Modified: trunk/dports/kde/kdesdk4/Portfile
===================================================================
--- trunk/dports/kde/kdesdk4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdesdk4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdesdk4
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky
 description         Utilities to ease development with the KDE4 platform
@@ -15,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdesdk-${version}
-checksums           sha1    278c63099bdcd06cb8b60c1e179c3befede2cd33 \
-                    rmd160  6d3a4a31f4946a7f840159e46955245da6774c94
+checksums           sha1    af8d67b1823f72b759ac604a1be15d8ec91b2b2c \
+                    rmd160  46e85f60b27262c723b0aa2433d0a947b725b262
 
 depends_lib-append  port:kdebase4 port:antlr port:boost
 

Modified: trunk/dports/kde/kdetoys4/Portfile
===================================================================
--- trunk/dports/kde/kdetoys4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdetoys4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdetoys4
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky
 description         KDE's fun stuff
@@ -15,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdetoys-${version}
-checksums           sha1    7b133ccc7ca1f506630ea98b97c3e04a04bc614d \
-                    rmd160  7f24c4f29ac9d354e4eccf919fbec445b8a3797f
+checksums           sha1    758f73eeb46f54ce21c6b50303b427fd2264e124 \
+                    rmd160  226fe74f9cf80a5219cf454a2d98052004132017
 
 depends_lib-append  port:kdelibs4 port:kdebase4-runtime
 

Modified: trunk/dports/kde/kdeutils4/Portfile
===================================================================
--- trunk/dports/kde/kdeutils4/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/kdeutils4/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeutils4
-version             4.5.5
+version             4.6.0
 conflicts           kdelibs4-experimental
 categories          kde kde4
 maintainers         snc sharky
@@ -16,20 +16,21 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdeutils-${version}
-checksums           sha1    f3bf2bd808e4540f6666cb9b26471a90f2c0135e \
-                    rmd160  9a381df068d99b13f96ce9ef2e7f479fd453aaa4
+checksums           sha1    d63e7abd1e91d4d33b7d03525c90abb3e8a56383 \
+                    rmd160  1f6b0182ca2a707fee34274d7f2eac2736bbc65c
 
 depends_lib-append  port:kdelibs4 port:kdebase4-runtime \
                     port:qca port:qimageblitz port:gmp \
                     port:mercurial port:git-core \
-                    port:py26-pyqt4 \
                     port:libzip port:libarchive
 
 patch.dir           ${workpath}/${distname}
 patchfiles          fix-namespace.diff
 
-configure.args-append   -DWITH_SIP=OFF -DKDE4Workspace_DIR=""
+configure.args-append   -DWITH_SIP=OFF \
+                        -DBUILD_printer-applet=OFF
 
+
 universal_variant   no
 
 livecheck.url       http://mirrors.ibiblio.org/pub/mirrors/kde/stable/latest/src/

Modified: trunk/dports/kde/oxygen-icons/Portfile
===================================================================
--- trunk/dports/kde/oxygen-icons/Portfile	2011-01-29 18:36:30 UTC (rev 75548)
+++ trunk/dports/kde/oxygen-icons/Portfile	2011-01-29 19:46:54 UTC (rev 75549)
@@ -5,9 +5,7 @@
 PortGroup           kde4   1.1
 
 name                oxygen-icons
-# do no epoch bump for this one
-# the current use of beta is sufficient
-version             4.5.5
+version             4.6.0
 categories          kde kde4
 maintainers         snc sharky
 description         Oxygen icon theme
@@ -16,8 +14,8 @@
 homepage            http://www.kde.org
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
-checksums           sha1    9c831506010fc441467575a53c91047c1004f473 \
-                    rmd160  76b03f857169f9c10f9d5dff6917ce57e7710622
+checksums           sha1    a5c9cdfd2ead610b3b7d763006802ee90afdb580 \
+                    rmd160  f59a43e3c63d332f39e85e0b7a2f41efb8c43c5a
 supported_archs     noarch
 
 livecheck.url       http://kde.mirrors.hoobly.com/unstable/

    

[75549] trunk/dports/kde

snc＠macports.org