[98642] trunk/dports/devel/qt4-creator-mac

jmr at macports.org jmr at macports.org
Thu Oct 11 17:07:18 PDT 2012


Revision: 98642
          http://trac.macports.org//changeset/98642
Author:   jmr at macports.org
Date:     2012-10-11 17:07:18 -0700 (Thu, 11 Oct 2012)
Log Message:
-----------
qt4-creator-mac: fix build failure due to wrong declaration scoping (#35834)

Modified Paths:
--------------
    trunk/dports/devel/qt4-creator-mac/Portfile

Added Paths:
-----------
    trunk/dports/devel/qt4-creator-mac/files/patch-servicebrowser_p.h.diff

Modified: trunk/dports/devel/qt4-creator-mac/Portfile
===================================================================
--- trunk/dports/devel/qt4-creator-mac/Portfile	2012-10-11 23:44:49 UTC (rev 98641)
+++ trunk/dports/devel/qt4-creator-mac/Portfile	2012-10-12 00:07:18 UTC (rev 98642)
@@ -23,7 +23,8 @@
 
 # fix up QMake build files to remove debug and release building;
 # specify that here instead.
-patchfiles          patch-remove_build_types.diff
+patchfiles          patch-remove_build_types.diff \
+                    patch-servicebrowser_p.h.diff
 
 post-patch {
     # remove arch from QMake build scripts

Added: trunk/dports/devel/qt4-creator-mac/files/patch-servicebrowser_p.h.diff
===================================================================
--- trunk/dports/devel/qt4-creator-mac/files/patch-servicebrowser_p.h.diff	                        (rev 0)
+++ trunk/dports/devel/qt4-creator-mac/files/patch-servicebrowser_p.h.diff	2012-10-12 00:07:18 UTC (rev 98642)
@@ -0,0 +1,11 @@
+--- src/libs/zeroconf/servicebrowser_p.h.orig	2012-08-08 15:47:06.000000000 +1000
++++ src/libs/zeroconf/servicebrowser_p.h	2012-10-12 11:02:22.000000000 +1100
+@@ -264,7 +264,7 @@ private:
+ };
+ 
+ class ServiceBrowserPrivate {
+-    friend class ServiceBrowser;
++    friend class ZeroConf::ServiceBrowser;
+ public:
+     ServiceBrowser *q;
+     QString         serviceType;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121011/7c81ac15/attachment.html>


More information about the macports-changes mailing list