Author: ranger
Date: Tue Mar 10 04:49:57 2009
New Revision: 1388
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1388&repname=user%3a+ranger>
Log:
pimlibs fix on 10.4
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.info
trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.patch
trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.info
trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.patch
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.info&rev=1388&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.info Tue Mar 10
04:49:57 2009
@@ -55,7 +55,7 @@
Source-MD5: 5f220939f33c38992f419d5dfc6874df
SourceDirectory: kdepimlibs-%v
PatchFile: kdepimlibs4.patch
-PatchFile-MD5: 540e8d0146c71425d652d92d4dc6cc92
+PatchFile-MD5: 813d8a0f47a7e480058a4da58e572918
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.patch&rev=1388&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdepimlibs4.patch Tue Mar 10
04:49:57 2009
@@ -1,6 +1,24 @@
+diff -Nurd kdepimlibs-4.2.1/akonadi/tests/testrunner/setup.cpp
kdepimlibs-4.2.1-new/akonadi/tests/testrunner/setup.cpp
+--- kdepimlibs-4.2.1/akonadi/tests/testrunner/setup.cpp 2009-01-06
12:19:31.000000000 -0500
++++ kdepimlibs-4.2.1-new/akonadi/tests/testrunner/setup.cpp 2009-03-09
23:43:30.000000000 -0400
+@@ -50,9 +50,14 @@
+
+ foreach(const QString& s, environment.keys()) {
+ if (s != "HOME") {
++#ifdef __APPLE__
++ /* on 10.4, this is a void :P */
++ unsetenv( s.toAscii() );
++#else
+ if ( !unsetenv( s.toAscii() )) {
+ return false;
+ }
++#endif
+ }
+ }
+
diff -Nurd kdepimlibs-4.2.1/cmake/modules/FindLibical.cmake
kdepimlibs-4.2.1-new/cmake/modules/FindLibical.cmake
--- kdepimlibs-4.2.1/cmake/modules/FindLibical.cmake 2009-02-26
09:15:40.000000000 -0500
-+++ kdepimlibs-4.2.1-new/cmake/modules/FindLibical.cmake 2009-03-06
11:17:08.000000000 -0500
++++ kdepimlibs-4.2.1-new/cmake/modules/FindLibical.cmake 2009-03-09
23:43:14.000000000 -0400
@@ -16,7 +16,6 @@
if (WIN32)
@@ -43,7 +61,7 @@
diff -Nurd kdepimlibs-4.2.1/kcal/CMakeLists.txt
kdepimlibs-4.2.1-new/kcal/CMakeLists.txt
--- kdepimlibs-4.2.1/kcal/CMakeLists.txt 2008-12-04 03:34:06.000000000
-0500
-+++ kdepimlibs-4.2.1-new/kcal/CMakeLists.txt 2009-03-06 11:14:34.000000000
-0500
++++ kdepimlibs-4.2.1-new/kcal/CMakeLists.txt 2009-03-09 23:43:14.000000000
-0400
@@ -17,6 +17,7 @@
include_directories(
${LIBICAL_INCLUDE_DIRS}
Modified: trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.info&rev=1388&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.info Tue Mar 10
04:49:57 2009
@@ -52,7 +52,7 @@
Source-MD5: 5f220939f33c38992f419d5dfc6874df
SourceDirectory: kdepimlibs-%v
PatchFile: kdepimlibs4.patch
-PatchFile-MD5: 540e8d0146c71425d652d92d4dc6cc92
+PatchFile-MD5: 813d8a0f47a7e480058a4da58e572918
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.patch&rev=1388&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdepimlibs4.patch Tue Mar 10
04:49:57 2009
@@ -1,6 +1,24 @@
+diff -Nurd kdepimlibs-4.2.1/akonadi/tests/testrunner/setup.cpp
kdepimlibs-4.2.1-new/akonadi/tests/testrunner/setup.cpp
+--- kdepimlibs-4.2.1/akonadi/tests/testrunner/setup.cpp 2009-01-06
12:19:31.000000000 -0500
++++ kdepimlibs-4.2.1-new/akonadi/tests/testrunner/setup.cpp 2009-03-09
23:43:30.000000000 -0400
+@@ -50,9 +50,14 @@
+
+ foreach(const QString& s, environment.keys()) {
+ if (s != "HOME") {
++#ifdef __APPLE__
++ /* on 10.4, this is a void :P */
++ unsetenv( s.toAscii() );
++#else
+ if ( !unsetenv( s.toAscii() )) {
+ return false;
+ }
++#endif
+ }
+ }
+
diff -Nurd kdepimlibs-4.2.1/cmake/modules/FindLibical.cmake
kdepimlibs-4.2.1-new/cmake/modules/FindLibical.cmake
--- kdepimlibs-4.2.1/cmake/modules/FindLibical.cmake 2009-02-26
09:15:40.000000000 -0500
-+++ kdepimlibs-4.2.1-new/cmake/modules/FindLibical.cmake 2009-03-06
11:17:08.000000000 -0500
++++ kdepimlibs-4.2.1-new/cmake/modules/FindLibical.cmake 2009-03-09
23:43:14.000000000 -0400
@@ -16,7 +16,6 @@
if (WIN32)
@@ -43,7 +61,7 @@
diff -Nurd kdepimlibs-4.2.1/kcal/CMakeLists.txt
kdepimlibs-4.2.1-new/kcal/CMakeLists.txt
--- kdepimlibs-4.2.1/kcal/CMakeLists.txt 2008-12-04 03:34:06.000000000
-0500
-+++ kdepimlibs-4.2.1-new/kcal/CMakeLists.txt 2009-03-06 11:14:34.000000000
-0500
++++ kdepimlibs-4.2.1-new/kcal/CMakeLists.txt 2009-03-09 23:43:14.000000000
-0400
@@ -17,6 +17,7 @@
include_directories(
${LIBICAL_INCLUDE_DIRS}
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
