Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory vz-cvs-3.sog:/tmp/cvs-serv4049

Modified Files:
        kdebase4-runtime.info kdebase4-runtime.patch 
Log Message:
fix build with latest phonon


Index: kdebase4-runtime.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdebase4-runtime.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kdebase4-runtime.patch      28 Nov 2010 17:18:42 -0000      1.5
+++ kdebase4-runtime.patch      23 Aug 2011 15:20:22 -0000      1.6
@@ -97,17 +97,17 @@
 +    <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 +</dict>
 +</plist>
-diff -Nurd kdebase-runtime-4.3.90/nepomuk/kioslaves/search/CMakeLists.txt 
kdebase-runtime-4.3.90-new/nepomuk/kioslaves/search/CMakeLists.txt
---- kdebase-runtime-4.3.90/nepomuk/kioslaves/search/CMakeLists.txt     
2009-11-30 19:29:30.000000000 -0500
-+++ kdebase-runtime-4.3.90-new/nepomuk/kioslaves/search/CMakeLists.txt 
2010-01-13 00:59:59.000000000 -0500
+diff -Nurd kdebase-runtime-4.4.1/nepomuk/kioslaves/search/CMakeLists.txt 
kdebase-runtime-4.4.1-new/nepomuk/kioslaves/search/CMakeLists.txt
+--- kdebase-runtime-4.4.1/nepomuk/kioslaves/search/CMakeLists.txt      
2010-01-31 14:30:12.000000000 -0500
++++ kdebase-runtime-4.4.1-new/nepomuk/kioslaves/search/CMakeLists.txt  
2011-08-23 10:15:29.000000000 -0400
 @@ -8,6 +8,7 @@
    ${QT_INCLUDES}
    ${KDE4_INCLUDES}
    ${KDE4_KIO_INCLUDES}
 +  ${SOPRANO_INCLUDE_DIR}
    ${NEPOMUK_INCLUDE_DIR}
+   ${nepomuk_kio_slaves_SOURCE_DIR}/common
  )
- 
 diff -Nurd kdebase-runtime-4.3.90/nepomuk/services/queryservice/CMakeLists.txt 
kdebase-runtime-4.3.90-new/nepomuk/services/queryservice/CMakeLists.txt
 --- kdebase-runtime-4.3.90/nepomuk/services/queryservice/CMakeLists.txt        
2009-11-30 19:29:32.000000000 -0500
 +++ kdebase-runtime-4.3.90-new/nepomuk/services/queryservice/CMakeLists.txt    
2010-01-13 01:00:02.000000000 -0500
@@ -119,29 +119,57 @@
    ${NEPOMUK_INCLUDES}
  )
  
-diff -Nurd kdebase-runtime-4.3.90/phonon/platform_kde/devicelisting.cpp 
kdebase-runtime-4.3.90-new/phonon/platform_kde/devicelisting.cpp
---- kdebase-runtime-4.3.90/phonon/platform_kde/devicelisting.cpp       
2008-10-17 07:00:15.000000000 -0400
-+++ kdebase-runtime-4.3.90-new/phonon/platform_kde/devicelisting.cpp   
2010-01-13 01:00:02.000000000 -0500
-@@ -35,7 +35,10 @@
+diff -Nurd kdebase-runtime-4.4.1/phonon/kded-module/phononserver.cpp 
kdebase-runtime-4.4.1-new/phonon/kded-module/phononserver.cpp
+--- kdebase-runtime-4.4.1/phonon/kded-module/phononserver.cpp  2009-12-17 
11:35:09.000000000 -0500
++++ kdebase-runtime-4.4.1-new/phonon/kded-module/phononserver.cpp      
2011-08-23 10:24:14.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ */
+ 
++#include "phononnamespace.h"
+ #include "phononserver.h"
+ #include "audiodevice.h"
+ 
+@@ -56,7 +57,9 @@
+ K_EXPORT_PLUGIN(PhononServerFactory("phononserver"))
+ 
+ typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList;
++#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3))
+ Q_DECLARE_METATYPE(PhononDeviceAccessList)
++#endif
+ 
+ PhononServer::PhononServer(QObject *parent, const QList<QVariant> &)
+     : KDEDModule(parent),
+diff -Nurd kdebase-runtime-4.4.1/phonon/platform_kde/devicelisting.cpp 
kdebase-runtime-4.4.1-new/phonon/platform_kde/devicelisting.cpp
+--- kdebase-runtime-4.4.1/phonon/platform_kde/devicelisting.cpp        
2008-10-17 07:00:15.000000000 -0400
++++ kdebase-runtime-4.4.1-new/phonon/platform_kde/devicelisting.cpp    
2011-08-23 10:25:01.000000000 -0400
+@@ -19,6 +19,7 @@
+ */
+ 
+ #include "devicelisting.h"
++#include "phononnamespace.h"
+ 
+ #include <QtCore/QFile>
+ #include <QtDBus/QDBusReply>
+@@ -35,7 +36,9 @@
  #endif // HAVE_ALSA_ASOUNDLIB_H
  
  typedef QList<QPair<QByteArray, QString> > PhononDeviceAccessList;
-+#ifndef _KDE_FINAL_PhononDeviceAccessList
-+#define _KDE_FINAL_PhononDeviceAccessList
++#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3))
  Q_DECLARE_METATYPE(PhononDeviceAccessList)
 +#endif
  
  static void installAlsaPhononDeviceHandle()
  {
-diff -Nurd kdebase-runtime-4.3.90/phonon/platform_kde/kdeplatformplugin.cpp 
kdebase-runtime-4.3.90-new/phonon/platform_kde/kdeplatformplugin.cpp
---- kdebase-runtime-4.3.90/phonon/platform_kde/kdeplatformplugin.cpp   
2009-01-16 10:04:57.000000000 -0500
-+++ kdebase-runtime-4.3.90-new/phonon/platform_kde/kdeplatformplugin.cpp       
2010-01-13 01:00:02.000000000 -0500
-@@ -44,8 +44,11 @@
+diff -Nurd kdebase-runtime-4.4.1/phonon/platform_kde/kdeplatformplugin.cpp 
kdebase-runtime-4.4.1-new/phonon/platform_kde/kdeplatformplugin.cpp
+--- kdebase-runtime-4.4.1/phonon/platform_kde/kdeplatformplugin.cpp    
2009-01-16 10:04:57.000000000 -0500
++++ kdebase-runtime-4.4.1-new/phonon/platform_kde/kdeplatformplugin.cpp        
2011-08-23 10:25:50.000000000 -0400
+@@ -43,9 +43,11 @@
+ 
  typedef QPair<QByteArray, QString> PhononDeviceAccess;
  typedef QList<PhononDeviceAccess> PhononDeviceAccessList;
++#if (PHONON_VERSION < PHONON_VERSION_CHECK(4, 4, 3))
  #ifndef KDE_USE_FINAL
-+#ifndef _KDE_FINAL_PhononDeviceAccessList
-+#define _KDE_FINAL_PhononDeviceAccessList
  Q_DECLARE_METATYPE(PhononDeviceAccessList)
  #endif
 +#endif

Index: kdebase4-runtime.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdebase4-runtime.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kdebase4-runtime.info       28 Nov 2010 17:18:42 -0000      1.14
+++ kdebase4-runtime.info       23 Aug 2011 15:20:22 -0000      1.15
@@ -1,7 +1,7 @@
 Info3: <<
 Package: kdebase4-runtime-%type_pkg[kde]
 Version: 4.4.1
-Revision: 4
+Revision: 5
 Description: KDE4 - base applications and tools (runtime)
 Type: kde (x11 mac)
 License: GPL/LGPL
@@ -11,8 +11,20 @@
        dbus (>= 1.2.12-1),
        kdepimlibs4-%type_pkg[kde] (>= 4.4.1-1),
        libattica-%type_pkg[kde]-shlibs,
+       libexiv2-0.19-shlibs,
+       libjpeg8-shlibs,
        libxine1-shlibs,
        oxygen-icons-%type_pkg[kde] (>= 4.4.1-1),
+       phonon-%type_pkg[kde]-shlibs (>= 4.5.0-1),
+       qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
+       qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
+       qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
+       qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
+       qt4-base-%type_pkg[kde]-qtnetwork-shlibs (>= 4.7.3-1),
+       qt4-base-%type_pkg[kde]-qtscript-shlibs (>= 4.7.3-1),
+       qt4-base-%type_pkg[kde]-qtsvg-shlibs (>= 4.7.3-1),
+       qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
+       soprano-%type_pkg[kde]-shlibs,
        strigi-gui-%type_pkg[kde] (>= 0.7.2-1)
 <<
 BuildDepends: <<
@@ -21,26 +33,26 @@
        qimageblitz-unified-%type_pkg[kde] (>= 0.0.4-2000),
        bzip2-dev,
        cmake (>= 2.6.4-1),
-       cups-dev,
        cyrus-sasl2-dev,
        dbus-dev (>= 1.2.12-1),
        expat1,
        fink (>= 0.29.7-1),
-       fontconfig2-dev (>= 2.4.1-1),
-       freetype219 (>= 2.3.7-7),
+       fontconfig2-dev (>= 2.8.0-4),
+       freetype219 (>= 2.3.12-1),
        gettext-tools,
        giflib,
-       glib2-dev (>= 2.18.4-1),
+       glib2-dev (>= 2.22.0-1),
        kde4-buildenv (>= 4.4.0-1),
        kdelibs4-%type_pkg[kde]-dev (>= 4.4.1-1),
        kdepimlibs4-%type_pkg[kde]-dev (>= 4.4.1-1),
        libattica-%type_pkg[kde]-dev,
+       libexiv2-0.19,
        libgettext8-dev,
        libidn,
        libjasper.1,
        libjpeg8,
        libknotificationitem1-%type_pkg[kde]-dev (>= 4.3.4-1),
-       libpng3,
+       libpng14,
        libtiff,
        libxine1,
        (%type_pkg[kde] = x11) libxklavier16,
@@ -49,8 +61,10 @@
        openexr-dev,
        openldap24-dev,
        pcre,
+       phonon-%type_pkg[kde] (>= 4.5.0-1),
        pkgconfig (>= 0.23-1),
-       qt4-%type_pkg[kde] (>= 4.6.1-1),
+       qt4-base-%type_pkg[kde] (>= 4.7.3-1),
+       soprano-%type_pkg[kde]-dev,
        strigi-dev (>= 0.6.3-1),
        strigi-gui-%type_pkg[kde]-dev (>= 0.7.2-1),
        (%type_pkg[kde] = x11) x11-dev,
@@ -67,7 +81,7 @@
 Source-MD5: d0e6f9afbd73c3f8321a468ae3d9c5e5
 SourceDirectory: kdebase-runtime-%v
 PatchFile: kdebase4-runtime.patch
-PatchFile-MD5: 5af6a6db6be5b877418b54d1ec4c93dd
+PatchFile-MD5: 10f31aefc7b96618d10011746aea6446
 
 CompileScript: <<
 #!/bin/sh -ev
@@ -108,6 +122,9 @@
 DescPackaging: <<
        Fixed for build with recent versions of attica. See:
        https://trac.macports.org/ticket/24947
+
+       Fixed for build with recent versions of phonon. See:
+       http://websvn.kde.org/?view=revision&revision=1196219
 <<
 <<
 


------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to