Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31560/main/finkinfo/kde
Modified Files:
kdelibs4.info kdelibs4.patch
Log Message:
kdelibs fixes; should update mime types and desktop files properly now
Index: kdelibs4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdelibs4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kdelibs4.patch 10 Apr 2009 19:27:19 -0000 1.3
+++ kdelibs4.patch 11 Apr 2009 00:57:09 -0000 1.4
@@ -35,8 +35,8 @@
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-04-09 10:13:51.000000000 -0400
-@@ -0,0 +1,41 @@
++++ kdelibs-4.2.2-new/kde4-postinst.sh 2009-04-10 17:42:42.000000000 -0400
+@@ -0,0 +1,52 @@
+#!/bin/sh
+
+if [ `id -u` -ne 0 ]; then
@@ -44,35 +44,46 @@
+ exit 1
+fi
+
-+mkdir -p /tmp/kb$$
-+cd /tmp/kb$$
-+export \
-+ KDEDIR= \
++PREFIX="@KDEPREFIX@"
++TYPE="@KDETYPE@"
++FULLPREFIX="@KDEPREFIX@/lib/@TYPE@"
++TEMPPATH="/tmp/kb$$"
++LOGFILE="$TEMPPATH/kde4-postinst.log"
++
++mkdir -p "$TEMPPATH"
++cd "$TEMPPATH"
++
++export XDG_DATA_DIRS="$FULLPREFIX/share:$PREFIX/share:$XDG_DATA_DIRS"
++
++KDEDIR= \
+ KDEDIRS= \
+ HOME=/tmp \
-+ XDG_CACHE_HOME=/tmp/kb$$/cache \
-+ XDG_CONFIG_HOME=/tmp/kb$$/config \
-+ XDG_DATA_HOME=/tmp/kb$$/share \
-+ HISTFILE=/tmp/kb$$/.bash_history \
++ XDG_CACHE_HOME=$TEMPPATH/cache \
++ XDG_CONFIG_HOME=$TEMPPATH/config \
++ XDG_DATA_HOME=$TEMPPATH/share \
++ HISTFILE=$TEMPPATH/.bash_history \
+ USER=root \
-+ LOGNAME=root
++ LOGNAME=root \
++ "$FULLPREFIX/bin/kbuildsycoca4" --global --noincremental --nosignal
>$LOGFILE 2>&1
+
-+"@KDEPREFIX@/lib/@KDETYPE@/bin/kbuildsycoca4" --global --noincremental
--nosignal >/tmp/kb$$/kbuildsycoca.log 2>&1
++"$PREFIX/bin/update-desktop-database" --verbose "$PREFIX/share/applications"
"$FULLPREFIX/share/applications" >>$$LOGFILE 2>&1
++"$PREFIX/bin/update-mime-database" -V "$PREFIX/share/mime" >>$LOGFILE 2>&1
++"$PREFIX/bin/update-mime-database" -V "$FULLPREFIX/share/mime" >>$LOGFILE 2>&1
+
+DO_SYMLINK_UPDATE=0
-+case `readlink "@KDEPREFIX@/etc/alternatives/applications.menu"` in
-+ *menus/@kdet...@-application*)
++case `readlink "$PREFIX/etc/alternatives/applications.menu"` in
++ *menus/$TYPE-application*)
+ DO_SYMLINK_UPDATE=1
+ ;;
+esac
+
+if [ $DO_SYMLINK_UPDATE -eq 1 ]; then
-+ mkdir -p "@KDEPREFIX@/share/dbus-1/interfaces"
-+ cd "@KDEPREFIX@/lib/@KDETYPE@/share/dbus-1/interfaces"
++ mkdir -p "$PREFIX/share/dbus-1/interfaces"
++ cd "$FULLPREFIX/share/dbus-1/interfaces"
+ for file in *.xml; do
-+ ln -sf
"@KDEPREFIX@/lib/@KDETYPE@/share/dbus-1/interfaces/$file"
"@KDEPREFIX@/share/dbus-1/interfaces/$file"
++ ln -sf "$FULLPREFIX/share/dbus-1/interfaces/$file"
"$PREFIX/share/dbus-1/interfaces/$file"
+ done
-+ for file in "@KDEPREFIX@/share/dbus-1/interfaces"/*.xml; do
++ for file in "$PREFIX/share/dbus-1/interfaces"/*.xml; do
+ if [ ! -f "$file" ]; then
+ rm -rf "$file"
+ fi
@@ -80,13 +91,13 @@
+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-04-09
10:13:51.000000000 -0400
++++ kdelibs-4.2.2-new/kdecore/config/kconfig.cpp 2009-04-10
17:19:19.000000000 -0400
@@ -71,7 +71,7 @@
#ifdef Q_WS_WIN
QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
#else
- QLatin1String("/etc/kde4rc");
-+ QLatin1String("@KDEPREFIX@/etc/kde4rc");
++ QLatin1String("@KDEPREFIX@/lib/@KDETYPE@/etc/kde4rc");
#endif
KEntryMap tmp;
// first entry is always /etc/kderc or empty if cannot read
@@ -142,7 +153,7 @@
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-04-09
10:13:51.000000000 -0400
++++ kdelibs-4.2.2-new/kdecore/kernel/kkernel_mac.cpp 2009-04-10
17:11:19.000000000 -0400
@@ -21,7 +21,7 @@
#include <config.h>
@@ -152,6 +163,15 @@
#include <unistd.h>
#include <string.h>
+@@ -142,7 +142,7 @@
+ return;
+ }
+
+- dbusVar = QFile::decodeName(qgetenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET"));
++ dbusVar = QFile::decodeName(qgetenv("DBUS_FINK_SESSION_BUS_SOCKET"));
+ if (mac_set_dbus_address(dbusVar)) {
+ dbus_initialized = true;
+ return;
@@ -161,22 +161,27 @@
}
@@ -160,13 +180,8 @@
- qp.setTextModeEnabled(true);
+ QProcess qp;
+ qp.setTextModeEnabled(true);
-+
-+ qp.start(externalProc, QStringList() << "load" <<
"@KDEPREFIX@/lib/mac/share/dbus/launchd/org.finkproject.dbus-session.plist");
-+ if (!qp.waitForFinished(timeout)) {
-+ kDebug() << "error running" << externalProc <<
qp.errorString();
-+ }
- qp.start(externalProc, QStringList() << "getenv" <<
"DBUS_LAUNCHD_SESSION_BUS_SOCKET");
+- qp.start(externalProc, QStringList() << "getenv" <<
"DBUS_LAUNCHD_SESSION_BUS_SOCKET");
- if (!qp.waitForFinished(timeout)) {
- kDebug() << "error running" << externalProc <<
qp.errorString();
- return;
@@ -175,6 +190,15 @@
- kDebug() << externalProc << "unsuccessful:" <<
qp.readAllStandardError();
- return;
- }
++ qp.start(externalProc, QStringList() << "load" <<
"@KDEPREFIX@/lib/mac/share/dbus/launchd/org.finkproject.dbus-session.plist");
++ if (!qp.waitForFinished(timeout)) {
++ kDebug() << "error running" << externalProc <<
qp.errorString();
++ }
+
+- QString line = qp.readLine().trimmed(); // read the first line
+- if (mac_set_dbus_address(line))
+- dbus_initialized = true; // hooray
++ qp.start(externalProc, QStringList() << "getenv" <<
"DBUS_FINK_SESSION_BUS_SOCKET");
+ if (!qp.waitForFinished(timeout)) {
+ kDebug() << "error running" << externalProc <<
qp.errorString();
+ return;
@@ -183,10 +207,7 @@
+ kDebug() << externalProc << "unsuccessful:" <<
qp.readAllStandardError();
+ return;
+ }
-
-- QString line = qp.readLine().trimmed(); // read the first line
-- if (mac_set_dbus_address(line))
-- dbus_initialized = true; // hooray
++
+ QString line = qp.readLine().trimmed(); // read the first line
+ if (mac_set_dbus_address(line))
+ dbus_initialized = true; // hooray
@@ -256,7 +277,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-04-09
10:13:52.000000000 -0400
++++ kdelibs-4.2.2-new/kdeui/kernel/kuniqueapplication.cpp 2009-04-10
16:27:59.000000000 -0400
@@ -65,7 +65,7 @@
# endif
#endif
@@ -266,16 +287,27 @@
#include <kkernel_mac.h>
#endif
-@@ -141,7 +141,7 @@
+@@ -141,14 +141,15 @@
appName.prepend(s);
}
-#ifdef Q_WS_MAC
+- mac_initialize_dbus();
+-#endif
+-
+ bool forceNewProcess = Private::s_multipleInstances || flags &
NonUniqueInstance;
+
+ if (Private::s_nofork)
+ {
++
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
- mac_initialize_dbus();
- #endif
++ mac_initialize_dbus();
++#endif
++
+ QDBusConnectionInterface* dbusService = tryToInitDBusConnection();
-@@ -182,8 +182,8 @@
+ QString pid = QString::number(getpid());
+@@ -182,8 +183,8 @@
// We'll call newInstance in the constructor. Do nothing here.
return true;
Index: kdelibs4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdelibs4.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kdelibs4.info 10 Apr 2009 19:27:18 -0000 1.4
+++ kdelibs4.info 11 Apr 2009 00:57:09 -0000 1.5
@@ -1,7 +1,7 @@
Info2: <<
Package: kdelibs4-%type_pkg[kde]
Version: 4.2.2
-Revision: 2
+Revision: 3
Description: KDE4 - essential libraries
Type: kde (x11 mac)
License: GPL/LGPL
@@ -57,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: d109c8c01fb08c523bc6f058d97ea0ee
+PatchFile-MD5: 0c6a1883b6c6c1f9291e7ee3ab084185
CompileScript: <<
#!/bin/sh -ev
@@ -82,6 +82,12 @@
mv %i/lib/%type_pkg[kde]/etc %i/etc
mv %i/etc/xdg/menus/applications.menu
%i/etc/xdg/menus/%type_pkg[kde]-applications.menu
install -c -m 755 kde4-postinst.sh %i/lib/%type_pkg[kde]/bin/
+
+ install -d -m 755 %i/lib/%type_pkg[kde]/etc
+ cat <<END >%i/lib/%type_pkg[kde]/etc/kde4rc
+[Directories]
+prefixes=%p/lib/%type_pkg[kde],%p/lib/qt4-%type_pkg[kde],%p,/usr
+END
<<
DocFiles: COPYING COPYING.LIB INSTALL
SplitOff: <<
@@ -112,6 +118,7 @@
<<
Recommends: %N (>= %v-%r)
Files: <<
+ lib/%type_pkg[kde]/etc/kde4rc
lib/%type_pkg[kde]/lib/kde4/*.so
lib/%type_pkg[kde]/lib/kde4/plugins
lib/%type_pkg[kde]/lib/libkde3support.4*.dylib
------------------------------------------------------------------------------
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
