Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11504
Modified Files:
wxgtk2.8.info wxgtk2.8.patch
Removed Files:
wxgtk2.8-x86_64.info wxgtk2.8-x86_64.patch
Log Message:
New upstream version by getphuture that merges -x86_64.*. From the submissions
tracker:
https://sourceforge.net/tracker/?func=detail&aid=2902574&group_id=17203&atid=414256
--- wxgtk2.8-x86_64.patch DELETED ---
Index: wxgtk2.8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk2.8.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- wxgtk2.8.info 6 Oct 2009 12:13:40 -0000 1.14
+++ wxgtk2.8.info 29 Nov 2009 22:16:25 -0000 1.15
@@ -1,10 +1,10 @@
Package: wxgtk2.8
-Version: 2.8.9
-Revision: 20
-Source-MD5: 8c845c11b02dc852471a7013eeded5ff
+Version: 2.8.10
+Revision: 21
+Source-MD5: d9638db3f3a9ce36c900a52f8c0087c6
Source: mirror:sourceforge:wxwindows/wxGTK-%v.tar.gz
PatchFile: %n.patch
-PatchFile-MD5: 7f57df4c5e18c46966bb35d7a22c4889
+PatchFile-MD5: b577f6923a1ad94d101b5a3b4da17b94
License: GPL
Maintainer: Pierre-Henri Lavigne <yakesonchih...@aim.com>
Homepage: http://www.wxwidgets.org/
@@ -50,7 +50,7 @@
pango1-xft2-ft219-dev (>= 1.22.0-4),
pixman (>= 0.12.0-1),
pkgconfig (>= 0.23-1),
- sdl,
+ (%m != x86_64) sdl,
x11-dev,
xft2-dev
<<
@@ -60,22 +60,27 @@
GCC: 4.0
BuildDependsOnly:true
PatchScript: <<
+#!/bin/sh -ev
%{default_script}
perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
perl -pi -e 's/single_module/$& -Wl,-x -dead_strip/'
build/aclocal/bakefile.m4 configure
perl -pi -e 's,^extern,#undef BOOL\n$&,' src/unix/displayx11.cpp
- perl -pi -e 's,^...@cond_shared_1_use_xrc_1\@.*\(__WXLIB_BASE_p\)$,$&
-lwx_gtk2u_adv-2.8 -lwx_gtk2u_html-2.8,' contrib/src/gizmos/Makefile.in
+ perl -pi -e 's,^...@cond_shared_1_use_xrc_1\@.*\(__WXLIB_BASE_p\).*$,$&
-lwx_gtk2u_adv-2.8 -lwx_gtk2u_html-2.8,' contrib/src/gizmos/Makefile.in
perl -pi -e 's,\...@libs\@,$& \...@cairo_libs\@,' Makefile.in
perl -pi -e 's,\$GUI_TK_LIBRARY -lXinerama,\$GUI_TK_LIBRARY -lXinerama -lX11
-lGL,g' configure
+ if [ %m = "x86_64" ]; then
+ perl -pi -e "s,\(unsigned int\) iter->user_data \)\;$,\(unsigned long\)
iter->user_data \)\;," src/gtk/dataview.cpp
+ perl -pi -e "s,unsigned int model_row = \(unsigned int\)
iter->user_data\;$,unsigned long model_row = \(unsigned long\)
iter->user_data\;," src/gtk/dataview.cpp
+ fi
<<
-SetCPPFLAGS: -I/usr/X11R6/include -I/usr/include -I%p/include/SDL
-I%p/include/gtk-2.0/gtk -I%p/include/gtk-2.0/gdk
-I%p/lib/pango-ft219/include/pango-1.0 -I%p/include/gstreamer-0.10
-SetLDFLAGS: -L/usr/X11R6/lib -L/usr/lib -L%p/lib/gtk-2.0
-L%p/lib/gstreamer-0.10 -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+SetCPPFLAGS: -I%p/include/SDL -I/usr/X11R6/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-L/usr/X11R6/lib
ConfigureParams: <<
--with-extra-includes=%p/include --with-extra-libs=%p/lib
--disable-dependency-tracking --disable-debug --disable-debug_flag \
--disable-debug_info --disable-monolithic --disable-precomp-headers
--enable-objc_uniquifying --enable-optimise --enable-threads \
--without-mac --without-cocoa --without-macosx-sdk
--without-macosx-version-min --disable-universal_binary --enable-apple_ieee \
--enable-gtk2 --with-gtk --with-gtk-prefix=%p --with-gnomeprint
--with-gnomevfs --with-opengl --enable-nanox --enable-webkit \
- --enable-no_rtti --enable-no_exceptions --with-x
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
+ --disable-no_rtti --disable-no_exceptions --with-x
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
--enable-unicode --enable-intl --enable-display --enable-geometry
--enable-controls --enable-gpe --enable-iff --without-odbc \
--enable-graphics_ctx --enable-mediactrl --enable-dataviewctrl
--enable-tabdialog --enable-docview --enable-sound \
--with-sdl --disable-sdltest --with-sdl-exec-prefix=%p
--with-libiconv-prefix=%p --with-expat \
@@ -86,7 +91,11 @@
#!/bin/sh -ev
export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
cd build
- ../configure %c
+ if [ %m = "x86_64" ]; then
+ ../configure %c --build=%m-apple-darwin`uname -r|cut -f1 -d.`
--host=%m-apple-darwin`uname -r|cut -f1 -d.`
+ else
+ ../configure %c --with-sdl --disable-sdltest --with-sdl-exec-prefix=%p
+ fi
make
make -C contrib/src/fl
make -C contrib/src/foldbar
@@ -132,32 +141,32 @@
libxml2-shlibs (>= 2.6.32-1),
orbit2-shlibs (>= 2.14.16-1),
pango1-xft2-ft219-shlibs (>= 1.22.0-4),
- sdl-shlibs,
+ (%m != x86_64) sdl-shlibs,
x11-shlibs
<<
Files: lib/libwx_*-*.*.*.dylib
Shlibs: <<
- %p/lib/libwx_baseu-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_baseu_net-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_baseu_xml-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_adv-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_aui-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_core-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_gl-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_html-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_media-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_qa-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_richtext-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_xrc-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_fl-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_foldbar-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_netutils-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_ogl-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_plot-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_stc-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_svg-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_gizmos-2.8.0.dylib 6.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_gizmos_xrc-2.8.0.dylib 6.0.0 %n (>=
2.8.7-4)
+ %p/lib/libwx_baseu-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_baseu_net-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_baseu_xml-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_adv-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_aui-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_core-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_gl-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_html-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_media-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_qa-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_richtext-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_xrc-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_fl-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_foldbar-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_netutils-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_ogl-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_plot-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_stc-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_svg-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_gizmos-2.8.0.dylib 7.0.0 %n (>= 2.8.7-4)
+ %p/lib/libwx_gtk2u_gizmos_xrc-2.8.0.dylib 7.0.0 %n (>=
2.8.7-4)
<<
<<
DescPort: <<
--- wxgtk2.8-x86_64.info DELETED ---
Index: wxgtk2.8.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk2.8.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wxgtk2.8.patch 1 Mar 2009 22:34:25 -0000 1.4
+++ wxgtk2.8.patch 29 Nov 2009 22:16:25 -0000 1.5
@@ -1,57 +1,46 @@
---- wxGTK-2.8.9/Makefile.in 2008-09-15 11:34:57.000000000 +0200
-+++ wxGTK-2.8.9-patched/Makefile.in 2008-11-09 20:34:54.000000000 +0100
-@@ -4960,8 +4960,8 @@
+--- wxGTK-2.8.10/Makefile.in 2009-03-06 21:17:59.000000000 +0900
++++ wxGTK-2.8.10-patched/Makefile.in 2009-11-21 00:21:44.000000000 +0900
+@@ -5007,8 +5007,8 @@
@cond_platform_macos...@__html_src_platform_objects = monodll_chm.o
@cond_platform_uni...@__html_src_platform_objects = monodll_chm.o
@cond_toolkit_...@__html_src_platform_objects = monodll_helpbest.o
-...@cond_platform_unix_1_use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS \
-...@cond_platform_unix_1_use_plugins_0@ = monodll_sound_sdl.o
+...@cond_use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS \
-...@cond_use_plugins_0@ = monodll_sound_sdl.o
+...@cond_use_plugins_0@ = monodll_sound_sdl.o
COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@cond_monolithic_1_share...@__monolib___depname =
$(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
-@@ -6749,8 +6749,8 @@
+@@ -6803,8 +6803,8 @@
@cond_platform_macos...@__html_src_platform_objects_1 = monolib_chm.o
@cond_platform_uni...@__html_src_platform_objects_1 = monolib_chm.o
@cond_toolkit_...@__html_src_platform_objects_1 = monolib_helpbest.o
-...@cond_platform_unix_1_use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
-...@cond_platform_unix_1_use_plugins_0@ = monolib_sound_sdl.o
+...@cond_use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
-...@cond_use_plugins_0@ = monolib_sound_sdl.o
+...@cond_use_plugins_0@ = monolib_sound_sdl.o
COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@cond_monolithic_0_share...@__basedll___depname =
$(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
-@@ -10254,8 +10254,8 @@
+@@ -10314,8 +10314,8 @@
@COND_TOOLKIT_MSW@ = advdll_datectrl.o
@cond_toolkit_wi...@__advanced_platform_native_src_objects_2 \
@COND_TOOLKIT_WINCE@ = advdll_datectrl.o
-...@cond_platform_unix_1_use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
-...@cond_platform_unix_1_use_plugins_0@ = advdll_sound_sdl.o
+...@cond_use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
-...@cond_use_plugins_0@ = advdll_sound_sdl.o
+...@cond_use_plugins_0@ = advdll_sound_sdl.o
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@cond_monolithic_0_shared_0_use_gu...@__advlib___depname =
$(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
-@@ -10319,8 +10319,8 @@
+@@ -10379,8 +10379,8 @@
@COND_TOOLKIT_MSW@ = advlib_datectrl.o
@cond_toolkit_wi...@__advanced_platform_native_src_objects_3 \
@COND_TOOLKIT_WINCE@ = advlib_datectrl.o
-...@cond_platform_unix_1_use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
-...@cond_platform_unix_1_use_plugins_0@ = advlib_sound_sdl.o
+...@use_plugins_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
-...@use_plugins_0@ = advlib_sound_sdl.o
+...@use_plugins_0@ = advlib_sound_sdl.o
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@cond_monolithic_0_shared_1_use_gui_1_use_medi...@__mediadll___depname =
$(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
---- wxGTK-2.8.9/src/gtk/gnome/gvfs.cpp 2008-09-15 11:35:07.000000000 +0200
-+++ wxGTK-2.8.9-patched/src/gtk/gnome/gvfs.cpp 2008-11-09 23:03:41.000000000
+0100
-@@ -91,7 +91,7 @@
- // which we link implicitly (GTK+ itself?) which are not uninstalled
- // when it's unloaded resulting in this crash, so just leave it in
- // memory -- it's a lesser evil
-- m_gnome_vfs_lib->.Detach();
-+ m_gnome_vfs_lib->Detach();
- delete m_gnome_vfs_lib;
- }
- }
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
