[69497] trunk/dports/kde/amarok/Portfile

[michaelld at macports.org]

Revision: 69497
          http://trac.macports.org/changeset/69497
Author:   michaelld at macports.org
Date:     2010-07-07 19:07:42 -0700 (Wed, 07 Jul 2010)
Log Message:
-----------
Hopeful fix for ticket #25489 (and, probably, others).  Patch
'src/app_mac.cpp' and 'src/App.cpp' to use Apple's recommended
'URefCon' for pointers instead of 'long' or something else, in order
to provided 32/64 bit compatibility on both 10.5 and 10.6.

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

Modified: trunk/dports/kde/amarok/Portfile
===================================================================
--- trunk/dports/kde/amarok/Portfile	2010-07-08 01:52:32 UTC (rev 69496)
+++ trunk/dports/kde/amarok/Portfile	2010-07-08 02:07:42 UTC (rev 69497)
@@ -6,6 +6,7 @@
 
 name                amarok
 version             2.3.1
+revision            1
 categories          kde kde4
 maintainers         illogic-al openmaintainer
 description         Amarok, the world-renowned media player.
@@ -26,9 +27,9 @@
                     port:loudmouth port:qca port:libmtp port:libgpod \
                     path:bin/mysql_config5:mysql5
 
-patchfiles          patch-src-app-mac.patch
-patch.dir           ${workpath}/${distname}
-patch.pre_args      -p1
+#patchfiles          patch-src-app-mac.patch
+#patch.dir           ${workpath}/${distname}
+#patch.pre_args      -p1
 
 pre-configure {
     if {![file exists ${prefix}/lib/mysql5/mysql/libmysqld.a]} {
@@ -37,6 +38,13 @@
     }
 }
 
+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
+}
+
 # have to include the various paths to the header and library manually
 # for libusb-legacy since libmtp doesn't provide them
 compiler.cpath        ${prefix}/include/libusb-legacy:${compiler.cpath}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100707/dbce35b8/attachment.html>