1 |
commit: 314daaa5abd0b947a21bcd4f76493c184673e76b |
2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
3 |
AuthorDate: Wed Mar 31 22:24:43 2021 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 25 19:12:34 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314daaa5 |
7 |
|
8 |
x11-libs/wxGTK: 3.0.5.1 version bump |
9 |
|
10 |
The fetching "wxGTK-3.0.5_p20210214.tar.xz" tarball contains patches |
11 |
from v3.0.5.1..WX_3_0_BRANCH available by end of day 2021-02-14. |
12 |
Some bakefile, 3.0.6 version update, wxMSW and wxMac patches removed. |
13 |
|
14 |
In 0006-* and 0009-* patches the chunks with "doc/changes.txt" |
15 |
changes were removed as they brake the src_prepare() phase. |
16 |
|
17 |
Also commit a309157a666e cherry-pick on top, as we want to remove |
18 |
webview from wx-config --libs to avoid overlinking in 3.0.x too. |
19 |
|
20 |
Closes: https://bugs.gentoo.org/732802 |
21 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
22 |
Closes: https://github.com/gentoo/gentoo/pull/20212 |
23 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
24 |
|
25 |
x11-libs/wxGTK/Manifest | 3 + |
26 |
x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild | 166 ++++++++++++++++++++++++++++++++++++ |
27 |
2 files changed, 169 insertions(+) |
28 |
|
29 |
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest |
30 |
index bef346b0422..d9aa3ba85a2 100644 |
31 |
--- a/x11-libs/wxGTK/Manifest |
32 |
+++ b/x11-libs/wxGTK/Manifest |
33 |
@@ -1,3 +1,6 @@ |
34 |
DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9 |
35 |
DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd |
36 |
DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 |
37 |
+DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335 |
38 |
+DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac |
39 |
+DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d |
40 |
|
41 |
diff --git a/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild |
42 |
new file mode 100644 |
43 |
index 00000000000..e43f2597c1a |
44 |
--- /dev/null |
45 |
+++ b/x11-libs/wxGTK/wxGTK-3.0.5.1.ebuild |
46 |
@@ -0,0 +1,166 @@ |
47 |
+# Copyright 1999-2021 Gentoo Authors |
48 |
+# Distributed under the terms of the GNU General Public License v2 |
49 |
+ |
50 |
+EAPI=7 |
51 |
+ |
52 |
+inherit multilib-minimal |
53 |
+ |
54 |
+WXSUBVERSION=${PV}-gtk3 # 3.0.5.1-gtk3 |
55 |
+WXVERSION=${WXSUBVERSION%.*} # 3.0.5 |
56 |
+WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3 |
57 |
+WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3 |
58 |
+ |
59 |
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" |
60 |
+HOMEPAGE="https://wxwidgets.org/" |
61 |
+SRC_URI=" |
62 |
+ https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 |
63 |
+ https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.5_p20210214.tar.xz |
64 |
+ doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${WXVERSION}/wxWidgets-${WXVERSION}-docs-html.tar.bz2 )" |
65 |
+S="${WORKDIR}/wxWidgets-${PV}" |
66 |
+ |
67 |
+LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" |
68 |
+SLOT="${WXRELEASE}" |
69 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
70 |
+IUSE="+X doc debug gstreamer libnotify opengl sdl tiff webkit" |
71 |
+ |
72 |
+RDEPEND=" |
73 |
+ >=app-eselect/eselect-wxwidgets-20131230 |
74 |
+ dev-libs/expat[${MULTILIB_USEDEP}] |
75 |
+ sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) |
76 |
+ X? ( |
77 |
+ >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] |
78 |
+ media-libs/libpng:0=[${MULTILIB_USEDEP}] |
79 |
+ sys-libs/zlib[${MULTILIB_USEDEP}] |
80 |
+ virtual/jpeg:0=[${MULTILIB_USEDEP}] |
81 |
+ x11-libs/cairo[${MULTILIB_USEDEP}] |
82 |
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}] |
83 |
+ x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] |
84 |
+ x11-libs/libSM[${MULTILIB_USEDEP}] |
85 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
86 |
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}] |
87 |
+ x11-libs/pango[${MULTILIB_USEDEP}] |
88 |
+ gstreamer? ( |
89 |
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
90 |
+ media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] |
91 |
+ ) |
92 |
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) |
93 |
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) |
94 |
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
95 |
+ webkit? ( net-libs/webkit-gtk:4 ) |
96 |
+ )" |
97 |
+DEPEND="${RDEPEND} |
98 |
+ opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) |
99 |
+ X? ( x11-base/xorg-proto )" |
100 |
+BDEPEND=" |
101 |
+ >=app-eselect/eselect-wxwidgets-20131230 |
102 |
+ virtual/pkgconfig" |
103 |
+ |
104 |
+PATCHES=( |
105 |
+ "${WORKDIR}"/wxGTK-3.0.5_p20210214/ |
106 |
+ "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch |
107 |
+ "${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 |
108 |
+) |
109 |
+ |
110 |
+src_prepare() { |
111 |
+ default |
112 |
+ |
113 |
+ # Versionating |
114 |
+ sed -i \ |
115 |
+ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ |
116 |
+ -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ |
117 |
+ -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ |
118 |
+ -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ |
119 |
+ -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \ |
120 |
+ -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \ |
121 |
+ Makefile.in || die |
122 |
+ |
123 |
+ sed -i \ |
124 |
+ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ |
125 |
+ utils/wxrc/Makefile.in || die |
126 |
+ |
127 |
+ sed -i \ |
128 |
+ -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ |
129 |
+ -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ |
130 |
+ -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ |
131 |
+ -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ |
132 |
+ configure || die |
133 |
+} |
134 |
+ |
135 |
+multilib_src_configure() { |
136 |
+ # X independent options |
137 |
+ local myeconfargs=( |
138 |
+ --with-zlib=sys |
139 |
+ --with-expat=sys |
140 |
+ --enable-compat28 |
141 |
+ $(use_with sdl) |
142 |
+ |
143 |
+ # Don't hard-code libdir's prefix for wx-config |
144 |
+ --libdir='${prefix}'/$(get_libdir) |
145 |
+ ) |
146 |
+ |
147 |
+ # debug in >=2.9 |
148 |
+ # there is no longer separate debug libraries (gtk2ud) |
149 |
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled |
150 |
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. |
151 |
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. |
152 |
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html |
153 |
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c |
154 |
+ use debug && myeconfargs+=( --enable-debug=max ) |
155 |
+ |
156 |
+ # wxGTK options |
157 |
+ # --enable-graphics_ctx - needed for webkit, editra |
158 |
+ # --without-gnomevfs - bug #203389 |
159 |
+ use X && myeconfargs+=( |
160 |
+ --enable-graphics_ctx |
161 |
+ --with-gtkprint |
162 |
+ --enable-gui |
163 |
+ --with-gtk=3 |
164 |
+ --with-libpng=sys |
165 |
+ --with-libjpeg=sys |
166 |
+ --without-gnomevfs |
167 |
+ $(use_enable gstreamer mediactrl) |
168 |
+ $(multilib_native_use_enable webkit webview) |
169 |
+ $(use_with libnotify) |
170 |
+ $(use_with opengl) |
171 |
+ $(use_with tiff libtiff sys) |
172 |
+ ) |
173 |
+ |
174 |
+ # wxBase options |
175 |
+ ! use X && myeconfargs+=( --disable-gui ) |
176 |
+ |
177 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
178 |
+} |
179 |
+ |
180 |
+multilib_src_install_all() { |
181 |
+ cd docs || die |
182 |
+ dodoc changes.txt readme.txt |
183 |
+ newdoc base/readme.txt base_readme.txt |
184 |
+ newdoc gtk/readme.txt gtk_readme.txt |
185 |
+ |
186 |
+ use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${WXVERSION}-docs-html/. ) |
187 |
+ einstalldocs |
188 |
+ |
189 |
+ # Stray windows locale file, bug #650118 |
190 |
+ rm -f "${ED}"/usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo || die |
191 |
+ |
192 |
+ # Unversioned links |
193 |
+ rm "${ED}"/usr/bin/wx{-config,rc} || die |
194 |
+ |
195 |
+ # version bakefile presets |
196 |
+ pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die |
197 |
+ local f |
198 |
+ for f in wx*; do |
199 |
+ mv "${f}" "${f/wx/wx30gtk3}" || die |
200 |
+ done |
201 |
+ popd >/dev/null || die |
202 |
+} |
203 |
+ |
204 |
+pkg_postinst() { |
205 |
+ has_version -b app-eselect/eselect-wxwidgets \ |
206 |
+ && eselect wxwidgets update |
207 |
+} |
208 |
+ |
209 |
+pkg_postrm() { |
210 |
+ has_version -b app-eselect/eselect-wxwidgets \ |
211 |
+ && eselect wxwidgets update |
212 |
+} |