Date: Thu, 15 Aug 2013 16:18:39 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181329: [patch] x11-toolkits/wxgtk29: update to 2.9.5 Message-ID: <201308151618.r7FGIdaF015388@oldred.freebsd.org> Resent-Message-ID: <201308151620.r7FGK0It048598@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181329
>Category: ports
>Synopsis: [patch] x11-toolkits/wxgtk29: update to 2.9.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 15 16:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rainer Hurling
>Release: 10.0-CURRENT amd64 (clang)
>Organization:
>Environment:
FreeBSD xxx.xxx.xxx 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r254330: Wed Aug 14 18:55:27 CEST 2013 xxx@xxx.xxx.xxx:/usr/obj/usr/src/sys/XXX amd64
>Description:
Update x11-toolkits/wxgtk29 from version 2.9.4_1 to 2.9.5
Again many bug fixes and some improvements.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Naur wxgtk29.orig/Makefile wxgtk29/Makefile
--- wxgtk29.orig/Makefile 2013-08-15 16:56:40.000000000 +0200
+++ wxgtk29/Makefile 2013-08-15 18:05:47.000000000 +0200
@@ -2,22 +2,21 @@
# $FreeBSD: head/x11-toolkits/wxgtk29/Makefile 324744 2013-08-14 22:35:50Z ak $
PORTNAME= wx
-PORTVERSION= 2.9.4
-PORTREVISION= 1
+PORTVERSION= 2.9.5
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/${PORTVERSION}
PKGNAMESUFFIX= gtk2
DISTNAME= wxWidgets-${PORTVERSION}
-MAINTAINER?= fjoe@FreeBSD.org
-COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings
+MAINTAINER= fjoe@FreeBSD.org
+COMMENT= The wxWidgets GUI toolkit with GTK+ bindings
-LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png\
- jpeg.11:${PORTSDIR}/graphics/jpeg\
- tiff.4:${PORTSDIR}/graphics/tiff\
- expat.6:${PORTSDIR}/textproc/expat2\
- inotify.0:${PORTSDIR}/devel/libinotify\
- webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png\
+ libjpeg.so:${PORTSDIR}/graphics/jpeg\
+ libtiff.so:${PORTSDIR}/graphics/tiff\
+ libexpat.so:${PORTSDIR}/textproc/expat2\
+ libinotify.so:${PORTSDIR}/devel/libinotify\
+ libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
USES+= iconv
USE_BZIP2= yes
@@ -63,7 +62,7 @@
.if ${PORT_OPTIONS:MMSPACK}
CONFIGURE_ARGS+=--with-libmspack
-LIB_DEPENDS+= mspack.1:${PORTSDIR}/archivers/libmspack
+LIB_DEPENDS+= libmspack.so:${PORTSDIR}/archivers/libmspack
.else
CONFIGURE_ARGS+=--without-libmspack
.endif
diff -Naur wxgtk29.orig/distinfo wxgtk29/distinfo
--- wxgtk29.orig/distinfo 2013-06-20 17:32:27.000000000 +0200
+++ wxgtk29/distinfo 2013-08-15 17:25:15.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (wxWidgets-2.9.4.tar.bz2) = 6c530c35f40c3b1a5f9a4577c3ee8a9982e745081f23e3fbb9951d6d17514d12
-SIZE (wxWidgets-2.9.4.tar.bz2) = 17045208
+SHA256 (wxWidgets-2.9.5.tar.bz2) = b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02
+SIZE (wxWidgets-2.9.5.tar.bz2) = 19863436
diff -Naur wxgtk29.orig/files/patch-Makefile.in wxgtk29/files/patch-Makefile.in
--- wxgtk29.orig/files/patch-Makefile.in 2013-06-20 17:32:27.000000000 +0200
+++ wxgtk29/files/patch-Makefile.in 2013-08-15 17:36:13.000000000 +0200
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2010-07-18 20:39:20.000000000 +0700
-+++ Makefile.in 2011-02-18 15:33:56.000000000 +0600
+--- Makefile.in.orig 2013-07-16 17:47:14.000000000 +0200
++++ Makefile.in 2013-08-15 17:34:39.000000000 +0200
@@ -25,6 +25,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,7 +8,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
-@@ -13465,9 +13466,9 @@
+@@ -15211,9 +15212,9 @@
install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname)
$(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
@@ -20,18 +20,18 @@
$(DYLIB_RPATH_INSTALL)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
-@@ -14308,9 +14309,7 @@
+@@ -16096,9 +16097,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -14318,7 +14317,7 @@
+@@ -16106,7 +16105,7 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
if test -f $(srcdir)/locale/$$l.mo ; then \
diff -Naur wxgtk29.orig/pkg-plist wxgtk29/pkg-plist
--- wxgtk29.orig/pkg-plist 2013-06-20 17:32:27.000000000 +0200
+++ wxgtk29/pkg-plist 2013-08-15 17:50:26.000000000 +0200
@@ -40,7 +40,6 @@
include/wx-2.9/wx/build.h
include/wx-2.9/wx/busyinfo.h
include/wx-2.9/wx/button.h
-include/wx-2.9/wx/cairo.h
include/wx-2.9/wx/calctrl.h
include/wx-2.9/wx/caret.h
include/wx-2.9/wx/chartype.h
@@ -65,6 +64,7 @@
include/wx-2.9/wx/combo.h
include/wx-2.9/wx/combobox.h
include/wx-2.9/wx/commandlinkbutton.h
+include/wx-2.9/wx/compiler.h
include/wx-2.9/wx/compositewin.h
include/wx-2.9/wx/confbase.h
include/wx-2.9/wx/config.h
@@ -279,6 +279,7 @@
include/wx-2.9/wx/gtk/msgdlg.h
include/wx-2.9/wx/gtk/nonownedwnd.h
include/wx-2.9/wx/gtk/notebook.h
+include/wx-2.9/wx/gtk/notifmsg.h
include/wx-2.9/wx/gtk/pen.h
include/wx-2.9/wx/gtk/popupwin.h
include/wx-2.9/wx/gtk/print.h
@@ -301,7 +302,6 @@
include/wx-2.9/wx/gtk/toolbar.h
include/wx-2.9/wx/gtk/tooltip.h
include/wx-2.9/wx/gtk/toplevel.h
-include/wx-2.9/wx/gtk/treeentry_gtk.h
include/wx-2.9/wx/gtk/webview_webkit.h
include/wx-2.9/wx/gtk/webviewhistoryitem_webkit.h
include/wx-2.9/wx/gtk/window.h
@@ -385,9 +385,11 @@
include/wx-2.9/wx/meta/int2type.h
include/wx-2.9/wx/meta/movable.h
include/wx-2.9/wx/meta/pod.h
+include/wx-2.9/wx/meta/removeref.h
include/wx-2.9/wx/metafile.h
include/wx-2.9/wx/mimetype.h
include/wx-2.9/wx/minifram.h
+include/wx-2.9/wx/modalhook.h
include/wx-2.9/wx/module.h
include/wx-2.9/wx/mousemanager.h
include/wx-2.9/wx/mousestate.h
@@ -482,6 +484,7 @@
include/wx-2.9/wx/richtext/richtextstylepage.h
include/wx-2.9/wx/richtext/richtextstyles.h
include/wx-2.9/wx/richtext/richtextsymboldlg.h
+include/wx-2.9/wx/richtext/richtexttabspage.h
include/wx-2.9/wx/richtext/richtextuicustomization.h
include/wx-2.9/wx/richtext/richtextxml.h
include/wx-2.9/wx/richtooltip.h
@@ -498,6 +501,7 @@
include/wx-2.9/wx/selstore.h
include/wx-2.9/wx/settings.h
include/wx-2.9/wx/sharedptr.h
+include/wx-2.9/wx/simplebook.h
include/wx-2.9/wx/sizer.h
include/wx-2.9/wx/slider.h
include/wx-2.9/wx/snglinst.h
@@ -603,6 +607,7 @@
include/wx-2.9/wx/weakref.h
include/wx-2.9/wx/webview.h
include/wx-2.9/wx/webviewarchivehandler.h
+include/wx-2.9/wx/webviewfshandler.h
include/wx-2.9/wx/wfstream.h
include/wx-2.9/wx/window.h
include/wx-2.9/wx/windowid.h
@@ -623,6 +628,7 @@
include/wx-2.9/wx/xpmhand.h
include/wx-2.9/wx/xrc/xh_all.h
include/wx-2.9/wx/xrc/xh_animatctrl.h
+include/wx-2.9/wx/xrc/xh_auinotbk.h
include/wx-2.9/wx/xrc/xh_bannerwindow.h
include/wx-2.9/wx/xrc/xh_bmp.h
include/wx-2.9/wx/xrc/xh_bmpbt.h
@@ -663,6 +669,8 @@
include/wx-2.9/wx/xrc/xh_propdlg.h
include/wx-2.9/wx/xrc/xh_radbt.h
include/wx-2.9/wx/xrc/xh_radbx.h
+include/wx-2.9/wx/xrc/xh_ribbon.h
+include/wx-2.9/wx/xrc/xh_richtext.h
include/wx-2.9/wx/xrc/xh_scrol.h
include/wx-2.9/wx/xrc/xh_scwin.h
include/wx-2.9/wx/xrc/xh_sizer.h
@@ -685,6 +693,7 @@
include/wx-2.9/wx/xrc/xh_unkwn.h
include/wx-2.9/wx/xrc/xh_wizrd.h
include/wx-2.9/wx/xrc/xmlres.h
+include/wx-2.9/wx/xrc/xmlreshandler.h
include/wx-2.9/wx/xti.h
include/wx-2.9/wx/xti2.h
include/wx-2.9/wx/xtictor.h
@@ -696,53 +705,53 @@
include/wx-2.9/wx/zipstrm.h
include/wx-2.9/wx/zstream.h
lib/libwx_baseu-2.9.so
-lib/libwx_baseu-2.9.so.4
-lib/libwx_baseu-2.9.so.4.0.0
+lib/libwx_baseu-2.9.so.5
+lib/libwx_baseu-2.9.so.5.0.0
lib/libwx_baseu_net-2.9.so
-lib/libwx_baseu_net-2.9.so.4
-lib/libwx_baseu_net-2.9.so.4.0.0
+lib/libwx_baseu_net-2.9.so.5
+lib/libwx_baseu_net-2.9.so.5.0.0
lib/libwx_baseu_xml-2.9.so
-lib/libwx_baseu_xml-2.9.so.4
-lib/libwx_baseu_xml-2.9.so.4.0.0
+lib/libwx_baseu_xml-2.9.so.5
+lib/libwx_baseu_xml-2.9.so.5.0.0
lib/libwx_gtk2u_adv-2.9.so
-lib/libwx_gtk2u_adv-2.9.so.4
-lib/libwx_gtk2u_adv-2.9.so.4.0.0
+lib/libwx_gtk2u_adv-2.9.so.5
+lib/libwx_gtk2u_adv-2.9.so.5.0.0
lib/libwx_gtk2u_aui-2.9.so
-lib/libwx_gtk2u_aui-2.9.so.4
-lib/libwx_gtk2u_aui-2.9.so.4.0.0
+lib/libwx_gtk2u_aui-2.9.so.5
+lib/libwx_gtk2u_aui-2.9.so.5.0.0
lib/libwx_gtk2u_core-2.9.so
-lib/libwx_gtk2u_core-2.9.so.4
-lib/libwx_gtk2u_core-2.9.so.4.0.0
+lib/libwx_gtk2u_core-2.9.so.5
+lib/libwx_gtk2u_core-2.9.so.5.0.0
lib/libwx_gtk2u_gl-2.9.so
-lib/libwx_gtk2u_gl-2.9.so.4
-lib/libwx_gtk2u_gl-2.9.so.4.0.0
+lib/libwx_gtk2u_gl-2.9.so.5
+lib/libwx_gtk2u_gl-2.9.so.5.0.0
lib/libwx_gtk2u_html-2.9.so
-lib/libwx_gtk2u_html-2.9.so.4
-lib/libwx_gtk2u_html-2.9.so.4.0.0
+lib/libwx_gtk2u_html-2.9.so.5
+lib/libwx_gtk2u_html-2.9.so.5.0.0
%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so.4
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so.4.0.0
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so.5
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.9.so.5.0.0
lib/libwx_gtk2u_propgrid-2.9.so
-lib/libwx_gtk2u_propgrid-2.9.so.4
-lib/libwx_gtk2u_propgrid-2.9.so.4.0.0
+lib/libwx_gtk2u_propgrid-2.9.so.5
+lib/libwx_gtk2u_propgrid-2.9.so.5.0.0
lib/libwx_gtk2u_qa-2.9.so
-lib/libwx_gtk2u_qa-2.9.so.4
-lib/libwx_gtk2u_qa-2.9.so.4.0.0
+lib/libwx_gtk2u_qa-2.9.so.5
+lib/libwx_gtk2u_qa-2.9.so.5.0.0
lib/libwx_gtk2u_ribbon-2.9.so
-lib/libwx_gtk2u_ribbon-2.9.so.4
-lib/libwx_gtk2u_ribbon-2.9.so.4.0.0
+lib/libwx_gtk2u_ribbon-2.9.so.5
+lib/libwx_gtk2u_ribbon-2.9.so.5.0.0
lib/libwx_gtk2u_richtext-2.9.so
-lib/libwx_gtk2u_richtext-2.9.so.4
-lib/libwx_gtk2u_richtext-2.9.so.4.0.0
+lib/libwx_gtk2u_richtext-2.9.so.5
+lib/libwx_gtk2u_richtext-2.9.so.5.0.0
lib/libwx_gtk2u_stc-2.9.so
-lib/libwx_gtk2u_stc-2.9.so.4
-lib/libwx_gtk2u_stc-2.9.so.4.0.0
+lib/libwx_gtk2u_stc-2.9.so.5
+lib/libwx_gtk2u_stc-2.9.so.5.0.0
lib/libwx_gtk2u_webview-2.9.so
-lib/libwx_gtk2u_webview-2.9.so.4
-lib/libwx_gtk2u_webview-2.9.so.4.0.0
+lib/libwx_gtk2u_webview-2.9.so.5
+lib/libwx_gtk2u_webview-2.9.so.5.0.0
lib/libwx_gtk2u_xrc-2.9.so
-lib/libwx_gtk2u_xrc-2.9.so.4
-lib/libwx_gtk2u_xrc-2.9.so.4.0.0
+lib/libwx_gtk2u_xrc-2.9.so.5
+lib/libwx_gtk2u_xrc-2.9.so.5.0.0
lib/wx/include/gtk2-unicode-2.9/wx/setup.h
share/aclocal/wxwin29.m4
share/bakefile/presets/wx29.bkl
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308151618.r7FGIdaF015388>