Author: ranger
Date: Tue Mar 31 23:18:16 2009
New Revision: 1468
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1468&repname=user%3a+ranger>
Log:
various work-in-progress updates
Added:
trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.info
trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.patch
trunk/experimental/common/main/finkinfo/libs/taglib-extras.info
trunk/experimental/common/main/finkinfo/libs/taglib-extras.patch
Modified:
trunk/experimental/10.4/crypto/finkinfo/digikam.info
trunk/experimental/10.4/crypto/finkinfo/koffice2.info
trunk/experimental/10.4/main/finkinfo/kde/amarok2.info
trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info
trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info
trunk/experimental/common/crypto/finkinfo/digikam.info
trunk/experimental/common/crypto/finkinfo/koffice2.info
trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.patch
trunk/experimental/common/main/finkinfo/kde/amarok2.info
trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in
Modified: trunk/experimental/10.4/crypto/finkinfo/digikam.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/digikam.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/digikam.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/digikam.info Tue Mar 31 23:18:16
2009
@@ -97,7 +97,7 @@
<<
<<
-PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null
2>&1 || :
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
DescDetail: <<
digiKam is an advanced digital photo management application for linux.
Modified: trunk/experimental/10.4/crypto/finkinfo/koffice2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/koffice2.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/koffice2.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/koffice2.info Tue Mar 31 23:18:16
2009
@@ -102,7 +102,7 @@
%p/lib/%type_pkg[kde]/lib/libkarboncommon.5.dylib 5.0.0 %n (>=
1.9.98.7-1)
%p/lib/%type_pkg[kde]/lib/libkarbonui.5.dylib 5.0.0 %n (>=
1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff2: <<
Package: kplato2-%type_pkg[kde]
@@ -144,7 +144,7 @@
%p/lib/%type_pkg[kde]/lib/libkplatoprivate.5.dylib 5.0.0 %n
(>= 1.9.98.7-1)
%p/lib/%type_pkg[kde]/lib/libkplatoui.5.dylib 5.0.0 %n
(>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff3: <<
Package: kpresenter2-%type_pkg[kde]
@@ -172,7 +172,7 @@
!%p/lib/%type_pkg[kde]/lib/libkdeinit4_kpresenter.dylib
%p/lib/%type_pkg[kde]/lib/libkpresenterprivate.5.dylib 5.0.0
%n (>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff4: <<
Package: krita2-%type_pkg[kde]
@@ -218,7 +218,7 @@
%p/lib/mac/lib/libkritaui.5.dylib
5.0.0 %n (>= 1.9.98.7-1)
%p/lib/%type_pkg[kde]/lib/libkrossmodulekrita.5.dylib
5.0.0 %n (>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff5: <<
Package: kspread2-%type_pkg[kde]
@@ -258,7 +258,7 @@
!%p/lib/%type_pkg[kde]/lib/libkdeinit4_kspread.dylib
%p/lib/%type_pkg[kde]/lib/libkspreadcommon.5.dylib 5.0.0 %n
(>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff6: <<
Package: kword2-%type_pkg[kde]
@@ -288,7 +288,7 @@
!%p/lib/%type_pkg[kde]/lib/libkdeinit4_kword.dylib
%p/lib/%type_pkg[kde]/lib/libkwordprivate.5.dylib 5.0.0 %n (>=
1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff7: <<
Package: %N-base-shlibs
@@ -367,7 +367,7 @@
lib/%type_pkg[kde]/share/kde4/servicetypes
<<
Shlibs: !%p/lib/%type_pkg[kde]/lib/libkdeinit4_kthesaurus.dylib
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff9: <<
Package: %N-dev
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=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/amarok2.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/amarok2.info Tue Mar 31 23:18:16
2009
@@ -1,7 +1,7 @@
-Info2: <<
+Info4: <<
Package: amarok2-%type_pkg[kde]
Version: 2.1.0
-Revision: 0.944785.1
+Revision: 0.947547.1
Description: KDE4 - music player
Type: kde (x11 mac)
License: GPL/LGPL
@@ -10,14 +10,16 @@
Depends: <<
dbus (>= 1.2.12-1),
kdebase4-%type_pkg[kde] (>= 4.2.2-1),
+ kdemultimedia4-%type_pkg[kde]-base-shlibs (>= 4.2.2-1),
libmp4v21-shlibs,
loudmouth-shlibs,
mysql15-shlibs,
qt4-%type_pkg[kde]-gui-shlibs (>= 4.5.0-3),
- qtscriptgenerator-%type_pkg[kde],
+ qtscriptgenerator-%type_pkg[kde]-runtime (>= 0.1.0-2),
soprano-%type_pkg[kde]-shlibs (>= 2.2.3-2),
strigi-shlibs (>= 0.6.3-1),
- taglib-shlibs (>= 1.5-1)
+ taglib-shlibs (>= 1.5-1),
+ taglib-extras-%type_pkg[kde]-shlibs (>= 0.1-1)
<<
BuildDepends: <<
automoc-%type_pkg[kde] (>= 0.9.89-0),
@@ -30,6 +32,7 @@
kde4-buildenv (>= 4.2.2-1),
kdebase4-%type_pkg[kde]-dev (>= 4.2.2-1),
kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
+ kdemultimedia4-%type_pkg[kde]-dev (>= 4.2.2-1),
libgettext3-dev,
libgpod4,
libmp4v21-dev,
@@ -39,17 +42,18 @@
mysql15-dev,
pkgconfig (>= 0.22-3),
qt4-%type_pkg[kde] (>= 4.5.0-3),
- qtscriptgenerator-%type_pkg[kde],
+ qtscriptgenerator-%type_pkg[kde] (>= 0.1.0-2),
soprano-%type_pkg[kde]-dev (>= 2.2.3-2),
strigi-dev (>= 0.6.3-1),
taglib (>= 1.5-1),
+ taglib-extras-%type_pkg[kde] (>= 0.1-1),
(%type_pkg[kde] = x11) x11-dev,
system-openssl-dev
<<
GCC: 4.0
-Source: http://ranger.befunk.com/fink/amarok/amarok-944785.tar.bz2
-Source-MD5: 8327e66975d4a3cf0d7d81d676821bd0
+Source: http://ranger.befunk.com/fink/amarok/amarok-947547.tar.bz2
+Source-MD5: 8ab7d6385b2144cd7ebdf803fdeba7ed
SourceDirectory: amarok
SetMAKEFLAGS: -j1
@@ -60,7 +64,7 @@
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
. %p/sbin/kde4-buildenv.sh
export CMAKE_INCLUDE_PATH="%p/include/mysql:$CMAKE_INCLUDE_PATH"
- export CMAKE_LIBRARY_PATH="%P/LIB/MYSQL:$CMAKE_LIBRARY_PATH"
+ export CMAKE_LIBRARY_PATH="%p/lib/mysql:$CMAKE_LIBRARY_PATH"
mkdir -p build
pushd build
@@ -92,7 +96,7 @@
!%p/lib/%type_pkg[kde]/lib/libamarokpud.1.dylib
<<
-PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null
2>&1 || :
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
DescDetail: <<
Amarok is the music player for Linux and Unix with an intuitive interface.
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info Tue Mar
31 23:18:16 2009
@@ -1,6 +1,6 @@
Info4: <<
Package: kdemultimedia4-mac
-Version: 4.2.1
+Version: 4.2.2
Revision: 1
Description: KDE4 - Multimedia Apps
Type: kde (mac)
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info Tue Mar
31 23:18:16 2009
@@ -1,6 +1,6 @@
Info4: <<
Package: kdemultimedia4-x11
-Version: 4.2.1
+Version: 4.2.2
Revision: 1
Description: KDE4 - Multimedia Apps
Type: kde (x11)
Added: trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.info (added)
+++ trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.info Tue Mar 31
23:18:16 2009
@@ -1,0 +1,78 @@
+Info3: <<
+Package: taglib-extras-%type_pkg[kde]
+Version: 0.1
+Revision: 1
+Description: Taglib support for other formats
+Type: kde (x11 mac)
+License: LGPL
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: %N-shlibs (= %v-%r)
+BuildDepends: <<
+ automoc-%type_pkg[kde] (>= 0.9.89-0),
+ bzip2-dev,
+ cmake (>= 2.6.3-1),
+ dbus-dev (>= 1.2.12-1),
+ fink (>= 0.28.0-1),
+ freetype219 (>= 2.3.7-7),
+ gettext-tools,
+ giflib,
+ kde4-buildenv (>= 4.2.2-1),
+ kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
+ libgettext3-dev,
+ libjpeg,
+ libpng3,
+ libtiff,
+ libxml2,
+ libxslt,
+ pkgconfig (>= 0.22-3),
+ qt4-%type_pkg[kde] (>= 4.5.0-3),
+ (%type_pkg[kde] = x11) x11-dev,
+ system-openssl-dev,
+ taglib (>= 1.5-1)
+<<
+GCC: 4.0
+
+Source: http://www.jefferai.com/taglib-extras/taglib-extras-%v.tar.gz
+Source-MD5: c6d32e4f203768a2e4b5a83c5285f0a7
+SourceDirectory: taglib-extras
+PatchFile: taglib-extras.patch
+PatchFile-MD5: c89feb2fba3ecbef81d1b840de987ee7
+
+CompileScript: <<
+#!/bin/sh -ev
+
+ export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
+ . %p/sbin/kde4-buildenv.sh
+
+ mkdir -p build
+ pushd build
+ cmake -DWITH_KDE:BOOL=ON $KDE4_CMAKE_ARGS ..
+ make VERBOSE=1
+ popd
+<<
+
+InstallScript: <<
+#!/bin/sh -ev
+
+ pushd build
+ make -j1 install/fast DESTDIR="%d"
+ popd
+<<
+SplitOff: <<
+ Package: %N-shlibs
+ Description: Shared libraries for taglib-extras
+ Depends: <<
+ kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.2-1),
+ taglib-shlibs (>= 1.5-1)
+ <<
+ Files: lib/%type_pkg[kde]/lib/libtag-extras.0*.dylib
+ Shlibs: %p/lib/%type_pkg[kde]/lib/libtag-extras.0.dylib 0.0.0 %n (>=
0.1-1)
+<<
+
+DescDetail: <<
+Taglib-extras delivers support for reading and editing the meta-data of
+audio formats not supported by taglib, including: asf, mp4v2, rmff, wav.
+<<
+<<
+
Added: trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.patch&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.patch (added)
+++ trunk/experimental/10.4/main/finkinfo/libs/taglib-extras.patch Tue Mar 31
23:18:16 2009
@@ -1,0 +1,41 @@
+diff -Nurd taglib-extras/taglib-extras/CMakeLists.txt
taglib-extras-patched/taglib-extras/CMakeLists.txt
+--- taglib-extras/taglib-extras/CMakeLists.txt 2009-03-12 17:15:06.000000000
-0400
++++ taglib-extras-patched/taglib-extras/CMakeLists.txt 2009-03-31
14:37:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/audible
+ ${CMAKE_CURRENT_SOURCE_DIR}/wav
+ ${CMAKE_CURRENT_SOURCE_DIR}/rmff
+- ${TAGLIB_INCLUDE_DIR}
++ ${TAGLIB_INCLUDES}
+ )
+
+ ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+diff -Nurd taglib-extras/taglib-extras/asf/asffiletyperesolver.h
taglib-extras-patched/taglib-extras/asf/asffiletyperesolver.h
+--- taglib-extras/taglib-extras/asf/asffiletyperesolver.h 2009-03-12
17:36:03.000000000 -0400
++++ taglib-extras-patched/taglib-extras/asf/asffiletyperesolver.h
2009-03-31 14:40:47.000000000 -0400
+@@ -25,8 +25,8 @@
+ #define TAGLIB_ASFFILETYPERESOLVER_H
+
+ #include <tfile_helper.h>
+-#include <taglib/tfile.h>
+-#include <taglib/fileref.h>
++#include <tfile.h>
++#include <fileref.h>
+ #include <taglib-extras_export.h>
+
+ class TAGLIB_EXTRAS_EXPORT ASFFileTypeResolver : public
TagLib::FileRef::FileTypeResolver
+diff -Nurd taglib-extras/taglib-extras/rmff/rmff.h
taglib-extras-patched/taglib-extras/rmff/rmff.h
+--- taglib-extras/taglib-extras/rmff/rmff.h 2009-03-11 10:56:06.000000000
-0400
++++ taglib-extras-patched/taglib-extras/rmff/rmff.h 2009-03-31
14:40:56.000000000 -0400
+@@ -31,9 +31,9 @@
+
+ #include "config-taglib-extras.h"
+
+-#include <taglib/audioproperties.h>
++#include <audioproperties.h>
+ #include <tfile.h>
+-#include <taglib/id3v1tag.h>
++#include <id3v1tag.h>
+
+ #include <string.h>
+
Modified: trunk/experimental/common/crypto/finkinfo/digikam.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/digikam.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/digikam.info (original)
+++ trunk/experimental/common/crypto/finkinfo/digikam.info Tue Mar 31 23:18:16
2009
@@ -77,7 +77,7 @@
popd
<<
-PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null
2>&1 || :
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
SplitOff: <<
Package: %N-shlibs
Modified: trunk/experimental/common/crypto/finkinfo/koffice2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/koffice2.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/koffice2.info (original)
+++ trunk/experimental/common/crypto/finkinfo/koffice2.info Tue Mar 31 23:18:16
2009
@@ -108,7 +108,7 @@
%p/lib/%type_pkg[kde]/lib/libkarboncommon.5.dylib 5.0.0 %n (>=
1.9.98.7-1)
%p/lib/%type_pkg[kde]/lib/libkarbonui.5.dylib 5.0.0 %n (>=
1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff2: <<
Package: kplato2-%type_pkg[kde]
@@ -150,7 +150,7 @@
%p/lib/%type_pkg[kde]/lib/libkplatoprivate.5.dylib 5.0.0 %n
(>= 1.9.98.7-1)
%p/lib/%type_pkg[kde]/lib/libkplatoui.5.dylib 5.0.0 %n
(>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff3: <<
Package: kpresenter2-%type_pkg[kde]
@@ -178,7 +178,7 @@
!%p/lib/%type_pkg[kde]/lib/libkdeinit4_kpresenter.dylib
%p/lib/%type_pkg[kde]/lib/libkpresenterprivate.5.dylib 5.0.0
%n (>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff4: <<
Package: krita2-%type_pkg[kde]
@@ -224,7 +224,7 @@
%p/lib/mac/lib/libkritaui.5.dylib
5.0.0 %n (>= 1.9.98.7-1)
%p/lib/%type_pkg[kde]/lib/libkrossmodulekrita.5.dylib
5.0.0 %n (>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff5: <<
Package: kspread2-%type_pkg[kde]
@@ -264,7 +264,7 @@
!%p/lib/%type_pkg[kde]/lib/libkdeinit4_kspread.dylib
%p/lib/%type_pkg[kde]/lib/libkspreadcommon.5.dylib 5.0.0 %n
(>= 1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff6: <<
Package: kword2-%type_pkg[kde]
@@ -294,7 +294,7 @@
!%p/lib/%type_pkg[kde]/lib/libkdeinit4_kword.dylib
%p/lib/%type_pkg[kde]/lib/libkwordprivate.5.dylib 5.0.0 %n (>=
1.9.98.7-1)
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff7: <<
Package: %N-base-shlibs
@@ -375,7 +375,7 @@
Shlibs: <<
!%p/lib/%type_pkg[kde]/lib/libkdeinit4_kthesaurus.dylib
<<
- PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh
>/dev/null 2>&1 || :
+ PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null
2>&1 || :
<<
SplitOff9: <<
Modified: trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info
(original)
+++ trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.info Tue
Mar 31 23:18:16 2009
@@ -1,7 +1,7 @@
Info4: <<
Package: qtscriptgenerator-%type_pkg[qt]
Version: 0.1.0
-Revision: 1
+Revision: 2
Type: qt (x11 mac)
Description: QtScript binding generator
License: GPL/LGPL
@@ -10,11 +10,12 @@
Source:
http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-%v.tar.gz
Source-MD5: ca4046ad4bda36cd4e21649d4b98886d
PatchFile: qtscriptgenerator.patch
-PatchFile-MD5: 25514d5289cbbba0a0c5bee830b64e87
+PatchFile-MD5: 226e6658b8f8a39b31af1d8c95d43c93
Depends: <<
qt4-%type_pkg[qt]-designer-shlibs (>= 4.5.0-1),
qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.0-1),
+ %N-runtime (>= %v-%r),
<<
BuildDepends: <<
@@ -60,5 +61,11 @@
mv examples %i/share/doc/%N
<<
+SplitOff: <<
+ Package: %N-runtime
+ Description: Runtime QtScript plugins
+ Files: lib/qt4-%type_pkg[qt]/lib/plugins
+<<
+
DocFiles: LICENSE* README*
<<
Modified: trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.patch&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.patch
(original)
+++ trunk/experimental/common/main/finkinfo/devel/qtscriptgenerator.patch Tue
Mar 31 23:18:16 2009
@@ -1,6 +1,25 @@
-diff -Nurd qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri
qtscriptgenerator-src-0.1.0-patched/qtbindings/qtbindingsbase.pri
+diff -Nurd qtscriptgenerator-src-0.1.0/generator/typesystem_core.xml
qtscriptgenerator-src-0.1.0-new/generator/typesystem_core.xml
+--- qtscriptgenerator-src-0.1.0/generator/typesystem_core.xml 2009-02-20
06:42:24.000000000 -0500
++++ qtscriptgenerator-src-0.1.0-new/generator/typesystem_core.xml
2009-03-31 16:20:21.000000000 -0400
+@@ -2090,6 +2090,7 @@
+
+ <namespace-type name="QtConcurrent" target-type="class">
+ <extra-includes>
++ <include file-name="QThreadPool" location="global"/>
+ <include file-name="qtconcurrentreducekernel.h" location="global"/>
+ <include file-name="qtconcurrentthreadengine.h" location="global"/>
+ </extra-includes>
+diff -Nurd qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro
qtscriptgenerator-src-0.1.0-new/qtbindings/qtbindings.pro
+--- qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro 2009-02-20
06:42:24.000000000 -0500
++++ qtscriptgenerator-src-0.1.0-new/qtbindings/qtbindings.pro 2009-03-31
16:19:39.000000000 -0400
+@@ -1,3 +1,4 @@
++CONFIG += debug_and_release
+ TEMPLATE = subdirs
+ SUBDIRS = qtscript_core \
+ qtscript_gui \
+diff -Nurd qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri
qtscriptgenerator-src-0.1.0-new/qtbindings/qtbindingsbase.pri
--- qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri 2009-02-20
06:42:24.000000000 -0500
-+++ qtscriptgenerator-src-0.1.0-patched/qtbindings/qtbindingsbase.pri
2009-03-12 08:49:44.000000000 -0400
++++ qtscriptgenerator-src-0.1.0-new/qtbindings/qtbindingsbase.pri
2009-03-31 16:19:24.000000000 -0400
@@ -3,6 +3,6 @@
INCLUDEPATH += .
DESTDIR = $$PWD/../plugins/script
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=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/amarok2.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/amarok2.info Tue Mar 31
23:18:16 2009
@@ -1,7 +1,7 @@
-Info2: <<
+Info4: <<
Package: amarok2-%type_pkg[kde]
Version: 2.1.0
-Revision: 0.944785.1
+Revision: 0.947547.1
Type: kde (x11 mac)
Description: KDE4 - music player
License: GPL/LGPL
@@ -13,8 +13,8 @@
looks good doing it.
<<
-Source: http://ranger.befunk.com/fink/amarok/amarok-944785.tar.bz2
-Source-MD5: 8327e66975d4a3cf0d7d81d676821bd0
+Source: http://ranger.befunk.com/fink/amarok/amarok-947547.tar.bz2
+Source-MD5: 8ab7d6385b2144cd7ebdf803fdeba7ed
SourceDirectory: amarok
#Source: mirror:kde:stable/amarok/%v/src/amarok-%v.tar.bz2
@@ -25,20 +25,20 @@
Depends: <<
dbus (>= 1.2.12-1),
kdebase4-%type_pkg[kde] (>= 4.2.0-1),
+ kdemultimedia4-%type_pkg[kde]-base-shlibs (>= 4.2.2-1),
libmp4v21-shlibs,
loudmouth-shlibs,
mysql15-shlibs,
qt4-%type_pkg[kde]-gui-shlibs (>= 4.5.0-1),
- qtscriptgenerator-%type_pkg[kde],
+ qtscriptgenerator-%type_pkg[kde]-runtime (>= 0.1.0-2),
soprano-%type_pkg[kde]-shlibs (>= 2.2.1-1),
strigi-shlibs (>= 0.6.3-1),
- taglib-shlibs (>= 1.5-1)
+ taglib-shlibs (>= 1.5-1),
+ taglib-extras-%type_pkg[kde]-shlibs (>= 0.1-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>
@@ -52,8 +52,9 @@
freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.14.0-1),
kde4-buildenv (>= 4.2-3),
- kdebase4-%type_pkg[kde]-dev (>= 4.2.0-1),
- kdelibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
+ kdebase4-%type_pkg[kde]-dev (>= 4.2.2-1),
+ kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
+ kdemultimedia4-%type_pkg[kde]-dev (>= 4.2.2-1),
libgettext3-dev,
libgpod4,
libmp4v21-dev,
@@ -63,10 +64,11 @@
mysql15-dev,
pkgconfig (>= 0.22-3),
qt4-%type_pkg[kde] (>= 4.4.0-1),
- qtscriptgenerator-%type_pkg[kde],
+ qtscriptgenerator-%type_pkg[kde] (>= 0.1.0-2),
soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
strigi-dev (>= 0.6.3-1),
taglib (>= 1.5-1),
+ taglib-extras-%type_pkg[kde] (>= 0.1-1),
(%type_pkg[kde] = x11) x11-dev,
system-openssl-dev
<<
@@ -81,7 +83,7 @@
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
. %p/sbin/kde4-buildenv.sh
export CMAKE_INCLUDE_PATH="%p/include/mysql:$CMAKE_INCLUDE_PATH"
- export CMAKE_LIBRARY_PATH="%P/LIB/MYSQL:$CMAKE_LIBRARY_PATH"
+ export CMAKE_LIBRARY_PATH="%p/lib/mysql:$CMAKE_LIBRARY_PATH"
mkdir -p build
pushd build
@@ -114,6 +116,6 @@
!%p/lib/%type_pkg[kde]/lib/libamarokpud.1.dylib
<<
-PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null
2>&1 || :
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
<<
Modified: trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in Tue Mar
31 23:18:16 2009
@@ -6,7 +6,7 @@
Package: kdemultimedia4-mac
Type: kde (mac)
#endif
-Version: 4.2.1
+Version: 4.2.2
Revision: 1
Description: KDE4 - Multimedia Apps
License: GPL/LGPL
Added: trunk/experimental/common/main/finkinfo/libs/taglib-extras.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/taglib-extras.info&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/taglib-extras.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/taglib-extras.info Tue Mar 31
23:18:16 2009
@@ -1,0 +1,80 @@
+Info3: <<
+Package: taglib-extras-%type_pkg[kde]
+Version: 0.1
+Revision: 1
+Type: kde (x11 mac)
+Description: Taglib support for other formats
+License: LGPL
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: %N-shlibs (= %v-%r)
+BuildDepends: <<
+ automoc-%type_pkg[kde] (>= 0.9.88-1),
+ bzip2-dev,
+ cmake (>= 2.6.1-2),
+ dbus-dev (>= 1.2.0-1),
+ fink (>= 0.28-1),
+ freetype219 (>= 2.3.7-7),
+ gettext-tools,
+ giflib,
+ kde4-buildenv (>= 4.2-3),
+ kdelibs4-%type_pkg[kde]-dev (>= %v-1),
+ libgettext3-dev,
+ libjpeg,
+ libpng3,
+ libtiff,
+ libxml2,
+ libxslt,
+ pkgconfig (>= 0.22-3),
+ qt4-%type_pkg[kde] (>= 4.4.1-1),
+ (%type_pkg[kde] = x11) x11-dev,
+ system-openssl-dev,
+ taglib (>= 1.5-1),
+<<
+GCC: 4.0
+
+Source: http://www.jefferai.com/taglib-extras/taglib-extras-%v.tar.gz
+Source-MD5: c6d32e4f203768a2e4b5a83c5285f0a7
+SourceDirectory: taglib-extras
+PatchFile: taglib-extras.patch
+PatchFile-MD5: c89feb2fba3ecbef81d1b840de987ee7
+
+CompileScript: <<
+#!/bin/sh -ev
+
+ export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
+ . %p/sbin/kde4-buildenv.sh
+
+ mkdir -p build
+ pushd build
+ cmake -DWITH_KDE:BOOL=ON $KDE4_CMAKE_ARGS ..
+ make VERBOSE=1
+ popd
+<<
+
+InstallScript: <<
+#!/bin/sh -ev
+
+ pushd build
+ make -j1 install/fast DESTDIR="%d"
+ popd
+<<
+
+SplitOff: <<
+ Package: %N-shlibs
+ Description: Shared libraries for taglib-extras
+ Depends: <<
+ kdelibs4-%type_pkg[kde]-shlibs (>= %v-1),
+ taglib-shlibs (>= 1.5-1),
+ <<
+ Files: <<
+ lib/%type_pkg[kde]/lib/libtag-extras.0*.dylib
+ <<
+ Shlibs: %p/lib/%type_pkg[kde]/lib/libtag-extras.0.dylib 0.0.0 %n (>=
0.1-1)
+<<
+
+DescDetail: <<
+Taglib-extras delivers support for reading and editing the meta-data of
+audio formats not supported by taglib, including: asf, mp4v2, rmff, wav.
+<<
+<<
Added: trunk/experimental/common/main/finkinfo/libs/taglib-extras.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/taglib-extras.patch&rev=1468&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/taglib-extras.patch (added)
+++ trunk/experimental/common/main/finkinfo/libs/taglib-extras.patch Tue Mar 31
23:18:16 2009
@@ -1,0 +1,41 @@
+diff -Nurd taglib-extras/taglib-extras/CMakeLists.txt
taglib-extras-patched/taglib-extras/CMakeLists.txt
+--- taglib-extras/taglib-extras/CMakeLists.txt 2009-03-12 17:15:06.000000000
-0400
++++ taglib-extras-patched/taglib-extras/CMakeLists.txt 2009-03-31
14:37:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/audible
+ ${CMAKE_CURRENT_SOURCE_DIR}/wav
+ ${CMAKE_CURRENT_SOURCE_DIR}/rmff
+- ${TAGLIB_INCLUDE_DIR}
++ ${TAGLIB_INCLUDES}
+ )
+
+ ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+diff -Nurd taglib-extras/taglib-extras/asf/asffiletyperesolver.h
taglib-extras-patched/taglib-extras/asf/asffiletyperesolver.h
+--- taglib-extras/taglib-extras/asf/asffiletyperesolver.h 2009-03-12
17:36:03.000000000 -0400
++++ taglib-extras-patched/taglib-extras/asf/asffiletyperesolver.h
2009-03-31 14:40:47.000000000 -0400
+@@ -25,8 +25,8 @@
+ #define TAGLIB_ASFFILETYPERESOLVER_H
+
+ #include <tfile_helper.h>
+-#include <taglib/tfile.h>
+-#include <taglib/fileref.h>
++#include <tfile.h>
++#include <fileref.h>
+ #include <taglib-extras_export.h>
+
+ class TAGLIB_EXTRAS_EXPORT ASFFileTypeResolver : public
TagLib::FileRef::FileTypeResolver
+diff -Nurd taglib-extras/taglib-extras/rmff/rmff.h
taglib-extras-patched/taglib-extras/rmff/rmff.h
+--- taglib-extras/taglib-extras/rmff/rmff.h 2009-03-11 10:56:06.000000000
-0400
++++ taglib-extras-patched/taglib-extras/rmff/rmff.h 2009-03-31
14:40:56.000000000 -0400
+@@ -31,9 +31,9 @@
+
+ #include "config-taglib-extras.h"
+
+-#include <taglib/audioproperties.h>
++#include <audioproperties.h>
+ #include <tfile.h>
+-#include <taglib/id3v1tag.h>
++#include <id3v1tag.h>
+
+ #include <string.h>
+
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
