[74075] trunk/dports/kde

4 Dec 2010

Revision: 74075
          http://trac.macports.org/changeset/74075
Author:   snc@macports.org
Date:     2010-12-04 10:00:55 -0800 (Sat, 04 Dec 2010)
Log Message:
-----------
KDE: update to 4.5.4
 * include check for needed poppler variant, #25965
 * mark kdepim4 as no longer installable, #27438

Modified Paths:
--------------
    trunk/dports/kde/kdebase4/Portfile
    trunk/dports/kde/kdeedu4/Portfile
    trunk/dports/kde/kdegames4/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

Removed Paths:
-------------
    trunk/dports/kde/kdelibs4/files/fix-bundle-icons.patch

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

--- trunk/dports/kde/kdebase4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdebase4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdebase4
-version             4.5.3
+version             4.5.4
 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    cc52a321e98fae8bca5126e94c18e10cc8f44361 \
-                    rmd160  a8012959afa83807bfd4186308a0093e5f0027f8
+checksums           sha1    486231f4c8bce974a0ac10870d5c68d1d225f7ce \
+                    rmd160  cedfab387211bdb7490db4b669444b4a572dfdc4
 
 depends_lib-append  port:kdelibs4 \
                     port:qimageblitz \

Modified: trunk/dports/kde/kdeedu4/Portfile
===================================================================
--- trunk/dports/kde/kdeedu4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdeedu4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeedu4
-version             4.5.3
+version             4.5.4
 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    3bb03536603aafbe317fa9ed5f02579f76ba5157 \
-                    rmd160  5d952896ecb18246694947ae8595c2ecb2656d91
+checksums           sha1    d670d62af51fba356f3058c54c90a709721774bf \
+                    rmd160  31ce749e31a765557d5b0febc0525df7b3b2ab01
 
 depends_lib-append  port:kdelibs4 port:kdebase4 \
                     port:ocaml port:openbabel \

Modified: trunk/dports/kde/kdegames4/Portfile
===================================================================
--- trunk/dports/kde/kdegames4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdegames4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdegames4
-version             4.5.3
+version             4.5.4
 categories          kde kde4
 maintainers         snc sharky
 description         A variety of games made with the KDE4 development platform
@@ -15,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdegames-${version}
-checksums           sha1    4fe320e4d934b9e5afd4165b45064a0b74308014 \
-                    rmd160  6a2f229c84ea996eb2cb137cf1b11bac354e1401
+checksums           sha1    6a0a33d5761c678f37f87a25268e53952134e081 \
+                    rmd160  1fddaa840af5b9d858f84983492e61bbbdfa97b8
 
 depends_lib-append  port:kdelibs4 port:kdebase4-runtime \
                     port:ggz-client-libs port:py26-twisted

Modified: trunk/dports/kde/kdegraphics4/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdegraphics4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdegraphics4
-version             4.5.3
+version             4.5.4
 categories          kde kde4
 maintainers         snc sharky
 description         KDE4 graphics applications
@@ -15,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdegraphics-${version}
-checksums           sha1    94b0fd60dd5018d97861810acdc1b4614b218dfa \
-                    rmd160  c3e32114bcd97fb3c1a3f012854391acd05db668
+checksums           sha1    1effe5c72577c9f63aa4959777c1dd6df5c54d9c \
+                    rmd160  4f678f57bff27180e54822a78316989ad4a85e6f
 
 depends_lib-append  port:kdebase4-runtime \
                     port:exiv2 port:poppler \
@@ -24,6 +24,13 @@
                     port:libspectre port:qca \
                     port:sane-backends port:gphoto2
 
+pre-configure {
+    if {![file exists ${prefix}/lib/libpoppler-qt4.dylib]} {
+        return -code error "Poppler must be installed with +qt4\
+                            and +quartz variants"
+    }
+}
+
 configure.args-append   -DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \
                         -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto \
                         -DGWENVIEW_SEMANTICINFO_BACKEND=None

Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdelibs4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,8 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdelibs4
-version             4.5.3
-revision            1
+version             4.5.4
 categories          kde kde4
 maintainers         snc sharky
 description         KDE4 core libraries
@@ -16,8 +15,8 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdelibs-${version}
-checksums           sha1    f76e54dd033bff548557c277811501b56d1c6bf0 \
-                    rmd160  08779952d7338c5c1f7928b866dbeffa873cbee0
+checksums           sha1    6378c8d1a2b71e19713fbc7830518359868be4bd \
+                    rmd160  b2f0c37872d4024203d8cdebe12ab7070d5e4821
 
 depends_build-append port:flex port:gmake
 
@@ -35,16 +34,15 @@
                     port:openssl port:enchant \
                     port:aspell port:aspell-dict-en \
                     port:attica port:liblzma \
-                    port:avahi \
+                    port:avahi port:qca \
                     port:dbusmenu-qt port:docbook-xml \
-                    port:docbook-xsl \
+                    port:docbook-xsl port:grantlee \
                     port:shared-desktop-ontologies
 
 conflicts           kdelibs3
 
 patchfiles          add-bundles-to-path.patch \
                     default-kde4-xdg-menu-prefix.patch \
-                    fix-bundle-icons.patch \
                     workaround-kdeinit4-crash.patch \
                     patch-cmake-modules-FindKDE4-Internal.cmake.diff
 

Deleted: trunk/dports/kde/kdelibs4/files/fix-bundle-icons.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/fix-bundle-icons.patch	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdelibs4/files/fix-bundle-icons.patch	2010-12-04 18:00:55 UTC (rev 74075)
@@ -1,17 +0,0 @@
-Index: kdelibs-4.3.2/cmake/modules/KDE4Macros.cmake
-===================================================================
---- kdelibs-4.3.2.orig/cmake/modules/KDE4Macros.cmake	2009-07-21 17:16:04.000000000 +0200
-+++ kdelibs-4.3.2/cmake/modules/KDE4Macros.cmake	2009-10-14 10:38:21.000000000 +0200
-@@ -1155,11 +1155,7 @@
-                 # main target
-                 list(APPEND ${appsources} ${_outfilename}.icns)
- 
--                #            this doesn't seem to work for me - Use manual "install" instead
--                # TODO: test again with cmake 2.6 ?
--                #           SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${target}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
--
--                install(FILES ${_outfilename}.icns DESTINATION ${BIN_INSTALL_DIR}/${target}.app/Contents/Resources/)
-+                set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- 
-             else(_icon)
-                 # TODO - try to scale a non-128 icon...? Try to convert an SVG on the fly?

Modified: trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2010-12-04 18:00:55 UTC (rev 74075)
@@ -1,8 +1,6 @@
-Index: kdelibs-4.3.2/kinit/kinit.cpp
-===================================================================
---- kdelibs-4.3.2.orig/kinit/kinit.cpp	2009-10-14 18:47:04.000000000 +0200
-+++ kdelibs-4.3.2/kinit/kinit.cpp	2009-10-14 19:10:14.000000000 +0200
-@@ -489,6 +489,14 @@
+--- kdelibs-4.5.80/kinit/kinit.cpp.orig	2010-11-27 11:49:11.000000000 -0500
++++ kdelibs-4.5.80/kinit/kinit.cpp	2010-11-27 11:49:15.000000000 -0500
+@@ -537,6 +537,14 @@
        init_startup_info( startup_id, name, envc, envs );
  #endif
  
@@ -17,15 +15,7 @@
    d.errorMsg = 0;
    d.fork = fork();
    switch(d.fork) {
-@@ -513,7 +521,6 @@
-      if (cwd && *cwd) {
-          (void)chdir(cwd);
-      } else {
--         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
-          (void)chdir(docPath.constData());
-      }
- 
-@@ -549,10 +556,9 @@
+@@ -601,10 +609,9 @@
       {
         int r;
         QByteArray procTitle;
@@ -37,7 +27,7 @@
         if (!argvexe.isEmpty()) {
            QByteArray cstr = argvexe.toLocal8Bit();
            kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
-@@ -628,7 +634,6 @@
+@@ -680,7 +687,6 @@
  
          QByteArray executable = execpath;
  #ifdef Q_WS_MAC
@@ -45,7 +35,7 @@
          if (!bundlepath.isEmpty())
             executable = QFile::encodeName(bundlepath);
  #endif
-@@ -642,25 +647,13 @@
+@@ -694,25 +700,13 @@
          exit(255);
       }
  
@@ -76,7 +66,7 @@
       if (d.debug_wait)
       {
          fprintf(stderr, "kdeinit4: Suspending process\n"
-@@ -674,8 +667,18 @@
+@@ -726,8 +720,18 @@
          setup_tty( tty );
       }
  

Modified: trunk/dports/kde/kdemultimedia4/Portfile
===================================================================
--- trunk/dports/kde/kdemultimedia4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdemultimedia4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -6,7 +6,7 @@
 
 name                kdemultimedia4
 conflicts           kdelibs4-experimental
-version             4.5.3
+version             4.5.4
 categories          kde kde4
 maintainers         snc sharky
 description         KDE4 multimedia applications
@@ -16,26 +16,20 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdemultimedia-${version}
-checksums           sha1    213d5113469a920184783a1c84ab487fbc4385dd \
-                    rmd160  248441ae4a70b961ea8350361696d559c6937ba4
+checksums           sha1    603ebc6a2cc63ecd5318bfcaa49a4255b7c244dd \
+                    rmd160  e5eeeb352524e7195b9ca2ce6ad5e05ddf139dc2
 
 depends_lib-append  port:kdebase4-runtime \
-                    port:cdparanoia \
                     port:libogg \
                     port:libvorbis \
+                    port:ffmpeg \
                     port:taglib
 
 configure.args-append   -DBUILD_dragonplayer=ON \
                         -DBUILD_juk=ON \
                         -DBUILD_kmix=OFF \
                         -DWITH_Taglib=ON \
-                        -DWITH_MusicBrainz=OFF \
-                        -DWITH_TunePimp=OFF \
-                        -DWITH_Xine=OFF \
                         -DWITH_Cdparanoia=OFF
-#                        -DWITH_OggVorbis=OFF \
-# wait for port	        -DCDPARANOIA_INCLUDE_DIR=${prefix}/include \
-
 universal_variant   no
 
 livecheck.url       http://mirrors.ibiblio.org/pub/mirrors/kde/stable/latest/src/

Modified: trunk/dports/kde/kdenetwork4/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdenetwork4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdenetwork4
-version             4.5.3
+version             4.5.4
 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    8d9c4f674bb0811977c04121305287f0acbece20 \
-                    rmd160  0bbbbbbf5bae1d1067062cfb24b9866d304784a2
+checksums           sha1    95a69183912fe9f29a2e877c0655050d4a7252d1 \
+                    rmd160  4ffc9e7c457b132692ad5736ae8815210b87c3b5
 
 depends_lib-append  port:kdebase4-runtime \
                     port:meanwhile \
@@ -28,6 +28,7 @@
                     port:libotr \
                     port:xmms \
                     port:libmsn \
+                    port:LibVNCServer \
                     port:libidn
 depends_run-append  port:qca-ossl
 

Modified: trunk/dports/kde/kdepimlibs4/Portfile
===================================================================
--- trunk/dports/kde/kdepimlibs4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdepimlibs4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdepimlibs4
-version             4.5.3
+version             4.5.4
 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    6e2497a5972c3e92052d1e9c414e3a0360c14584 \
-                    rmd160  83138d1761c4aadbd7f8117d906a0b617e06002f
+checksums           sha1    19849626439abb195f0827df59ab034a06af77ea \
+                    rmd160  38ce04ab98556786d30dd3b0ba50b0481f4287e7
 
 depends_lib-append  port:kdelibs4 \
                     port:akonadi \

Modified: trunk/dports/kde/kdesdk4/Portfile
===================================================================
--- trunk/dports/kde/kdesdk4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdesdk4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdesdk4
-version             4.5.3
+version             4.5.4
 categories          kde kde4
 maintainers         snc sharky
 description         Utilities to ease development with the KDE4 platform
@@ -15,10 +15,10 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdesdk-${version}
-checksums           sha1    6326560c55f5ba5e4fdee4b1d941aaaa6047689e \
-                    rmd160  30c6c42b72df847fe65a7bf20d81115754b48aa7
+checksums           sha1    a6775519b135e6e7a75e86512c7c7712ecabe873 \
+                    rmd160  b0731590fe2601b4585d745f758e495a27475c0a
 
-depends_lib-append  port:kdebase4
+depends_lib-append  port:kdebase4 port:antlr
 
 configure.args-append   -DWITH_Boost:BOOL=OFF
 

Modified: trunk/dports/kde/kdetoys4/Portfile
===================================================================
--- trunk/dports/kde/kdetoys4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdetoys4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdetoys4
-version             4.5.3
+version             4.5.4
 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    1a3bcd3bfee0cde9143f7d982dce9d8669beaf33 \
-                    rmd160  775949ef3ad8f146da950969c35f4af7a0befa34
+checksums           sha1    f9859dc10832852bd733898c08dd11ef72fe439b \
+                    rmd160  29af7a2e5a6ff4a796249d74a5e2b1424a759865
 
 depends_lib-append  port:kdelibs4 port:kdebase4-runtime
 

Modified: trunk/dports/kde/kdeutils4/Portfile
===================================================================
--- trunk/dports/kde/kdeutils4/Portfile	2010-12-04 17:32:51 UTC (rev 74074)
+++ trunk/dports/kde/kdeutils4/Portfile	2010-12-04 18:00:55 UTC (rev 74075)
@@ -5,7 +5,7 @@
 PortGroup           kde4   1.1
 
 name                kdeutils4
-version             4.5.3
+version             4.5.4
 conflicts           kdelibs4-experimental
 categories          kde kde4
 maintainers         snc sharky
@@ -16,12 +16,13 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdeutils-${version}
-checksums           sha1    9973c4cda083f31c73db67388289e144afcd675c \
-                    rmd160  88700a9606dc0acfec48d846d206b40b68835ab0
+checksums           sha1    8d5d1cb5cc37f7fa9cb065e2589b76df80282197 \
+                    rmd160  6b1cdc68d67ba3302e221d6ec4a5ab0958cf9b3d
 
 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}

    

[74075] trunk/dports/kde

snc＠macports.org