aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2007-01-09 02:37:22 +0800
committerfjoe <fjoe@FreeBSD.org>2007-01-09 02:37:22 +0800
commita64d363b6a0537392b523714905a8b41dcd78159 (patch)
treee536be837a88b038ce96ec2aac704fb6b7daf6d7 /x11-toolkits
parentc8df55d9e0fde4df878238d2ec48f1c25afadb75 (diff)
downloadfreebsd-ports-gnome-a64d363b6a0537392b523714905a8b41dcd78159.tar.gz
freebsd-ports-gnome-a64d363b6a0537392b523714905a8b41dcd78159.tar.zst
freebsd-ports-gnome-a64d363b6a0537392b523714905a8b41dcd78159.zip
- Update to 2.8.0 release.
- Fix file conflicts with wxgtk2 2.4 and wxgtk2-common 2.6 ports.
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/wxgtk28-common/pkg-plist56
-rw-r--r--x11-toolkits/wxgtk28-unicode/Makefile2
-rw-r--r--x11-toolkits/wxgtk28/Makefile5
-rw-r--r--x11-toolkits/wxgtk28/distinfo6
-rw-r--r--x11-toolkits/wxgtk28/files/patch-Makefile.in25
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp11
-rw-r--r--x11-toolkits/wxgtk29-common/pkg-plist56
-rw-r--r--x11-toolkits/wxgtk29-unicode/Makefile2
-rw-r--r--x11-toolkits/wxgtk29/Makefile5
-rw-r--r--x11-toolkits/wxgtk29/distinfo6
-rw-r--r--x11-toolkits/wxgtk29/files/patch-Makefile.in25
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp11
12 files changed, 126 insertions, 84 deletions
diff --git a/x11-toolkits/wxgtk28-common/pkg-plist b/x11-toolkits/wxgtk28-common/pkg-plist
index fc1dd50c43a3..2c38d3f44ce8 100644
--- a/x11-toolkits/wxgtk28-common/pkg-plist
+++ b/x11-toolkits/wxgtk28-common/pkg-plist
@@ -189,6 +189,7 @@ include/wx-2.8/wx/gsocket.h
include/wx-2.8/wx/gtk/accel.h
include/wx-2.8/wx/gtk/animate.h
include/wx-2.8/wx/gtk/app.h
+include/wx-2.8/wx/gtk/assertdlg_gtk.h
include/wx-2.8/wx/gtk/bitmap.h
include/wx-2.8/wx/gtk/bmpbuttn.h
include/wx-2.8/wx/gtk/brush.h
@@ -531,34 +532,33 @@ include/wx-2.8/wx/xtistrm.h
include/wx-2.8/wx/xtixml.h
include/wx-2.8/wx/zipstrm.h
include/wx-2.8/wx/zstream.h
-share/aclocal/wxwin.m4
-share/bakefile/presets/wx.bkl
-share/bakefile/presets/wx_unix.bkl
-share/bakefile/presets/wx_win32.bkl
-share/locale/ca/LC_MESSAGES/wxstd.mo
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/el/LC_MESSAGES/wxstd.mo
-share/locale/es/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/hu/LC_MESSAGES/wxstd.mo
-share/locale/id/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxmsw.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ja/LC_MESSAGES/wxstd.mo
-share/locale/nl/LC_MESSAGES/wxstd.mo
-share/locale/pl/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
-share/locale/sl/LC_MESSAGES/wxstd.mo
-share/locale/sv/LC_MESSAGES/wxstd.mo
-share/locale/tr/LC_MESSAGES/wxstd.mo
-share/locale/uk/LC_MESSAGES/wxstd.mo
-share/locale/zh_CN/LC_MESSAGES/wxstd.mo
-share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-@dirrm share/bakefile/presets
-@dirrm share/bakefile
+share/aclocal/wxwin28.m4
+share/bakefile/presets/wx28.bkl
+share/bakefile/presets/wx28_unix.bkl
+share/bakefile/presets/wx28_win32.bkl
+share/locale/ca/LC_MESSAGES/wxstd28.mo
+share/locale/cs/LC_MESSAGES/wxstd28.mo
+share/locale/da/LC_MESSAGES/wxstd28.mo
+share/locale/de/LC_MESSAGES/wxstd28.mo
+share/locale/el/LC_MESSAGES/wxstd28.mo
+share/locale/es/LC_MESSAGES/wxstd28.mo
+share/locale/fi/LC_MESSAGES/wxstd28.mo
+share/locale/fr/LC_MESSAGES/wxstd28.mo
+share/locale/hu/LC_MESSAGES/wxstd28.mo
+share/locale/id/LC_MESSAGES/wxstd28.mo
+share/locale/it/LC_MESSAGES/wxstd28.mo
+share/locale/ja/LC_MESSAGES/wxstd28.mo
+share/locale/nl/LC_MESSAGES/wxstd28.mo
+share/locale/pl/LC_MESSAGES/wxstd28.mo
+share/locale/ru/LC_MESSAGES/wxstd28.mo
+share/locale/sl/LC_MESSAGES/wxstd28.mo
+share/locale/sv/LC_MESSAGES/wxstd28.mo
+share/locale/tr/LC_MESSAGES/wxstd28.mo
+share/locale/uk/LC_MESSAGES/wxstd28.mo
+share/locale/zh_CN/LC_MESSAGES/wxstd28.mo
+share/locale/zh_TW/LC_MESSAGES/wxstd28.mo
+@dirrmtry share/bakefile/presets
+@dirrmtry share/bakefile
@dirrm include/wx-2.8/wx/xrc
@dirrm include/wx-2.8/wx/xml
@dirrm include/wx-2.8/wx/unix
diff --git a/x11-toolkits/wxgtk28-unicode/Makefile b/x11-toolkits/wxgtk28-unicode/Makefile
index 3b2dc70b979f..a5774af887b1 100644
--- a/x11-toolkits/wxgtk28-unicode/Makefile
+++ b/x11-toolkits/wxgtk28-unicode/Makefile
@@ -5,6 +5,8 @@
# $FreeBSD$
#
+PORTREVISION= 0
+
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index df20772edecb..e2abc881c37a 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.8.0rc1
+PORTVERSION= 2.8.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -22,11 +22,12 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
expat.6:${PORTSDIR}/textproc/expat2\
mspack.1:${PORTSDIR}/archivers/libmspack
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_GNOME= gtk20
+USE_GNOME= gtk20 gconf2
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
diff --git a/x11-toolkits/wxgtk28/distinfo b/x11-toolkits/wxgtk28/distinfo
index 45da3382d829..d880a1dfc96f 100644
--- a/x11-toolkits/wxgtk28/distinfo
+++ b/x11-toolkits/wxgtk28/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.8.0-rc1.tar.gz) = f549cb5c4f5decca5473dc6c82ab16c0
-SHA256 (wxGTK-2.8.0-rc1.tar.gz) = 0c48b874e5cd23d441a44828b441a6fa1884ef415f5bb2b267ae32575b175e67
-SIZE (wxGTK-2.8.0-rc1.tar.gz) = 12245061
+MD5 (wxGTK-2.8.0.tar.bz2) = 9de30aeaad9bac6f8869907fa42fe950
+SHA256 (wxGTK-2.8.0.tar.bz2) = b4e33116f7533ddba6497aa909d93330ad75bf74bde54e6073dd956c18788efe
+SIZE (wxGTK-2.8.0.tar.bz2) = 8861057
diff --git a/x11-toolkits/wxgtk28/files/patch-Makefile.in b/x11-toolkits/wxgtk28/files/patch-Makefile.in
index f3f537e90876..898e37e29af3 100644
--- a/x11-toolkits/wxgtk28/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk28/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon Nov 13 16:58:04 2006
-+++ Makefile.in Thu Nov 30 23:37:17 2006
+--- Makefile.in.orig Tue Dec 12 03:56:01 2006
++++ Makefile.in Mon Jan 8 21:44:56 2007
@@ -24,6 +24,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,7 +8,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
BK_DEPS = @BK_DEPS@
-@@ -11185,11 +11186,7 @@
+@@ -11246,11 +11247,7 @@
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
@@ -21,26 +21,26 @@
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
-@@ -11197,6 +11194,12 @@
+@@ -11258,6 +11255,12 @@
fi; \
$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
done
+
-+install-common: locale_install locale_msw_install
++install-common: locale_install
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
-+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
-+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -11944,11 +11947,10 @@
+@@ -12005,17 +12008,16 @@
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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
@@ -48,3 +48,10 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
for l in $(LOCALE_LINGUAS) ; do \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
diff --git a/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp
new file mode 100644
index 000000000000..5d205cecb55a
--- /dev/null
+++ b/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp
@@ -0,0 +1,11 @@
+--- src/common/intl.cpp.orig Mon Jan 8 21:27:30 2007
++++ src/common/intl.cpp Mon Jan 8 21:27:18 2007
+@@ -1585,7 +1585,7 @@
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
diff --git a/x11-toolkits/wxgtk29-common/pkg-plist b/x11-toolkits/wxgtk29-common/pkg-plist
index fc1dd50c43a3..2c38d3f44ce8 100644
--- a/x11-toolkits/wxgtk29-common/pkg-plist
+++ b/x11-toolkits/wxgtk29-common/pkg-plist
@@ -189,6 +189,7 @@ include/wx-2.8/wx/gsocket.h
include/wx-2.8/wx/gtk/accel.h
include/wx-2.8/wx/gtk/animate.h
include/wx-2.8/wx/gtk/app.h
+include/wx-2.8/wx/gtk/assertdlg_gtk.h
include/wx-2.8/wx/gtk/bitmap.h
include/wx-2.8/wx/gtk/bmpbuttn.h
include/wx-2.8/wx/gtk/brush.h
@@ -531,34 +532,33 @@ include/wx-2.8/wx/xtistrm.h
include/wx-2.8/wx/xtixml.h
include/wx-2.8/wx/zipstrm.h
include/wx-2.8/wx/zstream.h
-share/aclocal/wxwin.m4
-share/bakefile/presets/wx.bkl
-share/bakefile/presets/wx_unix.bkl
-share/bakefile/presets/wx_win32.bkl
-share/locale/ca/LC_MESSAGES/wxstd.mo
-share/locale/cs/LC_MESSAGES/wxstd.mo
-share/locale/da/LC_MESSAGES/wxstd.mo
-share/locale/de/LC_MESSAGES/wxstd.mo
-share/locale/el/LC_MESSAGES/wxstd.mo
-share/locale/es/LC_MESSAGES/wxstd.mo
-share/locale/fi/LC_MESSAGES/wxstd.mo
-share/locale/fr/LC_MESSAGES/wxstd.mo
-share/locale/hu/LC_MESSAGES/wxstd.mo
-share/locale/id/LC_MESSAGES/wxstd.mo
-share/locale/it/LC_MESSAGES/wxmsw.mo
-share/locale/it/LC_MESSAGES/wxstd.mo
-share/locale/ja/LC_MESSAGES/wxstd.mo
-share/locale/nl/LC_MESSAGES/wxstd.mo
-share/locale/pl/LC_MESSAGES/wxstd.mo
-share/locale/ru/LC_MESSAGES/wxstd.mo
-share/locale/sl/LC_MESSAGES/wxstd.mo
-share/locale/sv/LC_MESSAGES/wxstd.mo
-share/locale/tr/LC_MESSAGES/wxstd.mo
-share/locale/uk/LC_MESSAGES/wxstd.mo
-share/locale/zh_CN/LC_MESSAGES/wxstd.mo
-share/locale/zh_TW/LC_MESSAGES/wxstd.mo
-@dirrm share/bakefile/presets
-@dirrm share/bakefile
+share/aclocal/wxwin28.m4
+share/bakefile/presets/wx28.bkl
+share/bakefile/presets/wx28_unix.bkl
+share/bakefile/presets/wx28_win32.bkl
+share/locale/ca/LC_MESSAGES/wxstd28.mo
+share/locale/cs/LC_MESSAGES/wxstd28.mo
+share/locale/da/LC_MESSAGES/wxstd28.mo
+share/locale/de/LC_MESSAGES/wxstd28.mo
+share/locale/el/LC_MESSAGES/wxstd28.mo
+share/locale/es/LC_MESSAGES/wxstd28.mo
+share/locale/fi/LC_MESSAGES/wxstd28.mo
+share/locale/fr/LC_MESSAGES/wxstd28.mo
+share/locale/hu/LC_MESSAGES/wxstd28.mo
+share/locale/id/LC_MESSAGES/wxstd28.mo
+share/locale/it/LC_MESSAGES/wxstd28.mo
+share/locale/ja/LC_MESSAGES/wxstd28.mo
+share/locale/nl/LC_MESSAGES/wxstd28.mo
+share/locale/pl/LC_MESSAGES/wxstd28.mo
+share/locale/ru/LC_MESSAGES/wxstd28.mo
+share/locale/sl/LC_MESSAGES/wxstd28.mo
+share/locale/sv/LC_MESSAGES/wxstd28.mo
+share/locale/tr/LC_MESSAGES/wxstd28.mo
+share/locale/uk/LC_MESSAGES/wxstd28.mo
+share/locale/zh_CN/LC_MESSAGES/wxstd28.mo
+share/locale/zh_TW/LC_MESSAGES/wxstd28.mo
+@dirrmtry share/bakefile/presets
+@dirrmtry share/bakefile
@dirrm include/wx-2.8/wx/xrc
@dirrm include/wx-2.8/wx/xml
@dirrm include/wx-2.8/wx/unix
diff --git a/x11-toolkits/wxgtk29-unicode/Makefile b/x11-toolkits/wxgtk29-unicode/Makefile
index 3b2dc70b979f..a5774af887b1 100644
--- a/x11-toolkits/wxgtk29-unicode/Makefile
+++ b/x11-toolkits/wxgtk29-unicode/Makefile
@@ -5,6 +5,8 @@
# $FreeBSD$
#
+PORTREVISION= 0
+
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index df20772edecb..e2abc881c37a 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= wx
-PORTVERSION= 2.8.0rc1
+PORTVERSION= 2.8.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= wxwindows
@@ -22,11 +22,12 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\
expat.6:${PORTSDIR}/textproc/expat2\
mspack.1:${PORTSDIR}/archivers/libmspack
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GL= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_GNOME= gtk20
+USE_GNOME= gtk20 gconf2
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libpng=sys\
diff --git a/x11-toolkits/wxgtk29/distinfo b/x11-toolkits/wxgtk29/distinfo
index 45da3382d829..d880a1dfc96f 100644
--- a/x11-toolkits/wxgtk29/distinfo
+++ b/x11-toolkits/wxgtk29/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxGTK-2.8.0-rc1.tar.gz) = f549cb5c4f5decca5473dc6c82ab16c0
-SHA256 (wxGTK-2.8.0-rc1.tar.gz) = 0c48b874e5cd23d441a44828b441a6fa1884ef415f5bb2b267ae32575b175e67
-SIZE (wxGTK-2.8.0-rc1.tar.gz) = 12245061
+MD5 (wxGTK-2.8.0.tar.bz2) = 9de30aeaad9bac6f8869907fa42fe950
+SHA256 (wxGTK-2.8.0.tar.bz2) = b4e33116f7533ddba6497aa909d93330ad75bf74bde54e6073dd956c18788efe
+SIZE (wxGTK-2.8.0.tar.bz2) = 8861057
diff --git a/x11-toolkits/wxgtk29/files/patch-Makefile.in b/x11-toolkits/wxgtk29/files/patch-Makefile.in
index f3f537e90876..898e37e29af3 100644
--- a/x11-toolkits/wxgtk29/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk29/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Mon Nov 13 16:58:04 2006
-+++ Makefile.in Thu Nov 30 23:37:17 2006
+--- Makefile.in.orig Tue Dec 12 03:56:01 2006
++++ Makefile.in Mon Jan 8 21:44:56 2007
@@ -24,6 +24,7 @@
SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
@@ -8,7 +8,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
BK_DEPS = @BK_DEPS@
-@@ -11185,11 +11186,7 @@
+@@ -11246,11 +11247,7 @@
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
@@ -21,26 +21,26 @@
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
-@@ -11197,6 +11194,12 @@
+@@ -11258,6 +11255,12 @@
fi; \
$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
done
+
-+install-common: locale_install locale_msw_install
++install-common: locale_install
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
-+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
-+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
for f in $(ALL_HEADERS); do \
if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -11944,11 +11947,10 @@
+@@ -12005,17 +12008,16 @@
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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
@@ -48,3 +48,10 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
for l in $(LOCALE_LINGUAS) ; do \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
diff --git a/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp
new file mode 100644
index 000000000000..5d205cecb55a
--- /dev/null
+++ b/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp
@@ -0,0 +1,11 @@
+--- src/common/intl.cpp.orig Mon Jan 8 21:27:30 2007
++++ src/common/intl.cpp Mon Jan 8 21:27:18 2007
+@@ -1585,7 +1585,7 @@
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
generated by cgit (git 2.34.1) at 2024-11-27 01:25:13 +0800