| 1 |
commit: e16e67f0678b264a04e96954a4593ddac3a9a32d |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 03:44:12 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 17:18:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16e67f0 |
| 7 |
|
| 8 |
x11-libs/wxGTK: Apply patchset for lots of 3.0 branch fixes and webkit-gtk:4 port |
| 9 |
|
| 10 |
Includes 105 patches taken from WX_3_0_BRANCH, plus one from master only that we |
| 11 |
need to not litter DT_NEEDED with wxWebView library without --as-needed (it was |
| 12 |
part of squashed wxGTK-3.0.2.0-webview-fixes.patch before). Also includes my patch |
| 13 |
to install wx/evtloopsrc.h in core-only builds. |
| 14 |
Most notably the patchset adds support for webkit2gtk API (as provided by security |
| 15 |
safe net-libs/webkit-gtk:4), and lots of gtk3 port fixes, hopefully making 3.0-gtk3 |
| 16 |
SLOT good enough for mass transition without problematic runtime regressions. |
| 17 |
|
| 18 |
The patchset touches lines right above the first Makefile.in changes in the |
| 19 |
collision patch, so that patch needed to be adjusted to not fail on top of the |
| 20 |
patchset. Ideally the collision patch would be revised and moved to the same |
| 21 |
approach as 3.0-gtk3 has with seds - or vice-versa, but at least same approach.. |
| 22 |
|
| 23 |
Compiling amule[-X] and veracrypt[-X] against wxGTK[-X] is untested; please test |
| 24 |
and close the relevant bugs (617440 and 605018) if this is fixed now. |
| 25 |
|
| 26 |
Bug: https://bugs.gentoo.org/629122 |
| 27 |
Bug: https://bugs.gentoo.org/617440 |
| 28 |
Bug: https://bugs.gentoo.org/605018 |
| 29 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 30 |
|
| 31 |
x11-libs/wxGTK/Manifest | 1 + |
| 32 |
x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch | 75 ++++++++++++++++++++++++ |
| 33 |
x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 4 +- |
| 34 |
x11-libs/wxGTK/wxGTK-3.0.3.ebuild | 4 +- |
| 35 |
4 files changed, 82 insertions(+), 2 deletions(-) |
| 36 |
|
| 37 |
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest |
| 38 |
index 7606e383bee..3a43537a17d 100644 |
| 39 |
--- a/x11-libs/wxGTK/Manifest |
| 40 |
+++ b/x11-libs/wxGTK/Manifest |
| 41 |
@@ -1,3 +1,4 @@ |
| 42 |
+DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72 |
| 43 |
DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 BLAKE2B 9b6bea6426663b3457764000c3c91a9bdfa85f7e95cae345eb0ba32c3edf59f010738459123423ad68487eadde221dbc3576903b669b9aa674e052b690079de7 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e |
| 44 |
DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 |
| 45 |
DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 |
| 46 |
|
| 47 |
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch |
| 48 |
new file mode 100644 |
| 49 |
index 00000000000..3459e8dc75d |
| 50 |
--- /dev/null |
| 51 |
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch |
| 52 |
@@ -0,0 +1,75 @@ |
| 53 |
+Prevent file collisions between multiple installed SLOTs. |
| 54 |
+ |
| 55 |
+ - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. |
| 56 |
+ - Version the bakefile preset filenames. Unversioned symlinks to these files |
| 57 |
+ are handled by eselect. |
| 58 |
+ - Version wx-config and wxrc. The unversioned forms are wrapper scripts |
| 59 |
+ installed with eselect-wxwidgets. |
| 60 |
+ - Version wxstd.mo and modify AddStdCatalog to use it. |
| 61 |
+ |
| 62 |
+--- a/Makefile.in |
| 63 |
++++ b/Makefile.in |
| 64 |
+@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ |
| 65 |
+ 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) $(__webkit2_ext_ |
| 66 |
__depname) $(__wxrc___depname) $(__cocoa_res___depname) |
| 67 |
+ |
| 68 |
+ 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) |
| 69 |
$(__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_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) |
| 70 |
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal |
| 71 |
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) |
| 72 |
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets |
| 73 |
+- (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) |
| 74 |
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ |
| 75 |
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ |
| 76 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) |
| 77 |
+ $(DYLIB_RPATH_INSTALL) |
| 78 |
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx |
| 79 |
+ for f in setup.h $(RCDEFS_H); do \ |
| 80 |
+@@ -16101,7 +16101,7 @@ install-wxconfig: |
| 81 |
+ $(INSTALL_DIR) $(DESTDIR)$(bindir) |
| 82 |
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config |
| 83 |
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config |
| 84 |
+- (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) |
| 85 |
++ (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)) |
| 86 |
+ |
| 87 |
+ locale_install: |
| 88 |
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale |
| 89 |
+@@ -16109,7 +16109,7 @@ locale_install: |
| 90 |
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ |
| 91 |
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ |
| 92 |
+ if test -f $(srcdir)/locale/$$l.mo ; then \ |
| 93 |
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ |
| 94 |
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ |
| 95 |
+ fi ; \ |
| 96 |
+ done |
| 97 |
+ |
| 98 |
+--- a/build/bakefiles/wx.bkl |
| 99 |
++++ b/build/bakefiles/wx.bkl |
| 100 |
+@@ -137,7 +137,7 @@ |
| 101 |
+ <using module="gettext"/> |
| 102 |
+ <gettext-catalogs id="locale"> |
| 103 |
+ <srcdir>$(SRCDIR)/locale</srcdir> |
| 104 |
+- <catalog-name>wxstd</catalog-name> |
| 105 |
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> |
| 106 |
+ <linguas> |
| 107 |
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk |
| 108 |
+ zh zh_CN zh_TW |
| 109 |
+--- a/src/common/translation.cpp |
| 110 |
++++ b/src/common/translation.cpp |
| 111 |
+@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c |
| 112 |
+ |
| 113 |
+ bool wxTranslations::AddStdCatalog() |
| 114 |
+ { |
| 115 |
+- if ( !AddCatalog(wxS("wxstd")) ) |
| 116 |
++ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) |
| 117 |
+ return false; |
| 118 |
+ |
| 119 |
+ // there may be a catalog with toolkit specific overrides, it is not |
| 120 |
+--- a/utils/wxrc/Makefile.in |
| 121 |
++++ b/utils/wxrc/Makefile.in |
| 122 |
+@@ -125,7 +125,6 @@ distclean: clean |
| 123 |
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| 124 |
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
| 125 |
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| 126 |
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) |
| 127 |
+ |
| 128 |
+ @COND_USE_XRC_1@uninstall_wxrc: |
| 129 |
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |
| 130 |
|
| 131 |
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 132 |
index 0c69eb6d8c1..2a61e20e670 100644 |
| 133 |
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 134 |
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild |
| 135 |
@@ -8,6 +8,7 @@ inherit multilib-minimal |
| 136 |
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" |
| 137 |
HOMEPAGE="https://wxwidgets.org/" |
| 138 |
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 |
| 139 |
+ https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz |
| 140 |
doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" |
| 141 |
|
| 142 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
| 143 |
@@ -41,7 +42,7 @@ RDEPEND=" |
| 144 |
libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) |
| 145 |
opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) |
| 146 |
tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
| 147 |
- webkit? ( net-libs/webkit-gtk:3 ) |
| 148 |
+ webkit? ( net-libs/webkit-gtk:4 ) |
| 149 |
) |
| 150 |
aqua? ( |
| 151 |
x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}] |
| 152 |
@@ -65,6 +66,7 @@ LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" |
| 153 |
S="${WORKDIR}/wxWidgets-${PV}" |
| 154 |
|
| 155 |
PATCHES=( |
| 156 |
+ "${WORKDIR}"/wxGTK-3.0.3_p20180104/ |
| 157 |
"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch |
| 158 |
) |
| 159 |
|
| 160 |
|
| 161 |
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 162 |
index 316720cf495..e49514911b5 100644 |
| 163 |
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 164 |
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild |
| 165 |
@@ -8,6 +8,7 @@ inherit multilib-minimal |
| 166 |
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" |
| 167 |
HOMEPAGE="https://wxwidgets.org/" |
| 168 |
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 |
| 169 |
+ https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz |
| 170 |
doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" |
| 171 |
|
| 172 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
| 173 |
@@ -56,7 +57,8 @@ LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" |
| 174 |
|
| 175 |
S="${WORKDIR}/wxWidgets-${PV}" |
| 176 |
PATCHES=( |
| 177 |
- "${FILESDIR}"/${PN}-3.0.0.0-collision.patch |
| 178 |
+ "${WORKDIR}"/wxGTK-3.0.3_p20180104/ |
| 179 |
+ "${FILESDIR}"/${PN}-3.0.3-collision.patch |
| 180 |
) |
| 181 |
|
| 182 |
multilib_src_configure() { |
Archives