pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Update wxGTK to 2.6.3. Feel responsible for now.
details: https://anonhg.NetBSD.org/pkgsrc/rev/de49bbc903b3
branches: trunk
changeset: 510443:de49bbc903b3
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Mar 30 15:28:12 2006 +0000
description:
Update wxGTK to 2.6.3. Feel responsible for now.
Important changes:
- Fixed crash when loading message catalogs in Unicode build.
- Spurious error message from wxLaunchDefaultBrowser fixed.
- Compilation fixes for (more strict) g++ 4.1
- Speed improvements to wxRegEx when matching is done in a loop such as
during a search and replace.
- Fix regerror and regfree name conficts when built-in regex and system regex
are both used in the same program.
- wxCondition::WaitTimeout() now returns correct value when timeout occurs.
- Bug in wxLogStream::DoLogString in Unicode builds fixed.
- Fixed Unicode builds using SunPro compiler by defining__WCHAR_TYPE__.
- wxFileName now also looks for TMPDIR on Unix.
- Fixed occasional wxThread cleanup crash.
- Fixed build error in list.h with VC++ 2005.
- wxImage::Copy() forgot the alpha channel.
- Fixed wxSocketBase::InterruptWait on wxBase.
- Fixed abort() on loading invalid PNG image
- Added space after list item number in wxHTML.
- wxCalendarCtrl drawing, positioning and hit-testing fixes.
- More checking of image validity before loading into wxImage.
- Added double-buffering to wxVListBox and fixed a scrolling issue.
- More than one filter allowed in in wxDocTemplate filter.
- Fixed infinite loop in tab traversal code with wxUSE_STL==1
- Fixed problem with choice editor in wxGrid whereby the editor
lost focus when the combobox menu was shown.
- Fixed problem trying to print from a preview, whereby wrong printer
class was used.
- Worked around pango crashes in strncmp on Solaris 10.
- Polygon and line drawing speeded up if there is no scaling.
- Fixed problems with CJK input method (reverted)
- Fixed wxNotebook::HitTest when the leftmost visible tab is not the
actual first tab (has arrows for scrolling and is scrolled).
- Send wxSetCursorEvent
- Fix RequestMore for idle events.
- Implement user dashes for PS and GNOME printing.
- Correct update region code. Don't always invalidate the
whole window upon resize. Reenable support for the
wxNO_FULL_REPAINT_ON_RESIZE flag. Also disable refreshing
custom controls when focusing in and out.
- Change wxMimeTypesManager code to ignore /etc/mailcap and
to just read the MIME-types. Modifiying the MIME-types is
not allowed under GNOME anyways, so make it a no-op.
- Speed up reading MIME database.
- wxClipboard fixes (thanks to Timothée Lecomte).
Additionally the build system has been libtoolified to simplify
maintainance of the shared libraries in the PLIST. Patches against
the bakefile ruleset are included for reference.
The Unicode build is not enabled, since the interface changes to
drastical.
diffstat:
x11/wxGTK-contrib/Makefile | 3 +-
x11/wxGTK-contrib/PLIST | 18 +-
x11/wxGTK/Makefile | 14 ++-
x11/wxGTK/Makefile.common | 21 ++-
x11/wxGTK/PLIST | 31 ++--
x11/wxGTK/distinfo | 15 +-
x11/wxGTK/patches/manual-bakefile.diff | 196 +++++++++++++++++++++++++++++++++
x11/wxGTK/patches/manual-regen.diff | 50 ++++++++
x11/wxGTK/patches/patch-aa | 16 +-
x11/wxGTK/patches/patch-ab | 45 -------
x11/wxGTK/patches/patch-ah | 9 -
11 files changed, 316 insertions(+), 102 deletions(-)
diffs (truncated from 576 to 300 lines):
diff -r 7cd36f3dfad4 -r de49bbc903b3 x11/wxGTK-contrib/Makefile
--- a/x11/wxGTK-contrib/Makefile Thu Mar 30 13:55:28 2006 +0000
+++ b/x11/wxGTK-contrib/Makefile Thu Mar 30 15:28:12 2006 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/30 15:28:12 joerg Exp $
#
.include "../../x11/wxGTK/Makefile.common"
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK-contrib/}
-PKGREVISION= 2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= GTK-based implementation of the wxWidgets GUI library (contrib libraries)
diff -r 7cd36f3dfad4 -r de49bbc903b3 x11/wxGTK-contrib/PLIST
--- a/x11/wxGTK-contrib/PLIST Thu Mar 30 13:55:28 2006 +0000
+++ b/x11/wxGTK-contrib/PLIST Thu Mar 30 15:28:12 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/08/07 11:26:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/30 15:28:12 joerg Exp $
include/wx-2.6/wx/deprecated/expr.h
include/wx-2.6/wx/deprecated/prop.h
include/wx-2.6/wx/deprecated/propform.h
@@ -60,14 +60,14 @@
include/wx-2.6/wx/plot/wxplot.rc
include/wx-2.6/wx/stc/stc.h
include/wx-2.6/wx/svg/dcsvg.h
-lib/libwx_gtk2_deprecated-2.6.so
-lib/libwx_gtk2_fl-2.6.so
-lib/libwx_gtk2_gizmos-2.6.so
-lib/libwx_gtk2_gizmos_xrc-2.6.so
-lib/libwx_gtk2_ogl-2.6.so
-lib/libwx_gtk2_plot-2.6.so
-lib/libwx_gtk2_stc-2.6.so
-lib/libwx_gtk2_svg-2.6.so
+lib/libwx_gtk2_deprecated-2.6.la
+lib/libwx_gtk2_fl-2.6.la
+lib/libwx_gtk2_gizmos-2.6.la
+lib/libwx_gtk2_gizmos_xrc-2.6.la
+lib/libwx_gtk2_ogl-2.6.la
+lib/libwx_gtk2_plot-2.6.la
+lib/libwx_gtk2_stc-2.6.la
+lib/libwx_gtk2_svg-2.6.la
@dirrm include/wx-2.6/wx/svg
@dirrm include/wx-2.6/wx/stc
@dirrm include/wx-2.6/wx/plot
diff -r 7cd36f3dfad4 -r de49bbc903b3 x11/wxGTK/Makefile
--- a/x11/wxGTK/Makefile Thu Mar 30 13:55:28 2006 +0000
+++ b/x11/wxGTK/Makefile Thu Mar 30 15:28:12 2006 +0000
@@ -1,10 +1,20 @@
-# $NetBSD: Makefile,v 1.48 2006/03/09 21:04:46 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2006/03/30 15:28:12 joerg Exp $
#
.include "Makefile.common"
COMMENT= GTK-based implementation of the wxWidgets GUI library
-PKGREVISION= 2
+
+post-build:
+ set -e; cd ${WRKSRC}/locale; \
+ for lang in ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk \
+ zh_CN zh_TW; do \
+ ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
+ done
+ set -e; cd ${WRKSRC}/locale/msw; \
+ for lang in it; do \
+ ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
+ done
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
diff -r 7cd36f3dfad4 -r de49bbc903b3 x11/wxGTK/Makefile.common
--- a/x11/wxGTK/Makefile.common Thu Mar 30 13:55:28 2006 +0000
+++ b/x11/wxGTK/Makefile.common Thu Mar 30 15:28:12 2006 +0000
@@ -1,35 +1,46 @@
-# $NetBSD: Makefile.common,v 1.7 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2006/03/30 15:28:12 joerg Exp $
#
-DISTNAME= wxGTK-2.6.2
+DISTNAME= wxGTK-2.6.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= http://www.wxwidgets.org/
PATCHDIR= ${.CURDIR}/../../x11/wxGTK/patches
DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK/distinfo
-USE_TOOLS+= pkg-config
+PATCHFILES= ${DISTNAME}-libtool.diff.bz2
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+
+USE_TOOLS+= pkg-config msgfmt
+USE_LIBTOOL= yes
USE_PKGLOCALEDIR= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_GNU_CONFIGURE_HOST= NO
+USE_GNU_CONFIGURE_HOST= no
CONFIGURE_ARGS+= --with-gtk=2
CONFIGURE_ARGS+= --with-libjpeg=sys
CONFIGURE_ARGS+= --with-libpng=sys
CONFIGURE_ARGS+= --with-libtiff=sys
CONFIGURE_ARGS+= --with-opengl
CONFIGURE_ARGS+= --with-zlib=sys
+CONFIGURE_ARGS+= --with-regex=builtin
CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+#CONFIGURE_ARGS+= --enable-unicode
+#PIST_SUBST+= UNICODE=u
+PLIST_SUBST+= UNICODE=
+PLIST_SUBST+= BUILDTYPE=ansi
+
CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this
DOCDIR= ${PREFIX}/share/doc/wxGTK
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff -r 7cd36f3dfad4 -r de49bbc903b3 x11/wxGTK/PLIST
--- a/x11/wxGTK/PLIST Thu Mar 30 13:55:28 2006 +0000
+++ b/x11/wxGTK/PLIST Thu Mar 30 15:28:12 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/10/04 01:47:32 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/03/30 15:28:12 joerg Exp $
bin/wx-config
bin/wxrc
bin/wxrc-2.6
@@ -459,18 +459,19 @@
include/wx-2.6/wx/xtixml.h
include/wx-2.6/wx/zipstrm.h
include/wx-2.6/wx/zstream.h
-lib/libwx_base-2.6.so
-lib/libwx_base_net-2.6.so
-lib/libwx_base_xml-2.6.so
-lib/libwx_gtk2_adv-2.6.so
-lib/libwx_gtk2_core-2.6.so
-lib/libwx_gtk2_gl-2.6.so
-lib/libwx_gtk2_html-2.6.so
-lib/libwx_gtk2_media-2.6.so
-lib/libwx_gtk2_qa-2.6.so
-lib/libwx_gtk2_xrc-2.6.so
-lib/wx/config/gtk2-ansi-release-2.6
-lib/wx/include/gtk2-ansi-release-2.6/wx/setup.h
+lib/libwx_base${UNICODE}-2.6.la
+lib/libwx_base${UNICODE}_net-2.6.la
+lib/libwx_base${UNICODE}_xml-2.6.la
+lib/libwx_gtk2${UNICODE}_adv-2.6.la
+lib/libwx_gtk2${UNICODE}_core-2.6.la
+lib/libwx_gtk2${UNICODE}_gl-2.6.la
+lib/libwx_gtk2${UNICODE}_html-2.6.la
+lib/libwx_gtk2${UNICODE}_media-2.6.la
+lib/libwx_gtk2${UNICODE}_qa-2.6.la
+lib/libwx_gtk2${UNICODE}_xrc-2.6.la
+lib/libwxregex${UNICODE}-2.6.la
+lib/wx/config/gtk2-${BUILDTYPE}-release-2.6
+lib/wx/include/gtk2-${BUILDTYPE}-release-2.6/wx/setup.h
share/aclocal/wxwin.m4
share/bakefile/presets/wx.bkl
share/bakefile/presets/wx_unix.bkl
@@ -501,8 +502,8 @@
@dirrm share/doc/wxGTK
@dirrm share/bakefile/presets
@dirrm share/bakefile
-@dirrm lib/wx/include/gtk2-ansi-release-2.6/wx
-@dirrm lib/wx/include/gtk2-ansi-release-2.6
+@dirrm lib/wx/include/gtk2-${BUILDTYPE}-release-2.6/wx
+@dirrm lib/wx/include/gtk2-${BUILDTYPE}-release-2.6
@unexec ${RMDIR} %D/lib/wx/include 2>/dev/null || ${TRUE}
@dirrm lib/wx/config
@unexec ${RMDIR} %D/lib/wx 2>/dev/null || ${TRUE}
diff -r 7cd36f3dfad4 -r de49bbc903b3 x11/wxGTK/distinfo
--- a/x11/wxGTK/distinfo Thu Mar 30 13:55:28 2006 +0000
+++ b/x11/wxGTK/distinfo Thu Mar 30 15:28:12 2006 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2005/11/07 18:13:54 joerg Exp $
+$NetBSD: distinfo,v 1.24 2006/03/30 15:28:12 joerg Exp $
-SHA1 (wxGTK-2.6.2.tar.bz2) = ba953ecf9ee1c5be05d00f1f58523e2a5114e1a5
-RMD160 (wxGTK-2.6.2.tar.bz2) = 53f3b61606037dc502e1185ab517b5ddc64a205c
-Size (wxGTK-2.6.2.tar.bz2) = 7328807 bytes
-SHA1 (patch-aa) = 3e6761aef80f7dcdd0a9d9ff42ae78bce9e4a14f
-SHA1 (patch-ab) = 8f57d3169b363ef90c44fafb864589840b0eeafa
-SHA1 (patch-ah) = c384584623b63004f59b4755ef32156f3d5687a0
+SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
+RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
+Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes
+SHA1 (wxGTK-2.6.3-libtool.diff.bz2) = 5e1e93f34f031aeb970c5821a19cd57ed7b2013c
+RMD160 (wxGTK-2.6.3-libtool.diff.bz2) = 9031bc030bb1c23b1c46bdc43e2282741fcd078a
+Size (wxGTK-2.6.3-libtool.diff.bz2) = 136324 bytes
+SHA1 (patch-aa) = 159a42a05fe9287931e46bfdd1adfa7cfa9d36a3
diff -r 7cd36f3dfad4 -r de49bbc903b3 x11/wxGTK/patches/manual-bakefile.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK/patches/manual-bakefile.diff Thu Mar 30 15:28:12 2006 +0000
@@ -0,0 +1,196 @@
+Binary files ../bakefile-0.2.0.orig/output/msvc6prj.pyc and ./output/msvc6prj.pyc differ
+diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl ./rules/autoconf.bkl
+--- ../bakefile-0.2.0.orig/rules/autoconf.bkl 2006-01-22 23:31:00.000000000 +0000
++++ ./rules/autoconf.bkl 2006-02-28 18:00:14.000000000 +0000
+@@ -160,61 +160,18 @@
+
+ <set var="__linkname1">$(__linkname)</set>
+
+- <set var="__targetsuf2">
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0'">
+- $(DLLEXT).$(__soversion1)
+- </if>
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
+- .$(__soversion1)$(DLLEXT)
+- </if>
+- <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
+- </set>
++ <set var="__targetsuf2">$(DLLEXT)</set>
+ <set var="__linkname2" eval="0">
+ $(DLLPREFIX)$(__dllname)$(__targetsuf2)
+ </set>
+
+- <set var="__targetsuf3">
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0' and USE_SOVERCYGWIN=='0'">
+- $(DLLEXT).$(__soversion1).$(__soversion2).$(__soversion3)
+- </if>
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
+- .$(__soversion1).$(__soversion2).$(__soversion3)$(DLLEXT)
+- </if>
+- <if cond="USE_SOVERSION=='1' and USE_SOVERCYGWIN=='1'">
+- -$(__soversion1)$(DLLEXT)
+- </if>
+- <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
+- </set>
++ <set var="__targetsuf3">$(DLLEXT)</set>
+ <set var="__targetname" eval="0">
+ $(DLLPREFIX)$(__dllname)$(__targetsuf3)
+ </set>
+
+- <set var="__soname_flags">
+- <if cond="USE_SOVERLINUX=='1'"> <!-- Linux -->
+- $(SONAME_FLAG)$(__linkname2)
+- </if>
+- <if cond="USE_SOVERSOLARIS=='1'"> <!-- Solaris -->
+- $(SONAME_FLAG)$(__targetname)
+- </if>
+- </set>
++ <set var="__soname_flags">-version-number $(__soversion1):$(__soversion2):$(__soversion3)</set>
+ <ldflags>$(__soname_flags)</ldflags>
+-
+- <set var="__so_symlinks_cmd">
+- <if cond="USE_SOSYMLINKS=='1'">
+- (cd $(pathPrefixToPath(__targetdir));
+- $(RM) $(__linkname1) $(__linkname2);
+- $(LN_S) $(__targetname) $(__linkname2);
+- $(LN_S) $(__linkname2) $(__linkname1))
+- </if>
+- </set>
+- <set var="__so_symlinks_inst_cmd">
+- <if cond="USE_SOSYMLINKS=='1'">
+- $(RM) $(__linkname1) $(__linkname2);
+- $(LN_S) $(__targetname) $(__linkname2);
+- $(LN_S) $(__linkname2) $(__linkname1)
+- </if>
+- </set>
+- <__command>$(LF)$(__so_symlinks_cmd)</__command>
+
+ <set var="__mac_instname">$(__linkname2)</set>
+
+diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl ./rules/makefile.bkl
+--- ../bakefile-0.2.0.orig/rules/makefile.bkl 2005-12-08 10:19:46.000000000 +0000
++++ ./rules/makefile.bkl 2006-03-20 22:04:43.000000000 +0000
+@@ -604,7 +604,7 @@
+ <define-tag name="install-to" rules="exe">
+ <modify-target target="install_$(id)">
+ <command>
+- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
++ ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+ </command>
+ </modify-target>
+ </define-tag>
+@@ -612,8 +612,7 @@
+ <define-tag name="install-to" rules="dll">
+ <modify-target target="install_$(id)">
+ <command>
+- $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__linkname',id)) $(DESTDIR)$(value)
+- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+ </command>
+ </modify-target>
+ </define-tag>
+@@ -621,7 +620,7 @@
+ <define-tag name="install-to" rules="module">
+ <modify-target target="install_$(id)">
+ <command>
+- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
Home |
Main Index |
Thread Index |
Old Index