pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/wxGTK update to wxGTK 2.4.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/9e0a59ab07be
branches: trunk
changeset: 466024:9e0a59ab07be
user: recht <recht%pkgsrc.org@localhost>
date: Sat Jan 10 14:23:52 2004 +0000
description:
update to wxGTK 2.4.2
Changes:
Enable building of OpenGL support and bump buildlink dependecy because of
that.
2.4.2
-----
All:
- always NUL-terminate the log messages
- wxRegEx::Compile() now calculates the number of groups correctly
- wxHTTP::GetHeader() didn't find headers which were not all in upper case
- wxHTTP input stream didn't detect EOF correctly
- wxString::find_last_of() ignored "start" parameter (Robert Vazan)
- a bug in wxArrayString::Shrink() fixed (Gunnar Roth)
- added wxIPV4address::IPAddress()
All (GUI):
- rare crash in wxFontMapper fixed (Robert Vazan)
- added wxMenu::FindItemByPosition.
- copy wxImage options when copying the images
Generic:
- wxListCtrl: respect wxLC_NO_HEADER style when inserting first column
Unix:
- fixed build problems with OpenGL when libGL(U) were in different directories
- added --basename and --release flags to wx-config (Robert O'Connor)
- added support for GNU/Hurd in configure
- fixed wx-config --rezflags output on platforms different from Mac
- changed wxNativeFontInfo::FromXFontName to treat names with all
components being empty or '*' as default font (since default font is
converted to such a string by GetXFontName).
- wxLocale::Init now tries to set .utf8 locale in Unicode mode (Andreas Pflug)
wxGTK
- fixed compilation with --disable-compat-22
- set the event object correctly for wxMenu events (Bob Balfour)
- fixed memory leak in wxFileDialog (Christian Sturmlechner)
wxXRC:
- added wxNO_FULL_REPAINT_ON_RESIZE to "unknown" class handler (John Anderson)
diffstat:
x11/wxGTK/Makefile | 7 ++-
x11/wxGTK/PLIST | 7 +++-
x11/wxGTK/buildlink2.mk | 7 ++-
x11/wxGTK/distinfo | 15 +++----
x11/wxGTK/patches/patch-aa | 16 ++++++--
x11/wxGTK/patches/patch-ab | 82 +++++++++++++++++++++++----------------------
x11/wxGTK/patches/patch-ac | 6 +-
x11/wxGTK/patches/patch-ad | 8 ++--
8 files changed, 83 insertions(+), 65 deletions(-)
diffs (truncated from 346 to 300 lines):
diff -r 99bc55f0e6f6 -r 9e0a59ab07be x11/wxGTK/Makefile
--- a/x11/wxGTK/Makefile Sat Jan 10 13:57:12 2004 +0000
+++ b/x11/wxGTK/Makefile Sat Jan 10 14:23:52 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2004/01/07 21:45:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/10 14:23:52 recht Exp $
#
-DISTNAME= wxGTK-2.4.1
-PKGREVISION= 3
+DISTNAME= wxGTK-2.4.2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
EXTRACT_SUFX= .tar.bz2
@@ -16,6 +15,7 @@
USE_X11= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --with-opengl
CONFIGURE_ARGS+= --with-libjpeg=sys
CONFIGURE_ARGS+= --with-zlib=sys
CONFIGURE_ARGS+= --with-libpng=sys
@@ -42,6 +42,7 @@
${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
.include "../../graphics/tiff/buildlink2.mk"
diff -r 99bc55f0e6f6 -r 9e0a59ab07be x11/wxGTK/PLIST
--- a/x11/wxGTK/PLIST Sat Jan 10 13:57:12 2004 +0000
+++ b/x11/wxGTK/PLIST Sat Jan 10 14:23:52 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/01/07 21:45:18 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/01/10 14:23:52 recht Exp $
bin/wx-config
bin/wxgtk${GTKVER}-2.4-config
include/wx/accel.h
@@ -369,6 +369,11 @@
lib/libwx_gtk${GTKVER}.so
lib/libwx_gtk${GTKVER}.so.0
lib/libwx_gtk${GTKVER}.so.0.1
+lib/libwx_gtk${GTKVER}_gl-2.4.a
+lib/libwx_gtk${GTKVER}_gl-2.4.la
+lib/libwx_gtk${GTKVER}_gl-2.4.so
+lib/libwx_gtk${GTKVER}_gl-2.4.so.0
+lib/libwx_gtk${GTKVER}_gl-2.4.so.0.1
lib/wx/include/gtk${GTKVER}-2.4/wx/setup.h
share/aclocal/wxwin.m4
share/doc/wx/gtk/LICENSE
diff -r 99bc55f0e6f6 -r 9e0a59ab07be x11/wxGTK/buildlink2.mk
--- a/x11/wxGTK/buildlink2.mk Sat Jan 10 13:57:12 2004 +0000
+++ b/x11/wxGTK/buildlink2.mk Sat Jan 10 14:23:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/01/07 21:45:18 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2004/01/10 14:23:52 recht Exp $
#
# This Makefile fragment is included by packages that use wxGTK.
#
@@ -9,7 +9,7 @@
WXGTK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= wxGTK
-BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.4.1nb3
+BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.4.2
BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
EVAL_PREFIX+= BUILDLINK_PREFIX.wxGTK=wxGTK
@@ -25,15 +25,18 @@
.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
BUILDLINK_FILES.wxGTK+= lib/libwx_gtk.*
+BUILDLINK_FILES.wxGTK+= lib/libwx_gtk_gl-2.4.*
BUILDLINK_FILES.wxGTK+= lib/wx/include/gtk-2.4/wx/*
.include "../../x11/gtk/buildlink2.mk"
.else
BUILDLINK_FILES.wxGTK+= lib/libwx_gtk2.*
+BUILDLINK_FILES.wxGTK+= lib/libwx_gtk2_gl-2.4.*
BUILDLINK_FILES.wxGTK+= lib/wx/include/gtk2-2.4/wx/*
.include "../../x11/gtk2/buildlink2.mk"
.endif
.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
.include "../../graphics/tiff/buildlink2.mk"
diff -r 99bc55f0e6f6 -r 9e0a59ab07be x11/wxGTK/distinfo
--- a/x11/wxGTK/distinfo Sat Jan 10 13:57:12 2004 +0000
+++ b/x11/wxGTK/distinfo Sat Jan 10 14:23:52 2004 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2003/09/09 11:54:55 recht Exp $
+$NetBSD: distinfo,v 1.12 2004/01/10 14:23:52 recht Exp $
-SHA1 (wxGTK-2.4.1.tar.bz2) = 4aea0d24d755e7f1fa89d8198014790670a79437
-Size (wxGTK-2.4.1.tar.bz2) = 5348194 bytes
-SHA1 (patch-aa) = 5602ed3a9c15eab638f270990b91edc844a1e6e3
-SHA1 (patch-ab) = f0799ad63b9bd39cf58295b6d93ce7b697190d8c
-SHA1 (patch-ac) = 793ba08af48412fea905fc203b0c7322e4bafe9c
-SHA1 (patch-ad) = 1ee314f895451dfab8bf56952ad2822b8530590f
-SHA1 (patch-af) = 8d6572d26108d6aa914c4f12b67db646e936b464
+SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
+Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
+SHA1 (patch-aa) = 57e598262c8bf14c7d854fc1e569c9d6aaeca88b
+SHA1 (patch-ab) = 5327ac3b45e7bc1957a8482bd4d10652fe28c1a1
+SHA1 (patch-ac) = 01aa0bea28f838680cce6326fa67700b12f75d86
+SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
diff -r 99bc55f0e6f6 -r 9e0a59ab07be x11/wxGTK/patches/patch-aa
--- a/x11/wxGTK/patches/patch-aa Sat Jan 10 13:57:12 2004 +0000
+++ b/x11/wxGTK/patches/patch-aa Sat Jan 10 14:23:52 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/03/31 17:44:22 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2004/01/10 14:23:52 recht Exp $
---- configure.orig Mon Mar 10 00:42:05 2003
-+++ configure Mon Mar 10 00:42:20 2003
-@@ -15920,8 +15920,8 @@
+--- configure.orig 2003-09-21 13:31:30.000000000 +0200
++++ configure 2003-09-27 23:10:17.000000000 +0200
+@@ -16104,8 +16104,8 @@
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
@@ -13,3 +13,11 @@
if test "$wxUSE_OPENGL" = "yes"; then
WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
+@@ -22777,6 +22777,7 @@
+ s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
+ s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
+ s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
++s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
+ s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
+ s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
+ s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
diff -r 99bc55f0e6f6 -r 9e0a59ab07be x11/wxGTK/patches/patch-ab
--- a/x11/wxGTK/patches/patch-ab Sat Jan 10 13:57:12 2004 +0000
+++ b/x11/wxGTK/patches/patch-ab Sat Jan 10 14:23:52 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2003/09/04 13:07:01 adam Exp $
+$NetBSD: patch-ab,v 1.10 2004/01/10 14:23:52 recht Exp $
---- Makefile.in.orig 2003-01-05 12:54:59.000000000 +0100
-+++ Makefile.in
-@@ -21,13 +21,13 @@ include ./src/make.env
+--- Makefile.in.orig 2003-09-21 13:31:27.000000000 +0200
++++ Makefile.in 2004-01-10 10:30:56.000000000 +0100
+@@ -21,13 +21,13 @@
.SUFFIXES: .o .c .cpp .cxx .rsrc .r
.c.o:
@@ -19,7 +19,7 @@
.rsrc.r:
$(DEREZ) $^ Carbon.r -useDF > $@
-@@ -42,10 +42,6 @@ VP2 = @top_srcdir@/src/common
+@@ -42,10 +42,6 @@
VP3 = @top_srcdir@/src/generic
VP4 = @top_srcdir@/src/unix
VP5 = @top_srcdir@/src/html
@@ -30,7 +30,7 @@
VPA = @top_srcdir@/src/regex
VP10 = @top_srcdir@/src/iodbc
VP11 = @top_srcdir@/src/msw/ole
-@@ -53,7 +49,7 @@ VP11 = @top_srcdir@/src/msw/ole
+@@ -53,7 +49,7 @@
# the comment at the end of the next line is needed because otherwise autoconf
# would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':'
@@ -39,16 +39,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-@@ -64,7 +60,7 @@ libdir = @libdir@
- mandir = @mandir@
- includedir = @includedir@
-
--localedir = $(datadir)/locale
-+localedir = /usr/orinoco/share/locale
-
- top_builddir = .
- build_libdir = $(top_builddir)/lib
-@@ -72,7 +68,8 @@ build_libdir = $(top_builddir)/lib
+@@ -72,7 +68,8 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -58,7 +49,7 @@
build_alias = @build_alias@
build_triplet = @build@
-@@ -94,10 +91,6 @@ GENDIR = $(WXDIR)/src/generic
+@@ -94,10 +91,6 @@
COMMDIR = $(WXDIR)/src/common
HTMLDIR = $(WXDIR)/src/html
UNIXDIR = $(WXDIR)/src/unix
@@ -69,7 +60,7 @@
REGEXDIR = $(WXDIR)/src/regex
GTKDIR = $(WXDIR)/src/gtk
X11DIR = $(WXDIR)/src/x11
-@@ -161,124 +154,6 @@ REGEXOBJS = \
+@@ -161,124 +154,6 @@
regerror.o \
regfree.o
@@ -194,39 +185,40 @@
IODBCOBJS = \
catalog.o \
connect.o \
-@@ -302,52 +177,33 @@ IODBCOBJS = \
+@@ -302,52 +177,27 @@
SONAME_FLAGS = @SONAME_FLAGS@
SONAME_FLAGS_GL = @SONAME_FLAGS_GL@
-all: @WX_ALL@
-+all: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la
++all: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(build_libdir)/lib@WX_LIBRARY_GL@.la
-$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS)
- @$(INSTALL) -d $(build_libdir)
- @$(RM) $@
- $(AR) $(AROPTIONS) $@ $(OBJECTS)
- $(RANLIB) $@
+-
+-$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
+- @$(INSTALL) -d $(build_libdir)
+- @$(RM) $@
+- $(AR) $(AROPTIONS) $@ glcanvas.o
+- $(RANLIB) $@
+-
+-$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
+- @$(INSTALL) -d $(build_libdir)
+- $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
+$(build_libdir)/lib@WX_LIBRARY_BASENAME@.la: $(OBJECTS)
+ @$(INSTALL_DATA_DIR) $(build_libdir)
+ ${LIBTOOL} --mode=link cc -o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1
- $(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o
-- @$(INSTALL) -d $(build_libdir)
-+ @$(INSTALL_DATA_DIR) $(build_libdir)
- @$(RM) $@
- $(AR) $(AROPTIONS) $@ glcanvas.o
- $(RANLIB) $@
-
--$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
-- @$(INSTALL) -d $(build_libdir)
-- $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS)
--
# NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line
# but this seems to result in problems with libwx_gtk being linked in twice
- $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
+-$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
- @$(INSTALL) -d $(build_libdir)
+- $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
++$(build_libdir)/lib@WX_LIBRARY_GL@.la: glcanvas.o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la
+ @$(INSTALL_DATA_DIR) $(build_libdir)
- $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
++ ${LIBTOOL} --mode=link cc -o $(build_libdir)/lib@WX_LIBRARY_GL@.la glcanvas.lo ${EXTRALIBS} $(LDFLAGS_GL) $(OPENGLLIBS) -rpath ${PREFIX}/lib -version-info 0:1
$(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
- @$(INSTALL) -d $(build_libdir)
@@ -255,7 +247,7 @@
parser.c: $(COMMDIR)/parser.y lexer.c
$(YACC) $(COMMDIR)/parser.y
-@@ -369,13 +225,6 @@ lexer.c: $(COMMDIR)/lexer.l
+@@ -369,13 +219,6 @@
@IF_GNU_MAKE@-include $(OBJECTS:.o=.d)
@@ -269,7 +261,7 @@
CREATE_INSTALLED_LINKS_GL: preinstall_gl
$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
-@@ -385,10 +234,10 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
+@@ -385,10 +228,10 @@
afminstall: preinstall
@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
@@ -284,7 +276,7 @@
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
-@@ -410,51 +259,51 @@ win32install: preinstall
+@@ -410,51 +253,51 @@
# this is the real install target: copies the library, wx-config and the
# headers to the installation directory
@@ -358,12 +350,22 @@
$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
done
-@@ -474,7 +323,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGE
- @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+@@ -467,14 +310,14 @@
+ $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@
+ $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@
+
Home |
Main Index |
Thread Index |
Old Index