Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20819/stable/main/finkinfo/x11
Modified Files:
wxgtk2.8.info wxgtk2.8.patch
Log Message:
New wxMaxima needs newer wx, so sync from unstable.
Fix typos.
Unfortunately, the GTK version doesn't seem to run here, so discontinue for
now to keep people from getting false hope.
Index: wxgtk2.8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/wxgtk2.8.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wxgtk2.8.info 30 Mar 2009 03:37:21 -0000 1.3
+++ wxgtk2.8.info 13 May 2009 15:02:15 -0000 1.4
@@ -1,13 +1,13 @@
Package: wxgtk2.8
-Version: 2.8.7
-Revision: 18
-Source-MD5: 594391d6a585f37e79517cb97af46d84
+Version: 2.8.9
+Revision: 20
+Source-MD5: 8c845c11b02dc852471a7013eeded5ff
Source: mirror:sourceforge:wxwindows/wxGTK-%v.tar.gz
PatchFile: %n.patch
-PatchFile-MD5: 58ec74b5be10f4ce99b5bb2b32a40a53
+PatchFile-MD5: 7f57df4c5e18c46966bb35d7a22c4889
License: GPL
-Maintainer: Pierre-Henri Lavigne <wxgtk28.f...@getphuture.com>
-Homepage: http://wxWindows.org/
+Maintainer: Pierre-Henri Lavigne <yakeson_chih...@yahoo.co.jp>
+Homepage: http://www.wxwidgets.org/
Description: Cross-platform GUI API - unix/gtk version
DescDetail: <<
In addition to common and advanced GUI facilities such as
@@ -20,36 +20,36 @@
<<
DocFiles: BuildCVS.txt install-gtk.txt docs readme-gtk.txt
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- cairo (>= 1.6-1),
- dbus-dev (>= 1.0-1),
+ atk1 (>= 1.24.0-1),
+ cairo (>= 1.8.2-1),
+ dbus-dev (>= 1.2.3-6),
expat1,
- fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gconf2-dev (>= 2.20.0-1),
- glib2-dev (>= 2.14.0-1),
+ fink (>= 0.28.6-1),
+ fontconfig2-dev (>= 2.4.1-5),
+ freetype219 (>= 2.3.7-7),
+ gconf2-dev (>= 2.24.0-1),
+ glib2-dev (>= 2.18.2-1),
glitz,
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.0-1),
gst-plugins-base-0.10-dev,
gstreamer-0.10-dev,
- gtk+2-dev (>= 2.12.0-1),
+ gtk+2-dev (>= 2.14.4-1),
libart2,
libbonobo2-dev (>= 2.20.0-1),
libgettext3-dev,
libgl,
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomeprint2.2-dev (>= 2.18.2-1),
- libgnomeprintui2.2-dev (>= 2.18.1-1),
+ libgnomecanvas2-dev (>= 2.20.1-1),
+ libgnomeprint2.2-dev (>= 2.18.5-1),
+ libgnomeprintui2.2-dev (>= 2.18.3-1),
libiconv-dev,
libjpeg,
libpng3,
libtiff,
- libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
+ libxml2 (>= 2.6.32-1),
+ orbit2-dev (>= 2.14.16-1),
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.23-1),
sdl,
x11-dev,
xft2-dev
@@ -66,10 +66,10 @@
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,\...@libs\@,$& \...@cairo_libs\@,' Makefile.in
- perl -pi -e
's;EXTRALIBS_OPENGL=";$&-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib;'
configure
+ perl -pi -e 's,\$GUI_TK_LIBRARY -lXinerama,\$GUI_TK_LIBRARY -lXinerama -lX11
-lGL,g' configure
<<
-SetCPPFLAGS: -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%p/lib/gtk-2.0 -L%p/lib/gstreamer-0.10
+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
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 \
@@ -78,7 +78,7 @@
--enable-no_rtti --enable-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 \
+ --with-sdl --disable-sdltest --with-sdl-exec-prefix=%p
--with-libiconv-prefix=%p --with-expat \
--with-regex --with-zlib --with-libxpm --with-libtiff --with-libjpeg
--with-libpng --enable-std_iostreams --enable-std_string
<<
# --enable-stl --with-odbc --enable-plugins ??
@@ -116,47 +116,51 @@
Description: Shared libraries for %n
DocFiles: docs/readme.txt docs/licence.txt docs/changes.txt docs/lgpl.txt
docs/gpl.txt
Depends: <<
- atk1-shlibs (>= 1.20.0-1),
- cairo-shlibs (>= 1.6-1),
+ atk1-shlibs (>= 1.24.0-1),
+ cairo-shlibs (>= 1.8.2-1),
expat1-shlibs,
- gconf2-shlibs (>= 2.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
+ gconf2-shlibs (>= 2.24.0-1),
+ glib2-shlibs (>= 2.18.2-1),
gst-plugins-base-0.10-shlibs,
gstreamer-0.10-shlibs,
- gtk+2-shlibs (>= 2.12.0-1),
+ gtk+2-shlibs (>= 2.14.4-1),
libgettext3-shlibs,
libiconv,
libjpeg-shlibs,
libpng3-shlibs,
libtiff-shlibs,
- libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.9-1),
- pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ libxml2-shlibs (>= 2.6.32-1),
+ orbit2-shlibs (>= 2.14.16-1),
+ pango1-xft2-ft219-shlibs (>= 1.22.0-4),
sdl-shlibs,
x11-shlibs
<<
Files: lib/libwx_*-*.*.*.dylib
Shlibs: <<
- %p/lib/libwx_baseu-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_baseu_net-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_baseu_xml-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_adv-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_aui-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_core-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_gl-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_html-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_media-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_qa-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_richtext-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_xrc-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_fl-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_foldbar-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_netutils-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_ogl-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_plot-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_stc-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_svg-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_gizmos-2.8.0.dylib 5.0.0 %n (>= 2.8.7-4)
- %p/lib/libwx_gtk2u_gizmos_xrc-2.8.0.dylib 5.0.0 %n (>=
2.8.7-4)
+ %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)
<<
<<
+DescPort: <<
+ dmacks: dispalyx11.cpp (among others) uses x11 directly if
+ wxUSE_DISPLAY, so needs to link directly to libX11
+<<
Index: wxgtk2.8.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/wxgtk2.8.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxgtk2.8.patch 16 Jul 2008 03:01:54 -0000 1.1
+++ wxgtk2.8.patch 13 May 2009 15:02:15 -0000 1.2
@@ -1,46 +1,57 @@
---- wxGTK-2.8.7/Makefile.in 2007-11-21 13:52:18.000000000 +0100
-+++ wxGTK-2.8.7-patched/Makefile.in 2007-12-23 23:18:30.000000000 +0100
-@@ -4953,8 +4953,8 @@
+--- 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 @@
@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)
-@@ -6741,8 +6741,8 @@
+@@ -6749,8 +6749,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)
-@@ -10246,8 +10246,8 @@
+@@ -10254,8 +10254,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)
-@@ -10311,8 +10311,8 @@
+@@ -10319,8 +10319,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;
+ }
+ }
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
