Author: ranger
Date: Thu Mar 26 13:10:34 2009
New Revision: 1453
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1453&repname=user%3a+ranger>
Log:
remove proctitle_full stuff
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info
trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.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/kdelibs4.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info&rev=1453&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info Thu Mar 26 13:10:34
2009
@@ -1,7 +1,7 @@
Info2: <<
Package: kdelibs4-%type_pkg[kde]
Version: 4.2.1
-Revision: 2
+Revision: 3
Description: KDE4 - essential libraries
Type: kde (x11 mac)
License: GPL/LGPL
@@ -56,7 +56,7 @@
SourceDirectory: kdelibs-%v
PatchScript: sed -e 's,@KDEPREFIX@,%p/lib/%type_pkg[kde],g' %{PatchFile} |
patch -p1
PatchFile: kdelibs4.patch
-PatchFile-MD5: 82aeba9bbaa67ceb101d8d13a63c91e7
+PatchFile-MD5: b856d5b9804ba45f06fc18d387f4bcba
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=1453&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch Thu Mar 26
13:10:34 2009
@@ -1,6 +1,6 @@
diff -Nurd kdelibs-4.2.1/cmake/modules/FindKDE4Internal.cmake
kdelibs-4.2.1-new/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.1/cmake/modules/FindKDE4Internal.cmake 2009-02-26
09:18:26.000000000 -0500
-+++ kdelibs-4.2.1-new/cmake/modules/FindKDE4Internal.cmake 2009-03-09
14:53:54.000000000 -0400
++++ kdelibs-4.2.1-new/cmake/modules/FindKDE4Internal.cmake 2009-03-26
08:06:15.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.1/cmake/modules/KDE4Macros.cmake
kdelibs-4.2.1-new/cmake/modules/KDE4Macros.cmake
--- kdelibs-4.2.1/cmake/modules/KDE4Macros.cmake 2009-01-06
12:27:37.000000000 -0500
-+++ kdelibs-4.2.1-new/cmake/modules/KDE4Macros.cmake 2009-03-09
14:53:28.000000000 -0400
++++ kdelibs-4.2.1-new/cmake/modules/KDE4Macros.cmake 2009-03-26
08:06:15.000000000 -0400
@@ -1059,7 +1059,7 @@
message(STATUS "Unable to find the png2ico or windres utilities -
application will not have an application icon!")
endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
@@ -33,7 +33,7 @@
diff -Nurd kdelibs-4.2.1/doc/api/Doxyfile.local
kdelibs-4.2.1-new/doc/api/Doxyfile.local
--- kdelibs-4.2.1/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000
-0400
-+++ kdelibs-4.2.1-new/doc/api/Doxyfile.local 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/doc/api/Doxyfile.local 2009-03-26 08:06:15.000000000
-0400
@@ -173,6 +173,7 @@
Q_WS_MAC="" \
Q_OS_UNIX="" \
@@ -44,7 +44,7 @@
Q_SLOTS="slots" \
diff -Nurd kdelibs-4.2.1/kde3support/kdecore/k3processcontroller.cpp
kdelibs-4.2.1-new/kde3support/kdecore/k3processcontroller.cpp
--- kdelibs-4.2.1/kde3support/kdecore/k3processcontroller.cpp 2008-05-21
07:06:17.000000000 -0400
-+++ kdelibs-4.2.1-new/kde3support/kdecore/k3processcontroller.cpp
2009-03-09 14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kde3support/kdecore/k3processcontroller.cpp
2009-03-26 08:06:15.000000000 -0400
@@ -114,7 +114,7 @@
K3ProcessController::~K3ProcessController()
@@ -56,7 +56,7 @@
close( d->fd[1] );
diff -Nurd kdelibs-4.2.1/kdecore/config/kconfig.cpp
kdelibs-4.2.1-new/kdecore/config/kconfig.cpp
--- kdelibs-4.2.1/kdecore/config/kconfig.cpp 2008-10-22 19:05:09.000000000
-0400
-+++ kdelibs-4.2.1-new/kdecore/config/kconfig.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/config/kconfig.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -71,7 +71,7 @@
#ifdef Q_WS_WIN
QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
@@ -68,7 +68,7 @@
// first entry is always /etc/kderc or empty if cannot read
diff -Nurd kdelibs-4.2.1/kdecore/kernel/kkernel_mac.cpp
kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.cpp
--- kdelibs-4.2.1/kdecore/kernel/kkernel_mac.cpp 2009-01-06
12:27:48.000000000 -0500
-+++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -21,7 +21,7 @@
#include <config.h>
@@ -129,7 +129,7 @@
if (appFileName.isEmpty()) {
diff -Nurd kdelibs-4.2.1/kdecore/kernel/kkernel_mac.h
kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.h
--- kdelibs-4.2.1/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000
-0500
-+++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.h 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.h 2009-03-26
08:06:15.000000000 -0400
@@ -21,7 +21,7 @@
#include <QtCore/qglobal.h> // defines Q_OS_MACX
@@ -148,7 +148,7 @@
#endif // KKERNEL_MAC_H
diff -Nurd kdelibs-4.2.1/kdecore/tests/kconfigtest.cpp
kdelibs-4.2.1-new/kdecore/tests/kconfigtest.cpp
--- kdelibs-4.2.1/kdecore/tests/kconfigtest.cpp 2008-11-12
11:38:25.000000000 -0500
-+++ kdelibs-4.2.1-new/kdecore/tests/kconfigtest.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/tests/kconfigtest.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -416,7 +416,7 @@
QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") +
HOMEPATH );
QVERIFY(group.hasKey("URL"));
@@ -160,7 +160,7 @@
QVERIFY(group.hasKey("hostname"));
diff -Nurd kdelibs-4.2.1/kdeui/kernel/kapplication.cpp
kdelibs-4.2.1-new/kdeui/kernel/kapplication.cpp
--- kdelibs-4.2.1/kdeui/kernel/kapplication.cpp 2008-12-21
15:21:06.000000000 -0500
-+++ kdelibs-4.2.1-new/kdeui/kernel/kapplication.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdeui/kernel/kapplication.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -101,6 +101,9 @@
#include <Carbon/Carbon.h>
#include <QImage>
@@ -182,7 +182,7 @@
diff -Nurd kdelibs-4.2.1/kdeui/kernel/kuniqueapplication.cpp
kdelibs-4.2.1-new/kdeui/kernel/kuniqueapplication.cpp
--- kdelibs-4.2.1/kdeui/kernel/kuniqueapplication.cpp 2008-09-03
07:25:15.000000000 -0400
-+++ kdelibs-4.2.1-new/kdeui/kernel/kuniqueapplication.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdeui/kernel/kuniqueapplication.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -65,7 +65,7 @@
# endif
#endif
@@ -214,7 +214,7 @@
diff -Nurd kdelibs-4.2.1/kdeui/util/kcrash.cpp
kdelibs-4.2.1-new/kdeui/util/kcrash.cpp
--- kdelibs-4.2.1/kdeui/util/kcrash.cpp 2008-07-03 01:06:28.000000000
-0400
-+++ kdelibs-4.2.1-new/kdeui/util/kcrash.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kdeui/util/kcrash.cpp 2009-03-26 08:06:15.000000000
-0400
@@ -478,6 +478,8 @@
*screen = '\0';
while((i = strchr(result, ':')))
@@ -226,7 +226,7 @@
diff -Nurd kdelibs-4.2.1/kimgio/CMakeLists.txt
kdelibs-4.2.1-new/kimgio/CMakeLists.txt
--- kdelibs-4.2.1/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000
-0400
-+++ kdelibs-4.2.1-new/kimgio/CMakeLists.txt 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kimgio/CMakeLists.txt 2009-03-26 08:06:16.000000000
-0400
@@ -96,7 +96,7 @@
add_definitions(${OPENEXR_DEFINITIONS})
set(kimg_exr_LIB_SRCS exr.cpp)
@@ -236,9 +236,20 @@
install(TARGETS kimg_exr DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/imageformats/ )
install( FILES exr.desktop DESTINATION
${SERVICES_INSTALL_DIR}/qimageioplugins/ )
+diff -Nurd kdelibs-4.2.1/kinit/CMakeLists.txt
kdelibs-4.2.1-new/kinit/CMakeLists.txt
+--- kdelibs-4.2.1/kinit/CMakeLists.txt 2008-10-30 10:18:58.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/CMakeLists.txt 2009-03-26 08:06:56.000000000
-0400
+@@ -11,7 +11,6 @@
+ include (CheckIncludeFiles)
+ include (CheckVariableExists)
+ check_variable_exists(__progname HAVE___PROGNAME)
+-check_variable_exists(__progname_full HAVE___PROGNAME_FULL)
+ check_include_files(sys/pstat.h HAVE_SYS_PSTAT_H)
+ check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_files(unistd.h HAVE_UNISTD_H)
diff -Nurd kdelibs-4.2.1/kinit/kinit.cpp kdelibs-4.2.1-new/kinit/kinit.cpp
--- kdelibs-4.2.1/kinit/kinit.cpp 2009-02-26 09:18:34.000000000 -0500
-+++ kdelibs-4.2.1-new/kinit/kinit.cpp 2009-03-09 14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/kinit.cpp 2009-03-26 08:06:16.000000000 -0400
@@ -68,7 +68,7 @@
#endif
#endif
@@ -308,7 +319,7 @@
pipe(d.initpipe);
diff -Nurd kdelibs-4.2.1/kinit/klauncher.cpp
kdelibs-4.2.1-new/kinit/klauncher.cpp
--- kdelibs-4.2.1/kinit/klauncher.cpp 2009-02-26 09:18:34.000000000 -0500
-+++ kdelibs-4.2.1-new/kinit/klauncher.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kinit/klauncher.cpp 2009-03-26 08:06:16.000000000
-0400
@@ -965,6 +965,7 @@
#endif
request->envs = envs;
@@ -325,9 +336,33 @@
msg.setDelayedReply(true);
request->transaction = msg;
queueRequest(request);
+diff -Nurd kdelibs-4.2.1/kinit/proctitle.cpp
kdelibs-4.2.1-new/kinit/proctitle.cpp
+--- kdelibs-4.2.1/kinit/proctitle.cpp 2008-10-17 07:01:39.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/proctitle.cpp 2009-03-26 08:06:34.000000000
-0400
+@@ -71,9 +71,6 @@
+ #ifdef HAVE___PROGNAME
+ extern char *__progname;
+ #endif /* HAVE___PROGNAME */
+-#ifdef HAVE___PROGNAME_FULL
+-extern char *__progname_full;
+-#endif /* HAVE___PROGNAME_FULL */
+ extern char **environ;
+
+ static char **Argv = NULL;
+@@ -131,10 +128,6 @@
+ */
+ __progname = strdup("kdeinit4");
+ # endif /* HAVE___PROGNAME */
+-# ifdef HAVE____PROGNAME_FULL
+- /* __progname_full too */
+- __progname_full = strdup(argv[0]);
+-# endif /* HAVE___PROGNAME_FULL */
+ }
+
+ void proctitle_set(const char *fmt, ...) {
diff -Nurd kdelibs-4.2.1/kinit/wrapper.c kdelibs-4.2.1-new/kinit/wrapper.c
--- kdelibs-4.2.1/kinit/wrapper.c 2008-12-21 15:21:01.000000000 -0500
-+++ kdelibs-4.2.1-new/kinit/wrapper.c 2009-03-09 14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/wrapper.c 2009-03-26 08:06:16.000000000 -0400
@@ -77,6 +77,8 @@
*screen = '\0';
while((i = strchr(result, ':')))
@@ -339,7 +374,7 @@
diff -Nurd kdelibs-4.2.1/kio/kfile/kfsprocess.cpp
kdelibs-4.2.1-new/kio/kfile/kfsprocess.cpp
--- kdelibs-4.2.1/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000
-0400
-+++ kdelibs-4.2.1-new/kio/kfile/kfsprocess.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kio/kfile/kfsprocess.cpp 2009-03-26 08:06:16.000000000
-0400
@@ -83,7 +83,7 @@
KfsProcessController::~KfsProcessController()
@@ -351,7 +386,7 @@
close( m_fd[1] );
diff -Nurd kdelibs-4.2.1/kpty/kptydevice.cpp
kdelibs-4.2.1-new/kpty/kptydevice.cpp
--- kdelibs-4.2.1/kpty/kptydevice.cpp 2008-12-04 03:36:01.000000000 -0500
-+++ kdelibs-4.2.1-new/kpty/kptydevice.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kpty/kptydevice.cpp 2009-03-26 08:06:16.000000000
-0400
@@ -42,7 +42,7 @@
# include <sys/time.h>
#endif
@@ -363,7 +398,7 @@
#elif defined(TIOCINQ)
diff -Nurd kdelibs-4.2.1/kross/qts/CMakeLists.txt
kdelibs-4.2.1-new/kross/qts/CMakeLists.txt
--- kdelibs-4.2.1/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000
-0500
-+++ kdelibs-4.2.1-new/kross/qts/CMakeLists.txt 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kross/qts/CMakeLists.txt 2009-03-26 08:06:16.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})
@@ -375,7 +410,7 @@
diff -Nurd kdelibs-4.2.1/solid/solid/CMakeLists.txt
kdelibs-4.2.1-new/solid/solid/CMakeLists.txt
--- kdelibs-4.2.1/solid/solid/CMakeLists.txt 2008-11-19 05:20:13.000000000
-0500
-+++ kdelibs-4.2.1-new/solid/solid/CMakeLists.txt 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/solid/solid/CMakeLists.txt 2009-03-26
08:06:16.000000000 -0400
@@ -102,7 +102,7 @@
backends/fakehw/fakevolume.cpp
)
@@ -396,7 +431,7 @@
if(MSVC)
diff -Nurd kdelibs-4.2.1/solid/solid/managerbase.cpp
kdelibs-4.2.1-new/solid/solid/managerbase.cpp
--- kdelibs-4.2.1/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000
-0400
-+++ kdelibs-4.2.1-new/solid/solid/managerbase.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/solid/solid/managerbase.cpp 2009-03-26
08:06:16.000000000 -0400
@@ -23,7 +23,8 @@
#include "backends/fakehw/fakemanager.h"
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=1453&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.info Thu Mar 26
13:10:34 2009
@@ -1,7 +1,7 @@
Info2: <<
Package: kdelibs4-%type_pkg[kde]
Version: 4.2.1
-Revision: 2
+Revision: 3
Type: kde (x11 mac)
Description: KDE4 - essential libraries
License: GPL/LGPL
@@ -55,7 +55,7 @@
Source-MD5: fa4206dd747890c4e4283c8adb831e6c
SourceDirectory: kdelibs-%v
PatchFile: kdelibs4.patch
-PatchFile-MD5: 82aeba9bbaa67ceb101d8d13a63c91e7
+PatchFile-MD5: b856d5b9804ba45f06fc18d387f4bcba
PatchScript: sed -e 's,@KDEPREFIX@,%p/lib/%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=1453&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch Thu Mar 26
13:10:34 2009
@@ -1,6 +1,6 @@
diff -Nurd kdelibs-4.2.1/cmake/modules/FindKDE4Internal.cmake
kdelibs-4.2.1-new/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.1/cmake/modules/FindKDE4Internal.cmake 2009-02-26
09:18:26.000000000 -0500
-+++ kdelibs-4.2.1-new/cmake/modules/FindKDE4Internal.cmake 2009-03-09
14:53:54.000000000 -0400
++++ kdelibs-4.2.1-new/cmake/modules/FindKDE4Internal.cmake 2009-03-26
08:06:15.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.1/cmake/modules/KDE4Macros.cmake
kdelibs-4.2.1-new/cmake/modules/KDE4Macros.cmake
--- kdelibs-4.2.1/cmake/modules/KDE4Macros.cmake 2009-01-06
12:27:37.000000000 -0500
-+++ kdelibs-4.2.1-new/cmake/modules/KDE4Macros.cmake 2009-03-09
14:53:28.000000000 -0400
++++ kdelibs-4.2.1-new/cmake/modules/KDE4Macros.cmake 2009-03-26
08:06:15.000000000 -0400
@@ -1059,7 +1059,7 @@
message(STATUS "Unable to find the png2ico or windres utilities -
application will not have an application icon!")
endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
@@ -33,7 +33,7 @@
diff -Nurd kdelibs-4.2.1/doc/api/Doxyfile.local
kdelibs-4.2.1-new/doc/api/Doxyfile.local
--- kdelibs-4.2.1/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000
-0400
-+++ kdelibs-4.2.1-new/doc/api/Doxyfile.local 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/doc/api/Doxyfile.local 2009-03-26 08:06:15.000000000
-0400
@@ -173,6 +173,7 @@
Q_WS_MAC="" \
Q_OS_UNIX="" \
@@ -44,7 +44,7 @@
Q_SLOTS="slots" \
diff -Nurd kdelibs-4.2.1/kde3support/kdecore/k3processcontroller.cpp
kdelibs-4.2.1-new/kde3support/kdecore/k3processcontroller.cpp
--- kdelibs-4.2.1/kde3support/kdecore/k3processcontroller.cpp 2008-05-21
07:06:17.000000000 -0400
-+++ kdelibs-4.2.1-new/kde3support/kdecore/k3processcontroller.cpp
2009-03-09 14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kde3support/kdecore/k3processcontroller.cpp
2009-03-26 08:06:15.000000000 -0400
@@ -114,7 +114,7 @@
K3ProcessController::~K3ProcessController()
@@ -56,7 +56,7 @@
close( d->fd[1] );
diff -Nurd kdelibs-4.2.1/kdecore/config/kconfig.cpp
kdelibs-4.2.1-new/kdecore/config/kconfig.cpp
--- kdelibs-4.2.1/kdecore/config/kconfig.cpp 2008-10-22 19:05:09.000000000
-0400
-+++ kdelibs-4.2.1-new/kdecore/config/kconfig.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/config/kconfig.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -71,7 +71,7 @@
#ifdef Q_WS_WIN
QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
@@ -68,7 +68,7 @@
// first entry is always /etc/kderc or empty if cannot read
diff -Nurd kdelibs-4.2.1/kdecore/kernel/kkernel_mac.cpp
kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.cpp
--- kdelibs-4.2.1/kdecore/kernel/kkernel_mac.cpp 2009-01-06
12:27:48.000000000 -0500
-+++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -21,7 +21,7 @@
#include <config.h>
@@ -129,7 +129,7 @@
if (appFileName.isEmpty()) {
diff -Nurd kdelibs-4.2.1/kdecore/kernel/kkernel_mac.h
kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.h
--- kdelibs-4.2.1/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000
-0500
-+++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.h 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/kernel/kkernel_mac.h 2009-03-26
08:06:15.000000000 -0400
@@ -21,7 +21,7 @@
#include <QtCore/qglobal.h> // defines Q_OS_MACX
@@ -148,7 +148,7 @@
#endif // KKERNEL_MAC_H
diff -Nurd kdelibs-4.2.1/kdecore/tests/kconfigtest.cpp
kdelibs-4.2.1-new/kdecore/tests/kconfigtest.cpp
--- kdelibs-4.2.1/kdecore/tests/kconfigtest.cpp 2008-11-12
11:38:25.000000000 -0500
-+++ kdelibs-4.2.1-new/kdecore/tests/kconfigtest.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdecore/tests/kconfigtest.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -416,7 +416,7 @@
QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") +
HOMEPATH );
QVERIFY(group.hasKey("URL"));
@@ -160,7 +160,7 @@
QVERIFY(group.hasKey("hostname"));
diff -Nurd kdelibs-4.2.1/kdeui/kernel/kapplication.cpp
kdelibs-4.2.1-new/kdeui/kernel/kapplication.cpp
--- kdelibs-4.2.1/kdeui/kernel/kapplication.cpp 2008-12-21
15:21:06.000000000 -0500
-+++ kdelibs-4.2.1-new/kdeui/kernel/kapplication.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdeui/kernel/kapplication.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -101,6 +101,9 @@
#include <Carbon/Carbon.h>
#include <QImage>
@@ -182,7 +182,7 @@
diff -Nurd kdelibs-4.2.1/kdeui/kernel/kuniqueapplication.cpp
kdelibs-4.2.1-new/kdeui/kernel/kuniqueapplication.cpp
--- kdelibs-4.2.1/kdeui/kernel/kuniqueapplication.cpp 2008-09-03
07:25:15.000000000 -0400
-+++ kdelibs-4.2.1-new/kdeui/kernel/kuniqueapplication.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kdeui/kernel/kuniqueapplication.cpp 2009-03-26
08:06:15.000000000 -0400
@@ -65,7 +65,7 @@
# endif
#endif
@@ -214,7 +214,7 @@
diff -Nurd kdelibs-4.2.1/kdeui/util/kcrash.cpp
kdelibs-4.2.1-new/kdeui/util/kcrash.cpp
--- kdelibs-4.2.1/kdeui/util/kcrash.cpp 2008-07-03 01:06:28.000000000
-0400
-+++ kdelibs-4.2.1-new/kdeui/util/kcrash.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kdeui/util/kcrash.cpp 2009-03-26 08:06:15.000000000
-0400
@@ -478,6 +478,8 @@
*screen = '\0';
while((i = strchr(result, ':')))
@@ -226,7 +226,7 @@
diff -Nurd kdelibs-4.2.1/kimgio/CMakeLists.txt
kdelibs-4.2.1-new/kimgio/CMakeLists.txt
--- kdelibs-4.2.1/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000
-0400
-+++ kdelibs-4.2.1-new/kimgio/CMakeLists.txt 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kimgio/CMakeLists.txt 2009-03-26 08:06:16.000000000
-0400
@@ -96,7 +96,7 @@
add_definitions(${OPENEXR_DEFINITIONS})
set(kimg_exr_LIB_SRCS exr.cpp)
@@ -236,9 +236,20 @@
install(TARGETS kimg_exr DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/imageformats/ )
install( FILES exr.desktop DESTINATION
${SERVICES_INSTALL_DIR}/qimageioplugins/ )
+diff -Nurd kdelibs-4.2.1/kinit/CMakeLists.txt
kdelibs-4.2.1-new/kinit/CMakeLists.txt
+--- kdelibs-4.2.1/kinit/CMakeLists.txt 2008-10-30 10:18:58.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/CMakeLists.txt 2009-03-26 08:06:56.000000000
-0400
+@@ -11,7 +11,6 @@
+ include (CheckIncludeFiles)
+ include (CheckVariableExists)
+ check_variable_exists(__progname HAVE___PROGNAME)
+-check_variable_exists(__progname_full HAVE___PROGNAME_FULL)
+ check_include_files(sys/pstat.h HAVE_SYS_PSTAT_H)
+ check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_files(unistd.h HAVE_UNISTD_H)
diff -Nurd kdelibs-4.2.1/kinit/kinit.cpp kdelibs-4.2.1-new/kinit/kinit.cpp
--- kdelibs-4.2.1/kinit/kinit.cpp 2009-02-26 09:18:34.000000000 -0500
-+++ kdelibs-4.2.1-new/kinit/kinit.cpp 2009-03-09 14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/kinit.cpp 2009-03-26 08:06:16.000000000 -0400
@@ -68,7 +68,7 @@
#endif
#endif
@@ -308,7 +319,7 @@
pipe(d.initpipe);
diff -Nurd kdelibs-4.2.1/kinit/klauncher.cpp
kdelibs-4.2.1-new/kinit/klauncher.cpp
--- kdelibs-4.2.1/kinit/klauncher.cpp 2009-02-26 09:18:34.000000000 -0500
-+++ kdelibs-4.2.1-new/kinit/klauncher.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kinit/klauncher.cpp 2009-03-26 08:06:16.000000000
-0400
@@ -965,6 +965,7 @@
#endif
request->envs = envs;
@@ -325,9 +336,33 @@
msg.setDelayedReply(true);
request->transaction = msg;
queueRequest(request);
+diff -Nurd kdelibs-4.2.1/kinit/proctitle.cpp
kdelibs-4.2.1-new/kinit/proctitle.cpp
+--- kdelibs-4.2.1/kinit/proctitle.cpp 2008-10-17 07:01:39.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/proctitle.cpp 2009-03-26 08:06:34.000000000
-0400
+@@ -71,9 +71,6 @@
+ #ifdef HAVE___PROGNAME
+ extern char *__progname;
+ #endif /* HAVE___PROGNAME */
+-#ifdef HAVE___PROGNAME_FULL
+-extern char *__progname_full;
+-#endif /* HAVE___PROGNAME_FULL */
+ extern char **environ;
+
+ static char **Argv = NULL;
+@@ -131,10 +128,6 @@
+ */
+ __progname = strdup("kdeinit4");
+ # endif /* HAVE___PROGNAME */
+-# ifdef HAVE____PROGNAME_FULL
+- /* __progname_full too */
+- __progname_full = strdup(argv[0]);
+-# endif /* HAVE___PROGNAME_FULL */
+ }
+
+ void proctitle_set(const char *fmt, ...) {
diff -Nurd kdelibs-4.2.1/kinit/wrapper.c kdelibs-4.2.1-new/kinit/wrapper.c
--- kdelibs-4.2.1/kinit/wrapper.c 2008-12-21 15:21:01.000000000 -0500
-+++ kdelibs-4.2.1-new/kinit/wrapper.c 2009-03-09 14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/kinit/wrapper.c 2009-03-26 08:06:16.000000000 -0400
@@ -77,6 +77,8 @@
*screen = '\0';
while((i = strchr(result, ':')))
@@ -339,7 +374,7 @@
diff -Nurd kdelibs-4.2.1/kio/kfile/kfsprocess.cpp
kdelibs-4.2.1-new/kio/kfile/kfsprocess.cpp
--- kdelibs-4.2.1/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000
-0400
-+++ kdelibs-4.2.1-new/kio/kfile/kfsprocess.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kio/kfile/kfsprocess.cpp 2009-03-26 08:06:16.000000000
-0400
@@ -83,7 +83,7 @@
KfsProcessController::~KfsProcessController()
@@ -351,7 +386,7 @@
close( m_fd[1] );
diff -Nurd kdelibs-4.2.1/kpty/kptydevice.cpp
kdelibs-4.2.1-new/kpty/kptydevice.cpp
--- kdelibs-4.2.1/kpty/kptydevice.cpp 2008-12-04 03:36:01.000000000 -0500
-+++ kdelibs-4.2.1-new/kpty/kptydevice.cpp 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kpty/kptydevice.cpp 2009-03-26 08:06:16.000000000
-0400
@@ -42,7 +42,7 @@
# include <sys/time.h>
#endif
@@ -363,7 +398,7 @@
#elif defined(TIOCINQ)
diff -Nurd kdelibs-4.2.1/kross/qts/CMakeLists.txt
kdelibs-4.2.1-new/kross/qts/CMakeLists.txt
--- kdelibs-4.2.1/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000
-0500
-+++ kdelibs-4.2.1-new/kross/qts/CMakeLists.txt 2009-03-09 14:53:29.000000000
-0400
++++ kdelibs-4.2.1-new/kross/qts/CMakeLists.txt 2009-03-26 08:06:16.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})
@@ -375,7 +410,7 @@
diff -Nurd kdelibs-4.2.1/solid/solid/CMakeLists.txt
kdelibs-4.2.1-new/solid/solid/CMakeLists.txt
--- kdelibs-4.2.1/solid/solid/CMakeLists.txt 2008-11-19 05:20:13.000000000
-0500
-+++ kdelibs-4.2.1-new/solid/solid/CMakeLists.txt 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/solid/solid/CMakeLists.txt 2009-03-26
08:06:16.000000000 -0400
@@ -102,7 +102,7 @@
backends/fakehw/fakevolume.cpp
)
@@ -396,7 +431,7 @@
if(MSVC)
diff -Nurd kdelibs-4.2.1/solid/solid/managerbase.cpp
kdelibs-4.2.1-new/solid/solid/managerbase.cpp
--- kdelibs-4.2.1/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000
-0400
-+++ kdelibs-4.2.1-new/solid/solid/managerbase.cpp 2009-03-09
14:53:29.000000000 -0400
++++ kdelibs-4.2.1-new/solid/solid/managerbase.cpp 2009-03-26
08:06:16.000000000 -0400
@@ -23,7 +23,8 @@
#include "backends/fakehw/fakemanager.h"
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
