Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.8.11-unicode-odbc.patch wxGTK-2.8.11-collision.patch
Date: Thu, 27 May 2010 05:12:22
Message-Id: 20100527051217.829A82CE3C@corvid.gentoo.org
1 dirtyepic 10/05/27 05:12:17
2
3 Added: wxGTK-2.8.11-unicode-odbc.patch
4 wxGTK-2.8.11-collision.patch
5 Log:
6 Version bump, remove old.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch?rev=1.1&content-type=text/plain
14
15 Index: wxGTK-2.8.11-unicode-odbc.patch
16 ===================================================================
17 Allow odbc to be used with unicode builds.
18
19 --- a/Makefile.in
20 +++ b/Makefile.in
21 @@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
22 $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
23 $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) \
24 $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
25 - $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) \
26 + $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \
27 $(CPPFLAGS) $(CXXFLAGS)
28 ODBCDLL_OBJECTS = \
29 $(__odbcdll___win32rc) \
30
31
32
33 1.1 x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch?rev=1.1&content-type=text/plain
37
38 Index: wxGTK-2.8.11-collision.patch
39 ===================================================================
40 Prevent file collisions between multiple installed SLOTs.
41
42 - Don't install wxwin.m4. It is installed with app-admin/eselect-wxwidgets.
43 - Version the bakefile preset filenames. Unversioned symlinks to these files
44 are handled by eselect.
45 - Version wx-config and wxrc. Unversioned wrapper scripts are installed with
46 eselect-wxwidgets.
47 - Version wxstd.mo and modify AddCatalog to find it. (this might need more
48 work but no one has complained yet)
49
50 --- a/Makefile.in
51 +++ b/Makefile.in
52 @@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
53 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)
54
55 install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $
56 (__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___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)
57 - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
58 - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
59 $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
60 - (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
61 + (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do \
62 + $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
63 $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
64 for f in setup.h $(RCDEFS_H); do \
65 if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
66 @@ -12455,7 +12454,8 @@ install-wxconfig:
67 $(INSTALL_DIR) $(DESTDIR)$(bindir)
68 $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
69 $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
70 - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
71 + (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
72 + && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
73
74 locale_install:
75 $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
76 @@ -12463,7 +12463,7 @@ locale_install:
77 $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
78 $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
79 if test -f $(srcdir)/locale/$$l.mo ; then \
80 - $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
81 + $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
82 fi ; \
83 done
84
85 --- a/src/common/intl.cpp
86 +++ b/src/common/intl.cpp
87 @@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
88 m_initialized = false;
89 }
90
91 +#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
92 +
93 // NB: this function has (desired) side effect of changing current locale
94 bool wxLocale::Init(const wxChar *szName,
95 const wxChar *szShort,
96 @@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName,
97 bool bOk = true;
98 if ( bLoadDefault )
99 {
100 - bOk = AddCatalog(wxT("wxstd"));
101 + bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
102
103 // there may be a catalog with toolkit specific overrides, it is not
104 // an error if this does not exist
105 --- a/utils/wxrc/Makefile.in
106 +++ b/utils/wxrc/Makefile.in
107 @@ -120,7 +120,6 @@ distclean: clean
108 @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
109 @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
110 @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
111 -@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
112
113 @COND_USE_XRC_1@uninstall_wxrc:
114 @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
Report Message
Find on MARC Find on Google Groups