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

Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/, x11-libs/wxGTK/files/
Date: Sun, 25 Mar 2018 11:00:45
Message-Id: 1521975548.18b5f0bfcf1450e1826691402e01fec761258f5e.leio@gentoo
1 commit: 18b5f0bfcf1450e1826691402e01fec761258f5e
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 25 10:58:22 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 25 10:59:08 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b5f0bf
7
8 x11-libs/wxGTK: remove old
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 x11-libs/wxGTK/Manifest | 2 -
13 x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch | 75 ----------
14 x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch | 39 -----
15 .../wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch | 140 ------------------
16 x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild | 161 ---------------------
17 5 files changed, 417 deletions(-)
18
19 diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
20 index 3a43537a17d..281cacc4301 100644
21 --- a/x11-libs/wxGTK/Manifest
22 +++ b/x11-libs/wxGTK/Manifest
23 @@ -1,6 +1,4 @@
24 DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72
25 -DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 BLAKE2B 9b6bea6426663b3457764000c3c91a9bdfa85f7e95cae345eb0ba32c3edf59f010738459123423ad68487eadde221dbc3576903b669b9aa674e052b690079de7 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e
26 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
27 -DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
28 DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
29 DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
30
31 diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
32 deleted file mode 100644
33 index a2c6c6e1a8e..00000000000
34 --- a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
35 +++ /dev/null
36 @@ -1,75 +0,0 @@
37 -Prevent file collisions between multiple installed SLOTs.
38 -
39 - - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets.
40 - - Version the bakefile preset filenames. Unversioned symlinks to these files
41 - are handled by eselect.
42 - - Version wx-config and wxrc. The unversioned forms are wrapper scripts
43 - installed with eselect-wxwidgets.
44 - - Version wxstd.mo and modify AddStdCatalog to use it.
45 -
46 ---- a/Makefile.in
47 -+++ b/Makefile.in
48 -@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
49 - all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depna
50 me) $(__cocoa_res___depname)
51 -
52 - 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)
53 $(__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)
54 -- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
55 -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
56 - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
57 -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
58 -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
59 -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
60 -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
61 - $(DYLIB_RPATH_INSTALL)
62 - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
63 - for f in setup.h $(RCDEFS_H); do \
64 -@@ -16101,7 +16101,7 @@ install-wxconfig:
65 - $(INSTALL_DIR) $(DESTDIR)$(bindir)
66 - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
67 - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
68 -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
69 -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
70 -
71 - locale_install:
72 - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
73 -@@ -16109,7 +16109,7 @@ locale_install:
74 - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
75 - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
76 - if test -f $(srcdir)/locale/$$l.mo ; then \
77 -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
78 -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
79 - fi ; \
80 - done
81 -
82 ---- a/build/bakefiles/wx.bkl
83 -+++ b/build/bakefiles/wx.bkl
84 -@@ -137,7 +137,7 @@
85 - <using module="gettext"/>
86 - <gettext-catalogs id="locale">
87 - <srcdir>$(SRCDIR)/locale</srcdir>
88 -- <catalog-name>wxstd</catalog-name>
89 -+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
90 - <linguas>
91 - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
92 - zh zh_CN zh_TW
93 ---- a/src/common/translation.cpp
94 -+++ b/src/common/translation.cpp
95 -@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
96 -
97 - bool wxTranslations::AddStdCatalog()
98 - {
99 -- if ( !AddCatalog(wxS("wxstd")) )
100 -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
101 - return false;
102 -
103 - // there may be a catalog with toolkit specific overrides, it is not
104 ---- a/utils/wxrc/Makefile.in
105 -+++ b/utils/wxrc/Makefile.in
106 -@@ -125,7 +125,6 @@ distclean: clean
107 - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
108 - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
109 - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
110 --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
111 -
112 - @COND_USE_XRC_1@uninstall_wxrc:
113 - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
114
115 diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
116 deleted file mode 100644
117 index 119175c624d..00000000000
118 --- a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch
119 +++ /dev/null
120 @@ -1,39 +0,0 @@
121 -From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
122 -From: Scott Talbert <swt@××××××.net>
123 -Date: Sat, 20 Feb 2016 00:08:14 -0500
124 -Subject: [PATCH] Fix STC compilation with GCC6
125 -
126 -Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
127 -with ambiguous overloads.
128 -
129 -Closes #17147.
130 -
131 -Closes https://github.com/wxWidgets/wxWidgets/pull/222
132 ----
133 - src/stc/scintilla/src/Editor.cxx | 5 +++--
134 - 1 file changed, 3 insertions(+), 2 deletions(-)
135 -
136 -diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
137 -index cd72953..2081df2 100644
138 ---- a/src/stc/scintilla/src/Editor.cxx
139 -+++ b/src/stc/scintilla/src/Editor.cxx
140 -@@ -11,6 +11,7 @@
141 - #include <ctype.h>
142 - #include <assert.h>
143 -
144 -+#include <cmath>
145 - #include <string>
146 - #include <vector>
147 - #include <map>
148 -@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
149 - }
150 -
151 - static bool Close(Point pt1, Point pt2) {
152 -- if (abs(pt1.x - pt2.x) > 3)
153 -+ if (std::abs(pt1.x - pt2.x) > 3)
154 - return false;
155 -- if (abs(pt1.y - pt2.y) > 3)
156 -+ if (std::abs(pt1.y - pt2.y) > 3)
157 - return false;
158 - return true;
159 - }
160
161 diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch b/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
162 deleted file mode 100644
163 index 727fda16ddc..00000000000
164 --- a/x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch
165 +++ /dev/null
166 @@ -1,140 +0,0 @@
167 -Backport various webkit-related build fixes:
168 -
169 -a309157a Don't include "webview" in "standard" libraries.
170 -d24f711f Only link webview library with libwebkitgtk in wxGTK, not the core one.
171 -bde287ba Rebake webview sample makefile after EXTRALIBS_WEBVIEW addition
172 -037f6977 Report libraries in EXTRALIBS_WEBVIEW in wx-config output
173 -
174 -
175 ---- a/Makefile.in
176 -+++ b/Makefile.in
177 -@@ -65,6 +65,7 @@ EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@
178 - EXTRALIBS_GUI = @EXTRALIBS_GUI@
179 - EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
180 - EXTRALIBS_SDL = @EXTRALIBS_SDL@
181 -+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
182 - CXXWARNINGS = @CXXWARNINGS@
183 - HOST_SUFFIX = @HOST_SUFFIX@
184 - DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
185 -@@ -15493,7 +15494,7 @@ distclean: clean
186 - @COND_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
187 -
188 - @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
189 --@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
190 -+@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(EXTRALIBS_WEBVIEW) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
191 - @COND_MONOLITHIC_1_SHARED_1@ $(DYLIB_RPATH_POSTLINK)
192 - @COND_MONOLITHIC_1_SHARED_1@
193 - @COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
194 -@@ -15750,7 +15751,7 @@ distclean: clean
195 - @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
196 -
197 - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname)
198 --@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
199 -+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_WEBVIEW) $(LIBS)
200 - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(DYLIB_RPATH_POSTLINK)
201 - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@
202 - @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(__webviewdll___so_symlinks_cmd)
203 ---- a/build/bakefiles/config.bkl
204 -+++ b/build/bakefiles/config.bkl
205 -@@ -423,6 +423,7 @@ to run the tests, include CppUnit library here.
206 - <option name="EXTRALIBS_GUI"/>
207 - <option name="EXTRALIBS_OPENGL"/>
208 - <option name="EXTRALIBS_SDL"/>
209 -+ <option name="EXTRALIBS_WEBVIEW"/>
210 - <option name="CXXWARNINGS"/>
211 - <option name="HOST_SUFFIX"/>
212 - <option name="DYLIB_RPATH_INSTALL"/>
213 -@@ -506,6 +507,7 @@ it if SHARED=1 unless you know what you are doing.
214 - <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
215 - </set>
216 - <set var="EXTRALIBS_SDL"/>
217 -+ <set var="EXTRALIBS_WEBVIEW"/>
218 -
219 - <set var="WITH_PLUGIN_SDL">0</set>
220 -
221 ---- a/build/bakefiles/monolithic.bkl
222 -+++ b/build/bakefiles/monolithic.bkl
223 -@@ -26,6 +26,7 @@
224 - <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
225 - <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
226 - <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
227 -+ <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
228 - <library>$(wxscintilla_library_link)</library>
229 - </dll>
230 -
231 ---- a/build/bakefiles/multilib.bkl
232 -+++ b/build/bakefiles/multilib.bkl
233 -@@ -183,6 +183,7 @@
234 - <sources>$(WEBVIEW_SRC)</sources>
235 - <library>coredll</library>
236 - <library>basedll</library>
237 -+ <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
238 - <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
239 - </dll>
240 -
241 ---- a/build/bakefiles/wxwin.py
242 -+++ b/build/bakefiles/wxwin.py
243 -@@ -51,6 +51,7 @@ EXTRALIBS = {
244 - 'html' : '$(EXTRALIBS_HTML)',
245 - 'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
246 - 'media' : '$(EXTRALIBS_MEDIA)',
247 -+ 'webview' : '$(EXTRALIBS_WEBVIEW)',
248 - }
249 -
250 - def mkLibName(wxid):
251 ---- a/configure.in
252 -+++ b/configure.in
253 -@@ -7249,7 +7249,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
254 - [
255 - USE_WEBVIEW_WEBKIT=1
256 - CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
257 -- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
258 -+ EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
259 - ],
260 - [
261 - AC_MSG_WARN([webkitgtk not found.])
262 -@@ -7689,7 +7689,6 @@ if test "$wxUSE_GUI" = "yes"; then
263 - BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
264 - fi
265 - if test "$wxUSE_WEBVIEW" = "yes" ; then
266 -- STD_GUI_LIBS="webview $STD_GUI_LIBS"
267 - BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
268 - fi
269 - if test "$wxUSE_XRC" = "yes" ; then
270 -@@ -8002,6 +8001,7 @@ AC_SUBST(EXTRALIBS_GUI)
271 - AC_SUBST(EXTRALIBS_OPENGL)
272 - AC_SUBST(EXTRALIBS_SDL)
273 - AC_SUBST(EXTRALIBS_STC)
274 -+AC_SUBST(EXTRALIBS_WEBVIEW)
275 - AC_SUBST(WITH_PLUGIN_SDL)
276 - AC_SUBST(UNICODE)
277 - AC_SUBST(DEBUG_INFO)
278 ---- a/samples/webview/Makefile.in
279 -+++ b/samples/webview/Makefile.in
280 -@@ -33,6 +33,7 @@ EXTRALIBS = @EXTRALIBS@
281 - EXTRALIBS_XML = @EXTRALIBS_XML@
282 - EXTRALIBS_GUI = @EXTRALIBS_GUI@
283 - EXTRALIBS_SDL = @EXTRALIBS_SDL@
284 -+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
285 - CXXWARNINGS = @CXXWARNINGS@
286 - HOST_SUFFIX = @HOST_SUFFIX@
287 - SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
288 -@@ -163,7 +164,7 @@ distclean: clean
289 - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
290 -
291 - webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
292 -- $(CXX) -o $@ $(WEBVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
293 -+ $(CXX) -o $@ $(WEBVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
294 -
295 - $(__webview___mac_setfilecmd)
296 - $(__webview___os2_emxbindcmd)
297 ---- a/wx-config.in
298 -+++ b/wx-config.in
299 -@@ -1032,6 +1032,7 @@ ldlibs_html="@EXTRALIBS_HTML@"
300 - ldlibs_xml="@EXTRALIBS_XML@"
301 - ldlibs_adv="@EXTRALIBS_SDL@"
302 - ldlibs_stc="@EXTRALIBS_STC@"
303 -+ldlibs_webview="@EXTRALIBS_WEBVIEW@"
304 -
305 -
306 - # Order the libraries passed to us correctly for static linking.
307
308 diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild
309 deleted file mode 100644
310 index e9f06730d38..00000000000
311 --- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild
312 +++ /dev/null
313 @@ -1,161 +0,0 @@
314 -# Copyright 1999-2018 Gentoo Foundation
315 -# Distributed under the terms of the GNU General Public License v2
316 -
317 -EAPI="5"
318 -
319 -inherit autotools eutils multilib-minimal
320 -
321 -DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
322 -HOMEPAGE="https://wxwidgets.org/"
323 -
324 -# we use the wxPython tarballs because they include the full wxGTK sources and
325 -# docs, and are released more frequently than wxGTK.
326 -SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
327 - doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
328 -
329 -KEYWORDS="arm"
330 -IUSE="+X aqua doc debug libnotify opengl sdl tiff"
331 -
332 -SLOT="3.0"
333 -
334 -RDEPEND="
335 - dev-libs/expat[${MULTILIB_USEDEP}]
336 - sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
337 - X? (
338 - >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
339 - media-libs/libpng:0=[${MULTILIB_USEDEP}]
340 - sys-libs/zlib[${MULTILIB_USEDEP}]
341 - virtual/jpeg:0=[${MULTILIB_USEDEP}]
342 - >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
343 - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
344 - x11-libs/libSM[${MULTILIB_USEDEP}]
345 - x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
346 - x11-libs/pango[${MULTILIB_USEDEP}]
347 - libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
348 - opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
349 - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
350 - )
351 - aqua? (
352 - x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
353 - virtual/jpeg:0=[${MULTILIB_USEDEP}]
354 - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
355 - )"
356 -
357 -DEPEND="${RDEPEND}
358 - virtual/pkgconfig[${MULTILIB_USEDEP}]
359 - opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
360 - X? (
361 - x11-proto/xproto[${MULTILIB_USEDEP}]
362 - x11-proto/xineramaproto[${MULTILIB_USEDEP}]
363 - x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
364 - )"
365 -
366 -PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
367 -
368 -LICENSE="wxWinLL-3
369 - GPL-2
370 - doc? ( wxWinFDL-3 )"
371 -
372 -S="${WORKDIR}/wxPython-src-${PV}"
373 -
374 -src_prepare() {
375 - epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
376 - epatch "${FILESDIR}"/${P}-webview-fixes.patch
377 - epatch "${FILESDIR}"/${P}-gcc6.patch
378 - epatch_user
379 -
380 - for f in $(find "${S}" -name configure.in); do
381 - mv "${f}" "${f/in/ac}" || die
382 - done
383 - AT_M4DIR="${S}/build/aclocal" eautoreconf
384 -
385 - # https://bugs.gentoo.org/536004
386 - sed \
387 - -e 's:3\.0\.1:3.0.2:g' \
388 - -e 's:^wx_release_number=1$:wx_release_number=2:' \
389 - -i "${S}"/configure || die
390 -
391 -}
392 -
393 -multilib_src_configure() {
394 - local myconf
395 -
396 - # X independent options
397 - myconf="
398 - --with-zlib=sys
399 - --with-expat=sys
400 - --enable-compat28
401 - $(use_with sdl)"
402 -
403 - # debug in >=2.9
404 - # there is no longer separate debug libraries (gtk2ud)
405 - # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
406 - # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
407 - # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
408 - # http://docs.wxwidgets.org/3.0/overview_debugging.html
409 - # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
410 - use debug \
411 - && myconf="${myconf} --enable-debug=max"
412 -
413 - # wxGTK options
414 - # --enable-graphics_ctx - needed for webkit, editra
415 - # --without-gnomevfs - bug #203389
416 - use X && \
417 - myconf="${myconf}
418 - --enable-graphics_ctx
419 - --with-gtkprint
420 - --enable-gui
421 - --with-libpng=sys
422 - --with-libxpm=sys
423 - --with-libjpeg=sys
424 - --without-gnomevfs
425 - --disable-webview
426 - --disable-mediactrl
427 - $(use_with libnotify)
428 - $(use_with opengl)
429 - $(use_with tiff libtiff sys)"
430 -
431 - use aqua && \
432 - myconf="${myconf}
433 - --enable-graphics_ctx
434 - --enable-gui
435 - --with-libpng=sys
436 - --with-libxpm=sys
437 - --with-libjpeg=sys
438 - --with-mac
439 - --with-opengl"
440 - # cocoa toolkit seems to be broken
441 -
442 - # wxBase options
443 - if use !X && use !aqua ; then
444 - myconf="${myconf}
445 - --disable-gui"
446 - fi
447 -
448 - ECONF_SOURCE="${S}" econf ${myconf}
449 -}
450 -
451 -multilib_src_install_all() {
452 - cd "${S}"/docs || die
453 - dodoc changes.txt readme.txt
454 - newdoc base/readme.txt base_readme.txt
455 - newdoc gtk/readme.txt gtk_readme.txt
456 -
457 - if use doc; then
458 - dodoc -r "${S}"/docs/doxygen/out/html
459 - fi
460 -
461 - # Stray windows locale file, causes collisions
462 - local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
463 - [[ -e ${wxmsw} ]] && rm "${wxmsw}"
464 -}
465 -
466 -pkg_postinst() {
467 - has_version app-eselect/eselect-wxwidgets \
468 - && eselect wxwidgets update
469 -}
470 -
471 -pkg_postrm() {
472 - has_version app-eselect/eselect-wxwidgets \
473 - && eselect wxwidgets update
474 -}
Report Message
Find on MARC Find on Google Groups