Author: ranger
Date: Tue Nov 25 06:02:28 2008
New Revision: 1298
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1298&repname=user%3a+ranger>
Log:
more kde/qt updates
Modified:
trunk/experimental/10.4/main/finkinfo/libs/soprano.info
trunk/experimental/10.4/main/finkinfo/libs/soprano.patch
trunk/experimental/common/main/finkinfo/kde/kdelibs4.info
trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch
trunk/experimental/common/main/finkinfo/libs/phonon.info
trunk/experimental/common/main/finkinfo/libs/phonon.patch
trunk/experimental/common/main/finkinfo/libs/soprano.info
trunk/experimental/common/main/finkinfo/libs/soprano.patch
trunk/experimental/common/main/finkinfo/x11/qt4-x11.info
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=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/soprano.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/soprano.info Tue Nov 25 06:02:28
2008
@@ -22,7 +22,7 @@
libxslt,
pcre (>= 7.6-1),
pkgconfig (>= 0.22-3),
- redland-dev,
+ redland-dev (>= 1.0.5-1),
sqlite3-dev,
system-openssl-dev,
qt4-%type_pkg[soprano] (>= 4.4.0-1)
@@ -66,7 +66,7 @@
clucene-core-shlibs (>= 0.9.20-1),
dbus-shlibs (>= 1.2.0-1),
librasqal-shlibs (>= 0.9.15-1),
- redland-shlibs,
+ redland-shlibs (>= 1.0.5-1),
qt4-%type_pkg[soprano]-core-shlibs (>= 4.4.0-1)
<<
Recommends: %N (>= %v-%r)
@@ -78,10 +78,10 @@
lib/%type_pkg[soprano]/lib/libsopranoserver.1*.dylib
<<
Shlibs: <<
- %p/lib/%type_pkg[soprano]/lib/libsoprano.4.dylib 0.0.0 %n
(>= 1.95.0-1)
- %p/lib/%type_pkg[soprano]/lib/libsopranoclient.1.dylib 0.0.0 %n
(>= 1.95.0-1)
- %p/lib/%type_pkg[soprano]/lib/libsopranoindex.1.dylib 0.0.0 %n
(>= 1.95.0-1)
- %p/lib/%type_pkg[soprano]/lib/libsopranoserver.1.dylib 0.0.0 %n
(>= 1.95.0-1)
+ %p/lib/%type_pkg[soprano]/lib/libsoprano.4.dylib 4.0.0 %n
(>= 2.1.1-1)
+ %p/lib/%type_pkg[soprano]/lib/libsopranoclient.1.dylib 1.0.0 %n
(>= 2.1.1-1)
+ %p/lib/%type_pkg[soprano]/lib/libsopranoindex.1.dylib 1.0.0 %n
(>= 2.1.1-1)
+ %p/lib/%type_pkg[soprano]/lib/libsopranoserver.1.dylib 1.0.0 %n
(>= 2.1.1-1)
<<
<<
SplitOff2: <<
Modified: trunk/experimental/10.4/main/finkinfo/libs/soprano.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/soprano.patch&rev=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/soprano.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/soprano.patch Tue Nov 25
06:02:28 2008
@@ -1,7 +1,7 @@
-
---- soprano-1.95.0-beta2/backends/redland/CMakeLists.txt 2007-10-09
10:48:28.000000000 -0400
-+++ soprano-1.95.0-beta2-new/backends/redland/CMakeLists.txt 2007-10-10
22:47:22.000000000 -0400
-@@ -36,7 +36,7 @@
+diff -Nurd soprano-2.1.1/backends/redland/CMakeLists.txt
soprano-2.1.1-new/backends/redland/CMakeLists.txt
+--- soprano-2.1.1/backends/redland/CMakeLists.txt 2008-03-21
13:33:44.000000000 -0400
++++ soprano-2.1.1-new/backends/redland/CMakeLists.txt 2008-11-24
14:34:36.000000000 -0500
+@@ -33,7 +33,7 @@
add_library(soprano_redlandcore STATIC ${redland_core_SRC})
@@ -10,9 +10,22 @@
ADD_DEFINITIONS(${REDLAND_CFLAGS})
---- soprano-1.95.0-beta2/parsers/raptor/CMakeLists.txt 2007-10-09
10:48:15.000000000 -0400
-+++ soprano-1.95.0-beta2-new/parsers/raptor/CMakeLists.txt 2007-10-10
22:47:08.000000000 -0400
-@@ -21,7 +21,7 @@
+diff -Nurd soprano-2.1.1/parsers/nquads/CMakeLists.txt
soprano-2.1.1-new/parsers/nquads/CMakeLists.txt
+--- soprano-2.1.1/parsers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
++++ soprano-2.1.1-new/parsers/nquads/CMakeLists.txt 2008-11-24
14:35:30.000000000 -0500
+@@ -13,7 +13,7 @@
+
+ qt4_automoc(${nquadparser_SRC})
+
+-add_library(soprano_nquadparser SHARED ${nquadparser_SRC})
++add_library(soprano_nquadparser MODULE ${nquadparser_SRC})
+
+ TARGET_LINK_LIBRARIES(soprano_nquadparser soprano)
+
+diff -Nurd soprano-2.1.1/parsers/raptor/CMakeLists.txt
soprano-2.1.1-new/parsers/raptor/CMakeLists.txt
+--- soprano-2.1.1/parsers/raptor/CMakeLists.txt 2007-10-15
14:23:31.000000000 -0400
++++ soprano-2.1.1-new/parsers/raptor/CMakeLists.txt 2008-11-24
14:34:36.000000000 -0500
+@@ -17,7 +17,7 @@
qt4_automoc(${raptor_parser_SRC})
@@ -21,9 +34,22 @@
TARGET_LINK_LIBRARIES(soprano_raptorparser soprano ${RAPTOR_LIBRARIES})
---- soprano-1.95.0-beta2/serializers/raptor/CMakeLists.txt 2007-10-09
10:48:22.000000000 -0400
-+++ soprano-1.95.0-beta2-new/serializers/raptor/CMakeLists.txt 2007-10-10
22:46:53.000000000 -0400
-@@ -16,7 +16,7 @@
+diff -Nurd soprano-2.1.1/serializers/nquads/CMakeLists.txt
soprano-2.1.1-new/serializers/nquads/CMakeLists.txt
+--- soprano-2.1.1/serializers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
++++ soprano-2.1.1-new/serializers/nquads/CMakeLists.txt 2008-11-24
14:35:56.000000000 -0500
+@@ -13,7 +13,7 @@
+
+ qt4_automoc(${nquadserializer_SRC})
+
+-add_library(soprano_nquadserializer SHARED ${nquadserializer_SRC})
++add_library(soprano_nquadserializer MODULE ${nquadserializer_SRC})
+
+ TARGET_LINK_LIBRARIES(soprano_nquadserializer soprano)
+
+diff -Nurd soprano-2.1.1/serializers/raptor/CMakeLists.txt
soprano-2.1.1-new/serializers/raptor/CMakeLists.txt
+--- soprano-2.1.1/serializers/raptor/CMakeLists.txt 2008-07-10
03:41:35.000000000 -0400
++++ soprano-2.1.1-new/serializers/raptor/CMakeLists.txt 2008-11-24
14:34:36.000000000 -0500
+@@ -25,7 +25,7 @@
qt4_automoc(${raptor_serializer_SRC})
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=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.info Tue Nov 25
06:02:28 2008
@@ -1,6 +1,6 @@
Info2: <<
Package: kdelibs4-%type_pkg[kde]
-Version: 4.1.1
+Version: 4.1.80
Revision: 1
Type: kde (x11 mac)
Description: KDE4 - essential libraries
@@ -48,11 +48,11 @@
<<
GCC: 4.0
-Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
-Source-MD5: d75ec557cd864e3f9150059c3e58ed61
+Source: mirror:kde:unstable/%v/src/kdelibs-%v.tar.bz2
+Source-MD5: b92f4f58bd3143384a12fece88bd4da1
SourceDirectory: kdelibs-%v
PatchFile: kdelibs4.patch
-PatchFile-MD5: bbfad25f70e6c97d2f85883dc3055df3
+PatchFile-MD5: 0cb53817d571464a6777cdcd7894bf52
CompileScript: <<
#!/bin/sh -ev
@@ -73,8 +73,6 @@
pushd build
make -j1 install DESTDIR="%d"
popd
-
- sudo install_name_tool -id
"%p/lib/kde4-%type_pkg[kde]/lib/kde4/plugins/script/libkrossqtsplugin.4.dylib"
"%i/lib/kde4-%type_pkg[kde]/lib/kde4/plugins/script/libkrossqtsplugin.4.1.0.dylib"
mv %i/lib/kde4-%type_pkg[kde]/etc %i/etc
mv %i/etc/xdg/menus/applications.menu
%i/etc/xdg/menus/kde4-%type_pkg[kde]-applications.menu
@@ -148,6 +146,7 @@
lib/kde4-%type_pkg[kde]/lib/libkdeui.5*.dylib
lib/kde4-%type_pkg[kde]/lib/libkdnssd.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkfile.4*.dylib
+ lib/kde4-%type_pkg[kde]/lib/libkformula.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkhtml.5*.dylib
lib/kde4-%type_pkg[kde]/lib/libkimproxy.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkio.5*.dylib
@@ -161,12 +160,13 @@
lib/kde4-%type_pkg[kde]/lib/libkparts.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkpty.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkrosscore.4*.dylib
+ lib/kde4-%type_pkg[kde]/lib/libkrossqtsplugin.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkrossui.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libktexteditor.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkunittest.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libkutils.4*.dylib
- lib/kde4-%type_pkg[kde]/lib/libkwalletbackend.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libnepomuk.4*.dylib
+ lib/kde4-%type_pkg[kde]/lib/libplasma.3*.dylib
lib/kde4-%type_pkg[kde]/lib/libsolid.4*.dylib
lib/kde4-%type_pkg[kde]/lib/libthreadweaver.4*.dylib
<<
@@ -178,6 +178,7 @@
%p/lib/kde4-%type_pkg[kde]/lib/libkdeui.5.dylib
5.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkdnssd.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkfile.4.dylib
4.0.0 %n (>= 4.1.0-1)
+ %p/lib/kde4-%type_pkg[kde]/lib/libkformula.4.dylib
4.0.0 %n (>= 4.2.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkhtml.5.dylib
5.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkimproxy.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkio.5.dylib
5.0.0 %n (>= 4.1.0-1)
@@ -191,15 +192,15 @@
%p/lib/kde4-%type_pkg[kde]/lib/libkparts.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkpty.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkrosscore.4.dylib
4.0.0 %n (>= 4.1.0-1)
+ %p/lib/kde4-%type_pkg[kde]/lib/libkrossqtsplugin.4.dylib
4.0.0 %n (>= 4.2.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkrossui.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libktexteditor.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkunittest.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libkutils.4.dylib
4.0.0 %n (>= 4.1.0-1)
- %p/lib/kde4-%type_pkg[kde]/lib/libkwalletbackend.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libnepomuk.4.dylib
4.0.0 %n (>= 4.1.0-1)
+ %p/lib/kde4-%type_pkg[kde]/lib/libplasma.3.dylib
3.0.0 %n (>= 4.2.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libsolid.4.dylib
4.0.0 %n (>= 4.1.0-1)
%p/lib/kde4-%type_pkg[kde]/lib/libthreadweaver.4.dylib
4.0.0 %n (>= 4.1.0-1)
-
!%p/lib/kde4-%type_pkg[kde]/lib/kde4/plugins/script/libkrossqtsplugin.4.dylib
<<
<<
SplitOff2: <<
@@ -216,6 +217,7 @@
lib/kde4-%type_pkg[kde]/lib/libkdeui.dylib
lib/kde4-%type_pkg[kde]/lib/libkdnssd.dylib
lib/kde4-%type_pkg[kde]/lib/libkfile.dylib
+ lib/kde4-%type_pkg[kde]/lib/libkformula.dylib
lib/kde4-%type_pkg[kde]/lib/libkhtml.dylib
lib/kde4-%type_pkg[kde]/lib/libkimproxy.dylib
lib/kde4-%type_pkg[kde]/lib/libkio.dylib
@@ -229,12 +231,13 @@
lib/kde4-%type_pkg[kde]/lib/libkparts.dylib
lib/kde4-%type_pkg[kde]/lib/libkpty.dylib
lib/kde4-%type_pkg[kde]/lib/libkrosscore.dylib
+ lib/kde4-%type_pkg[kde]/lib/libkrossqtsplugin.dylib
lib/kde4-%type_pkg[kde]/lib/libkrossui.dylib
lib/kde4-%type_pkg[kde]/lib/libktexteditor.dylib
lib/kde4-%type_pkg[kde]/lib/libkunittest.dylib
lib/kde4-%type_pkg[kde]/lib/libkutils.dylib
- lib/kde4-%type_pkg[kde]/lib/libkwalletbackend.dylib
lib/kde4-%type_pkg[kde]/lib/libnepomuk.dylib
+ lib/kde4-%type_pkg[kde]/lib/libplasma.dylib
lib/kde4-%type_pkg[kde]/lib/libsolid.dylib
lib/kde4-%type_pkg[kde]/lib/libthreadweaver.dylib
lib/kde4-%type_pkg[kde]/share/apps/cmake
@@ -247,7 +250,6 @@
!%p/lib/kde4-%type_pkg[kde]/lib/libkdeinit4_kded4.dylib
!%p/lib/kde4-%type_pkg[kde]/lib/libkdeinit4_kio_http_cache_cleaner.dylib
!%p/lib/kde4-%type_pkg[kde]/lib/libkdeinit4_klauncher.dylib
- !%p/lib/kde4-%type_pkg[kde]/lib/libkdeinit4_kwalletd.dylib
<<
DescDetail: <<
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=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdelibs4.patch Tue Nov 25
06:02:28 2008
@@ -1,6 +1,6 @@
-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-15 21:58:06.000000000 -0400
+diff -Nurd kdelibs-4.1.80/kde3support/kdecore/k3processcontroller.cpp
kdelibs-4.1.80-new/kde3support/kdecore/k3processcontroller.cpp
+--- kdelibs-4.1.80/kde3support/kdecore/k3processcontroller.cpp 2008-05-21
07:06:17.000000000 -0400
++++ kdelibs-4.1.80-new/kde3support/kdecore/k3processcontroller.cpp
2008-11-24 14:41:24.000000000 -0500
@@ -114,7 +114,7 @@
K3ProcessController::~K3ProcessController()
@@ -10,21 +10,21 @@
/* 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-15
21:58:06.000000000 -0400
+diff -Nurd kdelibs-4.1.80/kdecore/kernel/kkernel_mac.cpp
kdelibs-4.1.80-new/kdecore/kernel/kkernel_mac.cpp
+--- kdelibs-4.1.80/kdecore/kernel/kkernel_mac.cpp 2008-07-29
07:53:31.000000000 -0400
++++ kdelibs-4.1.80-new/kdecore/kernel/kkernel_mac.cpp 2008-11-24
14:41:24.000000000 -0500
@@ -22,7 +22,7 @@
-
- #include "kkernel_mac.h"
+ #include <config.h>
+ #include <QtCore/qglobal.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-15
21:58:06.000000000 -0400
+diff -Nurd kdelibs-4.1.80/kdecore/kernel/kkernel_mac.h
kdelibs-4.1.80-new/kdecore/kernel/kkernel_mac.h
+--- kdelibs-4.1.80/kdecore/kernel/kkernel_mac.h 2008-05-29
07:20:12.000000000 -0400
++++ kdelibs-4.1.80-new/kdecore/kernel/kkernel_mac.h 2008-11-24
14:41:24.000000000 -0500
@@ -19,7 +19,7 @@
#ifndef KKERNEL_MAC_H
#define KKERNEL_MAC_H
@@ -41,10 +41,10 @@
-#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-15
21:58:06.000000000 -0400
-@@ -411,7 +411,7 @@
+diff -Nurd kdelibs-4.1.80/kdecore/tests/kconfigtest.cpp
kdelibs-4.1.80-new/kdecore/tests/kconfigtest.cpp
+--- kdelibs-4.1.80/kdecore/tests/kconfigtest.cpp 2008-11-12
11:38:25.000000000 -0500
++++ kdelibs-4.1.80-new/kdecore/tests/kconfigtest.cpp 2008-11-24
14:41:24.000000000 -0500
+@@ -416,7 +416,7 @@
QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") +
HOMEPATH );
QVERIFY(group.hasKey("URL"));
QCOMPARE(group.readEntry("URL", QString()), QString("file://") + HOMEPATH );
@@ -53,9 +53,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.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-15
21:58:06.000000000 -0400
+diff -Nurd kdelibs-4.1.80/kdeui/kernel/kapplication.cpp
kdelibs-4.1.80-new/kdeui/kernel/kapplication.cpp
+--- kdelibs-4.1.80/kdeui/kernel/kapplication.cpp 2008-11-19
05:20:13.000000000 -0500
++++ kdelibs-4.1.80-new/kdeui/kernel/kapplication.cpp 2008-11-24
14:41:24.000000000 -0500
@@ -101,6 +101,9 @@
#include <Carbon/Carbon.h>
#include <QImage>
@@ -66,7 +66,7 @@
#include <kkernel_mac.h>
#endif
-@@ -476,7 +479,7 @@
+@@ -472,7 +475,7 @@
::exit(127);
}
@@ -75,9 +75,9 @@
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-15
21:58:06.000000000 -0400
+diff -Nurd kdelibs-4.1.80/kdeui/kernel/kuniqueapplication.cpp
kdelibs-4.1.80-new/kdeui/kernel/kuniqueapplication.cpp
+--- kdelibs-4.1.80/kdeui/kernel/kuniqueapplication.cpp 2008-09-03
07:25:15.000000000 -0400
++++ kdelibs-4.1.80-new/kdeui/kernel/kuniqueapplication.cpp 2008-11-24
14:41:24.000000000 -0500
@@ -65,7 +65,7 @@
# endif
#endif
@@ -96,7 +96,7 @@
mac_initialize_dbus();
#endif
-@@ -184,8 +184,8 @@
+@@ -182,8 +182,8 @@
// We'll call newInstance in the constructor. Do nothing here.
return true;
@@ -107,10 +107,22 @@
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-15 22:08:49.000000000 -0400
-@@ -68,7 +68,7 @@
+diff -Nurd kdelibs-4.1.80/kimgio/CMakeLists.txt
kdelibs-4.1.80-new/kimgio/CMakeLists.txt
+--- kdelibs-4.1.80/kimgio/CMakeLists.txt 2008-05-21 07:07:47.000000000
-0400
++++ kdelibs-4.1.80-new/kimgio/CMakeLists.txt 2008-11-24 22:01:46.000000000
-0500
+@@ -96,7 +96,7 @@
+ add_definitions(${OPENEXR_DEFINITIONS})
+ set(kimg_exr_LIB_SRCS exr.cpp)
+ kde4_add_plugin(kimg_exr ${kimg_exr_LIB_SRCS})
+- target_link_libraries(kimg_exr ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}
${OPENEXR_LIBRARIES} )
++ target_link_libraries(kimg_exr ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}
${OPENEXR_LIBRARIES} z )
+
+ install(TARGETS kimg_exr DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/imageformats/ )
+ install( FILES exr.desktop DESTINATION
${SERVICES_INSTALL_DIR}/qimageioplugins/ )
+diff -Nurd kdelibs-4.1.80/kinit/kinit.cpp kdelibs-4.1.80-new/kinit/kinit.cpp
+--- kdelibs-4.1.80/kinit/kinit.cpp 2008-11-04 12:13:09.000000000 -0500
++++ kdelibs-4.1.80-new/kinit/kinit.cpp 2008-11-24 14:41:24.000000000 -0500
+@@ -66,7 +66,7 @@
#endif
#endif
@@ -119,7 +131,7 @@
#include <kkernel_mac.h>
#endif
-@@ -578,7 +578,7 @@
+@@ -566,7 +566,7 @@
QByteArray procTitle;
d.argv = (char **) malloc(sizeof(char *) * (argc+1));
d.argv[0] = (char *) _name;
@@ -128,7 +140,7 @@
QString argvexe =
s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0]));
if (!argvexe.isEmpty()) {
QByteArray cstr = argvexe.toLocal8Bit();
-@@ -1741,12 +1741,12 @@
+@@ -1730,12 +1730,12 @@
launch_klauncher = 0;
if (strcmp(safe_argv[i], "--no-kded") == 0)
launch_kded = 0;
@@ -144,7 +156,7 @@
do_fork = false;
if (strcmp(safe_argv[i], "--suicide") == 0)
d.suicide = true;
-@@ -1756,7 +1756,7 @@
+@@ -1751,7 +1751,7 @@
{
printf("Usage: kdeinit4 [options]\n");
// printf(" --no-dcop Do not start dcopserver\n");
@@ -153,7 +165,7 @@
printf(" --nofork Do not fork\n");
#else
printf(" --no-fork Do not fork\n");
-@@ -1772,7 +1772,7 @@
+@@ -1768,7 +1768,7 @@
cleanup_fds();
if (do_fork) {
@@ -162,9 +174,9 @@
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-15 21:58:06.000000000
-0400
+diff -Nurd kdelibs-4.1.80/kio/kfile/kfsprocess.cpp
kdelibs-4.1.80-new/kio/kfile/kfsprocess.cpp
+--- kdelibs-4.1.80/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000
-0400
++++ kdelibs-4.1.80-new/kio/kfile/kfsprocess.cpp 2008-11-24
14:41:24.000000000 -0500
@@ -83,7 +83,7 @@
KfsProcessController::~KfsProcessController()
@@ -174,16 +186,28 @@
/* 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-15
21:58:06.000000000 -0400
+diff -Nurd kdelibs-4.1.80/kross/qts/CMakeLists.txt
kdelibs-4.1.80-new/kross/qts/CMakeLists.txt
+--- kdelibs-4.1.80/kross/qts/CMakeLists.txt 2008-11-12 11:38:16.000000000
-0500
++++ kdelibs-4.1.80-new/kross/qts/CMakeLists.txt 2008-11-24
22:09:04.000000000 -0500
+@@ -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})
+
+-install(TARGETS krossqtsplugin DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/script)
++install(TARGETS krossqtsplugin EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### next target ###############
+
+diff -Nurd kdelibs-4.1.80/solid/solid/CMakeLists.txt
kdelibs-4.1.80-new/solid/solid/CMakeLists.txt
+--- kdelibs-4.1.80/solid/solid/CMakeLists.txt 2008-11-19 05:20:13.000000000
-0500
++++ kdelibs-4.1.80-new/solid/solid/CMakeLists.txt 2008-11-24
14:41:24.000000000 -0500
@@ -102,7 +102,7 @@
backends/fakehw/fakevolume.cpp
)
-if(NOT WIN32 AND NOT APPLE)
+if(NOT WIN32)
- MESSAGE(STATUS "-- Building Solid HAL backend." )
+ message(STATUS "-- Building Solid HAL backend." )
set(solid_LIB_SRCS ${solid_LIB_SRCS}
@@ -129,7 +129,7 @@
@@ -195,9 +219,9 @@
# TODO: mingw
if(MSVC)
-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-15
21:58:06.000000000 -0400
+diff -Nurd kdelibs-4.1.80/solid/solid/managerbase.cpp
kdelibs-4.1.80-new/solid/solid/managerbase.cpp
+--- kdelibs-4.1.80/solid/solid/managerbase.cpp 2008-05-29 07:20:07.000000000
-0400
++++ kdelibs-4.1.80-new/solid/solid/managerbase.cpp 2008-11-24
14:41:24.000000000 -0500
@@ -23,7 +23,8 @@
#include "backends/fakehw/fakemanager.h"
Modified: trunk/experimental/common/main/finkinfo/libs/phonon.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/phonon.info&rev=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/phonon.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/phonon.info Tue Nov 25
06:02:28 2008
@@ -1,6 +1,6 @@
Info3: <<
Package: phonon-%type_pkg[phonon]
-Version: 4.2.0
+Version: 4.2.80
Revision: 1
Type: phonon (x11 mac)
Description: Audio API for Qt
@@ -12,8 +12,7 @@
<<
BuildDepends: <<
fink (>= 0.24.12-1),
- (%type_pkg[phonon] = x11) gstreamer-0.10-dev,
- (%type_pkg[phonon] = x11) gst-plugins-base-0.10-dev,
+ (%type_pkg[phonon] = x11) libxine1 (>= 1.1.13-1),
(%type_pkg[phonon] = x11) libxml2,
(%type_pkg[phonon] = x11) x11-dev,
automoc-%type_pkg[phonon],
@@ -32,13 +31,13 @@
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:kde:stable/phonon/%v/phonon-%v.tar.bz2
-Source-MD5: de80b0f055886a6946acc7886713e23e
-Source2: mirror:custom:qt/qt-copy-853424.tar.bz2
-Source2-MD5: 84ff2a03fa92bd7870efe487fd5d197a
+Source: mirror:kde:unstable/4.1.80/src/phonon-%v.tar.bz2
+Source-MD5: 885d63087d9861d1660888f10cadd1c5
+Source2: mirror:custom:qt/qt-copy-888210.tar.bz2
+Source2-MD5: 361890d297362caac6ffcfacf7bc9ac3
PatchFile: phonon.patch
-PatchFile-MD5: 76eb23ae978f0b0ae385fda569bf4acd
+PatchFile-MD5: e8734169f9d79fb477bf3cf7ec28667b
CompileScript: <<
#!/bin/sh -ev
@@ -49,7 +48,7 @@
mkdir -p build
pushd build
- cmake $KDE4_CMAKE_ARGS ..
+ cmake -DBUILD_PHONON_QT7:BOOL=TRUE $KDE4_CMAKE_ARGS ..
make VERBOSE=1
popd
<<
@@ -68,7 +67,7 @@
Package: %N-shlibs
Description: Shared libraries for Phonon
Depends: <<
- (%type_pkg[phonon] = x11) gst-plugins-base-0.10-shlibs,
+ (%type_pkg[phonon] = x11) libxine1-shlibs (>= 1.1.13-1),
qt4-%type_pkg[phonon]-gui-shlibs (>= 4.4.0-1)
<<
DocFiles: COPYING*
Modified: trunk/experimental/common/main/finkinfo/libs/phonon.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/phonon.patch&rev=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/phonon.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/phonon.patch Tue Nov 25
06:02:28 2008
@@ -1,50 +1,64 @@
-diff -Nurd phonon-4.2.0/CMakeLists.txt phonon-4.2.0-patched/CMakeLists.txt
---- phonon-4.2.0/CMakeLists.txt 2008-07-22 12:32:00.000000000 -0400
-+++ phonon-4.2.0-patched/CMakeLists.txt 2008-08-27 13:13:43.000000000
-0400
-@@ -192,7 +192,9 @@
+diff -Nurd phonon-4.2.80/CMakeLists.txt phonon-4.2.80-new/CMakeLists.txt
+--- phonon-4.2.80/CMakeLists.txt 2008-11-24 12:12:03.000000000 -0500
++++ phonon-4.2.80-new/CMakeLists.txt 2008-11-24 14:15:52.000000000 -0500
+@@ -196,7 +196,9 @@
set(INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}
BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}" )
endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL "2.6")
- set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
-+ set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
++ set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+ set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined
dynamic_lookup")
+ set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -flat_namespace -undefined
dynamic_lookup")
endif(APPLE)
if (CMAKE_SYSTEM_NAME MATCHES Linux)
-@@ -312,7 +314,7 @@
- add_subdirectory(phonon)
- add_subdirectory(includes)
- if (Q_WS_MAC)
-- #add_subdirectory(qt7)
-+ add_subdirectory(qt7)
- endif (Q_WS_MAC)
- if (Q_WS_WIN)
- #add_subdirectory(ds9)
-diff -Nurd phonon-4.2.0/gstreamer/CMakeLists.txt
phonon-4.2.0-patched/gstreamer/CMakeLists.txt
---- phonon-4.2.0/gstreamer/CMakeLists.txt 2008-07-22 12:32:00.000000000
-0400
-+++ phonon-4.2.0-patched/gstreamer/CMakeLists.txt 2008-08-27
12:22:22.000000000 -0400
+@@ -443,8 +445,8 @@
+ endif (Q_WS_WIN)
+
+ if (Q_WS_X11)
+- add_subdirectory(gstreamer)
+- add_subdirectory(xine)
++ #add_subdirectory(gstreamer)
++ add_subdirectory(xine)
+ endif (Q_WS_X11)
+
+ if(NOT WIN32) # pkgconfig file
+diff -Nurd phonon-4.2.80/gstreamer/CMakeLists.txt
phonon-4.2.80-new/gstreamer/CMakeLists.txt
+--- phonon-4.2.80/gstreamer/CMakeLists.txt 2008-11-24 12:12:02.000000000
-0500
++++ phonon-4.2.80-new/gstreamer/CMakeLists.txt 2008-11-24 13:27:04.000000000
-0500
@@ -18,7 +18,7 @@
if (BUILD_PHONON_GSTREAMER)
include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
- ${LIBXML2_INCLUDE_DIR})
+ ${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ add_definitions(-DPHONON_BACKEND_VERSION_4_2)
set(phonon_gstreamer_SRCS
- audiooutput.cpp
@@ -56,7 +56,7 @@
+ )
+ endif(ALSA_FOUND AND NOT GSTREAMER_HAS_NONBLOCKING_ALSASINK)
- add_definitions(-DPHONON_BACKEND_VERSION_4_2)
- automoc4(phonon_gstreamer phonon_gstreamer_SRCS)
-- add_library(phonon_gstreamer SHARED ${phonon_gstreamer_SRCS})
-+ add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
+- automoc4_add_library(phonon_gstreamer SHARED ${phonon_gstreamer_SRCS})
++ automoc4_add_library(phonon_gstreamer MODULE ${phonon_gstreamer_SRCS})
set_target_properties(phonon_gstreamer PROPERTIES PREFIX "")
target_link_libraries(phonon_gstreamer
${QT_QTOPENGL_LIBRARY}
-diff -Nurd phonon-4.2.0/qt7/CMakeLists.txt
phonon-4.2.0-patched/qt7/CMakeLists.txt
---- phonon-4.2.0/qt7/CMakeLists.txt 2008-07-22 12:32:00.000000000 -0400
-+++ phonon-4.2.0-patched/qt7/CMakeLists.txt 2008-08-27 13:13:05.000000000
-0400
+diff -Nurd phonon-4.2.80/phonon/experimental/audioformat.h
phonon-4.2.80-new/phonon/experimental/audioformat.h
+--- phonon-4.2.80/phonon/experimental/audioformat.h 2008-11-24
12:11:59.000000000 -0500
++++ phonon-4.2.80-new/phonon/experimental/audioformat.h 2008-11-24
14:04:19.000000000 -0500
+@@ -87,7 +87,7 @@
+
+ } // namespace Experimental
+ } // namespace Phonon
+-#if !defined(Q_WS_WIN) && !defined(__arm__) && !defined(Q_OS_MAC)
++#if !defined(Q_WS_WIN) && !defined(__arm__) && !defined(Q_OS_MAC) &&
!defined(Q_OS_DARWIN)
+ inline uint qHash(const Phonon::Experimental::AudioFormat &p)
+ {
+ return Phonon::Experimental::qHash(p);
+diff -Nurd phonon-4.2.80/qt7/CMakeLists.txt
phonon-4.2.80-new/qt7/CMakeLists.txt
+--- phonon-4.2.80/qt7/CMakeLists.txt 2008-11-24 12:12:03.000000000 -0500
++++ phonon-4.2.80-new/qt7/CMakeLists.txt 2008-11-24 13:49:23.000000000
-0500
@@ -14,6 +14,8 @@
project(phonon-qt7)
include(ConfigureChecks.cmake)
@@ -58,38 +72,67 @@
audionode.cpp
audiograph.cpp
audiooutput.cpp
-+ audioeffects.cpp
++ audioeffects.cpp
quicktimemetadata.cpp
audiomixer.cpp
audiodevice.cpp
-@@ -37,15 +40,16 @@
+@@ -37,12 +40,14 @@
videoframe.cpp
audiosplitter.cpp
mediaobjectaudionode.cpp
-+ quicktimestreamreader.cpp
-+ quicktimestreamreader_objc.mm
++ quicktimestreamreader.cpp
++ quicktimestreamreader_objc.mm
)
-- add_definitions(-DPHONON_BACKEND_VERSION_4_2)
- automoc4(phonon_qt7 phonon_qt7_SRCS)
-- add_library(phonon_qt7 SHARED ${phonon_qt7_SRCS})
-- set_target_properties(phonon_gstreamer PROPERTIES PREFIX "")
-+ add_library(phonon_qt7 MODULE ${phonon_qt7_SRCS})
-+ set_target_properties(phonon_qt7 PROPERTIES PREFIX "")
+ automoc4_add_library(phonon_qt7 MODULE ${phonon_qt7_SRCS})
target_link_libraries(phonon_qt7
-- ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}
-- ${KDE4_PHONON_LIBS}
-+ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}
-+ ${PHONON_LIBS} objc
+ ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY}
+- "-framework phonon"
++ ${PHONON_LIBS}
"-framework QuickTime"
"-framework OpenGL"
"-framework AudioUnit"
-diff -Nurd phonon-4.2.0/qt7/ConfigureChecks.cmake
phonon-4.2.0-patched/qt7/ConfigureChecks.cmake
---- phonon-4.2.0/qt7/ConfigureChecks.cmake 2008-07-22 12:32:00.000000000
-0400
-+++ phonon-4.2.0-patched/qt7/ConfigureChecks.cmake 2008-08-27
12:12:34.000000000 -0400
-@@ -14,3 +14,5 @@
+diff -Nurd phonon-4.2.80/qt7/ConfigureChecks.cmake
phonon-4.2.80-new/qt7/ConfigureChecks.cmake
+--- phonon-4.2.80/qt7/ConfigureChecks.cmake 2008-11-24 12:12:03.000000000
-0500
++++ phonon-4.2.80-new/qt7/ConfigureChecks.cmake 2008-11-24
13:29:25.000000000 -0500
+@@ -14,3 +14,4 @@
# Find the frameworks if necessary
set(BUILD_PHONON_QT7 TRUE)
++find_path(QT_PRIVATE_INCLUDEDIR QtOpenGL/private/qgl_p.h)
+diff -Nurd phonon-4.2.80/xine/CMakeLists.txt
phonon-4.2.80-new/xine/CMakeLists.txt
+--- phonon-4.2.80/xine/CMakeLists.txt 2008-11-24 12:12:01.000000000 -0500
++++ phonon-4.2.80-new/xine/CMakeLists.txt 2008-11-24 14:20:09.000000000
-0500
+@@ -101,7 +101,7 @@
+ configure_file(config-xine-widget.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-xine-widget.h )
+
+ add_definitions(-DPHONON_BACKEND_VERSION_4_2)
+- automoc4_add_library(phonon_xine SHARED ${phonon_xine_SRCS})
++ automoc4_add_library(phonon_xine MODULE ${phonon_xine_SRCS})
+ set_target_properties(phonon_xine PROPERTIES PREFIX "")
+ target_link_libraries(phonon_xine ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY} ${PHONON_LIBS} ${XINE_LIBRARY})
+ if(XCB_FOUND AND XINE_XCB_FOUND)
+diff -Nurd phonon-4.2.80/xine/sinknode.h phonon-4.2.80-new/xine/sinknode.h
+--- phonon-4.2.80/xine/sinknode.h 2008-11-24 12:12:01.000000000 -0500
++++ phonon-4.2.80-new/xine/sinknode.h 2008-11-24 14:09:40.000000000 -0500
+@@ -25,6 +25,8 @@
+ #include "backend.h"
+ #include "shareddata.h"
+
++#undef assert
+
-+FIND_PATH(QT_PRIVATE_INCLUDEDIR QtOpenGL/private/qgl_p.h)
+ namespace Phonon
+ {
+ namespace Xine
+diff -Nurd phonon-4.2.80/xine/sourcenode.h phonon-4.2.80-new/xine/sourcenode.h
+--- phonon-4.2.80/xine/sourcenode.h 2008-11-24 12:12:01.000000000 -0500
++++ phonon-4.2.80-new/xine/sourcenode.h 2008-11-24 14:09:40.000000000
-0500
+@@ -27,6 +27,8 @@
+ #include "backend.h"
+ #include "shareddata.h"
+
++#undef assert
++
+ namespace Phonon
+ {
+ namespace Xine
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=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/soprano.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/soprano.info Tue Nov 25
06:02:28 2008
@@ -24,7 +24,7 @@
libxslt,
pcre (>= 7.6-1),
pkgconfig (>= 0.22-3),
- redland-dev,
+ redland-dev (>= 1.0.5-1),
sqlite3-dev,
system-openssl-dev,
qt4-%type_pkg[soprano] (>= 4.4.0-1)
@@ -89,7 +89,7 @@
clucene-core-shlibs (>= 0.9.20-1),
dbus-shlibs (>= 1.2-1),
librasqal-shlibs (>= 0.9.15-1),
- redland-shlibs,
+ redland-shlibs (>= 1.0.5-1),
qt4-%type_pkg[soprano]-core-shlibs (>= 4.4.0-1)
<<
DocFiles: COPYING*
@@ -101,10 +101,10 @@
lib/%type_pkg[soprano]/lib/libsopranoserver.1*.dylib
<<
Shlibs: <<
- %p/lib/%type_pkg[soprano]/lib/libsoprano.4.dylib 0.0.0 %n
(>= 1.95.0-1)
- %p/lib/%type_pkg[soprano]/lib/libsopranoclient.1.dylib 0.0.0 %n
(>= 1.95.0-1)
- %p/lib/%type_pkg[soprano]/lib/libsopranoindex.1.dylib 0.0.0 %n
(>= 1.95.0-1)
- %p/lib/%type_pkg[soprano]/lib/libsopranoserver.1.dylib 0.0.0 %n
(>= 1.95.0-1)
+ %p/lib/%type_pkg[soprano]/lib/libsoprano.4.dylib 4.0.0 %n
(>= 2.1.1-1)
+ %p/lib/%type_pkg[soprano]/lib/libsopranoclient.1.dylib 1.0.0 %n
(>= 2.1.1-1)
+ %p/lib/%type_pkg[soprano]/lib/libsopranoindex.1.dylib 1.0.0 %n
(>= 2.1.1-1)
+ %p/lib/%type_pkg[soprano]/lib/libsopranoserver.1.dylib 1.0.0 %n
(>= 2.1.1-1)
<<
<<
SplitOff2: <<
Modified: trunk/experimental/common/main/finkinfo/libs/soprano.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/soprano.patch&rev=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/soprano.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/soprano.patch Tue Nov 25
06:02:28 2008
@@ -1,7 +1,7 @@
-diff -uNr soprano-1.95.0-beta2/backends/redland/CMakeLists.txt
soprano-1.95.0-beta2-new/backends/redland/CMakeLists.txt
---- soprano-1.95.0-beta2/backends/redland/CMakeLists.txt 2007-10-09
10:48:28.000000000 -0400
-+++ soprano-1.95.0-beta2-new/backends/redland/CMakeLists.txt 2007-10-10
22:47:22.000000000 -0400
-@@ -36,7 +36,7 @@
+diff -Nurd soprano-2.1.1/backends/redland/CMakeLists.txt
soprano-2.1.1-new/backends/redland/CMakeLists.txt
+--- soprano-2.1.1/backends/redland/CMakeLists.txt 2008-03-21
13:33:44.000000000 -0400
++++ soprano-2.1.1-new/backends/redland/CMakeLists.txt 2008-11-24
14:34:36.000000000 -0500
+@@ -33,7 +33,7 @@
add_library(soprano_redlandcore STATIC ${redland_core_SRC})
@@ -10,10 +10,22 @@
ADD_DEFINITIONS(${REDLAND_CFLAGS})
-diff -uNr soprano-1.95.0-beta2/parsers/raptor/CMakeLists.txt
soprano-1.95.0-beta2-new/parsers/raptor/CMakeLists.txt
---- soprano-1.95.0-beta2/parsers/raptor/CMakeLists.txt 2007-10-09
10:48:15.000000000 -0400
-+++ soprano-1.95.0-beta2-new/parsers/raptor/CMakeLists.txt 2007-10-10
22:47:08.000000000 -0400
-@@ -21,7 +21,7 @@
+diff -Nurd soprano-2.1.1/parsers/nquads/CMakeLists.txt
soprano-2.1.1-new/parsers/nquads/CMakeLists.txt
+--- soprano-2.1.1/parsers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
++++ soprano-2.1.1-new/parsers/nquads/CMakeLists.txt 2008-11-24
14:35:30.000000000 -0500
+@@ -13,7 +13,7 @@
+
+ qt4_automoc(${nquadparser_SRC})
+
+-add_library(soprano_nquadparser SHARED ${nquadparser_SRC})
++add_library(soprano_nquadparser MODULE ${nquadparser_SRC})
+
+ TARGET_LINK_LIBRARIES(soprano_nquadparser soprano)
+
+diff -Nurd soprano-2.1.1/parsers/raptor/CMakeLists.txt
soprano-2.1.1-new/parsers/raptor/CMakeLists.txt
+--- soprano-2.1.1/parsers/raptor/CMakeLists.txt 2007-10-15
14:23:31.000000000 -0400
++++ soprano-2.1.1-new/parsers/raptor/CMakeLists.txt 2008-11-24
14:34:36.000000000 -0500
+@@ -17,7 +17,7 @@
qt4_automoc(${raptor_parser_SRC})
@@ -22,10 +34,22 @@
TARGET_LINK_LIBRARIES(soprano_raptorparser soprano ${RAPTOR_LIBRARIES})
-diff -uNr soprano-1.95.0-beta2/serializers/raptor/CMakeLists.txt
soprano-1.95.0-beta2-new/serializers/raptor/CMakeLists.txt
---- soprano-1.95.0-beta2/serializers/raptor/CMakeLists.txt 2007-10-09
10:48:22.000000000 -0400
-+++ soprano-1.95.0-beta2-new/serializers/raptor/CMakeLists.txt 2007-10-10
22:46:53.000000000 -0400
-@@ -16,7 +16,7 @@
+diff -Nurd soprano-2.1.1/serializers/nquads/CMakeLists.txt
soprano-2.1.1-new/serializers/nquads/CMakeLists.txt
+--- soprano-2.1.1/serializers/nquads/CMakeLists.txt 2007-11-23
04:56:23.000000000 -0500
++++ soprano-2.1.1-new/serializers/nquads/CMakeLists.txt 2008-11-24
14:35:56.000000000 -0500
+@@ -13,7 +13,7 @@
+
+ qt4_automoc(${nquadserializer_SRC})
+
+-add_library(soprano_nquadserializer SHARED ${nquadserializer_SRC})
++add_library(soprano_nquadserializer MODULE ${nquadserializer_SRC})
+
+ TARGET_LINK_LIBRARIES(soprano_nquadserializer soprano)
+
+diff -Nurd soprano-2.1.1/serializers/raptor/CMakeLists.txt
soprano-2.1.1-new/serializers/raptor/CMakeLists.txt
+--- soprano-2.1.1/serializers/raptor/CMakeLists.txt 2008-07-10
03:41:35.000000000 -0400
++++ soprano-2.1.1-new/serializers/raptor/CMakeLists.txt 2008-11-24
14:34:36.000000000 -0500
+@@ -25,7 +25,7 @@
qt4_automoc(${raptor_serializer_SRC})
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=1298&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/qt4-x11.info (original)
+++ trunk/experimental/common/main/finkinfo/x11/qt4-x11.info Tue Nov 25
06:02:28 2008
@@ -50,7 +50,6 @@
BuildConflicts: kdelibs3-dev, kdelibs3-ssl-dev, kdelibs3-unified-dev,
libevent1, pcre, clucene-core, %N
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
-SetLDFLAGS: -liconv
SetMAKEFLAGS: -j1
CompileScript: <<
find . -name ._\* -exec rm -rf {} \;
-------------------------------------------------------------------------
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
