[110220] users/mojca/wxports/graphics/wxWidgets-3.0
mojca at macports.org
mojca at macports.org
Wed Aug 28 15:21:03 PDT 2013
Revision: 110220
https://trac.macports.org/changeset/110220
Author: mojca at macports.org
Date: 2013-08-28 15:21:02 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
mojca/wxWidget-3.0: fix some patches
Modified Paths:
--------------
users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-sdl.diff
users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff
Added Paths:
-----------
users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff
Removed Paths:
-------------
users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure-change_install_names.diff
Modified: users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-08-28 22:17:39 UTC (rev 110219)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/Portfile 2013-08-28 22:21:02 UTC (rev 110220)
@@ -76,8 +76,8 @@
patch.dir ${worksrcpath}/..
-# without this patch wxrc-2.9 ends up linking to libraries in workdir
-patchfiles patch-configure-change_install_names.diff
+# without (the second part of) this patch wxrc-2.9 ends up linking to libraries in workdir
+patchfiles patch-configure.diff
# TODO: is this still needed?
# configure.ccache no
@@ -102,7 +102,7 @@
if {$subport == "wxPython-3.0"} {
# patch-src-osx-cocoa-window.mm.diff: http://trac.wxwidgets.org/changeset/72195 (only needed for 2.9.4)
- patchfiles patch-src-osx-cocoa-window.mm.diff
+ patchfiles-append patch-src-osx-cocoa-window.mm.diff
description wxWidgets ${branch} for the wxPython distribution
long_description The port installs wxWidgets ${branch} for wxPython \
@@ -119,7 +119,7 @@
#
# patch-sdl.diff: the patch allows using --wxth-sdl
# patch-upstream-psn.diff: http://trac.wxwidgets.org/changeset/74703
- patchfiles patch-sdl.diff \
+ patchfiles-append patch-sdl.diff \
patch-upstream-psn.diff
depends_lib-append port:cairo \
Deleted: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure-change_install_names.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure-change_install_names.diff 2013-08-28 22:17:39 UTC (rev 110219)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure-change_install_names.diff 2013-08-28 22:21:02 UTC (rev 110220)
@@ -1,27 +0,0 @@
---- configure.orig
-+++ configure
-@@ -29407,16 +29405,18 @@ rm -f core conftest.err conftest.$ac_objext \
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
- cat <<EOF >change-install-names
- #!/bin/sh
--libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
--for i in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
-- for dep in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
-+libnames=\`find -E \$4 -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
-+changes=''
-+for dep in \$libnames; do
-+ changes="\$changes -change \$4/\$dep \$3/\$dep"
- done
-+for i in \$libnames; do
-+ ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
- done
-+${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
- EOF
- chmod +x change-install-names
-- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
-+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
- fi
-
- HEADER_PAD_OPTION="-headerpad_max_install_names"
Copied: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff (from rev 110213, users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure-change_install_names.diff)
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff 2013-08-28 22:21:02 UTC (rev 110220)
@@ -0,0 +1,79 @@
+The first part is for GTK and makes sure that the port finds the right OpenGL library
+The second part makes sure that install_name_tool fixes links to dylib files in wxrc-2.9
+--- configure.orig
++++ configure
+@@ -22038,48 +22038,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-SEARCH_INCLUDE="\
+- /usr/local/include \
+- /usr/local/X11/include \
+- /usr/local/include/X11 \
+- /usr/local/X11R7/include \
+- /usr/local/X11R6/include \
+- /usr/local/include/X11R7 \
+- /usr/local/include/X11R6 \
+- \
+- /usr/Motif-2.1/include \
+- /usr/Motif-1.2/include \
+- /usr/include/Motif1.2 \
+- \
+- /usr/dt/include \
+- /usr/openwin/include \
+- \
+- /usr/include/Xm \
+- \
+- /usr/X11R7/include \
+- /usr/X11R6/include \
+- /usr/X11R6.4/include \
+- \
+- /usr/include/X11R7 \
+- /usr/include/X11R6 \
+- \
+- /usr/X11/include \
+- /usr/include/X11 \
+- \
+- /usr/XFree86/include/X11 \
+- /usr/pkg/include \
+- \
+- /usr/local/X1R5/include \
+- /usr/local/include/X11R5 \
+- /usr/X11R5/include \
+- /usr/include/X11R5 \
+- \
+- /usr/local/X11R4/include \
+- /usr/local/include/X11R4 \
+- /usr/X11R4/include \
+- /usr/include/X11R4 \
+- \
+- /usr/openwin/share/include"
++SEARCH_INCLUDE="@@PREFIX@@/include"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5
+ $as_echo_n "checking for libraries directories... " >&6; }
+@@ -29407,16 +29366,18 @@ rm -f core conftest.err conftest.$ac_objext \
+ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
+ cat <<EOF >change-install-names
+ #!/bin/sh
+-libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+-for i in \${libnames} ; do
+- ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
+- for dep in \${libnames} ; do
+- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
++libnames=\`find -E \$4 -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
++changes=''
++for dep in \$libnames; do
++ changes="\$changes -change \$4/\$dep \$3/\$dep"
+ done
++for i in \$libnames; do
++ ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
+ done
++${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
+ EOF
+ chmod +x change-install-names
+- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
++ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
+ fi
+
+ HEADER_PAD_OPTION="-headerpad_max_install_names"
Modified: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-sdl.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-sdl.diff 2013-08-28 22:17:39 UTC (rev 110219)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-sdl.diff 2013-08-28 22:21:02 UTC (rev 110220)
@@ -1,3 +1,4 @@
+This patch is needed to make --with-sdl work (it should be reported upstream)
--- Makefile.in.orig
+++ Makefile.in
@@ -6719,8 +6719,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
Modified: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff 2013-08-28 22:17:39 UTC (rev 110219)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-upstream-psn.diff 2013-08-28 22:21:02 UTC (rev 110220)
@@ -1,4 +1,4 @@
-http://trac.wxwidgets.org/changeset/74703
+Upstream: http://trac.wxwidgets.org/changeset/74703
--- src/common/appcmn.cpp.orig
+++ src/common/appcmn.cpp
@@ -84,6 +84,27 @@ wxAppBase::wxAppBase()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130828/ada6920f/attachment-0001.html>
More information about the macports-changes
mailing list