Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20920/main/finkinfo/kde
Modified Files:
kdelibs4.info kdelibs4.patch
Log Message:
change the command-line parsing (ignoring) of -psn_*
Index: kdelibs4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdelibs4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdelibs4.patch 3 Apr 2009 21:33:17 -0000 1.2
+++ kdelibs4.patch 10 Apr 2009 19:27:19 -0000 1.3
@@ -1,6 +1,6 @@
diff -Nurd kdelibs-4.2.2/cmake/modules/FindKDE4Internal.cmake
kdelibs-4.2.2-new/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.2/cmake/modules/FindKDE4Internal.cmake 2009-02-26
09:18:26.000000000 -0500
-+++ kdelibs-4.2.2-new/cmake/modules/FindKDE4Internal.cmake 2009-03-26
22:26:06.000000000 -0400
++++ kdelibs-4.2.2-new/cmake/modules/FindKDE4Internal.cmake 2009-04-09
10:13:51.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.2/doc/api/Doxyfile.local
kdelibs-4.2.2-new/doc/api/Doxyfile.local
--- kdelibs-4.2.2/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000
-0400
-+++ kdelibs-4.2.2-new/doc/api/Doxyfile.local 2009-03-26 22:26:08.000000000
-0400
++++ kdelibs-4.2.2-new/doc/api/Doxyfile.local 2009-04-09 10:13:51.000000000
-0400
@@ -173,6 +173,7 @@
Q_WS_MAC="" \
Q_OS_UNIX="" \
@@ -23,7 +23,7 @@
Q_SLOTS="slots" \
diff -Nurd kdelibs-4.2.2/kde3support/kdecore/k3processcontroller.cpp
kdelibs-4.2.2-new/kde3support/kdecore/k3processcontroller.cpp
--- kdelibs-4.2.2/kde3support/kdecore/k3processcontroller.cpp 2008-05-21
07:06:17.000000000 -0400
-+++ kdelibs-4.2.2-new/kde3support/kdecore/k3processcontroller.cpp
2009-03-26 22:26:08.000000000 -0400
++++ kdelibs-4.2.2-new/kde3support/kdecore/k3processcontroller.cpp
2009-04-09 10:13:51.000000000 -0400
@@ -114,7 +114,7 @@
K3ProcessController::~K3ProcessController()
@@ -35,7 +35,7 @@
close( d->fd[1] );
diff -Nurd kdelibs-4.2.2/kde4-postinst.sh kdelibs-4.2.2-new/kde4-postinst.sh
--- kdelibs-4.2.2/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500
-+++ kdelibs-4.2.2-new/kde4-postinst.sh 2009-03-26 22:49:44.000000000 -0400
++++ kdelibs-4.2.2-new/kde4-postinst.sh 2009-04-09 10:13:51.000000000 -0400
@@ -0,0 +1,41 @@
+#!/bin/sh
+
@@ -80,7 +80,7 @@
+fi
diff -Nurd kdelibs-4.2.2/kdecore/config/kconfig.cpp
kdelibs-4.2.2-new/kdecore/config/kconfig.cpp
--- kdelibs-4.2.2/kdecore/config/kconfig.cpp 2008-10-22 19:05:09.000000000
-0400
-+++ kdelibs-4.2.2-new/kdecore/config/kconfig.cpp 2009-03-26
22:26:08.000000000 -0400
++++ kdelibs-4.2.2-new/kdecore/config/kconfig.cpp 2009-04-09
10:13:51.000000000 -0400
@@ -71,7 +71,7 @@
#ifdef Q_WS_WIN
QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
@@ -92,28 +92,57 @@
// first entry is always /etc/kderc or empty if cannot read
diff -Nurd kdelibs-4.2.2/kdecore/kernel/kcmdlineargs.cpp
kdelibs-4.2.2-new/kdecore/kernel/kcmdlineargs.cpp
--- kdelibs-4.2.2/kdecore/kernel/kcmdlineargs.cpp 2009-03-26
10:44:21.000000000 -0400
-+++ kdelibs-4.2.2-new/kdecore/kernel/kcmdlineargs.cpp 2009-03-26
23:15:27.000000000 -0400
-@@ -792,7 +792,7 @@
++++ kdelibs-4.2.2-new/kdecore/kernel/kcmdlineargs.cpp 2009-04-10
13:05:33.000000000 -0400
+@@ -727,10 +727,6 @@
+ argument = opt.mid(j+1);
+ opt = opt.left(j);
+ }
+-#ifdef Q_WS_MACX
+- if(opt.startsWith("psn_"))
+- opt = "psn";
+-#endif
+
+ bool enabled = true;
+ int result = 0;
+@@ -791,10 +787,6 @@
+ {
if (s->ignoreUnknown)
return;
- #ifdef Q_WS_MACX
+-#ifdef Q_WS_MACX
- if (_opt.startsWith("psn_", Qt::CaseInsensitive))
-+ if (opt.startsWith("psn_"))
- return;
- #endif
+- return;
+-#endif
KCmdLineArgs::enable_i18n();
-@@ -812,7 +812,7 @@
+ KCmdLineArgs::usageError( i18n("Unknown option '%1'.",
QString::fromLocal8Bit(_opt)));
+ }
+@@ -811,10 +803,6 @@
+ {
if (s->ignoreUnknown)
return;
- #ifdef Q_WS_MACX
+-#ifdef Q_WS_MACX
- if (_opt.startsWith("psn_", Qt::CaseInsensitive))
-+ if (opt.startsWith("psn_"))
- return;
- #endif
+- return;
+-#endif
KCmdLineArgs::enable_i18n();
+ KCmdLineArgs::usageError( i18n("Unknown option '%1'.",
QString::fromLocal8Bit(_opt)));
+ }
+@@ -875,6 +863,13 @@
+ {
+ KCmdLineArgs::usage();
+ }
++#ifdef Q_WS_MAC
++ // skip the finder -psn_* crap
++ else if (option.startsWith("psn_"))
++ {
++ continue;
++ }
++#endif
+ else if (option.startsWith("help-"))
+ {
+ KCmdLineArgs::usage(option.mid(5));
diff -Nurd kdelibs-4.2.2/kdecore/kernel/kkernel_mac.cpp
kdelibs-4.2.2-new/kdecore/kernel/kkernel_mac.cpp
--- kdelibs-4.2.2/kdecore/kernel/kkernel_mac.cpp 2009-01-06
12:27:48.000000000 -0500
-+++ kdelibs-4.2.2-new/kdecore/kernel/kkernel_mac.cpp 2009-03-26
22:26:08.000000000 -0400
++++ kdelibs-4.2.2-new/kdecore/kernel/kkernel_mac.cpp 2009-04-09
10:13:51.000000000 -0400
@@ -21,7 +21,7 @@
#include <config.h>
@@ -174,7 +203,7 @@
if (appFileName.isEmpty()) {
diff -Nurd kdelibs-4.2.2/kdecore/kernel/kkernel_mac.h
kdelibs-4.2.2-new/kdecore/kernel/kkernel_mac.h
--- kdelibs-4.2.2/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000
-0500
-+++ kdelibs-4.2.2-new/kdecore/kernel/kkernel_mac.h 2009-03-26
22:26:08.000000000 -0400
++++ kdelibs-4.2.2-new/kdecore/kernel/kkernel_mac.h 2009-04-09
10:13:51.000000000 -0400
@@ -21,7 +21,7 @@
#include <QtCore/qglobal.h> // defines Q_OS_MACX
@@ -192,8 +221,8 @@
+#endif // MAC
#endif // KKERNEL_MAC_H
diff -Nurd kdelibs-4.2.2/kdecore/tests/kconfigtest.cpp
kdelibs-4.2.2-new/kdecore/tests/kconfigtest.cpp
---- kdelibs-4.2.2/kdecore/tests/kconfigtest.cpp 2008-11-12
11:38:25.000000000 -0500
-+++ kdelibs-4.2.2-new/kdecore/tests/kconfigtest.cpp 2009-03-26
22:26:08.000000000 -0400
+--- kdelibs-4.2.2/kdecore/tests/kconfigtest.cpp 2009-03-30
17:41:08.000000000 -0400
++++ kdelibs-4.2.2-new/kdecore/tests/kconfigtest.cpp 2009-04-09
10:13:52.000000000 -0400
@@ -416,7 +416,7 @@
QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") +
HOMEPATH );
QVERIFY(group.hasKey("URL"));
@@ -205,7 +234,7 @@
QVERIFY(group.hasKey("hostname"));
diff -Nurd kdelibs-4.2.2/kdeui/kernel/kapplication.cpp
kdelibs-4.2.2-new/kdeui/kernel/kapplication.cpp
--- kdelibs-4.2.2/kdeui/kernel/kapplication.cpp 2008-12-21
15:21:06.000000000 -0500
-+++ kdelibs-4.2.2-new/kdeui/kernel/kapplication.cpp 2009-03-26
22:26:08.000000000 -0400
++++ kdelibs-4.2.2-new/kdeui/kernel/kapplication.cpp 2009-04-10
12:47:41.000000000 -0400
@@ -101,6 +101,9 @@
#include <Carbon/Carbon.h>
#include <QImage>
@@ -227,7 +256,7 @@
diff -Nurd kdelibs-4.2.2/kdeui/kernel/kuniqueapplication.cpp
kdelibs-4.2.2-new/kdeui/kernel/kuniqueapplication.cpp
--- kdelibs-4.2.2/kdeui/kernel/kuniqueapplication.cpp 2008-09-03
07:25:15.000000000 -0400
-+++ kdelibs-4.2.2-new/kdeui/kernel/kuniqueapplication.cpp 2009-03-26
22:26:08.000000000 -0400
++++ kdelibs-4.2.2-new/kdeui/kernel/kuniqueapplication.cpp 2009-04-09
10:13:52.000000000 -0400
@@ -65,7 +65,7 @@
# endif
#endif
@@ -259,7 +288,7 @@
diff -Nurd kdelibs-4.2.2/kimgio/CMakeLists.txt
kdelibs-4.2.2-new/kimgio/CMakeLists.txt
--- kdelibs-4.2.2/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000
-0400
-+++ kdelibs-4.2.2-new/kimgio/CMakeLists.txt 2009-03-26 22:26:08.000000000
-0400
++++ kdelibs-4.2.2-new/kimgio/CMakeLists.txt 2009-04-09 10:13:52.000000000
-0400
@@ -96,7 +96,7 @@
add_definitions(${OPENEXR_DEFINITIONS})
set(kimg_exr_LIB_SRCS exr.cpp)
@@ -271,7 +300,7 @@
install( FILES exr.desktop DESTINATION
${SERVICES_INSTALL_DIR}/qimageioplugins/ )
diff -Nurd kdelibs-4.2.2/kinit/kinit.cpp kdelibs-4.2.2-new/kinit/kinit.cpp
--- kdelibs-4.2.2/kinit/kinit.cpp 2009-03-26 10:44:17.000000000 -0400
-+++ kdelibs-4.2.2-new/kinit/kinit.cpp 2009-03-26 22:29:10.000000000 -0400
++++ kdelibs-4.2.2-new/kinit/kinit.cpp 2009-04-09 10:13:52.000000000 -0400
@@ -68,7 +68,7 @@
#endif
#endif
@@ -324,7 +353,7 @@
pipe(d.initpipe);
diff -Nurd kdelibs-4.2.2/kio/kfile/kfsprocess.cpp
kdelibs-4.2.2-new/kio/kfile/kfsprocess.cpp
--- kdelibs-4.2.2/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000
-0400
-+++ kdelibs-4.2.2-new/kio/kfile/kfsprocess.cpp 2009-03-26 22:26:12.000000000
-0400
++++ kdelibs-4.2.2-new/kio/kfile/kfsprocess.cpp 2009-04-09 10:13:52.000000000
-0400
@@ -83,7 +83,7 @@
KfsProcessController::~KfsProcessController()
@@ -336,7 +365,7 @@
close( m_fd[1] );
diff -Nurd kdelibs-4.2.2/kio/kfile/kpropertiesdialog.cpp
kdelibs-4.2.2-new/kio/kfile/kpropertiesdialog.cpp
--- kdelibs-4.2.2/kio/kfile/kpropertiesdialog.cpp 2009-03-26
10:44:17.000000000 -0400
-+++ kdelibs-4.2.2-new/kio/kfile/kpropertiesdialog.cpp 2009-03-27
08:01:37.000000000 -0400
++++ kdelibs-4.2.2-new/kio/kfile/kpropertiesdialog.cpp 2009-04-09
10:13:52.000000000 -0400
@@ -1767,11 +1767,16 @@
strUser = user->pw_name;
@@ -358,7 +387,7 @@
} else {
diff -Nurd kdelibs-4.2.2/kpty/kptydevice.cpp
kdelibs-4.2.2-new/kpty/kptydevice.cpp
--- kdelibs-4.2.2/kpty/kptydevice.cpp 2009-03-26 10:44:18.000000000 -0400
-+++ kdelibs-4.2.2-new/kpty/kptydevice.cpp 2009-03-26 22:26:12.000000000
-0400
++++ kdelibs-4.2.2-new/kpty/kptydevice.cpp 2009-04-09 10:13:52.000000000
-0400
@@ -42,7 +42,7 @@
# include <sys/time.h>
#endif
@@ -370,7 +399,7 @@
#elif defined(TIOCINQ)
diff -Nurd kdelibs-4.2.2/kross/qts/CMakeLists.txt
kdelibs-4.2.2-new/kross/qts/CMakeLists.txt
--- kdelibs-4.2.2/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000
-0500
-+++ kdelibs-4.2.2-new/kross/qts/CMakeLists.txt 2009-03-26 22:26:12.000000000
-0400
++++ kdelibs-4.2.2-new/kross/qts/CMakeLists.txt 2009-04-09 10:13:52.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})
@@ -382,7 +411,7 @@
diff -Nurd kdelibs-4.2.2/solid/solid/CMakeLists.txt
kdelibs-4.2.2-new/solid/solid/CMakeLists.txt
--- kdelibs-4.2.2/solid/solid/CMakeLists.txt 2008-11-19 05:20:13.000000000
-0500
-+++ kdelibs-4.2.2-new/solid/solid/CMakeLists.txt 2009-03-26
22:26:12.000000000 -0400
++++ kdelibs-4.2.2-new/solid/solid/CMakeLists.txt 2009-04-09
10:13:52.000000000 -0400
@@ -102,7 +102,7 @@
backends/fakehw/fakevolume.cpp
)
@@ -403,7 +432,7 @@
if(MSVC)
diff -Nurd kdelibs-4.2.2/solid/solid/managerbase.cpp
kdelibs-4.2.2-new/solid/solid/managerbase.cpp
--- kdelibs-4.2.2/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000
-0400
-+++ kdelibs-4.2.2-new/solid/solid/managerbase.cpp 2009-03-26
22:26:12.000000000 -0400
++++ kdelibs-4.2.2-new/solid/solid/managerbase.cpp 2009-04-09
10:13:52.000000000 -0400
@@ -23,7 +23,8 @@
#include "backends/fakehw/fakemanager.h"
Index: kdelibs4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdelibs4.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kdelibs4.info 3 Apr 2009 21:33:17 -0000 1.3
+++ kdelibs4.info 10 Apr 2009 19:27:18 -0000 1.4
@@ -1,7 +1,7 @@
Info2: <<
Package: kdelibs4-%type_pkg[kde]
Version: 4.2.2
-Revision: 1
+Revision: 2
Description: KDE4 - essential libraries
Type: kde (x11 mac)
License: GPL/LGPL
@@ -47,7 +47,8 @@
soprano-%type_pkg[kde]-dev (>= 2.2.3-2),
strigi-dev (>= 0.6.3-1),
(%type_pkg[kde] = x11) x11-dev,
- system-openssl-dev
+ system-openssl-dev,
+ xmkmf
<<
GCC: 4.0
@@ -56,7 +57,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: 3da97de6f4fd171305d818882af294b1
+PatchFile-MD5: d109c8c01fb08c523bc6f058d97ea0ee
CompileScript: <<
#!/bin/sh -ev
@@ -99,7 +100,7 @@
libjpeg-shlibs,
libpng3-shlibs (>= 1.2.5-4),
libtiff-shlibs,
- libxml2-shlibs (>= 2.5.2-1),
+ libxml2-shlibs (>= 2.6.32-1),
libxslt-shlibs (>= 1.0.27-1),
macosx (>= 10.4.3-1),
pcre-shlibs (>= 7.6-1),
@@ -178,7 +179,10 @@
SplitOff2: <<
Package: %N-dev
Description: KDE4 - essential development libraries and headers
- Depends: %N (= %v-%r)
+ Depends: <<
+ %N (= %v-%r),
+ xmkmf
+ <<
BuildDependsOnly: true
Files: <<
lib/%type_pkg[kde]/include
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
