Author: ranger Date: Tue Sep 2 16:15:32 2008 New Revision: 1239 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1239&repname=user%3a+ranger> Log: more updates
Added: trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch trunk/experimental/common/main/finkinfo/kde/amarok2.patch Modified: trunk/experimental/10.4/main/finkinfo/kde/amarok2.info trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch trunk/experimental/common/main/finkinfo/kde/amarok2.info trunk/experimental/common/main/finkinfo/kde/kdelibs4.info trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch trunk/experimental/common/main/finkinfo/libs/dbus.info trunk/experimental/generate-infofiles.pl Modified: trunk/experimental/10.4/main/finkinfo/kde/amarok2.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/amarok2.info&rev=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/amarok2.info (original) +++ trunk/experimental/10.4/main/finkinfo/kde/amarok2.info Tue Sep 2 16:15:32 2008 @@ -7,22 +7,36 @@ License: GPL/LGPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> -Depends: kdelibs4-%type_pkg[kde] (>= %v-1) +Depends: << + dbus (>= 1.2.0-1), + kdebase4-workspace-%type_pkg[kde] (>= 4.1.0-1), + libmp4v21-shlibs, + loudmouth-shlibs, + soprano-%type_pkg[kde]-shlibs, + strigi-shlibs (>= 0.5.9-1), + taglib-shlibs (>= 1.5-1) +<< BuildDepends: << + automoc-%type_pkg[kde], cmake (>= 2.6.1-2), dbus-dev (>= 1.2.0-1), fink (>= 0.26.0-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.5-1), - gettext-tools, - giflib, + glib2-dev (>= 2.14.0-1), kde4-buildenv (>= 4.1-1), - kdelibs4-%type_pkg[kde]-dev (>= %v-1), + kdebase4-workspace-%type_pkg[kde]-dev (>= 4.1.0-1), + kdelibs4-%type_pkg[kde]-dev (>= 4.1.0-1), libgettext3-dev, + libgpod3, + libmp4v21-dev, libxml2, libxslt, + loudmouth, pkgconfig (>= 0.22-3), qt4-%type_pkg[kde] (>= 4.4.0-1), + soprano-%type_pkg[kde]-dev, + strigi-dev (>= 0.5.9-1), taglib (>= 1.5-1), (-%type_pkg[kde] = x11) x11-dev, system-openssl-dev @@ -31,6 +45,7 @@ Source: mirror:kde:unstable/amarok/%v/src/amarok-%v.tar.bz2 Source-MD5: 823fcaea9450110bc9ea9fceba674b4e +Patch: amarok2.patch CompileScript: << #!/bin/sh -ev @@ -38,9 +53,11 @@ export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]" . %p/sbin/kde4-buildenv.sh + touch config.h + mkdir -p build pushd build - cmake $KDE4_CMAKE_ARGS .. + cmake $KDE4_CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug .. make VERBOSE=1 popd << Added: trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch&rev=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch (added) +++ trunk/experimental/10.4/main/finkinfo/kde/amarok2.patch Tue Sep 2 16:15:32 2008 @@ -1,0 +1,23 @@ +diff -Nurd amarok-1.90/src/context/CMakeLists.txt amarok-1.90-new/src/context/CMakeLists.txt +--- amarok-1.90/src/context/CMakeLists.txt 2008-08-19 19:15:17.000000000 -0400 ++++ amarok-1.90-new/src/context/CMakeLists.txt 2008-08-30 22:27:50.000000000 -0400 +@@ -10,6 +10,7 @@ + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + .. + plasma ++ ${OPENGL_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/..) + + +diff -Nurd amarok-1.90/src/metadata/mp4/mp4properties.cpp amarok-1.90-new/src/metadata/mp4/mp4properties.cpp +--- amarok-1.90/src/metadata/mp4/mp4properties.cpp 2008-08-19 19:15:18.000000000 -0400 ++++ amarok-1.90-new/src/metadata/mp4/mp4properties.cpp 2008-08-30 22:24:38.000000000 -0400 +@@ -19,6 +19,8 @@ + * MA 02110-1301 USA * + ***************************************************************************/ + ++#define HAVE_INTTYPES_H 1 ++ + #include "mp4properties.h" + + 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=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info (original) +++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.info Tue Sep 2 16:15:32 2008 @@ -52,7 +52,7 @@ Source-MD5: d75ec557cd864e3f9150059c3e58ed61 SourceDirectory: kdelibs-%v PatchFile: kdelibs4.patch -PatchFile-MD5: 0fb00a6117089451c3808f95c09c558a +PatchFile-MD5: dfa16925f5d6cb938a63030eed88f0b2 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=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch (original) +++ trunk/experimental/10.4/main/finkinfo/kde/kdelibs4.patch Tue Sep 2 16:15:32 2008 @@ -1,6 +1,157 @@ -diff -Nurd kdelibs-4.1.0/solid/solid/CMakeLists.txt kdelibs-4.1.0-new/solid/solid/CMakeLists.txt ---- kdelibs-4.1.0/solid/solid/CMakeLists.txt 2008-07-03 01:06:26.000000000 -0400 -+++ kdelibs-4.1.0-new/solid/solid/CMakeLists.txt 2008-08-28 14:24:01.000000000 -0400 +diff -Nurd kdelibs-4.1.1/kde3support/kdecore/k3processcontroller.cpp kdelibs-4.1.1-new/kde3support/kdecore/k3processcontroller.cpp +--- kdelibs-4.1.1/kde3support/kdecore/k3processcontroller.cpp 2008-05-21 07:06:17.000000000 -0400 ++++ kdelibs-4.1.1-new/kde3support/kdecore/k3processcontroller.cpp 2008-09-02 08:20:40.000000000 -0400 +@@ -114,7 +114,7 @@ + + K3ProcessController::~K3ProcessController() + { +-#ifndef Q_OS_MAC ++#if !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC) + /* not sure why, but this is causing lockups */ + close( d->fd[0] ); + close( d->fd[1] ); +diff -Nurd kdelibs-4.1.1/kdecore/kernel/kkernel_mac.cpp kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.cpp +--- kdelibs-4.1.1/kdecore/kernel/kkernel_mac.cpp 2008-07-03 01:06:28.000000000 -0400 ++++ kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.cpp 2008-09-02 08:20:28.000000000 -0400 +@@ -22,7 +22,7 @@ + + #include "kkernel_mac.h" + +-#ifdef Q_OS_MACX ++#if (defined (Q_OS_DARWIN) || defined (Q_OS_MAC)) + + #include <unistd.h> + #include <string.h> +diff -Nurd kdelibs-4.1.1/kdecore/kernel/kkernel_mac.h kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.h +--- kdelibs-4.1.1/kdecore/kernel/kkernel_mac.h 2008-05-29 07:20:12.000000000 -0400 ++++ kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.h 2008-09-02 08:20:58.000000000 -0400 +@@ -19,7 +19,7 @@ + #ifndef KKERNEL_MAC_H + #define KKERNEL_MAC_H + +-#ifdef Q_OS_MACX ++#if (defined (Q_OS_DARWIN) || defined (Q_OS_MAC)) + + #include <kdecore_export.h> + #include <QtCore/QString> +@@ -49,5 +49,5 @@ + */ + KDECORE_EXPORT QString mac_app_filename(); + +-#endif // Q_OS_MACX ++#endif // MAC + #endif // KKERNEL_MAC_H +diff -Nurd kdelibs-4.1.1/kdecore/tests/kconfigtest.cpp kdelibs-4.1.1-new/kdecore/tests/kconfigtest.cpp +--- kdelibs-4.1.1/kdecore/tests/kconfigtest.cpp 2008-06-25 03:57:24.000000000 -0400 ++++ kdelibs-4.1.1-new/kdecore/tests/kconfigtest.cpp 2008-09-02 08:21:14.000000000 -0400 +@@ -411,7 +411,7 @@ + QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") + HOMEPATH ); + QVERIFY(group.hasKey("URL")); + QCOMPARE(group.readEntry("URL", QString()), QString("file://") + HOMEPATH ); +-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC) ++#if !defined(Q_OS_WIN32) && !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC) + // I don't know if this will work on windows + // This test hangs on OS X + QVERIFY(group.hasKey("hostname")); +diff -Nurd kdelibs-4.1.1/kdeui/kernel/kapplication.cpp kdelibs-4.1.1-new/kdeui/kernel/kapplication.cpp +--- kdelibs-4.1.1/kdeui/kernel/kapplication.cpp 2008-08-28 04:08:15.000000000 -0400 ++++ kdelibs-4.1.1-new/kdeui/kernel/kapplication.cpp 2008-09-02 09:30:24.000000000 -0400 +@@ -101,6 +101,9 @@ + #include <Carbon/Carbon.h> + #include <QImage> + #include <ksystemtrayicon.h> ++#endif ++ ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + #include <kkernel_mac.h> + #endif + +@@ -476,7 +479,7 @@ + ::exit(127); + } + +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + mac_initialize_dbus(); + #endif + +diff -Nurd kdelibs-4.1.1/kdeui/kernel/kuniqueapplication.cpp kdelibs-4.1.1-new/kdeui/kernel/kuniqueapplication.cpp +--- kdelibs-4.1.1/kdeui/kernel/kuniqueapplication.cpp 2008-07-08 05:54:19.000000000 -0400 ++++ kdelibs-4.1.1-new/kdeui/kernel/kuniqueapplication.cpp 2008-09-02 09:31:31.000000000 -0400 +@@ -65,7 +65,7 @@ + # endif + #endif + +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + #include <kkernel_mac.h> + #endif + +@@ -141,7 +141,7 @@ + appName.prepend(s); + } + +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + mac_initialize_dbus(); + #endif + +@@ -184,8 +184,8 @@ + // We'll call newInstance in the constructor. Do nothing here. + return true; + +-#ifdef Q_WS_MACX +- } else { ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) ++} else { + mac_fork_and_reexec_self(); + #endif + +diff -Nurd kdelibs-4.1.1/kinit/kinit.cpp kdelibs-4.1.1-new/kinit/kinit.cpp +--- kdelibs-4.1.1/kinit/kinit.cpp 2008-07-08 05:54:17.000000000 -0400 ++++ kdelibs-4.1.1-new/kinit/kinit.cpp 2008-09-02 09:33:38.000000000 -0400 +@@ -68,7 +68,7 @@ + #endif + #endif + +-#ifdef Q_WS_MACX ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + #include <kkernel_mac.h> + #endif + +@@ -578,7 +578,7 @@ + QByteArray procTitle; + d.argv = (char **) malloc(sizeof(char *) * (argc+1)); + d.argv[0] = (char *) _name; +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0])); + if (!argvexe.isEmpty()) { + QByteArray cstr = argvexe.toLocal8Bit(); +@@ -1772,7 +1772,7 @@ + cleanup_fds(); + + if (do_fork) { +-#ifdef Q_WS_MACX ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + mac_fork_and_reexec_self(); + #else + pipe(d.initpipe); +diff -Nurd kdelibs-4.1.1/kio/kfile/kfsprocess.cpp kdelibs-4.1.1-new/kio/kfile/kfsprocess.cpp +--- kdelibs-4.1.1/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000 -0400 ++++ kdelibs-4.1.1-new/kio/kfile/kfsprocess.cpp 2008-09-02 08:21:32.000000000 -0400 +@@ -83,7 +83,7 @@ + + KfsProcessController::~KfsProcessController() + { +-#ifndef Q_OS_MAC ++#if (!defined (Q_OS_DARWIN) && !defined (Q_OS_MAC)) + /* not sure why, but this is causing lockups */ + close( m_fd[0] ); + close( m_fd[1] ); +diff -Nurd kdelibs-4.1.1/solid/solid/CMakeLists.txt kdelibs-4.1.1-new/solid/solid/CMakeLists.txt +--- kdelibs-4.1.1/solid/solid/CMakeLists.txt 2008-07-03 01:06:26.000000000 -0400 ++++ kdelibs-4.1.1-new/solid/solid/CMakeLists.txt 2008-09-02 08:18:53.000000000 -0400 @@ -102,7 +102,7 @@ backends/fakehw/fakevolume.cpp ) @@ -19,9 +170,9 @@ # TODO: mingw if(MSVC) -diff -Nurd kdelibs-4.1.0/solid/solid/managerbase.cpp kdelibs-4.1.0-new/solid/solid/managerbase.cpp ---- kdelibs-4.1.0/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000 -0400 -+++ kdelibs-4.1.0-new/solid/solid/managerbase.cpp 2008-08-28 14:24:35.000000000 -0400 +diff -Nurd kdelibs-4.1.1/solid/solid/managerbase.cpp kdelibs-4.1.1-new/solid/solid/managerbase.cpp +--- kdelibs-4.1.1/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000 -0400 ++++ kdelibs-4.1.1-new/solid/solid/managerbase.cpp 2008-09-02 08:18:53.000000000 -0400 @@ -23,7 +23,8 @@ #include "backends/fakehw/fakemanager.h" Modified: trunk/experimental/common/main/finkinfo/kde/amarok2.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/amarok2.info&rev=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/amarok2.info (original) +++ trunk/experimental/common/main/finkinfo/kde/amarok2.info Tue Sep 2 16:15:32 2008 @@ -13,33 +13,55 @@ looks good doing it. << +Source: mirror:kde:unstable/amarok/%v/src/amarok-%v.tar.bz2 +Source-MD5: 823fcaea9450110bc9ea9fceba674b4e +Patch: amarok2.patch + # %N-shlibs (= %v-%r), Depends: << - kdelibs4-%type_pkg[kde] (>= %v-1) + dbus (>= 1.2.0-1), + kdebase4-workspace-%type_pkg[kde] (>= 4.1.0-1), + libmp4v21-shlibs, + loudmouth-shlibs, + soprano-%type_pkg[kde]-shlibs, + strigi-shlibs (>= 0.5.9-1), + taglib-shlibs (>= 1.5-1) << + +# TODO: +# Gdk, 2.0.x: Support for artwork on iPod audio devices via GdkPixbuf <http://developer.gnome.org/arch/imaging/gdkpixbuf.html> +# libgpod, 0.6.0: Support Apple iPod audio devices <http://sourceforge.net/projects/gtkpod/> +# mysql, 4.1.0: Store Collection in a mysql database instead of a sqlite one <http://www.mysql.com> +# libmtp, 0.3.0: Enable Support for portable media devices that use the media transfer protocol <http://libmtp.sourceforge.net/> +# loudmouth: Loudmouth is the communication backend needed by mp3tunes for synching. <http://www.loudmouth-project.org> +# kdemultimedia, 4.0: Support for playing audio cds <http://www.kde.org> + BuildDepends: << + automoc-%type_pkg[kde], cmake (>= 2.6.1-2), dbus-dev (>= 1.2.0-1), fink (>= 0.28.0-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.5-1), - gettext-tools, - giflib, + glib2-dev (>= 2.14.0-1), kde4-buildenv (>= 4.1-1), - kdelibs4-%type_pkg[kde]-dev (>= %v-1), + kdebase4-workspace-%type_pkg[kde]-dev (>= 4.1.0-1), + kdelibs4-%type_pkg[kde]-dev (>= 4.1.0-1), libgettext3-dev, + libgpod3, + libmp4v21-dev, libxml2, libxslt, + loudmouth, pkgconfig (>= 0.22-3), qt4-%type_pkg[kde] (>= 4.4.0-1), + soprano-%type_pkg[kde]-dev, + strigi-dev (>= 0.5.9-1), taglib (>= 1.5-1), (-%type_pkg[kde] = x11) x11-dev, system-openssl-dev << GCC: 4.0 - -Source: mirror:kde:unstable/amarok/%v/src/amarok-%v.tar.bz2 -Source-MD5: 823fcaea9450110bc9ea9fceba674b4e CompileScript: << #!/bin/sh -ev @@ -47,9 +69,11 @@ export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]" . %p/sbin/kde4-buildenv.sh + touch config.h + mkdir -p build pushd build - cmake $KDE4_CMAKE_ARGS .. + cmake $KDE4_CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug .. make VERBOSE=1 popd << Added: trunk/experimental/common/main/finkinfo/kde/amarok2.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/kde/amarok2.patch&rev=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/amarok2.patch (added) +++ trunk/experimental/common/main/finkinfo/kde/amarok2.patch Tue Sep 2 16:15:32 2008 @@ -1,0 +1,35 @@ +diff -Nurd amarok-1.90/src/context/CMakeLists.txt amarok-1.90-new/src/context/CMakeLists.txt +--- amarok-1.90/src/context/CMakeLists.txt 2008-08-19 19:15:17.000000000 -0400 ++++ amarok-1.90-new/src/context/CMakeLists.txt 2008-08-30 22:27:50.000000000 -0400 +@@ -10,6 +10,7 @@ + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + .. + plasma ++ ${OPENGL_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/..) + + +diff -Nurd amarok-1.90/src/metadata/mp4/mp4properties.cpp amarok-1.90-new/src/metadata/mp4/mp4properties.cpp +--- amarok-1.90/src/metadata/mp4/mp4properties.cpp 2008-08-19 19:15:18.000000000 -0400 ++++ amarok-1.90-new/src/metadata/mp4/mp4properties.cpp 2008-08-30 22:24:38.000000000 -0400 +@@ -19,6 +19,8 @@ + * MA 02110-1301 USA * + ***************************************************************************/ + ++#define HAVE_INTTYPES_H 1 ++ + #include "mp4properties.h" + + +diff -Nurd amarok-1.90/src/metadata/wav/wavproperties.cpp amarok-1.90-new/src/metadata/wav/wavproperties.cpp +--- amarok-1.90/src/metadata/wav/wavproperties.cpp 2008-08-19 19:15:19.000000000 -0400 ++++ amarok-1.90-new/src/metadata/wav/wavproperties.cpp 2008-08-31 08:07:10.000000000 -0400 +@@ -103,5 +103,7 @@ + m_channels = ntohs(swap16(header.num_channels)); + m_sampleRate = ntohl(swap32(header.num_samples_per_sec)); + m_bitrate = ntohl(swap32(header.num_avg_bytes_per_sec)) * 8 / 1000; +- m_length = ntohl(swap32(header.num_data_bytes))/ntohl(swap32(header.num_avg_bytes_per_sec)); ++ if (header.num_avg_bytes_per_sec > 0) { ++ m_length = ntohl(swap32(header.num_data_bytes))/ntohl(swap32(header.num_avg_bytes_per_sec)); ++ } + } 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=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/kdelibs4.info (original) +++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.info Tue Sep 2 16:15:32 2008 @@ -52,7 +52,7 @@ Source-MD5: d75ec557cd864e3f9150059c3e58ed61 SourceDirectory: kdelibs-%v PatchFile: kdelibs4.patch -PatchFile-MD5: 0fb00a6117089451c3808f95c09c558a +PatchFile-MD5: dfa16925f5d6cb938a63030eed88f0b2 CompileScript: << #!/bin/sh -ev 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=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch (original) +++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch Tue Sep 2 16:15:32 2008 @@ -1,6 +1,157 @@ -diff -Nurd kdelibs-4.1.0/solid/solid/CMakeLists.txt kdelibs-4.1.0-new/solid/solid/CMakeLists.txt ---- kdelibs-4.1.0/solid/solid/CMakeLists.txt 2008-07-03 01:06:26.000000000 -0400 -+++ kdelibs-4.1.0-new/solid/solid/CMakeLists.txt 2008-08-28 14:24:01.000000000 -0400 +diff -Nurd kdelibs-4.1.1/kde3support/kdecore/k3processcontroller.cpp kdelibs-4.1.1-new/kde3support/kdecore/k3processcontroller.cpp +--- kdelibs-4.1.1/kde3support/kdecore/k3processcontroller.cpp 2008-05-21 07:06:17.000000000 -0400 ++++ kdelibs-4.1.1-new/kde3support/kdecore/k3processcontroller.cpp 2008-09-02 08:20:40.000000000 -0400 +@@ -114,7 +114,7 @@ + + K3ProcessController::~K3ProcessController() + { +-#ifndef Q_OS_MAC ++#if !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC) + /* not sure why, but this is causing lockups */ + close( d->fd[0] ); + close( d->fd[1] ); +diff -Nurd kdelibs-4.1.1/kdecore/kernel/kkernel_mac.cpp kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.cpp +--- kdelibs-4.1.1/kdecore/kernel/kkernel_mac.cpp 2008-07-03 01:06:28.000000000 -0400 ++++ kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.cpp 2008-09-02 08:20:28.000000000 -0400 +@@ -22,7 +22,7 @@ + + #include "kkernel_mac.h" + +-#ifdef Q_OS_MACX ++#if (defined (Q_OS_DARWIN) || defined (Q_OS_MAC)) + + #include <unistd.h> + #include <string.h> +diff -Nurd kdelibs-4.1.1/kdecore/kernel/kkernel_mac.h kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.h +--- kdelibs-4.1.1/kdecore/kernel/kkernel_mac.h 2008-05-29 07:20:12.000000000 -0400 ++++ kdelibs-4.1.1-new/kdecore/kernel/kkernel_mac.h 2008-09-02 08:20:58.000000000 -0400 +@@ -19,7 +19,7 @@ + #ifndef KKERNEL_MAC_H + #define KKERNEL_MAC_H + +-#ifdef Q_OS_MACX ++#if (defined (Q_OS_DARWIN) || defined (Q_OS_MAC)) + + #include <kdecore_export.h> + #include <QtCore/QString> +@@ -49,5 +49,5 @@ + */ + KDECORE_EXPORT QString mac_app_filename(); + +-#endif // Q_OS_MACX ++#endif // MAC + #endif // KKERNEL_MAC_H +diff -Nurd kdelibs-4.1.1/kdecore/tests/kconfigtest.cpp kdelibs-4.1.1-new/kdecore/tests/kconfigtest.cpp +--- kdelibs-4.1.1/kdecore/tests/kconfigtest.cpp 2008-06-25 03:57:24.000000000 -0400 ++++ kdelibs-4.1.1-new/kdecore/tests/kconfigtest.cpp 2008-09-02 08:21:14.000000000 -0400 +@@ -411,7 +411,7 @@ + QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") + HOMEPATH ); + QVERIFY(group.hasKey("URL")); + QCOMPARE(group.readEntry("URL", QString()), QString("file://") + HOMEPATH ); +-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC) ++#if !defined(Q_OS_WIN32) && !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC) + // I don't know if this will work on windows + // This test hangs on OS X + QVERIFY(group.hasKey("hostname")); +diff -Nurd kdelibs-4.1.1/kdeui/kernel/kapplication.cpp kdelibs-4.1.1-new/kdeui/kernel/kapplication.cpp +--- kdelibs-4.1.1/kdeui/kernel/kapplication.cpp 2008-08-28 04:08:15.000000000 -0400 ++++ kdelibs-4.1.1-new/kdeui/kernel/kapplication.cpp 2008-09-02 09:30:24.000000000 -0400 +@@ -101,6 +101,9 @@ + #include <Carbon/Carbon.h> + #include <QImage> + #include <ksystemtrayicon.h> ++#endif ++ ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + #include <kkernel_mac.h> + #endif + +@@ -476,7 +479,7 @@ + ::exit(127); + } + +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + mac_initialize_dbus(); + #endif + +diff -Nurd kdelibs-4.1.1/kdeui/kernel/kuniqueapplication.cpp kdelibs-4.1.1-new/kdeui/kernel/kuniqueapplication.cpp +--- kdelibs-4.1.1/kdeui/kernel/kuniqueapplication.cpp 2008-07-08 05:54:19.000000000 -0400 ++++ kdelibs-4.1.1-new/kdeui/kernel/kuniqueapplication.cpp 2008-09-02 09:31:31.000000000 -0400 +@@ -65,7 +65,7 @@ + # endif + #endif + +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + #include <kkernel_mac.h> + #endif + +@@ -141,7 +141,7 @@ + appName.prepend(s); + } + +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + mac_initialize_dbus(); + #endif + +@@ -184,8 +184,8 @@ + // We'll call newInstance in the constructor. Do nothing here. + return true; + +-#ifdef Q_WS_MACX +- } else { ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) ++} else { + mac_fork_and_reexec_self(); + #endif + +diff -Nurd kdelibs-4.1.1/kinit/kinit.cpp kdelibs-4.1.1-new/kinit/kinit.cpp +--- kdelibs-4.1.1/kinit/kinit.cpp 2008-07-08 05:54:17.000000000 -0400 ++++ kdelibs-4.1.1-new/kinit/kinit.cpp 2008-09-02 09:33:38.000000000 -0400 +@@ -68,7 +68,7 @@ + #endif + #endif + +-#ifdef Q_WS_MACX ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + #include <kkernel_mac.h> + #endif + +@@ -578,7 +578,7 @@ + QByteArray procTitle; + d.argv = (char **) malloc(sizeof(char *) * (argc+1)); + d.argv[0] = (char *) _name; +-#ifdef Q_WS_MAC ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0])); + if (!argvexe.isEmpty()) { + QByteArray cstr = argvexe.toLocal8Bit(); +@@ -1772,7 +1772,7 @@ + cleanup_fds(); + + if (do_fork) { +-#ifdef Q_WS_MACX ++#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC) + mac_fork_and_reexec_self(); + #else + pipe(d.initpipe); +diff -Nurd kdelibs-4.1.1/kio/kfile/kfsprocess.cpp kdelibs-4.1.1-new/kio/kfile/kfsprocess.cpp +--- kdelibs-4.1.1/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000 -0400 ++++ kdelibs-4.1.1-new/kio/kfile/kfsprocess.cpp 2008-09-02 08:21:32.000000000 -0400 +@@ -83,7 +83,7 @@ + + KfsProcessController::~KfsProcessController() + { +-#ifndef Q_OS_MAC ++#if (!defined (Q_OS_DARWIN) && !defined (Q_OS_MAC)) + /* not sure why, but this is causing lockups */ + close( m_fd[0] ); + close( m_fd[1] ); +diff -Nurd kdelibs-4.1.1/solid/solid/CMakeLists.txt kdelibs-4.1.1-new/solid/solid/CMakeLists.txt +--- kdelibs-4.1.1/solid/solid/CMakeLists.txt 2008-07-03 01:06:26.000000000 -0400 ++++ kdelibs-4.1.1-new/solid/solid/CMakeLists.txt 2008-09-02 08:18:53.000000000 -0400 @@ -102,7 +102,7 @@ backends/fakehw/fakevolume.cpp ) @@ -19,9 +170,9 @@ # TODO: mingw if(MSVC) -diff -Nurd kdelibs-4.1.0/solid/solid/managerbase.cpp kdelibs-4.1.0-new/solid/solid/managerbase.cpp ---- kdelibs-4.1.0/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000 -0400 -+++ kdelibs-4.1.0-new/solid/solid/managerbase.cpp 2008-08-28 14:24:35.000000000 -0400 +diff -Nurd kdelibs-4.1.1/solid/solid/managerbase.cpp kdelibs-4.1.1-new/solid/solid/managerbase.cpp +--- kdelibs-4.1.1/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000 -0400 ++++ kdelibs-4.1.1-new/solid/solid/managerbase.cpp 2008-09-02 08:18:53.000000000 -0400 @@ -23,7 +23,8 @@ #include "backends/fakehw/fakemanager.h" Modified: trunk/experimental/common/main/finkinfo/libs/dbus.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/dbus.info&rev=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/libs/dbus.info (original) +++ trunk/experimental/common/main/finkinfo/libs/dbus.info Tue Sep 2 16:15:32 2008 @@ -1,25 +1,24 @@ Package: dbus Version: 1.2.3 -Revision: 1 +Revision: 3 Description: Message bus system for applications License: OSI-Approved # dual license: Academic Free License, GPL2 Maintainer: Benjamin Reed <[EMAIL PROTECTED]> +#BuildConflicts: dbus-dev BuildDepends: << expat1, gettext-tools, glib2-dev (>= 2.12.0-1), libgettext3-dev, libiconv-dev, - pkgconfig (>= 0.22-1), - x11-dev + pkgconfig (>= 0.22-1) << Depends: << %N-shlibs (>= %v-%r), daemonic, - expat1-shlibs, - x11-shlibs + expat1-shlibs << Source: http://%n.freedesktop.org/releases/%n/%n-%v.tar.gz @@ -45,7 +44,7 @@ --disable-xml-docs \ --disable-doxygen-docs \ --disable-dependency-tracking \ - --with-x + --without-x << CompileScript: << @@ -68,7 +67,7 @@ # D-Bus GLib bindings pushd dbus-glib* PKG_CONFIG_PATH="%b/tmproot%p/lib/pkgconfig" ./configure %c - DYLD_LIBRARY_PATH="%b/tmproot%p/lib:$DYLD_LIBRARY_PATH" make DBUS_CFLAGS="-I%b/tmproot%p/include/dbus-1.0 -I%b/tmproot%p/lib/dbus-1.0/include" DBUS_LIBS="-L%b/tmproot%p/lib -ldbus-1" + DYLD_LIBRARY_PATH="%b/tmproot%p/lib:$DYLD_LIBRARY_PATH" make DBUS_CFLAGS="-I%b/tmproot%p/include/dbus-1.0 -I%b/tmproot%p/lib/dbus-1.0/include" DBUS_LIBS="%b/dbus/libdbus-1.la" popd << Modified: trunk/experimental/generate-infofiles.pl URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1239&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/generate-infofiles.pl (original) +++ trunk/experimental/generate-infofiles.pl Tue Sep 2 16:15:32 2008 @@ -32,6 +32,7 @@ '.*-pm.info$', 'akode', 'amanith-py', + 'amarok', 'apt', 'blitz', 'boson', ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs