Author: ranger
Date: Tue Jun 9 23:04:26 2009
New Revision: 1568
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1568&repname=user%3a+ranger>
Log:
more kde updates
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.info
trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.patch
trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info
trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch
trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.info
trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.patch
trunk/experimental/common/main/finkinfo/kde/kdelibs4.info
trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.info&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.info Tue Jun 9
23:04:26 2009
@@ -58,7 +58,7 @@
Source-MD5: 9b5067b3ff73498705b5575e9290dffb
SourceDirectory: kdebase-runtime-%v
PatchFile: kdebase4-runtime.patch
-PatchFile-MD5: e783a65db6549f2b6833c8d511a56d4d
+PatchFile-MD5: 8bd3c5a96d3629b345152b53eaa5801f
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.patch&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase4-runtime.patch Tue Jun 9
23:04:26 2009
@@ -1,6 +1,6 @@
diff -Nurd kdebase-runtime-4.2.4/kcontrol/componentchooser/CMakeLists.txt
kdebase-runtime-4.2.4-new/kcontrol/componentchooser/CMakeLists.txt
--- kdebase-runtime-4.2.4/kcontrol/componentchooser/CMakeLists.txt
2008-09-17 16:54:29.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/kcontrol/componentchooser/CMakeLists.txt
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/kcontrol/componentchooser/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -19,10 +19,10 @@
componentchooserterminal.cpp ktimerdialog.cpp)
endif(NOT WIN32)
@@ -16,7 +16,7 @@
kde4_add_ui_files(kcm_componentchooser_SRCS
diff -Nurd kdebase-runtime-4.2.4/kioslave/thumbnail/CMakeLists.txt
kdebase-runtime-4.2.4-new/kioslave/thumbnail/CMakeLists.txt
--- kdebase-runtime-4.2.4/kioslave/thumbnail/CMakeLists.txt 2009-01-17
05:59:27.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/kioslave/thumbnail/CMakeLists.txt
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/kioslave/thumbnail/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -86,7 +86,7 @@
kde4_add_plugin(exrthumbnail ${exrthumbnail_PART_SRCS})
@@ -26,9 +26,65 @@
install(TARGETS exrthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
install( FILES exrthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff -Nurd kdebase-runtime-4.2.4/knotify/CMakeLists.txt
kdebase-runtime-4.2.4-new/knotify/CMakeLists.txt
+--- kdebase-runtime-4.2.4/knotify/CMakeLists.txt 2008-05-29
07:18:43.000000000 -0400
++++ kdebase-runtime-4.2.4-new/knotify/CMakeLists.txt 2009-06-09
17:02:50.000000000 -0400
+@@ -17,6 +17,12 @@
+
+ kde4_add_executable( knotify ${knotify_SRCS})
+
++if (Q_WS_MAC)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kde.knotify4")
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Notify")
++endif (Q_WS_MAC)
++
+ target_link_libraries( knotify ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS})
+
+ set_target_properties(knotify PROPERTIES OUTPUT_NAME knotify4 )
+diff -Nurd kdebase-runtime-4.2.4/knotify/Info.plist.template
kdebase-runtime-4.2.4-new/knotify/Info.plist.template
+--- kdebase-runtime-4.2.4/knotify/Info.plist.template 1969-12-31
19:00:00.000000000 -0500
++++ kdebase-runtime-4.2.4-new/knotify/Info.plist.template 2009-06-09
17:02:04.000000000 -0400
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
diff -Nurd kdebase-runtime-4.2.4/nepomuk/kioslaves/search/CMakeLists.txt
kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/CMakeLists.txt
--- kdebase-runtime-4.2.4/nepomuk/kioslaves/search/CMakeLists.txt
2008-09-26 10:55:58.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/CMakeLists.txt
2009-06-06 08:21:35.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -4,6 +4,7 @@
${QT_INCLUDES}
${KDE4_INCLUDES}
@@ -39,7 +95,7 @@
)
diff -Nurd kdebase-runtime-4.2.4/nepomuk/kioslaves/search/querymetatype.h
kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/querymetatype.h
--- kdebase-runtime-4.2.4/nepomuk/kioslaves/search/querymetatype.h
2008-09-26 10:55:58.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/querymetatype.h
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/querymetatype.h
2009-06-09 17:01:51.000000000 -0400
@@ -5,4 +5,7 @@
#include "query.h"
@@ -50,7 +106,7 @@
+#endif
diff -Nurd kdebase-runtime-4.2.4/nepomuk/kioslaves/search/searchfolder.cpp
kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/searchfolder.cpp
--- kdebase-runtime-4.2.4/nepomuk/kioslaves/search/searchfolder.cpp
2008-11-28 10:33:43.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/searchfolder.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/searchfolder.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -33,12 +33,7 @@
#include <KIO/NetAccess>
#include <KUser>
@@ -67,7 +123,7 @@
QString addCounterToFileName( const QString& name, int i )
diff -Nurd kdebase-runtime-4.2.4/nepomuk/libnepomukquery/dbusoperators.cpp
kdebase-runtime-4.2.4-new/nepomuk/libnepomukquery/dbusoperators.cpp
--- kdebase-runtime-4.2.4/nepomuk/libnepomukquery/dbusoperators.cpp
2008-11-28 10:33:44.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/nepomuk/libnepomukquery/dbusoperators.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/libnepomukquery/dbusoperators.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -23,9 +23,14 @@
Q_DECLARE_METATYPE(Nepomuk::Search::Result)
@@ -85,7 +141,7 @@
diff -Nurd kdebase-runtime-4.2.4/nepomuk/services/queryservice/CMakeLists.txt
kdebase-runtime-4.2.4-new/nepomuk/services/queryservice/CMakeLists.txt
--- kdebase-runtime-4.2.4/nepomuk/services/queryservice/CMakeLists.txt
2008-09-26 10:55:58.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/nepomuk/services/queryservice/CMakeLists.txt
2009-06-06 08:21:23.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/services/queryservice/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -3,6 +3,7 @@
include_directories(
${QT_INCLUDES}
@@ -96,7 +152,7 @@
)
diff -Nurd kdebase-runtime-4.2.4/phonon/platform_kde/devicelisting.cpp
kdebase-runtime-4.2.4-new/phonon/platform_kde/devicelisting.cpp
--- kdebase-runtime-4.2.4/phonon/platform_kde/devicelisting.cpp
2008-10-17 07:00:15.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/phonon/platform_kde/devicelisting.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/phonon/platform_kde/devicelisting.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -35,7 +35,10 @@
#endif // HAVE_ALSA_ASOUNDLIB_H
@@ -110,7 +166,7 @@
{
diff -Nurd kdebase-runtime-4.2.4/phonon/platform_kde/kdeplatformplugin.cpp
kdebase-runtime-4.2.4-new/phonon/platform_kde/kdeplatformplugin.cpp
--- kdebase-runtime-4.2.4/phonon/platform_kde/kdeplatformplugin.cpp
2008-11-28 10:33:42.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/phonon/platform_kde/kdeplatformplugin.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/phonon/platform_kde/kdeplatformplugin.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -43,7 +43,10 @@
typedef QPair<QByteArray, QString> PhononDeviceAccess;
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info Tue Jun 9 23:04:26
2009
@@ -58,7 +58,7 @@
SourceDirectory: kdelibs-%v
PatchScript: sed -e 's,@KDEPREFIX@,%p,g' -e 's,@KDETYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
PatchFile: kdelibs4.patch
-PatchFile-MD5: dd989317d302e1eb2970190637f80cb2
+PatchFile-MD5: bad6ea67efa33d357f1712f3d8d0ecbc
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch Tue Jun 9
23:04:26 2009
@@ -1,6 +1,6 @@
diff -Nurd kdelibs-4.2.4/cmake/modules/FindKDE4Internal.cmake
kdelibs-4.2.4-new/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.4/cmake/modules/FindKDE4Internal.cmake 2009-02-26
09:18:26.000000000 -0500
-+++ kdelibs-4.2.4-new/cmake/modules/FindKDE4Internal.cmake 2009-06-08
14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/cmake/modules/FindKDE4Internal.cmake 2009-06-09
16:43:40.000000000 -0400
@@ -360,7 +360,7 @@
if (_kdeBootStrapping)
set(KDE4_INCLUDE_DIR ${kdelibs_SOURCE_DIR})
@@ -12,7 +12,7 @@
if (UNIX)
diff -Nurd kdelibs-4.2.4/cmake/modules/FindSoprano.cmake
kdelibs-4.2.4-new/cmake/modules/FindSoprano.cmake
--- kdelibs-4.2.4/cmake/modules/FindSoprano.cmake 2009-01-06
12:27:37.000000000 -0500
-+++ kdelibs-4.2.4-new/cmake/modules/FindSoprano.cmake 2009-06-08
14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/cmake/modules/FindSoprano.cmake 2009-06-09
16:43:40.000000000 -0400
@@ -128,7 +128,7 @@
NAMES
soprano/plugins
@@ -24,7 +24,7 @@
)
diff -Nurd kdelibs-4.2.4/doc/api/Doxyfile.local
kdelibs-4.2.4-new/doc/api/Doxyfile.local
--- kdelibs-4.2.4/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000
-0400
-+++ kdelibs-4.2.4-new/doc/api/Doxyfile.local 2009-06-08 14:13:29.000000000
-0400
++++ kdelibs-4.2.4-new/doc/api/Doxyfile.local 2009-06-09 16:43:40.000000000
-0400
@@ -173,6 +173,7 @@
Q_WS_MAC="" \
Q_OS_UNIX="" \
@@ -35,7 +35,7 @@
Q_SLOTS="slots" \
diff -Nurd kdelibs-4.2.4/kde3support/kdecore/k3processcontroller.cpp
kdelibs-4.2.4-new/kde3support/kdecore/k3processcontroller.cpp
--- kdelibs-4.2.4/kde3support/kdecore/k3processcontroller.cpp 2008-05-21
07:06:17.000000000 -0400
-+++ kdelibs-4.2.4-new/kde3support/kdecore/k3processcontroller.cpp
2009-06-08 14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/kde3support/kdecore/k3processcontroller.cpp
2009-06-09 16:43:40.000000000 -0400
@@ -114,7 +114,7 @@
K3ProcessController::~K3ProcessController()
@@ -47,7 +47,7 @@
close( d->fd[1] );
diff -Nurd kdelibs-4.2.4/kde4-check-sycoca.sh
kdelibs-4.2.4-new/kde4-check-sycoca.sh
--- kdelibs-4.2.4/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-4.2.4-new/kde4-check-sycoca.sh 2009-06-08 14:17:19.000000000
-0400
++++ kdelibs-4.2.4-new/kde4-check-sycoca.sh 2009-06-09 16:43:40.000000000
-0400
@@ -0,0 +1,18 @@
+#!/bin/sh
+
@@ -69,7 +69,7 @@
+fi
diff -Nurd kdelibs-4.2.4/kde4-postinst.sh kdelibs-4.2.4-new/kde4-postinst.sh
--- kdelibs-4.2.4/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-4.2.4-new/kde4-postinst.sh 2009-06-08 14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/kde4-postinst.sh 2009-06-09 16:43:40.000000000 -0400
@@ -0,0 +1,81 @@
+#!/bin/sh
+
@@ -154,7 +154,7 @@
+echo ""
diff -Nurd kdelibs-4.2.4/kdecore/config/kconfig.cpp
kdelibs-4.2.4-new/kdecore/config/kconfig.cpp
--- kdelibs-4.2.4/kdecore/config/kconfig.cpp 2008-10-22 19:05:09.000000000
-0400
-+++ kdelibs-4.2.4-new/kdecore/config/kconfig.cpp 2009-06-08
14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/config/kconfig.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -71,7 +71,7 @@
#ifdef Q_WS_WIN
QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
@@ -166,7 +166,7 @@
// first entry is always /etc/kderc or empty if cannot read
diff -Nurd kdelibs-4.2.4/kdecore/kernel/kcmdlineargs.cpp
kdelibs-4.2.4-new/kdecore/kernel/kcmdlineargs.cpp
--- kdelibs-4.2.4/kdecore/kernel/kcmdlineargs.cpp 2009-05-28
15:22:22.000000000 -0400
-+++ kdelibs-4.2.4-new/kdecore/kernel/kcmdlineargs.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/kernel/kcmdlineargs.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -727,10 +727,6 @@
argument = opt.mid(j+1);
opt = opt.left(j);
@@ -216,7 +216,7 @@
KCmdLineArgs::usage(option.mid(5));
diff -Nurd kdelibs-4.2.4/kdecore/kernel/kkernel_mac.cpp
kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.cpp
--- kdelibs-4.2.4/kdecore/kernel/kkernel_mac.cpp 2009-01-06
12:27:48.000000000 -0500
-+++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -21,7 +21,7 @@
#include <config.h>
@@ -287,7 +287,7 @@
if (appFileName.isEmpty()) {
diff -Nurd kdelibs-4.2.4/kdecore/kernel/kkernel_mac.h
kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.h
--- kdelibs-4.2.4/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000
-0500
-+++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.h 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.h 2009-06-09
16:43:40.000000000 -0400
@@ -21,7 +21,7 @@
#include <QtCore/qglobal.h> // defines Q_OS_MACX
@@ -306,7 +306,7 @@
#endif // KKERNEL_MAC_H
diff -Nurd kdelibs-4.2.4/kdecore/tests/kconfigtest.cpp
kdelibs-4.2.4-new/kdecore/tests/kconfigtest.cpp
--- kdelibs-4.2.4/kdecore/tests/kconfigtest.cpp 2009-05-28
15:22:22.000000000 -0400
-+++ kdelibs-4.2.4-new/kdecore/tests/kconfigtest.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/tests/kconfigtest.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -416,7 +416,7 @@
QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") +
HOMEPATH );
QVERIFY(group.hasKey("URL"));
@@ -316,9 +316,65 @@
// I don't know if this will work on windows
// This test hangs on OS X
QVERIFY(group.hasKey("hostname"));
+diff -Nurd kdelibs-4.2.4/kded/CMakeLists.txt
kdelibs-4.2.4-new/kded/CMakeLists.txt
+--- kdelibs-4.2.4/kded/CMakeLists.txt 2008-12-10 11:12:28.000000000 -0500
++++ kdelibs-4.2.4-new/kded/CMakeLists.txt 2009-06-09 16:59:04.000000000
-0400
+@@ -13,6 +13,12 @@
+
+ kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS})
+
++if (Q_WS_MAC)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kded.kded4")
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Daemon")
++endif (Q_WS_MAC)
++
+ target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
+
+ install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
+diff -Nurd kdelibs-4.2.4/kded/Info.plist.template
kdelibs-4.2.4-new/kded/Info.plist.template
+--- kdelibs-4.2.4/kded/Info.plist.template 1969-12-31 19:00:00.000000000
-0500
++++ kdelibs-4.2.4-new/kded/Info.plist.template 2009-06-09 16:57:31.000000000
-0400
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
diff -Nurd kdelibs-4.2.4/kdeui/kernel/kapplication.cpp
kdelibs-4.2.4-new/kdeui/kernel/kapplication.cpp
--- kdelibs-4.2.4/kdeui/kernel/kapplication.cpp 2008-12-21
15:21:06.000000000 -0500
-+++ kdelibs-4.2.4-new/kdeui/kernel/kapplication.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdeui/kernel/kapplication.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -101,6 +101,9 @@
#include <Carbon/Carbon.h>
#include <QImage>
@@ -340,7 +396,7 @@
diff -Nurd kdelibs-4.2.4/kdeui/kernel/kuniqueapplication.cpp
kdelibs-4.2.4-new/kdeui/kernel/kuniqueapplication.cpp
--- kdelibs-4.2.4/kdeui/kernel/kuniqueapplication.cpp 2008-09-03
07:25:15.000000000 -0400
-+++ kdelibs-4.2.4-new/kdeui/kernel/kuniqueapplication.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdeui/kernel/kuniqueapplication.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -65,7 +65,7 @@
# endif
#endif
@@ -399,7 +455,7 @@
#endif
diff -Nurd kdelibs-4.2.4/kimgio/CMakeLists.txt
kdelibs-4.2.4-new/kimgio/CMakeLists.txt
--- kdelibs-4.2.4/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000
-0400
-+++ kdelibs-4.2.4-new/kimgio/CMakeLists.txt 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kimgio/CMakeLists.txt 2009-06-09 16:43:40.000000000
-0400
@@ -96,7 +96,7 @@
add_definitions(${OPENEXR_DEFINITIONS})
set(kimg_exr_LIB_SRCS exr.cpp)
@@ -409,9 +465,71 @@
install(TARGETS kimg_exr DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/imageformats/ )
install( FILES exr.desktop DESTINATION
${SERVICES_INSTALL_DIR}/qimageioplugins/ )
+diff -Nurd kdelibs-4.2.4/kinit/CMakeLists.txt
kdelibs-4.2.4-new/kinit/CMakeLists.txt
+--- kdelibs-4.2.4/kinit/CMakeLists.txt 2008-10-30 10:18:58.000000000 -0400
++++ kdelibs-4.2.4-new/kinit/CMakeLists.txt 2009-06-09 16:59:25.000000000
-0400
+@@ -38,12 +38,15 @@
+ set(kdeinit_LIBS kparts)
+ endif (WIN32)
+
+-if (APPLE)
++if (Q_WS_MAC)
+ # this has to be GUI on OSX because it launches GUI apps and need a quartz
context
+ kde4_add_executable(kdeinit4 ${kdeinit_SRCS})
+-else (APPLE)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kde.kdeinit4")
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Init")
++else (Q_WS_MAC)
+ kde4_add_executable(kdeinit4 NOGUI ${kdeinit_SRCS})
+-endif (APPLE)
++endif (Q_WS_MAC)
+
+ target_link_libraries(kdeinit4 ${KDE4_KDECORE_LIBS} ${kdeinit_LIBS} )
+ if (Q_WS_X11)
+diff -Nurd kdelibs-4.2.4/kinit/Info.plist.template
kdelibs-4.2.4-new/kinit/Info.plist.template
+--- kdelibs-4.2.4/kinit/Info.plist.template 1969-12-31 19:00:00.000000000
-0500
++++ kdelibs-4.2.4-new/kinit/Info.plist.template 2009-06-09
16:54:09.000000000 -0400
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
diff -Nurd kdelibs-4.2.4/kinit/kinit.cpp kdelibs-4.2.4-new/kinit/kinit.cpp
--- kdelibs-4.2.4/kinit/kinit.cpp 2009-04-30 05:13:35.000000000 -0400
-+++ kdelibs-4.2.4-new/kinit/kinit.cpp 2009-06-08 14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kinit/kinit.cpp 2009-06-09 16:43:40.000000000 -0400
@@ -68,7 +68,7 @@
#endif
#endif
@@ -464,7 +582,7 @@
pipe(d.initpipe);
diff -Nurd kdelibs-4.2.4/kio/kfile/kfsprocess.cpp
kdelibs-4.2.4-new/kio/kfile/kfsprocess.cpp
--- kdelibs-4.2.4/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000
-0400
-+++ kdelibs-4.2.4-new/kio/kfile/kfsprocess.cpp 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kio/kfile/kfsprocess.cpp 2009-06-09 16:43:40.000000000
-0400
@@ -83,7 +83,7 @@
KfsProcessController::~KfsProcessController()
@@ -476,7 +594,7 @@
close( m_fd[1] );
diff -Nurd kdelibs-4.2.4/kio/kfile/kpropertiesdialog.cpp
kdelibs-4.2.4-new/kio/kfile/kpropertiesdialog.cpp
--- kdelibs-4.2.4/kio/kfile/kpropertiesdialog.cpp 2009-05-28
15:22:21.000000000 -0400
-+++ kdelibs-4.2.4-new/kio/kfile/kpropertiesdialog.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kio/kfile/kpropertiesdialog.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -1769,13 +1769,13 @@
#ifdef Q_OS_UNIX
// pick the groups to which the user belongs
@@ -495,7 +613,7 @@
groups = new gid_t[groupCount];
diff -Nurd kdelibs-4.2.4/kpty/kptydevice.cpp
kdelibs-4.2.4-new/kpty/kptydevice.cpp
--- kdelibs-4.2.4/kpty/kptydevice.cpp 2009-03-26 10:44:18.000000000 -0400
-+++ kdelibs-4.2.4-new/kpty/kptydevice.cpp 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kpty/kptydevice.cpp 2009-06-09 16:43:40.000000000
-0400
@@ -42,7 +42,7 @@
# include <sys/time.h>
#endif
@@ -507,7 +625,7 @@
#elif defined(TIOCINQ)
diff -Nurd kdelibs-4.2.4/kross/qts/CMakeLists.txt
kdelibs-4.2.4-new/kross/qts/CMakeLists.txt
--- kdelibs-4.2.4/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000
-0500
-+++ kdelibs-4.2.4-new/kross/qts/CMakeLists.txt 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kross/qts/CMakeLists.txt 2009-06-09 16:43:40.000000000
-0400
@@ -6,7 +6,7 @@
target_link_libraries(krossqtsplugin ${QT_QTUITOOLS_LIBRARY}
${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} krosscore ${QT_QTSCRIPT_LIBRARY})
set_target_properties(krossqtsplugin PROPERTIES VERSION
${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
@@ -519,7 +637,7 @@
diff -Nurd kdelibs-4.2.4/solid/solid/CMakeLists.txt
kdelibs-4.2.4-new/solid/solid/CMakeLists.txt
--- kdelibs-4.2.4/solid/solid/CMakeLists.txt 2008-11-19 05:20:13.000000000
-0500
-+++ kdelibs-4.2.4-new/solid/solid/CMakeLists.txt 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/solid/solid/CMakeLists.txt 2009-06-09
16:43:40.000000000 -0400
@@ -102,7 +102,7 @@
backends/fakehw/fakevolume.cpp
)
@@ -540,7 +658,7 @@
if(MSVC)
diff -Nurd kdelibs-4.2.4/solid/solid/managerbase.cpp
kdelibs-4.2.4-new/solid/solid/managerbase.cpp
--- kdelibs-4.2.4/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000
-0400
-+++ kdelibs-4.2.4-new/solid/solid/managerbase.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/solid/solid/managerbase.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -23,7 +23,8 @@
#include "backends/fakehw/fakemanager.h"
Modified: trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.info&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.info Tue Jun
9 23:04:26 2009
@@ -58,7 +58,7 @@
Source-MD5: 9b5067b3ff73498705b5575e9290dffb
SourceDirectory: kdebase-runtime-%v
PatchFile: kdebase4-runtime.patch
-PatchFile-MD5: e783a65db6549f2b6833c8d511a56d4d
+PatchFile-MD5: 8bd3c5a96d3629b345152b53eaa5801f
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.patch&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.patch
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase4-runtime.patch Tue Jun
9 23:04:26 2009
@@ -1,6 +1,6 @@
diff -Nurd kdebase-runtime-4.2.4/kcontrol/componentchooser/CMakeLists.txt
kdebase-runtime-4.2.4-new/kcontrol/componentchooser/CMakeLists.txt
--- kdebase-runtime-4.2.4/kcontrol/componentchooser/CMakeLists.txt
2008-09-17 16:54:29.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/kcontrol/componentchooser/CMakeLists.txt
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/kcontrol/componentchooser/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -19,10 +19,10 @@
componentchooserterminal.cpp ktimerdialog.cpp)
endif(NOT WIN32)
@@ -16,7 +16,7 @@
kde4_add_ui_files(kcm_componentchooser_SRCS
diff -Nurd kdebase-runtime-4.2.4/kioslave/thumbnail/CMakeLists.txt
kdebase-runtime-4.2.4-new/kioslave/thumbnail/CMakeLists.txt
--- kdebase-runtime-4.2.4/kioslave/thumbnail/CMakeLists.txt 2009-01-17
05:59:27.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/kioslave/thumbnail/CMakeLists.txt
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/kioslave/thumbnail/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -86,7 +86,7 @@
kde4_add_plugin(exrthumbnail ${exrthumbnail_PART_SRCS})
@@ -26,9 +26,65 @@
install(TARGETS exrthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
install( FILES exrthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff -Nurd kdebase-runtime-4.2.4/knotify/CMakeLists.txt
kdebase-runtime-4.2.4-new/knotify/CMakeLists.txt
+--- kdebase-runtime-4.2.4/knotify/CMakeLists.txt 2008-05-29
07:18:43.000000000 -0400
++++ kdebase-runtime-4.2.4-new/knotify/CMakeLists.txt 2009-06-09
17:02:50.000000000 -0400
+@@ -17,6 +17,12 @@
+
+ kde4_add_executable( knotify ${knotify_SRCS})
+
++if (Q_WS_MAC)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kde.knotify4")
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Notify")
++endif (Q_WS_MAC)
++
+ target_link_libraries( knotify ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS})
+
+ set_target_properties(knotify PROPERTIES OUTPUT_NAME knotify4 )
+diff -Nurd kdebase-runtime-4.2.4/knotify/Info.plist.template
kdebase-runtime-4.2.4-new/knotify/Info.plist.template
+--- kdebase-runtime-4.2.4/knotify/Info.plist.template 1969-12-31
19:00:00.000000000 -0500
++++ kdebase-runtime-4.2.4-new/knotify/Info.plist.template 2009-06-09
17:02:04.000000000 -0400
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
diff -Nurd kdebase-runtime-4.2.4/nepomuk/kioslaves/search/CMakeLists.txt
kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/CMakeLists.txt
--- kdebase-runtime-4.2.4/nepomuk/kioslaves/search/CMakeLists.txt
2008-09-26 10:55:58.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/CMakeLists.txt
2009-06-06 08:21:35.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -4,6 +4,7 @@
${QT_INCLUDES}
${KDE4_INCLUDES}
@@ -39,7 +95,7 @@
)
diff -Nurd kdebase-runtime-4.2.4/nepomuk/kioslaves/search/querymetatype.h
kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/querymetatype.h
--- kdebase-runtime-4.2.4/nepomuk/kioslaves/search/querymetatype.h
2008-09-26 10:55:58.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/querymetatype.h
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/querymetatype.h
2009-06-09 17:01:51.000000000 -0400
@@ -5,4 +5,7 @@
#include "query.h"
@@ -50,7 +106,7 @@
+#endif
diff -Nurd kdebase-runtime-4.2.4/nepomuk/kioslaves/search/searchfolder.cpp
kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/searchfolder.cpp
--- kdebase-runtime-4.2.4/nepomuk/kioslaves/search/searchfolder.cpp
2008-11-28 10:33:43.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/searchfolder.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/kioslaves/search/searchfolder.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -33,12 +33,7 @@
#include <KIO/NetAccess>
#include <KUser>
@@ -67,7 +123,7 @@
QString addCounterToFileName( const QString& name, int i )
diff -Nurd kdebase-runtime-4.2.4/nepomuk/libnepomukquery/dbusoperators.cpp
kdebase-runtime-4.2.4-new/nepomuk/libnepomukquery/dbusoperators.cpp
--- kdebase-runtime-4.2.4/nepomuk/libnepomukquery/dbusoperators.cpp
2008-11-28 10:33:44.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/nepomuk/libnepomukquery/dbusoperators.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/libnepomukquery/dbusoperators.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -23,9 +23,14 @@
Q_DECLARE_METATYPE(Nepomuk::Search::Result)
@@ -85,7 +141,7 @@
diff -Nurd kdebase-runtime-4.2.4/nepomuk/services/queryservice/CMakeLists.txt
kdebase-runtime-4.2.4-new/nepomuk/services/queryservice/CMakeLists.txt
--- kdebase-runtime-4.2.4/nepomuk/services/queryservice/CMakeLists.txt
2008-09-26 10:55:58.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/nepomuk/services/queryservice/CMakeLists.txt
2009-06-06 08:21:23.000000000 -0400
++++ kdebase-runtime-4.2.4-new/nepomuk/services/queryservice/CMakeLists.txt
2009-06-09 17:01:51.000000000 -0400
@@ -3,6 +3,7 @@
include_directories(
${QT_INCLUDES}
@@ -96,7 +152,7 @@
)
diff -Nurd kdebase-runtime-4.2.4/phonon/platform_kde/devicelisting.cpp
kdebase-runtime-4.2.4-new/phonon/platform_kde/devicelisting.cpp
--- kdebase-runtime-4.2.4/phonon/platform_kde/devicelisting.cpp
2008-10-17 07:00:15.000000000 -0400
-+++ kdebase-runtime-4.2.4-new/phonon/platform_kde/devicelisting.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/phonon/platform_kde/devicelisting.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -35,7 +35,10 @@
#endif // HAVE_ALSA_ASOUNDLIB_H
@@ -110,7 +166,7 @@
{
diff -Nurd kdebase-runtime-4.2.4/phonon/platform_kde/kdeplatformplugin.cpp
kdebase-runtime-4.2.4-new/phonon/platform_kde/kdeplatformplugin.cpp
--- kdebase-runtime-4.2.4/phonon/platform_kde/kdeplatformplugin.cpp
2008-11-28 10:33:42.000000000 -0500
-+++ kdebase-runtime-4.2.4-new/phonon/platform_kde/kdeplatformplugin.cpp
2009-06-06 01:56:56.000000000 -0400
++++ kdebase-runtime-4.2.4-new/phonon/platform_kde/kdeplatformplugin.cpp
2009-06-09 17:01:51.000000000 -0400
@@ -43,7 +43,10 @@
typedef QPair<QByteArray, QString> PhononDeviceAccess;
Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs4.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs4.info&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.info Tue Jun 9
23:04:26 2009
@@ -59,7 +59,7 @@
#Source2: http://ranger.befunk.com/fink/kdelibs4/kde-logo-official-oxygen.png
#Source2-MD5: f45c1ba4d86a81816295a46a0ebbbe71
PatchFile: kdelibs4.patch
-PatchFile-MD5: dd989317d302e1eb2970190637f80cb2
+PatchFile-MD5: bad6ea67efa33d357f1712f3d8d0ecbc
PatchScript: sed -e 's,@KDEPREFIX@,%p,g' -e 's,@KDETYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
CompileScript: <<
Modified: trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch&rev=1568&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch Tue Jun 9
23:04:26 2009
@@ -1,6 +1,6 @@
diff -Nurd kdelibs-4.2.4/cmake/modules/FindKDE4Internal.cmake
kdelibs-4.2.4-new/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.4/cmake/modules/FindKDE4Internal.cmake 2009-02-26
09:18:26.000000000 -0500
-+++ kdelibs-4.2.4-new/cmake/modules/FindKDE4Internal.cmake 2009-06-08
14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/cmake/modules/FindKDE4Internal.cmake 2009-06-09
16:43:40.000000000 -0400
@@ -360,7 +360,7 @@
if (_kdeBootStrapping)
set(KDE4_INCLUDE_DIR ${kdelibs_SOURCE_DIR})
@@ -12,7 +12,7 @@
if (UNIX)
diff -Nurd kdelibs-4.2.4/cmake/modules/FindSoprano.cmake
kdelibs-4.2.4-new/cmake/modules/FindSoprano.cmake
--- kdelibs-4.2.4/cmake/modules/FindSoprano.cmake 2009-01-06
12:27:37.000000000 -0500
-+++ kdelibs-4.2.4-new/cmake/modules/FindSoprano.cmake 2009-06-08
14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/cmake/modules/FindSoprano.cmake 2009-06-09
16:43:40.000000000 -0400
@@ -128,7 +128,7 @@
NAMES
soprano/plugins
@@ -24,7 +24,7 @@
)
diff -Nurd kdelibs-4.2.4/doc/api/Doxyfile.local
kdelibs-4.2.4-new/doc/api/Doxyfile.local
--- kdelibs-4.2.4/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000
-0400
-+++ kdelibs-4.2.4-new/doc/api/Doxyfile.local 2009-06-08 14:13:29.000000000
-0400
++++ kdelibs-4.2.4-new/doc/api/Doxyfile.local 2009-06-09 16:43:40.000000000
-0400
@@ -173,6 +173,7 @@
Q_WS_MAC="" \
Q_OS_UNIX="" \
@@ -35,7 +35,7 @@
Q_SLOTS="slots" \
diff -Nurd kdelibs-4.2.4/kde3support/kdecore/k3processcontroller.cpp
kdelibs-4.2.4-new/kde3support/kdecore/k3processcontroller.cpp
--- kdelibs-4.2.4/kde3support/kdecore/k3processcontroller.cpp 2008-05-21
07:06:17.000000000 -0400
-+++ kdelibs-4.2.4-new/kde3support/kdecore/k3processcontroller.cpp
2009-06-08 14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/kde3support/kdecore/k3processcontroller.cpp
2009-06-09 16:43:40.000000000 -0400
@@ -114,7 +114,7 @@
K3ProcessController::~K3ProcessController()
@@ -47,7 +47,7 @@
close( d->fd[1] );
diff -Nurd kdelibs-4.2.4/kde4-check-sycoca.sh
kdelibs-4.2.4-new/kde4-check-sycoca.sh
--- kdelibs-4.2.4/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-4.2.4-new/kde4-check-sycoca.sh 2009-06-08 14:17:19.000000000
-0400
++++ kdelibs-4.2.4-new/kde4-check-sycoca.sh 2009-06-09 16:43:40.000000000
-0400
@@ -0,0 +1,18 @@
+#!/bin/sh
+
@@ -69,7 +69,7 @@
+fi
diff -Nurd kdelibs-4.2.4/kde4-postinst.sh kdelibs-4.2.4-new/kde4-postinst.sh
--- kdelibs-4.2.4/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-4.2.4-new/kde4-postinst.sh 2009-06-08 14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/kde4-postinst.sh 2009-06-09 16:43:40.000000000 -0400
@@ -0,0 +1,81 @@
+#!/bin/sh
+
@@ -154,7 +154,7 @@
+echo ""
diff -Nurd kdelibs-4.2.4/kdecore/config/kconfig.cpp
kdelibs-4.2.4-new/kdecore/config/kconfig.cpp
--- kdelibs-4.2.4/kdecore/config/kconfig.cpp 2008-10-22 19:05:09.000000000
-0400
-+++ kdelibs-4.2.4-new/kdecore/config/kconfig.cpp 2009-06-08
14:13:29.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/config/kconfig.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -71,7 +71,7 @@
#ifdef Q_WS_WIN
QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
@@ -166,7 +166,7 @@
// first entry is always /etc/kderc or empty if cannot read
diff -Nurd kdelibs-4.2.4/kdecore/kernel/kcmdlineargs.cpp
kdelibs-4.2.4-new/kdecore/kernel/kcmdlineargs.cpp
--- kdelibs-4.2.4/kdecore/kernel/kcmdlineargs.cpp 2009-05-28
15:22:22.000000000 -0400
-+++ kdelibs-4.2.4-new/kdecore/kernel/kcmdlineargs.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/kernel/kcmdlineargs.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -727,10 +727,6 @@
argument = opt.mid(j+1);
opt = opt.left(j);
@@ -216,7 +216,7 @@
KCmdLineArgs::usage(option.mid(5));
diff -Nurd kdelibs-4.2.4/kdecore/kernel/kkernel_mac.cpp
kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.cpp
--- kdelibs-4.2.4/kdecore/kernel/kkernel_mac.cpp 2009-01-06
12:27:48.000000000 -0500
-+++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -21,7 +21,7 @@
#include <config.h>
@@ -287,7 +287,7 @@
if (appFileName.isEmpty()) {
diff -Nurd kdelibs-4.2.4/kdecore/kernel/kkernel_mac.h
kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.h
--- kdelibs-4.2.4/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000
-0500
-+++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.h 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/kernel/kkernel_mac.h 2009-06-09
16:43:40.000000000 -0400
@@ -21,7 +21,7 @@
#include <QtCore/qglobal.h> // defines Q_OS_MACX
@@ -306,7 +306,7 @@
#endif // KKERNEL_MAC_H
diff -Nurd kdelibs-4.2.4/kdecore/tests/kconfigtest.cpp
kdelibs-4.2.4-new/kdecore/tests/kconfigtest.cpp
--- kdelibs-4.2.4/kdecore/tests/kconfigtest.cpp 2009-05-28
15:22:22.000000000 -0400
-+++ kdelibs-4.2.4-new/kdecore/tests/kconfigtest.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdecore/tests/kconfigtest.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -416,7 +416,7 @@
QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") +
HOMEPATH );
QVERIFY(group.hasKey("URL"));
@@ -316,9 +316,65 @@
// I don't know if this will work on windows
// This test hangs on OS X
QVERIFY(group.hasKey("hostname"));
+diff -Nurd kdelibs-4.2.4/kded/CMakeLists.txt
kdelibs-4.2.4-new/kded/CMakeLists.txt
+--- kdelibs-4.2.4/kded/CMakeLists.txt 2008-12-10 11:12:28.000000000 -0500
++++ kdelibs-4.2.4-new/kded/CMakeLists.txt 2009-06-09 16:59:04.000000000
-0400
+@@ -13,6 +13,12 @@
+
+ kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS})
+
++if (Q_WS_MAC)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kded.kded4")
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Daemon")
++endif (Q_WS_MAC)
++
+ target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
+
+ install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
+diff -Nurd kdelibs-4.2.4/kded/Info.plist.template
kdelibs-4.2.4-new/kded/Info.plist.template
+--- kdelibs-4.2.4/kded/Info.plist.template 1969-12-31 19:00:00.000000000
-0500
++++ kdelibs-4.2.4-new/kded/Info.plist.template 2009-06-09 16:57:31.000000000
-0400
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
diff -Nurd kdelibs-4.2.4/kdeui/kernel/kapplication.cpp
kdelibs-4.2.4-new/kdeui/kernel/kapplication.cpp
--- kdelibs-4.2.4/kdeui/kernel/kapplication.cpp 2008-12-21
15:21:06.000000000 -0500
-+++ kdelibs-4.2.4-new/kdeui/kernel/kapplication.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdeui/kernel/kapplication.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -101,6 +101,9 @@
#include <Carbon/Carbon.h>
#include <QImage>
@@ -340,7 +396,7 @@
diff -Nurd kdelibs-4.2.4/kdeui/kernel/kuniqueapplication.cpp
kdelibs-4.2.4-new/kdeui/kernel/kuniqueapplication.cpp
--- kdelibs-4.2.4/kdeui/kernel/kuniqueapplication.cpp 2008-09-03
07:25:15.000000000 -0400
-+++ kdelibs-4.2.4-new/kdeui/kernel/kuniqueapplication.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kdeui/kernel/kuniqueapplication.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -65,7 +65,7 @@
# endif
#endif
@@ -399,7 +455,7 @@
#endif
diff -Nurd kdelibs-4.2.4/kimgio/CMakeLists.txt
kdelibs-4.2.4-new/kimgio/CMakeLists.txt
--- kdelibs-4.2.4/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000
-0400
-+++ kdelibs-4.2.4-new/kimgio/CMakeLists.txt 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kimgio/CMakeLists.txt 2009-06-09 16:43:40.000000000
-0400
@@ -96,7 +96,7 @@
add_definitions(${OPENEXR_DEFINITIONS})
set(kimg_exr_LIB_SRCS exr.cpp)
@@ -409,9 +465,71 @@
install(TARGETS kimg_exr DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/imageformats/ )
install( FILES exr.desktop DESTINATION
${SERVICES_INSTALL_DIR}/qimageioplugins/ )
+diff -Nurd kdelibs-4.2.4/kinit/CMakeLists.txt
kdelibs-4.2.4-new/kinit/CMakeLists.txt
+--- kdelibs-4.2.4/kinit/CMakeLists.txt 2008-10-30 10:18:58.000000000 -0400
++++ kdelibs-4.2.4-new/kinit/CMakeLists.txt 2009-06-09 16:59:25.000000000
-0400
+@@ -38,12 +38,15 @@
+ set(kdeinit_LIBS kparts)
+ endif (WIN32)
+
+-if (APPLE)
++if (Q_WS_MAC)
+ # this has to be GUI on OSX because it launches GUI apps and need a quartz
context
+ kde4_add_executable(kdeinit4 ${kdeinit_SRCS})
+-else (APPLE)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kde.kdeinit4")
++ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Init")
++else (Q_WS_MAC)
+ kde4_add_executable(kdeinit4 NOGUI ${kdeinit_SRCS})
+-endif (APPLE)
++endif (Q_WS_MAC)
+
+ target_link_libraries(kdeinit4 ${KDE4_KDECORE_LIBS} ${kdeinit_LIBS} )
+ if (Q_WS_X11)
+diff -Nurd kdelibs-4.2.4/kinit/Info.plist.template
kdelibs-4.2.4-new/kinit/Info.plist.template
+--- kdelibs-4.2.4/kinit/Info.plist.template 1969-12-31 19:00:00.000000000
-0500
++++ kdelibs-4.2.4-new/kinit/Info.plist.template 2009-06-09
16:54:09.000000000 -0400
+@@ -0,0 +1,36 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
++<plist version="1.0">
++<dict>
++ <key>CFBundleDevelopmentRegion</key>
++ <string>English</string>
++ <key>CFBundleExecutable</key>
++ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
++ <key>CFBundleGetInfoString</key>
++ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
++ <key>CFBundleIconFile</key>
++ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
++ <key>CFBundleIdentifier</key>
++ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
++ <key>CFBundleInfoDictionaryVersion</key>
++ <string>6.0</string>
++ <key>CFBundleLongVersionString</key>
++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
++ <key>CFBundleName</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
++ <key>CFBundlePackageType</key>
++ <string>APPL</string>
++ <key>CFBundleShortVersionString</key>
++ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
++ <key>CFBundleVersion</key>
++ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
++ <key>CSResourcesFileMapped</key>
++ <true/>
++ <key>LSRequiresCarbon</key>
++ <true/>
++ <key>LSUIElement</key>
++ <string>1</string>
++ <key>NSHumanReadableCopyright</key>
++ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
++</dict>
++</plist>
diff -Nurd kdelibs-4.2.4/kinit/kinit.cpp kdelibs-4.2.4-new/kinit/kinit.cpp
--- kdelibs-4.2.4/kinit/kinit.cpp 2009-04-30 05:13:35.000000000 -0400
-+++ kdelibs-4.2.4-new/kinit/kinit.cpp 2009-06-08 14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kinit/kinit.cpp 2009-06-09 16:43:40.000000000 -0400
@@ -68,7 +68,7 @@
#endif
#endif
@@ -464,7 +582,7 @@
pipe(d.initpipe);
diff -Nurd kdelibs-4.2.4/kio/kfile/kfsprocess.cpp
kdelibs-4.2.4-new/kio/kfile/kfsprocess.cpp
--- kdelibs-4.2.4/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000
-0400
-+++ kdelibs-4.2.4-new/kio/kfile/kfsprocess.cpp 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kio/kfile/kfsprocess.cpp 2009-06-09 16:43:40.000000000
-0400
@@ -83,7 +83,7 @@
KfsProcessController::~KfsProcessController()
@@ -476,7 +594,7 @@
close( m_fd[1] );
diff -Nurd kdelibs-4.2.4/kio/kfile/kpropertiesdialog.cpp
kdelibs-4.2.4-new/kio/kfile/kpropertiesdialog.cpp
--- kdelibs-4.2.4/kio/kfile/kpropertiesdialog.cpp 2009-05-28
15:22:21.000000000 -0400
-+++ kdelibs-4.2.4-new/kio/kfile/kpropertiesdialog.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/kio/kfile/kpropertiesdialog.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -1769,13 +1769,13 @@
#ifdef Q_OS_UNIX
// pick the groups to which the user belongs
@@ -495,7 +613,7 @@
groups = new gid_t[groupCount];
diff -Nurd kdelibs-4.2.4/kpty/kptydevice.cpp
kdelibs-4.2.4-new/kpty/kptydevice.cpp
--- kdelibs-4.2.4/kpty/kptydevice.cpp 2009-03-26 10:44:18.000000000 -0400
-+++ kdelibs-4.2.4-new/kpty/kptydevice.cpp 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kpty/kptydevice.cpp 2009-06-09 16:43:40.000000000
-0400
@@ -42,7 +42,7 @@
# include <sys/time.h>
#endif
@@ -507,7 +625,7 @@
#elif defined(TIOCINQ)
diff -Nurd kdelibs-4.2.4/kross/qts/CMakeLists.txt
kdelibs-4.2.4-new/kross/qts/CMakeLists.txt
--- kdelibs-4.2.4/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000
-0500
-+++ kdelibs-4.2.4-new/kross/qts/CMakeLists.txt 2009-06-08 14:13:30.000000000
-0400
++++ kdelibs-4.2.4-new/kross/qts/CMakeLists.txt 2009-06-09 16:43:40.000000000
-0400
@@ -6,7 +6,7 @@
target_link_libraries(krossqtsplugin ${QT_QTUITOOLS_LIBRARY}
${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} krosscore ${QT_QTSCRIPT_LIBRARY})
set_target_properties(krossqtsplugin PROPERTIES VERSION
${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
@@ -519,7 +637,7 @@
diff -Nurd kdelibs-4.2.4/solid/solid/CMakeLists.txt
kdelibs-4.2.4-new/solid/solid/CMakeLists.txt
--- kdelibs-4.2.4/solid/solid/CMakeLists.txt 2008-11-19 05:20:13.000000000
-0500
-+++ kdelibs-4.2.4-new/solid/solid/CMakeLists.txt 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/solid/solid/CMakeLists.txt 2009-06-09
16:43:40.000000000 -0400
@@ -102,7 +102,7 @@
backends/fakehw/fakevolume.cpp
)
@@ -540,7 +658,7 @@
if(MSVC)
diff -Nurd kdelibs-4.2.4/solid/solid/managerbase.cpp
kdelibs-4.2.4-new/solid/solid/managerbase.cpp
--- kdelibs-4.2.4/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000
-0400
-+++ kdelibs-4.2.4-new/solid/solid/managerbase.cpp 2009-06-08
14:13:30.000000000 -0400
++++ kdelibs-4.2.4-new/solid/solid/managerbase.cpp 2009-06-09
16:43:40.000000000 -0400
@@ -23,7 +23,8 @@
#include "backends/fakehw/fakemanager.h"
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
