mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
x11-libs/wxGTK: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
Mart Raudsepp
@@ -1,6 +1,4 @@
|
||||
DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72
|
||||
DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 BLAKE2B 9b6bea6426663b3457764000c3c91a9bdfa85f7e95cae345eb0ba32c3edf59f010738459123423ad68487eadde221dbc3576903b669b9aa674e052b690079de7 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e
|
||||
DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
|
||||
DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
|
||||
DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
|
||||
DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
Prevent file collisions between multiple installed SLOTs.
|
||||
|
||||
- Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets.
|
||||
- Version the bakefile preset filenames. Unversioned symlinks to these files
|
||||
are handled by eselect.
|
||||
- Version wx-config and wxrc. The unversioned forms are wrapper scripts
|
||||
installed with eselect-wxwidgets.
|
||||
- Version wxstd.mo and modify AddStdCatalog to use it.
|
||||
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
|
||||
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___depname) $(__cocoa_res___depname)
|
||||
|
||||
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) $(__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)
|
||||
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
|
||||
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
|
||||
- (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)
|
||||
+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
|
||||
+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
|
||||
+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
|
||||
$(DYLIB_RPATH_INSTALL)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
|
||||
for f in setup.h $(RCDEFS_H); do \
|
||||
@@ -16101,7 +16101,7 @@ 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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
|
||||
+ (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))
|
||||
|
||||
locale_install:
|
||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
|
||||
@@ -16109,7 +16109,7 @@ locale_install:
|
||||
$(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
|
||||
|
||||
--- a/build/bakefiles/wx.bkl
|
||||
+++ b/build/bakefiles/wx.bkl
|
||||
@@ -137,7 +137,7 @@
|
||||
<using module="gettext"/>
|
||||
<gettext-catalogs id="locale">
|
||||
<srcdir>$(SRCDIR)/locale</srcdir>
|
||||
- <catalog-name>wxstd</catalog-name>
|
||||
+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
|
||||
<linguas>
|
||||
ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
|
||||
zh zh_CN zh_TW
|
||||
--- a/src/common/translation.cpp
|
||||
+++ b/src/common/translation.cpp
|
||||
@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
|
||||
|
||||
bool wxTranslations::AddStdCatalog()
|
||||
{
|
||||
- if ( !AddCatalog(wxS("wxstd")) )
|
||||
+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
|
||||
return false;
|
||||
|
||||
// there may be a catalog with toolkit specific overrides, it is not
|
||||
--- a/utils/wxrc/Makefile.in
|
||||
+++ b/utils/wxrc/Makefile.in
|
||||
@@ -125,7 +125,6 @@ distclean: clean
|
||||
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
|
||||
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
|
||||
@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
|
||||
-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
|
||||
|
||||
@COND_USE_XRC_1@uninstall_wxrc:
|
||||
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
|
||||
@@ -1,39 +0,0 @@
|
||||
From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Talbert <swt@techie.net>
|
||||
Date: Sat, 20 Feb 2016 00:08:14 -0500
|
||||
Subject: [PATCH] Fix STC compilation with GCC6
|
||||
|
||||
Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
|
||||
with ambiguous overloads.
|
||||
|
||||
Closes #17147.
|
||||
|
||||
Closes https://github.com/wxWidgets/wxWidgets/pull/222
|
||||
---
|
||||
src/stc/scintilla/src/Editor.cxx | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
|
||||
index cd72953..2081df2 100644
|
||||
--- a/src/stc/scintilla/src/Editor.cxx
|
||||
+++ b/src/stc/scintilla/src/Editor.cxx
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <ctype.h>
|
||||
#include <assert.h>
|
||||
|
||||
+#include <cmath>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
|
||||
}
|
||||
|
||||
static bool Close(Point pt1, Point pt2) {
|
||||
- if (abs(pt1.x - pt2.x) > 3)
|
||||
+ if (std::abs(pt1.x - pt2.x) > 3)
|
||||
return false;
|
||||
- if (abs(pt1.y - pt2.y) > 3)
|
||||
+ if (std::abs(pt1.y - pt2.y) > 3)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
@@ -1,140 +0,0 @@
|
||||
Backport various webkit-related build fixes:
|
||||
|
||||
a309157a Don't include "webview" in "standard" libraries.
|
||||
d24f711f Only link webview library with libwebkitgtk in wxGTK, not the core one.
|
||||
bde287ba Rebake webview sample makefile after EXTRALIBS_WEBVIEW addition
|
||||
037f6977 Report libraries in EXTRALIBS_WEBVIEW in wx-config output
|
||||
|
||||
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -65,6 +65,7 @@ EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
|
||||
CXXWARNINGS = @CXXWARNINGS@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
|
||||
@@ -15493,7 +15494,7 @@ distclean: clean
|
||||
@COND_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
|
||||
|
||||
@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)
|
||||
-@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)
|
||||
+@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)
|
||||
@COND_MONOLITHIC_1_SHARED_1@ $(DYLIB_RPATH_POSTLINK)
|
||||
@COND_MONOLITHIC_1_SHARED_1@
|
||||
@COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
|
||||
@@ -15750,7 +15751,7 @@ distclean: clean
|
||||
@COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
|
||||
|
||||
@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)
|
||||
-@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)
|
||||
+@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)
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(DYLIB_RPATH_POSTLINK)
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@ $(__webviewdll___so_symlinks_cmd)
|
||||
--- a/build/bakefiles/config.bkl
|
||||
+++ b/build/bakefiles/config.bkl
|
||||
@@ -423,6 +423,7 @@ to run the tests, include CppUnit library here.
|
||||
<option name="EXTRALIBS_GUI"/>
|
||||
<option name="EXTRALIBS_OPENGL"/>
|
||||
<option name="EXTRALIBS_SDL"/>
|
||||
+ <option name="EXTRALIBS_WEBVIEW"/>
|
||||
<option name="CXXWARNINGS"/>
|
||||
<option name="HOST_SUFFIX"/>
|
||||
<option name="DYLIB_RPATH_INSTALL"/>
|
||||
@@ -506,6 +507,7 @@ it if SHARED=1 unless you know what you are doing.
|
||||
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
|
||||
</set>
|
||||
<set var="EXTRALIBS_SDL"/>
|
||||
+ <set var="EXTRALIBS_WEBVIEW"/>
|
||||
|
||||
<set var="WITH_PLUGIN_SDL">0</set>
|
||||
|
||||
--- a/build/bakefiles/monolithic.bkl
|
||||
+++ b/build/bakefiles/monolithic.bkl
|
||||
@@ -26,6 +26,7 @@
|
||||
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
|
||||
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
|
||||
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
|
||||
+ <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
|
||||
<library>$(wxscintilla_library_link)</library>
|
||||
</dll>
|
||||
|
||||
--- a/build/bakefiles/multilib.bkl
|
||||
+++ b/build/bakefiles/multilib.bkl
|
||||
@@ -183,6 +183,7 @@
|
||||
<sources>$(WEBVIEW_SRC)</sources>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
+ <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
|
||||
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
|
||||
</dll>
|
||||
|
||||
--- a/build/bakefiles/wxwin.py
|
||||
+++ b/build/bakefiles/wxwin.py
|
||||
@@ -51,6 +51,7 @@ EXTRALIBS = {
|
||||
'html' : '$(EXTRALIBS_HTML)',
|
||||
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
|
||||
'media' : '$(EXTRALIBS_MEDIA)',
|
||||
+ 'webview' : '$(EXTRALIBS_WEBVIEW)',
|
||||
}
|
||||
|
||||
def mkLibName(wxid):
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -7249,7 +7249,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
|
||||
[
|
||||
USE_WEBVIEW_WEBKIT=1
|
||||
CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
|
||||
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
|
||||
+ EXTRALIBS_WEBVIEW="$WEBKIT_LIBS"
|
||||
],
|
||||
[
|
||||
AC_MSG_WARN([webkitgtk not found.])
|
||||
@@ -7689,7 +7689,6 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
|
||||
fi
|
||||
if test "$wxUSE_WEBVIEW" = "yes" ; then
|
||||
- STD_GUI_LIBS="webview $STD_GUI_LIBS"
|
||||
BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
|
||||
fi
|
||||
if test "$wxUSE_XRC" = "yes" ; then
|
||||
@@ -8002,6 +8001,7 @@ AC_SUBST(EXTRALIBS_GUI)
|
||||
AC_SUBST(EXTRALIBS_OPENGL)
|
||||
AC_SUBST(EXTRALIBS_SDL)
|
||||
AC_SUBST(EXTRALIBS_STC)
|
||||
+AC_SUBST(EXTRALIBS_WEBVIEW)
|
||||
AC_SUBST(WITH_PLUGIN_SDL)
|
||||
AC_SUBST(UNICODE)
|
||||
AC_SUBST(DEBUG_INFO)
|
||||
--- a/samples/webview/Makefile.in
|
||||
+++ b/samples/webview/Makefile.in
|
||||
@@ -33,6 +33,7 @@ EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
+EXTRALIBS_WEBVIEW = @EXTRALIBS_WEBVIEW@
|
||||
CXXWARNINGS = @CXXWARNINGS@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
@@ -163,7 +164,7 @@ distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
|
||||
- $(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)
|
||||
+ $(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)
|
||||
|
||||
$(__webview___mac_setfilecmd)
|
||||
$(__webview___os2_emxbindcmd)
|
||||
--- a/wx-config.in
|
||||
+++ b/wx-config.in
|
||||
@@ -1032,6 +1032,7 @@ ldlibs_html="@EXTRALIBS_HTML@"
|
||||
ldlibs_xml="@EXTRALIBS_XML@"
|
||||
ldlibs_adv="@EXTRALIBS_SDL@"
|
||||
ldlibs_stc="@EXTRALIBS_STC@"
|
||||
+ldlibs_webview="@EXTRALIBS_WEBVIEW@"
|
||||
|
||||
|
||||
# Order the libraries passed to us correctly for static linking.
|
||||
@@ -1,161 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit autotools eutils multilib-minimal
|
||||
|
||||
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
|
||||
HOMEPAGE="https://wxwidgets.org/"
|
||||
|
||||
# we use the wxPython tarballs because they include the full wxGTK sources and
|
||||
# docs, and are released more frequently than wxGTK.
|
||||
SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
|
||||
doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
|
||||
|
||||
KEYWORDS="arm"
|
||||
IUSE="+X aqua doc debug libnotify opengl sdl tiff"
|
||||
|
||||
SLOT="3.0"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/expat[${MULTILIB_USEDEP}]
|
||||
sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
|
||||
X? (
|
||||
>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
|
||||
media-libs/libpng:0=[${MULTILIB_USEDEP}]
|
||||
sys-libs/zlib[${MULTILIB_USEDEP}]
|
||||
virtual/jpeg:0=[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
|
||||
x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
|
||||
x11-libs/libSM[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
|
||||
x11-libs/pango[${MULTILIB_USEDEP}]
|
||||
libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
|
||||
opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
|
||||
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
aqua? (
|
||||
x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
|
||||
virtual/jpeg:0=[${MULTILIB_USEDEP}]
|
||||
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig[${MULTILIB_USEDEP}]
|
||||
opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
|
||||
X? (
|
||||
x11-proto/xproto[${MULTILIB_USEDEP}]
|
||||
x11-proto/xineramaproto[${MULTILIB_USEDEP}]
|
||||
x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
|
||||
)"
|
||||
|
||||
PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
|
||||
|
||||
LICENSE="wxWinLL-3
|
||||
GPL-2
|
||||
doc? ( wxWinFDL-3 )"
|
||||
|
||||
S="${WORKDIR}/wxPython-src-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
|
||||
epatch "${FILESDIR}"/${P}-webview-fixes.patch
|
||||
epatch "${FILESDIR}"/${P}-gcc6.patch
|
||||
epatch_user
|
||||
|
||||
for f in $(find "${S}" -name configure.in); do
|
||||
mv "${f}" "${f/in/ac}" || die
|
||||
done
|
||||
AT_M4DIR="${S}/build/aclocal" eautoreconf
|
||||
|
||||
# https://bugs.gentoo.org/536004
|
||||
sed \
|
||||
-e 's:3\.0\.1:3.0.2:g' \
|
||||
-e 's:^wx_release_number=1$:wx_release_number=2:' \
|
||||
-i "${S}"/configure || die
|
||||
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf
|
||||
|
||||
# X independent options
|
||||
myconf="
|
||||
--with-zlib=sys
|
||||
--with-expat=sys
|
||||
--enable-compat28
|
||||
$(use_with sdl)"
|
||||
|
||||
# debug in >=2.9
|
||||
# there is no longer separate debug libraries (gtk2ud)
|
||||
# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
|
||||
# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
|
||||
# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
|
||||
# http://docs.wxwidgets.org/3.0/overview_debugging.html
|
||||
# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
|
||||
use debug \
|
||||
&& myconf="${myconf} --enable-debug=max"
|
||||
|
||||
# wxGTK options
|
||||
# --enable-graphics_ctx - needed for webkit, editra
|
||||
# --without-gnomevfs - bug #203389
|
||||
use X && \
|
||||
myconf="${myconf}
|
||||
--enable-graphics_ctx
|
||||
--with-gtkprint
|
||||
--enable-gui
|
||||
--with-libpng=sys
|
||||
--with-libxpm=sys
|
||||
--with-libjpeg=sys
|
||||
--without-gnomevfs
|
||||
--disable-webview
|
||||
--disable-mediactrl
|
||||
$(use_with libnotify)
|
||||
$(use_with opengl)
|
||||
$(use_with tiff libtiff sys)"
|
||||
|
||||
use aqua && \
|
||||
myconf="${myconf}
|
||||
--enable-graphics_ctx
|
||||
--enable-gui
|
||||
--with-libpng=sys
|
||||
--with-libxpm=sys
|
||||
--with-libjpeg=sys
|
||||
--with-mac
|
||||
--with-opengl"
|
||||
# cocoa toolkit seems to be broken
|
||||
|
||||
# wxBase options
|
||||
if use !X && use !aqua ; then
|
||||
myconf="${myconf}
|
||||
--disable-gui"
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf ${myconf}
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
cd "${S}"/docs || die
|
||||
dodoc changes.txt readme.txt
|
||||
newdoc base/readme.txt base_readme.txt
|
||||
newdoc gtk/readme.txt gtk_readme.txt
|
||||
|
||||
if use doc; then
|
||||
dodoc -r "${S}"/docs/doxygen/out/html
|
||||
fi
|
||||
|
||||
# Stray windows locale file, causes collisions
|
||||
local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
|
||||
[[ -e ${wxmsw} ]] && rm "${wxmsw}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
has_version app-eselect/eselect-wxwidgets \
|
||||
&& eselect wxwidgets update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
has_version app-eselect/eselect-wxwidgets \
|
||||
&& eselect wxwidgets update
|
||||
}
|
||||
Reference in New Issue
Block a user