[84396] trunk/dports/kde/kdelibs4

snc at macports.org snc at macports.org
Sun Sep 25 09:46:06 PDT 2011


Revision: 84396
          http://trac.macports.org/changeset/84396
Author:   snc at macports.org
Date:     2011-09-25 09:46:02 -0700 (Sun, 25 Sep 2011)
Log Message:
-----------
kdelibs4: try to make KDE work on the Mac, #31332

Modified Paths:
--------------
    trunk/dports/kde/kdelibs4/Portfile
    trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch

Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile	2011-09-25 16:24:35 UTC (rev 84395)
+++ trunk/dports/kde/kdelibs4/Portfile	2011-09-25 16:46:02 UTC (rev 84396)
@@ -6,8 +6,10 @@
 
 name                kdelibs4
 version             4.7.1
+revision            1
 categories          kde kde4
 maintainers         snc sharky michaelld
+license             GPL-2+
 description         KDE4 core libraries
 long_description    Core libraries for KDE4 applications to function
 platforms           darwin

Modified: trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2011-09-25 16:24:35 UTC (rev 84395)
+++ trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2011-09-25 16:46:02 UTC (rev 84396)
@@ -1,5 +1,7 @@
---- kdelibs-4.6.1/kinit/kinit.cpp.orig	2011-03-05 18:46:43.000000000 -0500
-+++ kdelibs-4.6.1/kinit/kinit.cpp	2011-03-05 18:48:53.000000000 -0500
+Index: kdelibs-4.7.1/kinit/kinit.cpp
+===================================================================
+--- kdelibs-4.7.1.orig/kinit/kinit.cpp	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.7.1/kinit/kinit.cpp	2011-09-25 01:29:50.000000000 +0200
 @@ -543,6 +543,12 @@
    const QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(execpath));
  #endif
@@ -13,7 +15,7 @@
    d.errorMsg = 0;
    d.fork = fork();
    switch(d.fork) {
-@@ -607,10 +615,9 @@
+@@ -607,13 +613,11 @@
       {
         int r;
         QByteArray procTitle;
@@ -24,8 +26,11 @@
 -       QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0]));
         if (!argvexe.isEmpty()) {
            QByteArray cstr = argvexe.toLocal8Bit();
-           kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
-@@ -699,25 +706,13 @@
+-          kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
+           d.argv[0] = strdup(cstr.data());
+        }
+ #endif
+@@ -699,25 +703,13 @@
          exit(255);
       }
  
@@ -56,7 +61,7 @@
       if (d.debug_wait)
       {
          fprintf(stderr, "kdeinit4: Suspending process\n"
-@@ -731,8 +726,18 @@
+@@ -731,8 +723,18 @@
          setup_tty( tty );
       }
  
@@ -76,9 +81,11 @@
       break;
    }
    default:
---- kdelibs-4.6.0/kinit/CMakeLists.txt.weee    2011-01-30 17:08:09.000000000 -0500
-+++ kdelibs-4.6.0/kinit/CMakeLists.txt 2011-01-30 17:15:54.000000000 -0500
-@@ -57,6 +57,16 @@
+Index: kdelibs-4.7.1/kinit/CMakeLists.txt
+===================================================================
+--- kdelibs-4.7.1.orig/kinit/CMakeLists.txt	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.7.1/kinit/CMakeLists.txt	2011-09-21 01:41:37.000000000 +0200
+@@ -58,6 +58,16 @@
  
  install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
@@ -95,10 +102,10 @@
  ########### kwrapper4 ###############
  if (WIN32)
    set(kwrapper_SRCS kwrapper_win.cpp  )
-Index: kdelibs-4.3.2/kinit/helper.cpp
+Index: kdelibs-4.7.1/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
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ kdelibs-4.7.1/kinit/helper.cpp	2011-09-21 01:41:37.000000000 +0200
 @@ -0,0 +1,42 @@
 +#include <stdio.h>
 +#include <stdlib.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110925/ce4ba328/attachment.html>


More information about the macports-changes mailing list