[84899] trunk/dports/kde/amarok

[ryandesign at macports.org]

Revision: 84899
          http://trac.macports.org/changeset/84899
Author:   ryandesign at macports.org
Date:     2011-10-04 03:43:12 -0700 (Tue, 04 Oct 2011)
Log Message:
-----------
amarok: update to 2.4.3 (#28788); turn post-patch reinplace into patchfile so it's easier to see what it's doing; disable universal variant which now fails with a weird error

Modified Paths:
--------------
    trunk/dports/kde/amarok/Portfile

Added Paths:
-----------
    trunk/dports/kde/amarok/files/patch-src-app_mac.cpp.diff

Removed Paths:
-------------
    trunk/dports/kde/amarok/files/patch-bind_dataengine.h.diff

Modified: trunk/dports/kde/amarok/Portfile
===================================================================
--- trunk/dports/kde/amarok/Portfile	2011-10-04 07:40:23 UTC (rev 84898)
+++ trunk/dports/kde/amarok/Portfile	2011-10-04 10:43:12 UTC (rev 84899)
@@ -6,8 +6,7 @@
 
 name                amarok
 conflicts           amarok-devel
-version             2.3.2
-revision            1
+version             2.4.3
 categories          kde kde4
 maintainers         illogic-al openmaintainer
 description         Amarok, the world-renowned media player.
@@ -18,21 +17,17 @@
 homepage            http://amarok.kde.org
 master_sites        kde:stable/${name}/${version}/src/
 use_bzip2           yes
-checksums           md5 4e03dc009f8b44d9b8dfb5f6d1034081 \
-                    sha1 594d6d3ad57832fb80ba4387459356132d37ace2 \
-                    rmd160 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390
 
+checksums           rmd160  02026c400025e944c69f31b29013c8054a2575d2 \
+                    sha256  6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208
+
 depends_lib-append  port:kde4-runtime port:kdelibs4 \
                     port:qtscriptgenerator port:liblastfm \
                     port:taglib port:taglib-extras \
                     port:loudmouth port:qca port:libmtp port:libgpod \
                     path:lib/mysql5/mysql/libmysqld.a:mysql5
 
-patchfiles          patch-bind_dataengine.h.diff
+patchfiles          patch-src-app_mac.cpp.diff
 
-post-patch {
-    # fix 32/64-bit pointer for 'this' in AE
-    reinplace "s at long@URefCon at g" ${workpath}/${distname}/src/app_mac.cpp
-    reinplace "/setupEventHandler_mac/s at long@URefCon at g" \
-        ${workpath}/${distname}/src/App.cpp
-}
+# prototype for 'Dynamic::BiasPtr Dynamic::AbstractBiasFactory::createFromXml(QCoreXmlStreamReader*)' does not match any in class 'Dynamic::AbstractBiasFactory'
+universal_variant   no

Deleted: trunk/dports/kde/amarok/files/patch-bind_dataengine.h.diff
===================================================================
--- trunk/dports/kde/amarok/files/patch-bind_dataengine.h.diff	2011-10-04 07:40:23 UTC (rev 84898)
+++ trunk/dports/kde/amarok/files/patch-bind_dataengine.h.diff	2011-10-04 10:43:12 UTC (rev 84899)
@@ -1,13 +0,0 @@
---- src/context/scriptengine/javascript/bind_dataengine.h.orig	2010-09-15 23:24:11.000000000 +0200
-+++ src/context/scriptengine/javascript/bind_dataengine.h	2011-09-03 19:26:15.000000000 +0200
-@@ -29,8 +29,10 @@
- #if !KDE_IS_VERSION(4, 4, 76)
- Q_DECLARE_METATYPE(DataEngine*)
- #endif
-+#if !KDE_IS_VERSION(4, 6, 81)
- Q_DECLARE_METATYPE(Service*)
- Q_DECLARE_METATYPE(ServiceJob*)
-+#endif
- Q_DECLARE_METATYPE(QVariant)
- Q_DECLARE_METATYPE(DataEngine::Dict)
- Q_DECLARE_METATYPE(DataEngine::Data)

Added: trunk/dports/kde/amarok/files/patch-src-app_mac.cpp.diff
===================================================================
--- trunk/dports/kde/amarok/files/patch-src-app_mac.cpp.diff	                        (rev 0)
+++ trunk/dports/kde/amarok/files/patch-src-app_mac.cpp.diff	2011-10-04 10:43:12 UTC (rev 84899)
@@ -0,0 +1,21 @@
+# fix 32/64-bit pointer for 'this' in AE
+--- src/app_mac.cpp.orig	2011-10-04 01:37:31.000000000 -0500
++++ src/app_mac.cpp	2011-10-04 01:38:04.000000000 -0500
+@@ -35,7 +35,7 @@
+ static AEEventHandlerUPP macCallbackUrlHandlerUPP = 0;
+ 
+ OSStatus
+-appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/)
++appleEventProcessor(const AppleEvent *ae, AppleEvent *, SRefCon /*handlerRefCon*/)
+ {
+     OSType aeID = typeWildCard;
+     OSType aeClass = typeWildCard;
+@@ -57,7 +57,7 @@
+ }
+ 
+ OSStatus
+-macCallbackUrlHandler( const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/)
++macCallbackUrlHandler( const AppleEvent *ae, AppleEvent *, SRefCon /*handlerRefCon*/)
+ {
+     DEBUG_BLOCK
+     OSErr error = noErr;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111004/533731b0/attachment.html>