[75067] trunk/dports/kde/kdelibs4

[snc at macports.org]

Revision: 75067
          http://trac.macports.org/changeset/75067
Author:   snc at macports.org
Date:     2011-01-13 19:11:04 -0800 (Thu, 13 Jan 2011)
Log Message:
-----------
kdelibs4: fix patch, #25178

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-01-14 02:31:26 UTC (rev 75066)
+++ trunk/dports/kde/kdelibs4/Portfile	2011-01-14 03:11:04 UTC (rev 75067)
@@ -6,7 +6,7 @@
 
 name                kdelibs4
 version             4.5.5
-revision            1
+revision            2
 categories          kde kde4
 maintainers         snc sharky michaelld
 description         KDE4 core libraries

Modified: trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2011-01-14 02:31:26 UTC (rev 75066)
+++ trunk/dports/kde/kdelibs4/files/workaround-kdeinit4-crash.patch	2011-01-14 03:11:04 UTC (rev 75067)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
        init_startup_info( startup_id, name, envc, envs );
  #endif
  
@@ -15,7 +15,15 @@
    d.errorMsg = 0;
    d.fork = fork();
    switch(d.fork) {
-@@ -601,10 +609,9 @@
+@@ -559,7 +567,6 @@
+      if (cwd && *cwd) {
+          (void)chdir(cwd);
+      } else {
+-         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
+          (void)chdir(docPath.constData());
+      }
+ 
+@@ -595,10 +602,9 @@
       {
         int r;
         QByteArray procTitle;
@@ -27,7 +35,7 @@
         if (!argvexe.isEmpty()) {
            QByteArray cstr = argvexe.toLocal8Bit();
            kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
-@@ -680,7 +687,6 @@
+@@ -674,7 +680,6 @@
  
          QByteArray executable = execpath;
  #ifdef Q_WS_MAC
@@ -35,7 +43,7 @@
          if (!bundlepath.isEmpty())
             executable = QFile::encodeName(bundlepath);
  #endif
-@@ -694,25 +700,13 @@
+@@ -688,25 +693,13 @@
          exit(255);
       }
  
@@ -66,7 +74,7 @@
       if (d.debug_wait)
       {
          fprintf(stderr, "kdeinit4: Suspending process\n"
-@@ -726,8 +720,18 @@
+@@ -720,8 +713,18 @@
          setup_tty( tty );
       }
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110113/9cd45ec0/attachment-0001.html>