[110226] users/mojca/wxports/graphics/wxWidgets-2.8

[mojca at macports.org]

Revision: 110226
          https://trac.macports.org/changeset/110226
Author:   mojca at macports.org
Date:     2013-08-28 20:49:37 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
mojca/wxWidgets-2.8: untested patch that should avoid build conflicts with installed wxWidgets

Modified Paths:
--------------
    users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
    users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-configure.diff
    users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-src-gtk-app.cpp.diff

Modified: users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/Portfile	2013-08-29 03:08:50 UTC (rev 110225)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/Portfile	2013-08-29 03:49:37 UTC (rev 110226)
@@ -6,12 +6,8 @@
 PortGroup           archcheck       1.0
 PortGroup           select          1.0
 PortGroup           wxWidgets       1.0
-# temporary conflict to prevent wrong linking
-PortGroup           conflicts_build 1.0
 
 name                wxWidgets-2.8
-# (temporary)
-conflicts_build     wxgtk wxWidgets wxWidgets-python wxWidgets30 wxWidgets-devel
 version             2.8.12
 set branch          [join [lrange [split ${version} .] 0 1] .]
 set wxpythonsubset  wxPython-2.8.12.1-MacPorts-subset
@@ -125,7 +121,7 @@
 }
 
 # wxgtk-2.8
-if {$subport != $name && $subport != ""} {
+if {$subport != $name} {
     depends_lib-append      port:cairo \
                             port:gtk2 \
                             port:mesa \
@@ -163,6 +159,7 @@
     install-mac.txt readme-mac.txt \
     install-gtk.txt readme-gtk.txt ${destdocdir}
 
+    # maybe not needed
     set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${installtype}-2.8
     ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
 }

Modified: users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-configure.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-configure.diff	2013-08-29 03:08:50 UTC (rev 110225)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-configure.diff	2013-08-29 03:49:37 UTC (rev 110226)
@@ -73,6 +73,29 @@
          OPENGL_LIBS=""
      else
                          echo "$as_me:$LINENO: checking for OpenGL headers" >&5
+@@ -33801,22 +33764,6 @@ rm -f conftest.err conftest.$ac_objext \
+       ;;
+ 
+       *-*-darwin* )
+-        install_name_tool=`which install_name_tool`
+-        if test "$install_name_tool" -a -x "$install_name_tool"; then
+-            SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+-            cat <<EOF >change-install-names
+-#!/bin/sh
+-libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+-inst_cmd="install_name_tool "
+-for i in \${libnames} ; do
+-    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+-done
+-\${inst_cmd} \${3}
+-EOF
+-            chmod +x change-install-names
+-
+-            HEADER_PAD_OPTION="-headerpad_max_install_names"
+-        fi
+       ;;
+ 
+       *-*-cygwin* | *-*-mingw32* )
 --- setup.h.in.orig
 +++ setup.h.in
 @@ -552,7 +552,7 @@

Modified: users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-src-gtk-app.cpp.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-src-gtk-app.cpp.diff	2013-08-29 03:08:50 UTC (rev 110225)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/files/patch-src-gtk-app.cpp.diff	2013-08-29 03:49:37 UTC (rev 110226)
@@ -1,4 +1,6 @@
-allows also the gtk-based wxWidgets apps to be bundled
+allows also the GTK-based wxWidgets apps to be bundled
+(even though they still bounce off the Dock)
+http://trac.wxwidgets.org/changeset/74703
 --- src/gtk/app.cpp.orig
 +++ src/gtk/app.cpp
 @@ -415,6 +415,21 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130828/9390a4f3/attachment-0001.html>