From 3aae7c847009209bfe168beb8e7afd13b2391a9b Mon Sep 17 00:00:00 2001 From: piernov Date: Wed, 30 May 2012 16:52:40 +0000 Subject: wxgtk 2.8.12-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wxgtk/.footprint.i686 | 65 +++++++++++++++++++++++++++++++----------------- wxgtk/.footprint.x86_64 | 65 +++++++++++++++++++++++++++++++----------------- wxgtk/.md5sum.i686 | 4 +-- wxgtk/.md5sum.x86_64 | 4 +-- wxgtk/Pkgfile | 20 +++------------ wxgtk/glib-2.21.patch | 16 ------------ wxgtk/overflow.patch | 66 ------------------------------------------------- 7 files changed, 92 insertions(+), 148 deletions(-) delete mode 100644 wxgtk/glib-2.21.patch delete mode 100644 wxgtk/overflow.patch (limited to 'wxgtk') diff --git a/wxgtk/.footprint.i686 b/wxgtk/.footprint.i686 index c548b405a..f87906f6c 100644 --- a/wxgtk/.footprint.i686 +++ b/wxgtk/.footprint.i686 @@ -615,38 +615,59 @@ drwxr-xr-x root/root usr/include/wx-2.8/wx/xrc/ -rw-r--r-- root/root usr/include/wx-2.8/wx/zstream.h drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libwx_baseu-2.8.so -> libwx_baseu-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu-2.8.so.0 -> libwx_baseu-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_baseu-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_baseu-2.8.so.0 -> libwx_baseu-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_baseu-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_baseu_net-2.8.so -> libwx_baseu_net-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu_net-2.8.so.0 -> libwx_baseu_net-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_baseu_net-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_baseu_net-2.8.so.0 -> libwx_baseu_net-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_baseu_net-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-2.8.so -> libwx_baseu_xml-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-2.8.so.0 -> libwx_baseu_xml-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_baseu_xml-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-2.8.so.0 -> libwx_baseu_xml-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_baseu_xml-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_adv-2.8.so -> libwx_gtk2u_adv-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_adv-2.8.so.0 -> libwx_gtk2u_adv-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_adv-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_adv-2.8.so.0 -> libwx_gtk2u_adv-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_adv-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_aui-2.8.so -> libwx_gtk2u_aui-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_aui-2.8.so.0 -> libwx_gtk2u_aui-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_aui-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_aui-2.8.so.0 -> libwx_gtk2u_aui-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_aui-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_core-2.8.so -> libwx_gtk2u_core-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_core-2.8.so.0 -> libwx_gtk2u_core-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_core-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_core-2.8.so.0 -> libwx_gtk2u_core-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_core-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_fl-2.8.so -> libwx_gtk2u_fl-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_fl-2.8.so.0 -> libwx_gtk2u_fl-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_fl-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos-2.8.so -> libwx_gtk2u_gizmos-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos-2.8.so.0 -> libwx_gtk2u_gizmos-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_gizmos-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so -> libwx_gtk2u_gizmos_xrc-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so.0 -> libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gl-2.8.so -> libwx_gtk2u_gl-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gl-2.8.so.0 -> libwx_gtk2u_gl-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_gl-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gl-2.8.so.0 -> libwx_gtk2u_gl-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_gl-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_html-2.8.so -> libwx_gtk2u_html-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_html-2.8.so.0 -> libwx_gtk2u_html-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_html-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_html-2.8.so.0 -> libwx_gtk2u_html-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_html-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_ogl-2.8.so -> libwx_gtk2u_ogl-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_ogl-2.8.so.0 -> libwx_gtk2u_ogl-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_ogl-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_plot-2.8.so -> libwx_gtk2u_plot-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_plot-2.8.so.0 -> libwx_gtk2u_plot-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_plot-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_qa-2.8.so -> libwx_gtk2u_qa-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_qa-2.8.so.0 -> libwx_gtk2u_qa-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_qa-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_qa-2.8.so.0 -> libwx_gtk2u_qa-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_qa-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_richtext-2.8.so -> libwx_gtk2u_richtext-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0 -> libwx_gtk2u_richtext-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0 -> libwx_gtk2u_richtext-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_stc-2.8.so -> libwx_gtk2u_stc-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_stc-2.8.so.0 -> libwx_gtk2u_stc-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_stc-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_svg-2.8.so -> libwx_gtk2u_svg-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_svg-2.8.so.0 -> libwx_gtk2u_svg-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_svg-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_xrc-2.8.so -> libwx_gtk2u_xrc-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0 -> libwx_gtk2u_xrc-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0 -> libwx_gtk2u_xrc-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0.8.0 drwxr-xr-x root/root usr/lib/wx/ drwxr-xr-x root/root usr/lib/wx/config/ -rwxr-xr-x root/root usr/lib/wx/config/gtk2-unicode-release-2.8 diff --git a/wxgtk/.footprint.x86_64 b/wxgtk/.footprint.x86_64 index c548b405a..f87906f6c 100644 --- a/wxgtk/.footprint.x86_64 +++ b/wxgtk/.footprint.x86_64 @@ -615,38 +615,59 @@ drwxr-xr-x root/root usr/include/wx-2.8/wx/xrc/ -rw-r--r-- root/root usr/include/wx-2.8/wx/zstream.h drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libwx_baseu-2.8.so -> libwx_baseu-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu-2.8.so.0 -> libwx_baseu-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_baseu-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_baseu-2.8.so.0 -> libwx_baseu-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_baseu-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_baseu_net-2.8.so -> libwx_baseu_net-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu_net-2.8.so.0 -> libwx_baseu_net-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_baseu_net-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_baseu_net-2.8.so.0 -> libwx_baseu_net-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_baseu_net-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-2.8.so -> libwx_baseu_xml-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-2.8.so.0 -> libwx_baseu_xml-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_baseu_xml-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_baseu_xml-2.8.so.0 -> libwx_baseu_xml-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_baseu_xml-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_adv-2.8.so -> libwx_gtk2u_adv-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_adv-2.8.so.0 -> libwx_gtk2u_adv-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_adv-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_adv-2.8.so.0 -> libwx_gtk2u_adv-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_adv-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_aui-2.8.so -> libwx_gtk2u_aui-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_aui-2.8.so.0 -> libwx_gtk2u_aui-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_aui-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_aui-2.8.so.0 -> libwx_gtk2u_aui-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_aui-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_core-2.8.so -> libwx_gtk2u_core-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_core-2.8.so.0 -> libwx_gtk2u_core-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_core-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_core-2.8.so.0 -> libwx_gtk2u_core-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_core-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_fl-2.8.so -> libwx_gtk2u_fl-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_fl-2.8.so.0 -> libwx_gtk2u_fl-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_fl-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos-2.8.so -> libwx_gtk2u_gizmos-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos-2.8.so.0 -> libwx_gtk2u_gizmos-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_gizmos-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so -> libwx_gtk2u_gizmos_xrc-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so.0 -> libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gl-2.8.so -> libwx_gtk2u_gl-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gl-2.8.so.0 -> libwx_gtk2u_gl-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_gl-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_gl-2.8.so.0 -> libwx_gtk2u_gl-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_gl-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_html-2.8.so -> libwx_gtk2u_html-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_html-2.8.so.0 -> libwx_gtk2u_html-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_html-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_html-2.8.so.0 -> libwx_gtk2u_html-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_html-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_ogl-2.8.so -> libwx_gtk2u_ogl-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_ogl-2.8.so.0 -> libwx_gtk2u_ogl-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_ogl-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_plot-2.8.so -> libwx_gtk2u_plot-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_plot-2.8.so.0 -> libwx_gtk2u_plot-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_plot-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_qa-2.8.so -> libwx_gtk2u_qa-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_qa-2.8.so.0 -> libwx_gtk2u_qa-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_qa-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_qa-2.8.so.0 -> libwx_gtk2u_qa-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_qa-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_richtext-2.8.so -> libwx_gtk2u_richtext-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0 -> libwx_gtk2u_richtext-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0 -> libwx_gtk2u_richtext-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_richtext-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_stc-2.8.so -> libwx_gtk2u_stc-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_stc-2.8.so.0 -> libwx_gtk2u_stc-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_stc-2.8.so.0.8.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_svg-2.8.so -> libwx_gtk2u_svg-2.8.so.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_svg-2.8.so.0 -> libwx_gtk2u_svg-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_svg-2.8.so.0.8.0 lrwxrwxrwx root/root usr/lib/libwx_gtk2u_xrc-2.8.so -> libwx_gtk2u_xrc-2.8.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0 -> libwx_gtk2u_xrc-2.8.so.0.6.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0.6.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0 -> libwx_gtk2u_xrc-2.8.so.0.8.0 +-rwxr-xr-x root/root usr/lib/libwx_gtk2u_xrc-2.8.so.0.8.0 drwxr-xr-x root/root usr/lib/wx/ drwxr-xr-x root/root usr/lib/wx/config/ -rwxr-xr-x root/root usr/lib/wx/config/gtk2-unicode-release-2.8 diff --git a/wxgtk/.md5sum.i686 b/wxgtk/.md5sum.i686 index a32b3f4db..d3fa5dd31 100644 --- a/wxgtk/.md5sum.i686 +++ b/wxgtk/.md5sum.i686 @@ -1,3 +1 @@ -569bc725e6d866e94c81ff649464b46e glib-2.21.patch -325dba65152bc0cfbc1400a2bf54508e overflow.patch -88b867bc118a183af56efc67014bdf27 wxGTK-2.8.10.tar.bz2 +08f81ab60647308058f6ce99712b14f8 wxGTK-2.8.12.tar.bz2 diff --git a/wxgtk/.md5sum.x86_64 b/wxgtk/.md5sum.x86_64 index a32b3f4db..d3fa5dd31 100644 --- a/wxgtk/.md5sum.x86_64 +++ b/wxgtk/.md5sum.x86_64 @@ -1,3 +1 @@ -569bc725e6d866e94c81ff649464b46e glib-2.21.patch -325dba65152bc0cfbc1400a2bf54508e overflow.patch -88b867bc118a183af56efc67014bdf27 wxGTK-2.8.10.tar.bz2 +08f81ab60647308058f6ce99712b14f8 wxGTK-2.8.12.tar.bz2 diff --git a/wxgtk/Pkgfile b/wxgtk/Pkgfile index 72259bb23..b3a1b4d21 100755 --- a/wxgtk/Pkgfile +++ b/wxgtk/Pkgfile @@ -6,28 +6,17 @@ # Run on: gtk,mesa3d name=wxgtk -version=2.8.10 +version=2.8.12 release=1 -source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${version}.tar.bz2 \ - overflow.patch glib-2.21.patch) - +source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${version}.tar.bz2) build() { - export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib" cd wxGTK-$version - - patch -p4 < ../overflow.patch - patch -Np1 -i ../glib-2.21.patch - - ./configure --prefix=/usr\ + ./configure --prefix=/usr\ --with-gtk=2 \ - --libdir=/usr/lib \ --with-opengl \ --enable-unicode \ - --without-gnomeprint \ - --disable-optimize \ - --mandir=/usr/share/man\ - --infodir=/usr/share/info + --without-gnomeprint make make DESTDIR=$PKG install cd contrib @@ -35,4 +24,3 @@ build() { make prefix=$PKG/usr install ln -sf /usr/lib/wx/config/gtk2-unicode-release-2.8 $PKG/usr/bin/wx-config } - diff --git a/wxgtk/glib-2.21.patch b/wxgtk/glib-2.21.patch deleted file mode 100644 index 079fe28d6..000000000 --- a/wxgtk/glib-2.21.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 2.8/src/gtk/gsockgtk.cpp (revision 60599) -+++ 2.8/src/gtk/gsockgtk.cpp (working copy) -@@ -15,8 +15,13 @@ - #include - #include - -+// newer versions of glib define its own GSocket but we unfortunately use this -+// name in our own (semi-)public header and so can't change it -- rename glib -+// one instead -+#define GSocket GlibGSocket - #include - #include -+#undef GSocket - - #include "wx/gsocket.h" - #include "wx/unix/gsockunx.h" diff --git a/wxgtk/overflow.patch b/wxgtk/overflow.patch deleted file mode 100644 index 543bdff12..000000000 --- a/wxgtk/overflow.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp -=================================================================== ---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 53479) -+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagpng.cpp (revision 60875) -@@ -569,5 +569,7 @@ - goto error; - -- lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) ); -+ // initialize all line pointers to NULL to ensure that they can be safely -+ // free()d if an error occurs before all of them could be allocated -+ lines = (unsigned char **)calloc(height, sizeof(unsigned char *)); - if ( !lines ) - goto error; -@@ -576,9 +578,5 @@ - { - if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL) -- { -- for ( unsigned int n = 0; n < i; n++ ) -- free( lines[n] ); - goto error; -- } - } - -Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp -=================================================================== ---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 48694) -+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60876) -@@ -262,5 +262,4 @@ - - uint32 w, h; -- uint32 npixels; - uint32 *raster; - -@@ -276,7 +275,18 @@ - samplesInfo[0] == EXTRASAMPLE_UNASSALPHA)); - -- npixels = w * h; -- -- raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) ); -+ // guard against integer overflow during multiplication which could result -+ // in allocating a too small buffer and then overflowing it -+ const double bytesNeeded = w * h * sizeof(uint32); -+ if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ ) -+ { -+ if ( verbose ) -+ wxLogError( _("TIFF: Image size is abnormally big.") ); -+ -+ TIFFClose(tif); -+ -+ return false; -+ } -+ -+ raster = (uint32*) _TIFFmalloc( bytesNeeded ); - - if (!raster) -Index: /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp -=================================================================== ---- /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60876) -+++ /wxWidgets/branches/WX_2_8_BRANCH/src/common/imagtiff.cpp (revision 60897) -@@ -277,5 +277,5 @@ - // guard against integer overflow during multiplication which could result - // in allocating a too small buffer and then overflowing it -- const double bytesNeeded = w * h * sizeof(uint32); -+ const double bytesNeeded = (double)w * (double)h * sizeof(uint32); - if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ ) - { -- cgit v1.2.3-54-g00ecf