[65552] trunk/dports/kde/kdelibs4

[snc at macports.org]

Revision: 65552
          http://trac.macports.org/changeset/65552
Author:   snc at macports.org
Date:     2010-03-27 10:18:49 -0700 (Sat, 27 Mar 2010)
Log Message:
-----------
Patch OpenGL, #23720

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

Added Paths:
-----------
    trunk/dports/kde/kdelibs4/files/opengl-on-mac.patch

Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile	2010-03-27 16:56:16 UTC (rev 65551)
+++ trunk/dports/kde/kdelibs4/Portfile	2010-03-27 17:18:49 UTC (rev 65552)
@@ -6,7 +6,7 @@
 
 name                kdelibs4
 version             4.4.1
-revision        1
+revision            2
 categories          kde kde4
 maintainers         snc sharky
 description         KDE4 core libraries
@@ -44,7 +44,9 @@
                     default-kde4-xdg-menu-prefix.patch \
                     fix-bundle-icons.patch \
                     remove-dbus-hacks.patch \
-                    workaround-kdeinit4-crash.patch
+                    workaround-kdeinit4-crash.patch \
+                    opengl-on-mac.patch
+
 patch.dir           ${workpath}/${distname}
 patch.pre_args      -p1
 

Added: trunk/dports/kde/kdelibs4/files/opengl-on-mac.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/opengl-on-mac.patch	                        (rev 0)
+++ trunk/dports/kde/kdelibs4/files/opengl-on-mac.patch	2010-03-27 17:18:49 UTC (rev 65552)
@@ -0,0 +1,24 @@
+Index: kdelibs-4.4.1/cmake/modules/Qt4ConfigDependentSettings.cmake
+===================================================================
+--- kdelibs-4.4.1/cmake/modules/Qt4ConfigDependentSettings.cmake	(revision 1099551)
++++ kdelibs-4.4.1/cmake/modules/Qt4ConfigDependentSettings.cmake	(working copy)
+@@ -77,7 +77,18 @@
+ 
+ # QtOpenGL dependencies
+ QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
+-SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
++IF(Q_WS_MAC)
++# On the Mac OpenGL is probably frameworks and QMAKE_LIBS_OPENGL can be e.g. "-framework OpenGL -framework AGL".
++# The separate_arguments() call in the other branch makes "-framework;-OpenGL;-framework;-lAGL" appear in the 
++# linker command. So we need to protect the "-framework foo" as non-separatable strings.
++# We do this by replacing the space after "-framework" with an underscore, then calling separate_arguments(),
++# and then we replace the underscores again with spaces. So we get proper linker commands. Alex
++  STRING(REGEX REPLACE "-framework +" "-framework_" QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
++  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
++  STRING(REGEX REPLACE "-framework_" "-framework " QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
++ELSE(Q_WS_MAC)
++  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
++ENDIF(Q_WS_MAC)
+ SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100327/14a99410/attachment.html>