Author: ranger Date: Fri Oct 9 16:19:41 2009 New Revision: 1639 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1639&repname=user%3a+ranger> Log: various fixes
Added: trunk/experimental/common/main/finkinfo/utils/jailkit.info Modified: trunk/experimental/10.4/crypto/ (props changed) trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch trunk/experimental/10.4/main/finkinfo/libs/soprano.info trunk/experimental/common/main/finkinfo/kde/kdelibs4.info trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch trunk/experimental/common/main/finkinfo/libs/soprano.info trunk/experimental/common/main/finkinfo/x11/qt4-x11.info Propchange: trunk/experimental/10.4/crypto/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Oct 9 16:19:41 2009 @@ -1,2 +1,3 @@ binary-darwin-powerpc binary-darwin-i386 +binary-darwin-x86_64 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=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info (original) +++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info Fri Oct 9 16:19:41 2009 @@ -59,7 +59,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: e82e76830051f232bdef9c3120f37fcf +PatchFile-MD5: b6fdd1e5a8a9e2ccf6ed0a2c72016237 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=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch (original) +++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch Fri Oct 9 16:19:41 2009 @@ -1,7 +1,7 @@ -diff -Nurd kdelibs-4.3.1/cmake/modules/FindKDE4Internal.cmake kdelibs-4.3.1-new/cmake/modules/FindKDE4Internal.cmake ---- kdelibs-4.3.1/cmake/modules/FindKDE4Internal.cmake 2009-08-27 04:18:42.000000000 -0400 -+++ kdelibs-4.3.1-new/cmake/modules/FindKDE4Internal.cmake 2009-09-21 20:16:49.000000000 -0400 -@@ -365,7 +365,7 @@ +diff -Nurd kdelibs-4.3.2/cmake/modules/FindKDE4Internal.cmake kdelibs-4.3.2-new/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.3.2/cmake/modules/FindKDE4Internal.cmake 2009-10-02 04:18:05.000000000 -0400 ++++ kdelibs-4.3.2-new/cmake/modules/FindKDE4Internal.cmake 2009-10-09 10:16:45.000000000 -0400 +@@ -371,7 +371,7 @@ if (_kdeBootStrapping) set(KDE4_INCLUDE_DIR ${kdelibs_SOURCE_DIR}) set(KDE4_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore) @@ -10,9 +10,9 @@ set(KDE4_KIO_LIBS ${KDE4_KDEUI_LIBS} kio) set(KDE4_KPARTS_LIBS ${KDE4_KIO_LIBS} kparts) if (UNIX) -diff -Nurd kdelibs-4.3.1/cmake/modules/FindSoprano.cmake kdelibs-4.3.1-new/cmake/modules/FindSoprano.cmake ---- kdelibs-4.3.1/cmake/modules/FindSoprano.cmake 2009-07-29 15:54:57.000000000 -0400 -+++ kdelibs-4.3.1-new/cmake/modules/FindSoprano.cmake 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/cmake/modules/FindSoprano.cmake kdelibs-4.3.2-new/cmake/modules/FindSoprano.cmake +--- kdelibs-4.3.2/cmake/modules/FindSoprano.cmake 2009-07-29 15:54:57.000000000 -0400 ++++ kdelibs-4.3.2-new/cmake/modules/FindSoprano.cmake 2009-10-09 10:16:45.000000000 -0400 @@ -132,6 +132,7 @@ PATHS ${SOPRANO_INCLUDE_DIR}/../share @@ -21,9 +21,22 @@ /usr/share /usr/local/share NO_DEFAULT_PATH -diff -Nurd kdelibs-4.3.1/doc/api/Doxyfile.local kdelibs-4.3.1-new/doc/api/Doxyfile.local ---- kdelibs-4.3.1/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000 -0400 -+++ kdelibs-4.3.1-new/doc/api/Doxyfile.local 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/config.h.cmake kdelibs-4.3.2-new/config.h.cmake +--- kdelibs-4.3.2/config.h.cmake 2009-04-15 06:26:51.000000000 -0400 ++++ kdelibs-4.3.2-new/config.h.cmake 2009-10-09 10:18:09.000000000 -0400 +@@ -91,7 +91,9 @@ + #cmakedefine HAVE_GETMNTINFO 1 + #cmakedefine HAVE_GETPAGESIZE 1 + #cmakedefine HAVE_INITGROUPS 1 ++#ifndef __APPLE__ + #cmakedefine HAVE_FDATASYNC 1 ++#endif + #cmakedefine HAVE_MADVISE 1 + #cmakedefine HAVE_MMAP 1 + #cmakedefine HAVE_MKSTEMPS 1 +diff -Nurd kdelibs-4.3.2/doc/api/Doxyfile.local kdelibs-4.3.2-new/doc/api/Doxyfile.local +--- kdelibs-4.3.2/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000 -0400 ++++ kdelibs-4.3.2-new/doc/api/Doxyfile.local 2009-10-09 10:16:45.000000000 -0400 @@ -173,6 +173,7 @@ Q_WS_MAC="" \ Q_OS_UNIX="" \ @@ -32,9 +45,9 @@ Q_OS_MACX="" \ \ Q_SLOTS="slots" \ -diff -Nurd kdelibs-4.3.1/kde3support/kdecore/k3processcontroller.cpp kdelibs-4.3.1-new/kde3support/kdecore/k3processcontroller.cpp ---- kdelibs-4.3.1/kde3support/kdecore/k3processcontroller.cpp 2008-05-21 07:06:17.000000000 -0400 -+++ kdelibs-4.3.1-new/kde3support/kdecore/k3processcontroller.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kde3support/kdecore/k3processcontroller.cpp kdelibs-4.3.2-new/kde3support/kdecore/k3processcontroller.cpp +--- kdelibs-4.3.2/kde3support/kdecore/k3processcontroller.cpp 2008-05-21 07:06:17.000000000 -0400 ++++ kdelibs-4.3.2-new/kde3support/kdecore/k3processcontroller.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -114,7 +114,7 @@ K3ProcessController::~K3ProcessController() @@ -44,9 +57,9 @@ /* not sure why, but this is causing lockups */ close( d->fd[0] ); close( d->fd[1] ); -diff -Nurd kdelibs-4.3.1/kde4-check-sycoca.sh kdelibs-4.3.1-new/kde4-check-sycoca.sh ---- kdelibs-4.3.1/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kde4-check-sycoca.sh 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kde4-check-sycoca.sh kdelibs-4.3.2-new/kde4-check-sycoca.sh +--- kdelibs-4.3.2/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kde4-check-sycoca.sh 2009-10-09 10:16:45.000000000 -0400 @@ -0,0 +1,18 @@ +#!/bin/sh + @@ -66,9 +79,9 @@ + echo "* you've installed KDE4 (@KDETYPE@) applications since last time you ran init -- updating desktop cache" + ("$FULLPREFIX/bin/kbuildsycoca4" >"$LOCAL_SYCOCA_DIR/kbuildsycoca4.log" 2>&1 && touch "$LOCAL_SYCOCA_DIR/$TOUCHFILE") & +fi -diff -Nurd kdelibs-4.3.1/kde4-postinst.sh kdelibs-4.3.1-new/kde4-postinst.sh ---- kdelibs-4.3.1/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kde4-postinst.sh 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kde4-postinst.sh kdelibs-4.3.2-new/kde4-postinst.sh +--- kdelibs-4.3.2/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kde4-postinst.sh 2009-10-09 10:16:45.000000000 -0400 @@ -0,0 +1,81 @@ +#!/bin/sh + @@ -151,9 +164,9 @@ +echo "== KDE4 Applications Have Been Updated ==" +echo "You should start a new shell, or run $FULLPREFIX/bin/kbuildsycoca4 to update the KDE4 application database." +echo "" -diff -Nurd kdelibs-4.3.1/kdecore/config/kconfig.cpp kdelibs-4.3.1-new/kdecore/config/kconfig.cpp ---- kdelibs-4.3.1/kdecore/config/kconfig.cpp 2009-04-28 09:47:32.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/config/kconfig.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/config/kconfig.cpp kdelibs-4.3.2-new/kdecore/config/kconfig.cpp +--- kdelibs-4.3.2/kdecore/config/kconfig.cpp 2009-10-02 04:18:09.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/config/kconfig.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -70,7 +70,7 @@ #ifdef Q_WS_WIN QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" ); @@ -163,9 +176,9 @@ #endif if (!KStandardDirs::checkAccess(etc_kderc, R_OK)) { etc_kderc.clear(); -diff -Nurd kdelibs-4.3.1/kdecore/kernel/kcmdlineargs.cpp kdelibs-4.3.1-new/kdecore/kernel/kcmdlineargs.cpp ---- kdelibs-4.3.1/kdecore/kernel/kcmdlineargs.cpp 2009-03-27 10:47:33.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/kernel/kcmdlineargs.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/kernel/kcmdlineargs.cpp kdelibs-4.3.2-new/kdecore/kernel/kcmdlineargs.cpp +--- kdelibs-4.3.2/kdecore/kernel/kcmdlineargs.cpp 2009-10-02 04:18:08.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/kernel/kcmdlineargs.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -737,10 +737,6 @@ argument = opt.mid(j+1); opt = opt.left(j); @@ -213,9 +226,9 @@ else if (option.startsWith("help-")) { KCmdLineArgs::usage(option.mid(5)); -diff -Nurd kdelibs-4.3.1/kdecore/kernel/kkernel_mac.cpp kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.cpp ---- kdelibs-4.3.1/kdecore/kernel/kkernel_mac.cpp 2009-01-06 12:27:48.000000000 -0500 -+++ kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/kernel/kkernel_mac.cpp kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.cpp +--- kdelibs-4.3.2/kdecore/kernel/kkernel_mac.cpp 2009-01-06 12:27:48.000000000 -0500 ++++ kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -21,7 +21,7 @@ #include <config.h> @@ -284,9 +297,9 @@ QString mac_app_filename() { static QString appFileName; if (appFileName.isEmpty()) { -diff -Nurd kdelibs-4.3.1/kdecore/kernel/kkernel_mac.h kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.h ---- kdelibs-4.3.1/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000 -0500 -+++ kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.h 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/kernel/kkernel_mac.h kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.h +--- kdelibs-4.3.2/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000 -0500 ++++ kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.h 2009-10-09 10:16:45.000000000 -0400 @@ -21,7 +21,7 @@ #include <QtCore/qglobal.h> // defines Q_OS_MACX @@ -303,10 +316,10 @@ -#endif // Q_OS_MACX +#endif // MAC #endif // KKERNEL_MAC_H -diff -Nurd kdelibs-4.3.1/kdecore/localization/klocale.cpp kdelibs-4.3.1-new/kdecore/localization/klocale.cpp ---- kdelibs-4.3.1/kdecore/localization/klocale.cpp 2009-07-08 10:41:53.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/localization/klocale.cpp 2009-09-21 20:16:49.000000000 -0400 -@@ -2235,7 +2235,7 @@ +diff -Nurd kdelibs-4.3.2/kdecore/localization/klocale.cpp kdelibs-4.3.2-new/kdecore/localization/klocale.cpp +--- kdelibs-4.3.2/kdecore/localization/klocale.cpp 2009-10-02 04:18:08.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/localization/klocale.cpp 2009-10-09 10:16:45.000000000 -0400 +@@ -2246,7 +2246,7 @@ // just like Qt compiled without iconv does. Windows already has its own workaround QByteArray systemLocale = nl_langinfo(CODESET); @@ -315,9 +328,9 @@ // Mac OX X is UTF-8, always. systemLocale = "UTF-8"; #endif -diff -Nurd kdelibs-4.3.1/kdecore/tests/kconfigtest.cpp kdelibs-4.3.1-new/kdecore/tests/kconfigtest.cpp ---- kdelibs-4.3.1/kdecore/tests/kconfigtest.cpp 2009-05-06 06:14:39.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/tests/kconfigtest.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/tests/kconfigtest.cpp kdelibs-4.3.2-new/kdecore/tests/kconfigtest.cpp +--- kdelibs-4.3.2/kdecore/tests/kconfigtest.cpp 2009-05-06 06:14:39.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/tests/kconfigtest.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -416,7 +416,7 @@ QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") + HOMEPATH ); QVERIFY(group.hasKey("URL")); @@ -327,9 +340,9 @@ // I don't know if this will work on windows // This test hangs on OS X QVERIFY(group.hasKey("hostname")); -diff -Nurd kdelibs-4.3.1/kded/CMakeLists.txt kdelibs-4.3.1-new/kded/CMakeLists.txt ---- kdelibs-4.3.1/kded/CMakeLists.txt 2008-12-10 11:12:28.000000000 -0500 -+++ kdelibs-4.3.1-new/kded/CMakeLists.txt 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kded/CMakeLists.txt kdelibs-4.3.2-new/kded/CMakeLists.txt +--- kdelibs-4.3.2/kded/CMakeLists.txt 2008-12-10 11:12:28.000000000 -0500 ++++ kdelibs-4.3.2-new/kded/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -13,6 +13,12 @@ kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS}) @@ -343,9 +356,9 @@ target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS}) -diff -Nurd kdelibs-4.3.1/kded/Info.plist.template kdelibs-4.3.1-new/kded/Info.plist.template ---- kdelibs-4.3.1/kded/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kded/Info.plist.template 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kded/Info.plist.template kdelibs-4.3.2-new/kded/Info.plist.template +--- kdelibs-4.3.2/kded/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kded/Info.plist.template 2009-10-09 10:16:45.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"> @@ -383,9 +396,9 @@ + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> +</dict> +</plist> -diff -Nurd kdelibs-4.3.1/kdeui/kernel/kapplication.cpp kdelibs-4.3.1-new/kdeui/kernel/kapplication.cpp ---- kdelibs-4.3.1/kdeui/kernel/kapplication.cpp 2009-07-21 11:16:13.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/kernel/kapplication.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/kernel/kapplication.cpp kdelibs-4.3.2-new/kdeui/kernel/kapplication.cpp +--- kdelibs-4.3.2/kdeui/kernel/kapplication.cpp 2009-07-21 11:16:13.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/kernel/kapplication.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -96,6 +96,9 @@ #include <Carbon/Carbon.h> #include <QImage> @@ -405,9 +418,9 @@ mac_initialize_dbus(); #endif -diff -Nurd kdelibs-4.3.1/kdeui/kernel/kuniqueapplication.cpp kdelibs-4.3.1-new/kdeui/kernel/kuniqueapplication.cpp ---- kdelibs-4.3.1/kdeui/kernel/kuniqueapplication.cpp 2009-07-21 11:16:13.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/kernel/kuniqueapplication.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/kernel/kuniqueapplication.cpp kdelibs-4.3.2-new/kdeui/kernel/kuniqueapplication.cpp +--- kdelibs-4.3.2/kdeui/kernel/kuniqueapplication.cpp 2009-07-21 11:16:13.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/kernel/kuniqueapplication.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -66,7 +66,7 @@ # endif #endif @@ -464,9 +477,9 @@ } else { mac_fork_and_reexec_self(); #endif -diff -Nurd kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac.cpp kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac.cpp ---- kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-05-27 15:54:57.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac.cpp kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac.cpp +--- kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-05-27 15:54:57.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -59,14 +59,14 @@ { ProcessInfoRec pinfo; @@ -502,9 +515,9 @@ FSSpec spec; ref = parentRef; FSGetCatalogInfo(&ref, kFSCatInfoNone, 0, &name, &spec, &parentRef); -diff -Nurd kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac_p.h kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac_p.h ---- kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-05-27 15:54:57.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac_p.h kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac_p.h +--- kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-05-27 15:54:57.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-10-09 10:16:45.000000000 -0400 @@ -43,7 +43,7 @@ pid_t pid() const { return m_pid; } void setProcessSerialNumber(const ProcessSerialNumber& psn); @@ -514,9 +527,9 @@ FSSpec iconSpec; #else FSRef iconSpec; -diff -Nurd kdelibs-4.3.1/kdeui/windowmanagement/kwindowsystem_mac.cpp kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowsystem_mac.cpp ---- kdelibs-4.3.1/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-07-21 11:16:14.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/windowmanagement/kwindowsystem_mac.cpp kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowsystem_mac.cpp +--- kdelibs-4.3.2/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-07-21 11:16:14.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -141,7 +141,7 @@ m_noEmit = false; @@ -553,9 +566,9 @@ // not supported for 'global' windows; only for windows in the current process if (hasWId(winid)) return; -diff -Nurd kdelibs-4.3.1/kimgio/CMakeLists.txt kdelibs-4.3.1-new/kimgio/CMakeLists.txt ---- kdelibs-4.3.1/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000 -0400 -+++ kdelibs-4.3.1-new/kimgio/CMakeLists.txt 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kimgio/CMakeLists.txt kdelibs-4.3.2-new/kimgio/CMakeLists.txt +--- kdelibs-4.3.2/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000 -0400 ++++ kdelibs-4.3.2-new/kimgio/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -96,7 +96,7 @@ add_definitions(${OPENEXR_DEFINITIONS}) set(kimg_exr_LIB_SRCS exr.cpp) @@ -565,9 +578,9 @@ install(TARGETS kimg_exr DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/imageformats/ ) install( FILES exr.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/ ) -diff -Nurd kdelibs-4.3.1/kinit/CMakeLists.txt kdelibs-4.3.1-new/kinit/CMakeLists.txt ---- kdelibs-4.3.1/kinit/CMakeLists.txt 2009-07-21 11:16:06.000000000 -0400 -+++ kdelibs-4.3.1-new/kinit/CMakeLists.txt 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kinit/CMakeLists.txt kdelibs-4.3.2-new/kinit/CMakeLists.txt +--- kdelibs-4.3.2/kinit/CMakeLists.txt 2009-07-21 11:16:06.000000000 -0400 ++++ kdelibs-4.3.2-new/kinit/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -38,13 +38,16 @@ set(kdeinit_LIBS kparts) endif (WIN32) @@ -588,9 +601,9 @@ target_link_libraries(kdeinit4 ${KDE4_KDECORE_LIBS} ${kdeinit_LIBS} ) if (Q_WS_X11) -diff -Nurd kdelibs-4.3.1/kinit/Info.plist.template kdelibs-4.3.1-new/kinit/Info.plist.template ---- kdelibs-4.3.1/kinit/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kinit/Info.plist.template 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kinit/Info.plist.template kdelibs-4.3.2-new/kinit/Info.plist.template +--- kdelibs-4.3.2/kinit/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kinit/Info.plist.template 2009-10-09 10:16:45.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"> @@ -628,9 +641,9 @@ + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> +</dict> +</plist> -diff -Nurd kdelibs-4.3.1/kinit/kinit.cpp kdelibs-4.3.1-new/kinit/kinit.cpp ---- kdelibs-4.3.1/kinit/kinit.cpp 2009-08-27 04:19:03.000000000 -0400 -+++ kdelibs-4.3.1-new/kinit/kinit.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kinit/kinit.cpp kdelibs-4.3.2-new/kinit/kinit.cpp +--- kdelibs-4.3.2/kinit/kinit.cpp 2009-08-27 04:19:03.000000000 -0400 ++++ kdelibs-4.3.2-new/kinit/kinit.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -70,7 +70,7 @@ #endif #endif @@ -681,9 +694,9 @@ mac_fork_and_reexec_self(); #else if (pipe(d.initpipe) != 0) { -diff -Nurd kdelibs-4.3.1/kio/kfile/kfsprocess.cpp kdelibs-4.3.1-new/kio/kfile/kfsprocess.cpp ---- kdelibs-4.3.1/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000 -0400 -+++ kdelibs-4.3.1-new/kio/kfile/kfsprocess.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kio/kfile/kfsprocess.cpp kdelibs-4.3.2-new/kio/kfile/kfsprocess.cpp +--- kdelibs-4.3.2/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000 -0400 ++++ kdelibs-4.3.2-new/kio/kfile/kfsprocess.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -83,7 +83,7 @@ KfsProcessController::~KfsProcessController() @@ -693,9 +706,9 @@ /* not sure why, but this is causing lockups */ close( m_fd[0] ); close( m_fd[1] ); -diff -Nurd kdelibs-4.3.1/kio/kfile/kpropertiesdialog.cpp kdelibs-4.3.1-new/kio/kfile/kpropertiesdialog.cpp ---- kdelibs-4.3.1/kio/kfile/kpropertiesdialog.cpp 2009-08-27 23:47:22.000000000 -0400 -+++ kdelibs-4.3.1-new/kio/kfile/kpropertiesdialog.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kio/kfile/kpropertiesdialog.cpp kdelibs-4.3.2-new/kio/kfile/kpropertiesdialog.cpp +--- kdelibs-4.3.2/kio/kfile/kpropertiesdialog.cpp 2009-08-27 23:47:22.000000000 -0400 ++++ kdelibs-4.3.2-new/kio/kfile/kpropertiesdialog.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -1799,7 +1799,7 @@ #ifdef Q_OS_UNIX // pick the groups to which the user belongs @@ -705,9 +718,9 @@ QVarLengthArray<int> groups; #else QVarLengthArray<gid_t> groups; -diff -Nurd kdelibs-4.3.1/kpty/kptydevice.cpp kdelibs-4.3.1-new/kpty/kptydevice.cpp ---- kdelibs-4.3.1/kpty/kptydevice.cpp 2009-03-27 10:47:33.000000000 -0400 -+++ kdelibs-4.3.1-new/kpty/kptydevice.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kpty/kptydevice.cpp kdelibs-4.3.2-new/kpty/kptydevice.cpp +--- kdelibs-4.3.2/kpty/kptydevice.cpp 2009-03-27 10:47:33.000000000 -0400 ++++ kdelibs-4.3.2-new/kpty/kptydevice.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -42,7 +42,7 @@ # include <sys/time.h> #endif @@ -717,9 +730,9 @@ // "the other end's output queue size" - kinda braindead, huh? # define PTY_BYTES_AVAILABLE TIOCOUTQ #elif defined(TIOCINQ) -diff -Nurd kdelibs-4.3.1/kross/qts/CMakeLists.txt kdelibs-4.3.1-new/kross/qts/CMakeLists.txt ---- kdelibs-4.3.1/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000 -0500 -+++ kdelibs-4.3.1-new/kross/qts/CMakeLists.txt 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kross/qts/CMakeLists.txt kdelibs-4.3.2-new/kross/qts/CMakeLists.txt +--- kdelibs-4.3.2/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000 -0500 ++++ kdelibs-4.3.2-new/kross/qts/CMakeLists.txt 2009-10-09 10:16:45.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}) @@ -729,9 +742,9 @@ ########### next target ############### -diff -Nurd kdelibs-4.3.1/solid/solid/CMakeLists.txt kdelibs-4.3.1-new/solid/solid/CMakeLists.txt ---- kdelibs-4.3.1/solid/solid/CMakeLists.txt 2009-06-23 07:16:25.000000000 -0400 -+++ kdelibs-4.3.1-new/solid/solid/CMakeLists.txt 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/solid/solid/CMakeLists.txt kdelibs-4.3.2-new/solid/solid/CMakeLists.txt +--- kdelibs-4.3.2/solid/solid/CMakeLists.txt 2009-06-23 07:16:25.000000000 -0400 ++++ kdelibs-4.3.2-new/solid/solid/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -107,7 +107,7 @@ backends/fakehw/fakesmartcardreader.cpp ) @@ -750,9 +763,9 @@ if(APPLE) find_package(IOKit REQUIRED) -diff -Nurd kdelibs-4.3.1/solid/solid/managerbase.cpp kdelibs-4.3.1-new/solid/solid/managerbase.cpp ---- kdelibs-4.3.1/solid/solid/managerbase.cpp 2009-03-10 08:26:04.000000000 -0400 -+++ kdelibs-4.3.1-new/solid/solid/managerbase.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/solid/solid/managerbase.cpp kdelibs-4.3.2-new/solid/solid/managerbase.cpp +--- kdelibs-4.3.2/solid/solid/managerbase.cpp 2009-03-10 08:26:04.000000000 -0400 ++++ kdelibs-4.3.2-new/solid/solid/managerbase.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -23,7 +23,8 @@ #include "backends/fakehw/fakemanager.h" Modified: trunk/experimental/10.4/main/finkinfo/libs/soprano.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/soprano.info&rev=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/libs/soprano.info (original) +++ trunk/experimental/10.4/main/finkinfo/libs/soprano.info Fri Oct 9 16:19:41 2009 @@ -35,7 +35,12 @@ Source: mirror:sourceforge:soprano/soprano-%v.tar.bz2 Source-MD5: c9a2c008b80cd5d76599e9d48139dfe9 -PatchScript: find . -name CMakeLists.txt | xargs perl -pi -e 's,include/Soprano,include/soprano,g' +PatchScript: << + %{default_script} + find . -name CMakeLists.txt | xargs perl -pi -e 's,include/Soprano,include/soprano,g' +<< +PatchFile: soprano.patch +PatchFile-MD5: 1447c93a237bfa38369081d46d17b0f0 CompileScript: << #!/bin/sh -ev 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=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/kdelibs4.info (original) +++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.info Fri Oct 9 16:19:41 2009 @@ -58,7 +58,7 @@ Source-MD5: 0564ed8ba804a0f3f1cee9732a3d2d72 SourceDirectory: kdelibs-%v PatchFile: kdelibs4.patch -PatchFile-MD5: e82e76830051f232bdef9c3120f37fcf +PatchFile-MD5: b6fdd1e5a8a9e2ccf6ed0a2c72016237 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=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch (original) +++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch Fri Oct 9 16:19:41 2009 @@ -1,7 +1,7 @@ -diff -Nurd kdelibs-4.3.1/cmake/modules/FindKDE4Internal.cmake kdelibs-4.3.1-new/cmake/modules/FindKDE4Internal.cmake ---- kdelibs-4.3.1/cmake/modules/FindKDE4Internal.cmake 2009-08-27 04:18:42.000000000 -0400 -+++ kdelibs-4.3.1-new/cmake/modules/FindKDE4Internal.cmake 2009-09-21 20:16:49.000000000 -0400 -@@ -365,7 +365,7 @@ +diff -Nurd kdelibs-4.3.2/cmake/modules/FindKDE4Internal.cmake kdelibs-4.3.2-new/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.3.2/cmake/modules/FindKDE4Internal.cmake 2009-10-02 04:18:05.000000000 -0400 ++++ kdelibs-4.3.2-new/cmake/modules/FindKDE4Internal.cmake 2009-10-09 10:16:45.000000000 -0400 +@@ -371,7 +371,7 @@ if (_kdeBootStrapping) set(KDE4_INCLUDE_DIR ${kdelibs_SOURCE_DIR}) set(KDE4_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore) @@ -10,9 +10,9 @@ set(KDE4_KIO_LIBS ${KDE4_KDEUI_LIBS} kio) set(KDE4_KPARTS_LIBS ${KDE4_KIO_LIBS} kparts) if (UNIX) -diff -Nurd kdelibs-4.3.1/cmake/modules/FindSoprano.cmake kdelibs-4.3.1-new/cmake/modules/FindSoprano.cmake ---- kdelibs-4.3.1/cmake/modules/FindSoprano.cmake 2009-07-29 15:54:57.000000000 -0400 -+++ kdelibs-4.3.1-new/cmake/modules/FindSoprano.cmake 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/cmake/modules/FindSoprano.cmake kdelibs-4.3.2-new/cmake/modules/FindSoprano.cmake +--- kdelibs-4.3.2/cmake/modules/FindSoprano.cmake 2009-07-29 15:54:57.000000000 -0400 ++++ kdelibs-4.3.2-new/cmake/modules/FindSoprano.cmake 2009-10-09 10:16:45.000000000 -0400 @@ -132,6 +132,7 @@ PATHS ${SOPRANO_INCLUDE_DIR}/../share @@ -21,9 +21,22 @@ /usr/share /usr/local/share NO_DEFAULT_PATH -diff -Nurd kdelibs-4.3.1/doc/api/Doxyfile.local kdelibs-4.3.1-new/doc/api/Doxyfile.local ---- kdelibs-4.3.1/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000 -0400 -+++ kdelibs-4.3.1-new/doc/api/Doxyfile.local 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/config.h.cmake kdelibs-4.3.2-new/config.h.cmake +--- kdelibs-4.3.2/config.h.cmake 2009-04-15 06:26:51.000000000 -0400 ++++ kdelibs-4.3.2-new/config.h.cmake 2009-10-09 10:18:09.000000000 -0400 +@@ -91,7 +91,9 @@ + #cmakedefine HAVE_GETMNTINFO 1 + #cmakedefine HAVE_GETPAGESIZE 1 + #cmakedefine HAVE_INITGROUPS 1 ++#ifndef __APPLE__ + #cmakedefine HAVE_FDATASYNC 1 ++#endif + #cmakedefine HAVE_MADVISE 1 + #cmakedefine HAVE_MMAP 1 + #cmakedefine HAVE_MKSTEMPS 1 +diff -Nurd kdelibs-4.3.2/doc/api/Doxyfile.local kdelibs-4.3.2-new/doc/api/Doxyfile.local +--- kdelibs-4.3.2/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000 -0400 ++++ kdelibs-4.3.2-new/doc/api/Doxyfile.local 2009-10-09 10:16:45.000000000 -0400 @@ -173,6 +173,7 @@ Q_WS_MAC="" \ Q_OS_UNIX="" \ @@ -32,9 +45,9 @@ Q_OS_MACX="" \ \ Q_SLOTS="slots" \ -diff -Nurd kdelibs-4.3.1/kde3support/kdecore/k3processcontroller.cpp kdelibs-4.3.1-new/kde3support/kdecore/k3processcontroller.cpp ---- kdelibs-4.3.1/kde3support/kdecore/k3processcontroller.cpp 2008-05-21 07:06:17.000000000 -0400 -+++ kdelibs-4.3.1-new/kde3support/kdecore/k3processcontroller.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kde3support/kdecore/k3processcontroller.cpp kdelibs-4.3.2-new/kde3support/kdecore/k3processcontroller.cpp +--- kdelibs-4.3.2/kde3support/kdecore/k3processcontroller.cpp 2008-05-21 07:06:17.000000000 -0400 ++++ kdelibs-4.3.2-new/kde3support/kdecore/k3processcontroller.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -114,7 +114,7 @@ K3ProcessController::~K3ProcessController() @@ -44,9 +57,9 @@ /* not sure why, but this is causing lockups */ close( d->fd[0] ); close( d->fd[1] ); -diff -Nurd kdelibs-4.3.1/kde4-check-sycoca.sh kdelibs-4.3.1-new/kde4-check-sycoca.sh ---- kdelibs-4.3.1/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kde4-check-sycoca.sh 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kde4-check-sycoca.sh kdelibs-4.3.2-new/kde4-check-sycoca.sh +--- kdelibs-4.3.2/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kde4-check-sycoca.sh 2009-10-09 10:16:45.000000000 -0400 @@ -0,0 +1,18 @@ +#!/bin/sh + @@ -66,9 +79,9 @@ + echo "* you've installed KDE4 (@KDETYPE@) applications since last time you ran init -- updating desktop cache" + ("$FULLPREFIX/bin/kbuildsycoca4" >"$LOCAL_SYCOCA_DIR/kbuildsycoca4.log" 2>&1 && touch "$LOCAL_SYCOCA_DIR/$TOUCHFILE") & +fi -diff -Nurd kdelibs-4.3.1/kde4-postinst.sh kdelibs-4.3.1-new/kde4-postinst.sh ---- kdelibs-4.3.1/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kde4-postinst.sh 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kde4-postinst.sh kdelibs-4.3.2-new/kde4-postinst.sh +--- kdelibs-4.3.2/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kde4-postinst.sh 2009-10-09 10:16:45.000000000 -0400 @@ -0,0 +1,81 @@ +#!/bin/sh + @@ -151,9 +164,9 @@ +echo "== KDE4 Applications Have Been Updated ==" +echo "You should start a new shell, or run $FULLPREFIX/bin/kbuildsycoca4 to update the KDE4 application database." +echo "" -diff -Nurd kdelibs-4.3.1/kdecore/config/kconfig.cpp kdelibs-4.3.1-new/kdecore/config/kconfig.cpp ---- kdelibs-4.3.1/kdecore/config/kconfig.cpp 2009-04-28 09:47:32.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/config/kconfig.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/config/kconfig.cpp kdelibs-4.3.2-new/kdecore/config/kconfig.cpp +--- kdelibs-4.3.2/kdecore/config/kconfig.cpp 2009-10-02 04:18:09.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/config/kconfig.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -70,7 +70,7 @@ #ifdef Q_WS_WIN QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" ); @@ -163,9 +176,9 @@ #endif if (!KStandardDirs::checkAccess(etc_kderc, R_OK)) { etc_kderc.clear(); -diff -Nurd kdelibs-4.3.1/kdecore/kernel/kcmdlineargs.cpp kdelibs-4.3.1-new/kdecore/kernel/kcmdlineargs.cpp ---- kdelibs-4.3.1/kdecore/kernel/kcmdlineargs.cpp 2009-03-27 10:47:33.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/kernel/kcmdlineargs.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/kernel/kcmdlineargs.cpp kdelibs-4.3.2-new/kdecore/kernel/kcmdlineargs.cpp +--- kdelibs-4.3.2/kdecore/kernel/kcmdlineargs.cpp 2009-10-02 04:18:08.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/kernel/kcmdlineargs.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -737,10 +737,6 @@ argument = opt.mid(j+1); opt = opt.left(j); @@ -213,9 +226,9 @@ else if (option.startsWith("help-")) { KCmdLineArgs::usage(option.mid(5)); -diff -Nurd kdelibs-4.3.1/kdecore/kernel/kkernel_mac.cpp kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.cpp ---- kdelibs-4.3.1/kdecore/kernel/kkernel_mac.cpp 2009-01-06 12:27:48.000000000 -0500 -+++ kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/kernel/kkernel_mac.cpp kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.cpp +--- kdelibs-4.3.2/kdecore/kernel/kkernel_mac.cpp 2009-01-06 12:27:48.000000000 -0500 ++++ kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -21,7 +21,7 @@ #include <config.h> @@ -284,9 +297,9 @@ QString mac_app_filename() { static QString appFileName; if (appFileName.isEmpty()) { -diff -Nurd kdelibs-4.3.1/kdecore/kernel/kkernel_mac.h kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.h ---- kdelibs-4.3.1/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000 -0500 -+++ kdelibs-4.3.1-new/kdecore/kernel/kkernel_mac.h 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/kernel/kkernel_mac.h kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.h +--- kdelibs-4.3.2/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000 -0500 ++++ kdelibs-4.3.2-new/kdecore/kernel/kkernel_mac.h 2009-10-09 10:16:45.000000000 -0400 @@ -21,7 +21,7 @@ #include <QtCore/qglobal.h> // defines Q_OS_MACX @@ -303,10 +316,10 @@ -#endif // Q_OS_MACX +#endif // MAC #endif // KKERNEL_MAC_H -diff -Nurd kdelibs-4.3.1/kdecore/localization/klocale.cpp kdelibs-4.3.1-new/kdecore/localization/klocale.cpp ---- kdelibs-4.3.1/kdecore/localization/klocale.cpp 2009-07-08 10:41:53.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/localization/klocale.cpp 2009-09-21 20:16:49.000000000 -0400 -@@ -2235,7 +2235,7 @@ +diff -Nurd kdelibs-4.3.2/kdecore/localization/klocale.cpp kdelibs-4.3.2-new/kdecore/localization/klocale.cpp +--- kdelibs-4.3.2/kdecore/localization/klocale.cpp 2009-10-02 04:18:08.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/localization/klocale.cpp 2009-10-09 10:16:45.000000000 -0400 +@@ -2246,7 +2246,7 @@ // just like Qt compiled without iconv does. Windows already has its own workaround QByteArray systemLocale = nl_langinfo(CODESET); @@ -315,9 +328,9 @@ // Mac OX X is UTF-8, always. systemLocale = "UTF-8"; #endif -diff -Nurd kdelibs-4.3.1/kdecore/tests/kconfigtest.cpp kdelibs-4.3.1-new/kdecore/tests/kconfigtest.cpp ---- kdelibs-4.3.1/kdecore/tests/kconfigtest.cpp 2009-05-06 06:14:39.000000000 -0400 -+++ kdelibs-4.3.1-new/kdecore/tests/kconfigtest.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdecore/tests/kconfigtest.cpp kdelibs-4.3.2-new/kdecore/tests/kconfigtest.cpp +--- kdelibs-4.3.2/kdecore/tests/kconfigtest.cpp 2009-05-06 06:14:39.000000000 -0400 ++++ kdelibs-4.3.2-new/kdecore/tests/kconfigtest.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -416,7 +416,7 @@ QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") + HOMEPATH ); QVERIFY(group.hasKey("URL")); @@ -327,9 +340,9 @@ // I don't know if this will work on windows // This test hangs on OS X QVERIFY(group.hasKey("hostname")); -diff -Nurd kdelibs-4.3.1/kded/CMakeLists.txt kdelibs-4.3.1-new/kded/CMakeLists.txt ---- kdelibs-4.3.1/kded/CMakeLists.txt 2008-12-10 11:12:28.000000000 -0500 -+++ kdelibs-4.3.1-new/kded/CMakeLists.txt 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kded/CMakeLists.txt kdelibs-4.3.2-new/kded/CMakeLists.txt +--- kdelibs-4.3.2/kded/CMakeLists.txt 2008-12-10 11:12:28.000000000 -0500 ++++ kdelibs-4.3.2-new/kded/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -13,6 +13,12 @@ kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS}) @@ -343,9 +356,9 @@ target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS}) -diff -Nurd kdelibs-4.3.1/kded/Info.plist.template kdelibs-4.3.1-new/kded/Info.plist.template ---- kdelibs-4.3.1/kded/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kded/Info.plist.template 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kded/Info.plist.template kdelibs-4.3.2-new/kded/Info.plist.template +--- kdelibs-4.3.2/kded/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kded/Info.plist.template 2009-10-09 10:16:45.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"> @@ -383,9 +396,9 @@ + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> +</dict> +</plist> -diff -Nurd kdelibs-4.3.1/kdeui/kernel/kapplication.cpp kdelibs-4.3.1-new/kdeui/kernel/kapplication.cpp ---- kdelibs-4.3.1/kdeui/kernel/kapplication.cpp 2009-07-21 11:16:13.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/kernel/kapplication.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/kernel/kapplication.cpp kdelibs-4.3.2-new/kdeui/kernel/kapplication.cpp +--- kdelibs-4.3.2/kdeui/kernel/kapplication.cpp 2009-07-21 11:16:13.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/kernel/kapplication.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -96,6 +96,9 @@ #include <Carbon/Carbon.h> #include <QImage> @@ -405,9 +418,9 @@ mac_initialize_dbus(); #endif -diff -Nurd kdelibs-4.3.1/kdeui/kernel/kuniqueapplication.cpp kdelibs-4.3.1-new/kdeui/kernel/kuniqueapplication.cpp ---- kdelibs-4.3.1/kdeui/kernel/kuniqueapplication.cpp 2009-07-21 11:16:13.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/kernel/kuniqueapplication.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/kernel/kuniqueapplication.cpp kdelibs-4.3.2-new/kdeui/kernel/kuniqueapplication.cpp +--- kdelibs-4.3.2/kdeui/kernel/kuniqueapplication.cpp 2009-07-21 11:16:13.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/kernel/kuniqueapplication.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -66,7 +66,7 @@ # endif #endif @@ -464,9 +477,9 @@ } else { mac_fork_and_reexec_self(); #endif -diff -Nurd kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac.cpp kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac.cpp ---- kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-05-27 15:54:57.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac.cpp kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac.cpp +--- kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-05-27 15:54:57.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -59,14 +59,14 @@ { ProcessInfoRec pinfo; @@ -502,9 +515,9 @@ FSSpec spec; ref = parentRef; FSGetCatalogInfo(&ref, kFSCatInfoNone, 0, &name, &spec, &parentRef); -diff -Nurd kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac_p.h kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac_p.h ---- kdelibs-4.3.1/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-05-27 15:54:57.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac_p.h kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac_p.h +--- kdelibs-4.3.2/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-05-27 15:54:57.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-10-09 10:16:45.000000000 -0400 @@ -43,7 +43,7 @@ pid_t pid() const { return m_pid; } void setProcessSerialNumber(const ProcessSerialNumber& psn); @@ -514,9 +527,9 @@ FSSpec iconSpec; #else FSRef iconSpec; -diff -Nurd kdelibs-4.3.1/kdeui/windowmanagement/kwindowsystem_mac.cpp kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowsystem_mac.cpp ---- kdelibs-4.3.1/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-07-21 11:16:14.000000000 -0400 -+++ kdelibs-4.3.1-new/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kdeui/windowmanagement/kwindowsystem_mac.cpp kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowsystem_mac.cpp +--- kdelibs-4.3.2/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-07-21 11:16:14.000000000 -0400 ++++ kdelibs-4.3.2-new/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -141,7 +141,7 @@ m_noEmit = false; @@ -553,9 +566,9 @@ // not supported for 'global' windows; only for windows in the current process if (hasWId(winid)) return; -diff -Nurd kdelibs-4.3.1/kimgio/CMakeLists.txt kdelibs-4.3.1-new/kimgio/CMakeLists.txt ---- kdelibs-4.3.1/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000 -0400 -+++ kdelibs-4.3.1-new/kimgio/CMakeLists.txt 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kimgio/CMakeLists.txt kdelibs-4.3.2-new/kimgio/CMakeLists.txt +--- kdelibs-4.3.2/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000 -0400 ++++ kdelibs-4.3.2-new/kimgio/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -96,7 +96,7 @@ add_definitions(${OPENEXR_DEFINITIONS}) set(kimg_exr_LIB_SRCS exr.cpp) @@ -565,9 +578,9 @@ install(TARGETS kimg_exr DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/imageformats/ ) install( FILES exr.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/ ) -diff -Nurd kdelibs-4.3.1/kinit/CMakeLists.txt kdelibs-4.3.1-new/kinit/CMakeLists.txt ---- kdelibs-4.3.1/kinit/CMakeLists.txt 2009-07-21 11:16:06.000000000 -0400 -+++ kdelibs-4.3.1-new/kinit/CMakeLists.txt 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kinit/CMakeLists.txt kdelibs-4.3.2-new/kinit/CMakeLists.txt +--- kdelibs-4.3.2/kinit/CMakeLists.txt 2009-07-21 11:16:06.000000000 -0400 ++++ kdelibs-4.3.2-new/kinit/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -38,13 +38,16 @@ set(kdeinit_LIBS kparts) endif (WIN32) @@ -588,9 +601,9 @@ target_link_libraries(kdeinit4 ${KDE4_KDECORE_LIBS} ${kdeinit_LIBS} ) if (Q_WS_X11) -diff -Nurd kdelibs-4.3.1/kinit/Info.plist.template kdelibs-4.3.1-new/kinit/Info.plist.template ---- kdelibs-4.3.1/kinit/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 -+++ kdelibs-4.3.1-new/kinit/Info.plist.template 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kinit/Info.plist.template kdelibs-4.3.2-new/kinit/Info.plist.template +--- kdelibs-4.3.2/kinit/Info.plist.template 1969-12-31 19:00:00.000000000 -0500 ++++ kdelibs-4.3.2-new/kinit/Info.plist.template 2009-10-09 10:16:45.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"> @@ -628,9 +641,9 @@ + <string>${MACOSX_BUNDLE_COPYRIGHT}</string> +</dict> +</plist> -diff -Nurd kdelibs-4.3.1/kinit/kinit.cpp kdelibs-4.3.1-new/kinit/kinit.cpp ---- kdelibs-4.3.1/kinit/kinit.cpp 2009-08-27 04:19:03.000000000 -0400 -+++ kdelibs-4.3.1-new/kinit/kinit.cpp 2009-09-21 20:16:49.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kinit/kinit.cpp kdelibs-4.3.2-new/kinit/kinit.cpp +--- kdelibs-4.3.2/kinit/kinit.cpp 2009-08-27 04:19:03.000000000 -0400 ++++ kdelibs-4.3.2-new/kinit/kinit.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -70,7 +70,7 @@ #endif #endif @@ -681,9 +694,9 @@ mac_fork_and_reexec_self(); #else if (pipe(d.initpipe) != 0) { -diff -Nurd kdelibs-4.3.1/kio/kfile/kfsprocess.cpp kdelibs-4.3.1-new/kio/kfile/kfsprocess.cpp ---- kdelibs-4.3.1/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000 -0400 -+++ kdelibs-4.3.1-new/kio/kfile/kfsprocess.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kio/kfile/kfsprocess.cpp kdelibs-4.3.2-new/kio/kfile/kfsprocess.cpp +--- kdelibs-4.3.2/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000 -0400 ++++ kdelibs-4.3.2-new/kio/kfile/kfsprocess.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -83,7 +83,7 @@ KfsProcessController::~KfsProcessController() @@ -693,9 +706,9 @@ /* not sure why, but this is causing lockups */ close( m_fd[0] ); close( m_fd[1] ); -diff -Nurd kdelibs-4.3.1/kio/kfile/kpropertiesdialog.cpp kdelibs-4.3.1-new/kio/kfile/kpropertiesdialog.cpp ---- kdelibs-4.3.1/kio/kfile/kpropertiesdialog.cpp 2009-08-27 23:47:22.000000000 -0400 -+++ kdelibs-4.3.1-new/kio/kfile/kpropertiesdialog.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kio/kfile/kpropertiesdialog.cpp kdelibs-4.3.2-new/kio/kfile/kpropertiesdialog.cpp +--- kdelibs-4.3.2/kio/kfile/kpropertiesdialog.cpp 2009-08-27 23:47:22.000000000 -0400 ++++ kdelibs-4.3.2-new/kio/kfile/kpropertiesdialog.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -1799,7 +1799,7 @@ #ifdef Q_OS_UNIX // pick the groups to which the user belongs @@ -705,9 +718,9 @@ QVarLengthArray<int> groups; #else QVarLengthArray<gid_t> groups; -diff -Nurd kdelibs-4.3.1/kpty/kptydevice.cpp kdelibs-4.3.1-new/kpty/kptydevice.cpp ---- kdelibs-4.3.1/kpty/kptydevice.cpp 2009-03-27 10:47:33.000000000 -0400 -+++ kdelibs-4.3.1-new/kpty/kptydevice.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kpty/kptydevice.cpp kdelibs-4.3.2-new/kpty/kptydevice.cpp +--- kdelibs-4.3.2/kpty/kptydevice.cpp 2009-03-27 10:47:33.000000000 -0400 ++++ kdelibs-4.3.2-new/kpty/kptydevice.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -42,7 +42,7 @@ # include <sys/time.h> #endif @@ -717,9 +730,9 @@ // "the other end's output queue size" - kinda braindead, huh? # define PTY_BYTES_AVAILABLE TIOCOUTQ #elif defined(TIOCINQ) -diff -Nurd kdelibs-4.3.1/kross/qts/CMakeLists.txt kdelibs-4.3.1-new/kross/qts/CMakeLists.txt ---- kdelibs-4.3.1/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000 -0500 -+++ kdelibs-4.3.1-new/kross/qts/CMakeLists.txt 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/kross/qts/CMakeLists.txt kdelibs-4.3.2-new/kross/qts/CMakeLists.txt +--- kdelibs-4.3.2/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000 -0500 ++++ kdelibs-4.3.2-new/kross/qts/CMakeLists.txt 2009-10-09 10:16:45.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}) @@ -729,9 +742,9 @@ ########### next target ############### -diff -Nurd kdelibs-4.3.1/solid/solid/CMakeLists.txt kdelibs-4.3.1-new/solid/solid/CMakeLists.txt ---- kdelibs-4.3.1/solid/solid/CMakeLists.txt 2009-06-23 07:16:25.000000000 -0400 -+++ kdelibs-4.3.1-new/solid/solid/CMakeLists.txt 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/solid/solid/CMakeLists.txt kdelibs-4.3.2-new/solid/solid/CMakeLists.txt +--- kdelibs-4.3.2/solid/solid/CMakeLists.txt 2009-06-23 07:16:25.000000000 -0400 ++++ kdelibs-4.3.2-new/solid/solid/CMakeLists.txt 2009-10-09 10:16:45.000000000 -0400 @@ -107,7 +107,7 @@ backends/fakehw/fakesmartcardreader.cpp ) @@ -750,9 +763,9 @@ if(APPLE) find_package(IOKit REQUIRED) -diff -Nurd kdelibs-4.3.1/solid/solid/managerbase.cpp kdelibs-4.3.1-new/solid/solid/managerbase.cpp ---- kdelibs-4.3.1/solid/solid/managerbase.cpp 2009-03-10 08:26:04.000000000 -0400 -+++ kdelibs-4.3.1-new/solid/solid/managerbase.cpp 2009-09-21 20:16:52.000000000 -0400 +diff -Nurd kdelibs-4.3.2/solid/solid/managerbase.cpp kdelibs-4.3.2-new/solid/solid/managerbase.cpp +--- kdelibs-4.3.2/solid/solid/managerbase.cpp 2009-03-10 08:26:04.000000000 -0400 ++++ kdelibs-4.3.2-new/solid/solid/managerbase.cpp 2009-10-09 10:16:45.000000000 -0400 @@ -23,7 +23,8 @@ #include "backends/fakehw/fakemanager.h" Modified: trunk/experimental/common/main/finkinfo/libs/soprano.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/soprano.info&rev=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/libs/soprano.info (original) +++ trunk/experimental/common/main/finkinfo/libs/soprano.info Fri Oct 9 16:19:41 2009 @@ -37,9 +37,12 @@ Source: mirror:sourceforge:soprano/soprano-%v.tar.bz2 Source-MD5: c9a2c008b80cd5d76599e9d48139dfe9 -#PatchFile: soprano.patch -#PatchFile-MD5: 1447c93a237bfa38369081d46d17b0f0 -PatchScript: find . -name CMakeLists.txt | xargs perl -pi -e 's,include/Soprano,include/soprano,g' +PatchFile: soprano.patch +PatchFile-MD5: 1447c93a237bfa38369081d46d17b0f0 +PatchScript: << + %{default_script} + find . -name CMakeLists.txt | xargs perl -pi -e 's,include/Soprano,include/soprano,g' +<< CompileScript: << #!/bin/sh -ev Added: trunk/experimental/common/main/finkinfo/utils/jailkit.info URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/utils/jailkit.info&rev=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/utils/jailkit.info (added) +++ trunk/experimental/common/main/finkinfo/utils/jailkit.info Fri Oct 9 16:19:41 2009 @@ -1,0 +1,47 @@ +Package: jailkit +Version: 2.8 +Revision: 1 +Source: http://olivier.sessink.nl/%n/%n-%v.tar.bz2 +Source-MD5: 3f8b94407b80e0a793f906f054720570 +InstallScript: << + perl -pi -e 's,test -w /etc/shells,false,g' Makefile + make install DESTDIR=%d + rm -rf %i/share/jailkit/*.pyc +<< +PostInstScript: << + if test -w /etc/shells; then + if ! grep -q "%p/sbin/jk_chrootsh" /etc/shells ; then + echo "" + echo "" + echo "you should add %p/sbin/jk_chroots to /etc/shells" + echo "" + echo "" + fi + fi +<< +PreRmScript: << + if grep -q "%p/sbin/jk_chrootsh" /etc/shells ; then + echo "" + echo "" + echo "you should remove %p/sbin/jk_chroots from /etc/shells" + echo "" + echo "" + fi +<< +DocFiles: COPYRIGHT *.txt +Description: Limit user accounts using chroot +DescDetail: << +Jailkit is a set of utilities to limit user accounts to specific files +using chroot() and or specific commands. Setting up a chroot shell, a +shell limited to some specific command, or a daemon inside a chroot +jail is a lot easier and can be automated using these utilities. + +Jailkit is known to be used in network security appliances from several +well known manufacturers, internet servers from several large +enterprise organizations, internet servers from internet service +providers, as well as many smaller companies and private users that +need to secure cvs, sftp, shell or daemon processes. +<< +License: LGPL +Maintainer: Benjamin Reed <jail...@fink.racoonfink.com> +Homepage: http://olivier.sessink.nl/jailkit/ Modified: trunk/experimental/common/main/finkinfo/x11/qt4-x11.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/qt4-x11.info&rev=1639&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/x11/qt4-x11.info (original) +++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.info Fri Oct 9 16:19:41 2009 @@ -55,6 +55,7 @@ BuildDependsOnly: true BuildConflicts: kdelibs3-dev, kdelibs3-ssl-dev, kdelibs3-unified-dev, libevent1, pcre, clucene-core NoSetLDFLAGS: true +SetLDFLAGS: -lglib-2.0 CompileScript: << #!/bin/sh -ev @@ -63,8 +64,8 @@ export CXX=g++ fi if [ -x /usr/bin/gcc-4.2 ]; then - export CC=/usr/bin/gcc-4.2 - export CXX=/usr/bin/g++-4.2 + export CC=gcc-4.2 + export CXX=g++-4.2 if [ -x %p/bin/ccache ]; then export CC="%p/bin/ccache $CC" export CXX="%p/bin/ccache $CXX" ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs