1 |
commit: 11088ba712cb6a1dfa2861f44aac83f12ef232bb |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 16 21:30:09 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 16 21:32:34 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11088ba7 |
7 |
|
8 |
x11-libs/wxGTK: remove last-rited 2.8 SLOT |
9 |
|
10 |
Closes: https://bugs.gentoo.org/661284 |
11 |
Package-Manager: Portage-2.3.46, Repoman-2.3.10 |
12 |
|
13 |
profiles/package.mask | 4 +- |
14 |
x11-libs/wxGTK/Manifest | 1 - |
15 |
.../wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch | 39 --- |
16 |
x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch | 74 ----- |
17 |
.../wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch | 13 - |
18 |
x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch | 27 -- |
19 |
x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch | 25 -- |
20 |
.../wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch | 77 ------ |
21 |
x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch | 304 --------------------- |
22 |
x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch | 11 - |
23 |
x11-libs/wxGTK/metadata.xml | 3 - |
24 |
x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild | 184 ------------- |
25 |
12 files changed, 3 insertions(+), 759 deletions(-) |
26 |
|
27 |
diff --git a/profiles/package.mask b/profiles/package.mask |
28 |
index f509f359eb7..0639e25225a 100644 |
29 |
--- a/profiles/package.mask |
30 |
+++ b/profiles/package.mask |
31 |
@@ -101,7 +101,9 @@ dev-python/django-celery |
32 |
# Mart Raudsepp <leio@g.o> (16 Jul 2018) |
33 |
# Parallel-installable old versions with no remaining consumers |
34 |
# in main tree. Use applications ported to wxGTK:3.0 and |
35 |
-# wxpython:3.0 instead. Bug #661284 |
36 |
+# wxpython:3.0 instead. |
37 |
+# Please keep this package.mask entry until at least 16th Oct 2018 |
38 |
+# for extra notification of the unmerge need. Bug #661284 |
39 |
x11-libs/wxGTK:2.8 |
40 |
dev-python/wxpython:2.8 |
41 |
|
42 |
|
43 |
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest |
44 |
index 3655a1d2606..ecf85f5bc5f 100644 |
45 |
--- a/x11-libs/wxGTK/Manifest |
46 |
+++ b/x11-libs/wxGTK/Manifest |
47 |
@@ -1,6 +1,5 @@ |
48 |
DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72 |
49 |
DIST wxGTK-3.0.4_p20180507.tar.xz 2972 BLAKE2B 431855d43aefac6227925195c107b21f7539ca2709c98f6d6beb7d25dbdf8633c61bb160fb4e5c993e97dbddc37cdf90dc7b09753a312c25b16f79f0207cfe98 SHA512 9caa7ca3b6f15fd70014ccd4008c4fa76f12cb07d3fc58a8f0d2b9a591cf8be3f0eb40497dc757b9d0a04d26f54296aaa8fe693aa601bb1c058365529bb4bc8b |
50 |
-DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 |
51 |
DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb |
52 |
DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1 |
53 |
DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd |
54 |
|
55 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch |
56 |
deleted file mode 100644 |
57 |
index 3636b64f976..00000000000 |
58 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch |
59 |
+++ /dev/null |
60 |
@@ -1,39 +0,0 @@ |
61 |
-unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef |
62 |
-declaration instead of preprocessor #define macro definition. This breaks |
63 |
-the preprocessor checks in this include file.cpp, causing the source to fall |
64 |
-back to older types instead, leading to compile time errors like this: |
65 |
- |
66 |
-db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to |
67 |
-‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’ |
68 |
-... |
69 |
-dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to |
70 |
-‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’ |
71 |
-... |
72 |
- |
73 |
-This change hard-wires the new names, breaking compatibility with ancient |
74 |
-(pre 2001) unixODBC versions. This change may break other ODBC implementations |
75 |
-but in Gentoo only unixODBC is supported. |
76 |
- |
77 |
-References: |
78 |
-http://bugs.gentoo.org/310923 |
79 |
- |
80 |
-2010-03-23 Martin von Gagern |
81 |
- |
82 |
---- wxPython-src-2.6.4.0.orig/include/wx/db.h |
83 |
-+++ wxPython-src-2.6.4.0/include/wx/db.h |
84 |
-@@ -134,15 +134,6 @@ enum enumDummy {enumDum1}; |
85 |
- #endif |
86 |
- #endif |
87 |
- |
88 |
--#ifndef _WIN64 |
89 |
--#ifndef SQLLEN |
90 |
--#define SQLLEN SQLINTEGER |
91 |
--#endif |
92 |
--#ifndef SQLULEN |
93 |
--#define SQLULEN SQLUINTEGER |
94 |
--#endif |
95 |
--#endif |
96 |
-- |
97 |
- const int wxDB_PATH_MAX = 254; |
98 |
- |
99 |
- extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME; |
100 |
|
101 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch |
102 |
deleted file mode 100644 |
103 |
index a5c574cb2d6..00000000000 |
104 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch |
105 |
+++ /dev/null |
106 |
@@ -1,74 +0,0 @@ |
107 |
-Prevent file collisions between multiple installed SLOTs. |
108 |
- |
109 |
- - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. |
110 |
- - Version the bakefile preset filenames. Unversioned symlinks to these files |
111 |
- are handled by eselect. |
112 |
- - Version wx-config and wxrc. Unversioned wrapper scripts are installed with |
113 |
- eselect-wxwidgets. |
114 |
- - Version wxstd.mo and modify AddCatalog to find it. (this might need more |
115 |
- work but no one has complained yet) |
116 |
- |
117 |
---- a/Makefile.in |
118 |
-+++ b/Makefile.in |
119 |
-@@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ |
120 |
- 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) |
121 |
- |
122 |
- 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) $(__inst |
123 |
all_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) |
124 |
-- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal |
125 |
-- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) |
126 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets |
127 |
-- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) |
128 |
-+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do \ |
129 |
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) |
130 |
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx |
131 |
- for f in setup.h $(RCDEFS_H); do \ |
132 |
- if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ |
133 |
-@@ -12455,7 +12454,8 @@ install-wxconfig: |
134 |
- $(INSTALL_DIR) $(DESTDIR)$(bindir) |
135 |
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config |
136 |
- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config |
137 |
-- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) |
138 |
-+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ |
139 |
-+ && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) |
140 |
- |
141 |
- locale_install: |
142 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale |
143 |
-@@ -12463,7 +12463,7 @@ locale_install: |
144 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ |
145 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ |
146 |
- if test -f $(srcdir)/locale/$$l.mo ; then \ |
147 |
-- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ |
148 |
-+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ |
149 |
- fi ; \ |
150 |
- done |
151 |
- |
152 |
---- a/src/common/intl.cpp |
153 |
-+++ b/src/common/intl.cpp |
154 |
-@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit() |
155 |
- m_initialized = false; |
156 |
- } |
157 |
- |
158 |
-+#define wxSTRINGIZE2(x) wxSTRINGIZE(x) |
159 |
-+ |
160 |
- // NB: this function has (desired) side effect of changing current locale |
161 |
- bool wxLocale::Init(const wxChar *szName, |
162 |
- const wxChar *szShort, |
163 |
-@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName, |
164 |
- bool bOk = true; |
165 |
- if ( bLoadDefault ) |
166 |
- { |
167 |
-- bOk = AddCatalog(wxT("wxstd")); |
168 |
-+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION))); |
169 |
- |
170 |
- // there may be a catalog with toolkit specific overrides, it is not |
171 |
- // an error if this does not exist |
172 |
---- a/utils/wxrc/Makefile.in |
173 |
-+++ b/utils/wxrc/Makefile.in |
174 |
-@@ -120,7 +120,6 @@ distclean: clean |
175 |
- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
176 |
- @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
177 |
- @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
178 |
--@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) |
179 |
- |
180 |
- @COND_USE_XRC_1@uninstall_wxrc: |
181 |
- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |
182 |
|
183 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch |
184 |
deleted file mode 100644 |
185 |
index d272247091b..00000000000 |
186 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch |
187 |
+++ /dev/null |
188 |
@@ -1,13 +0,0 @@ |
189 |
-Allow odbc to be used with unicode builds. |
190 |
- |
191 |
---- a/Makefile.in |
192 |
-+++ b/Makefile.in |
193 |
-@@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \ |
194 |
- $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ |
195 |
- $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) \ |
196 |
- $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \ |
197 |
-- $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) \ |
198 |
-+ $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \ |
199 |
- $(CPPFLAGS) $(CXXFLAGS) |
200 |
- ODBCDLL_OBJECTS = \ |
201 |
- $(__odbcdll___win32rc) \ |
202 |
|
203 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch |
204 |
deleted file mode 100644 |
205 |
index 2701500d7ad..00000000000 |
206 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch |
207 |
+++ /dev/null |
208 |
@@ -1,27 +0,0 @@ |
209 |
-From 4164cd68d45ec4b3b46c22ed981c81f766154428 Mon Sep 17 00:00:00 2001 |
210 |
-From: Vadim Zeitlin <vadim@×××××××××.org> |
211 |
-Date: Thu, 17 Jun 2010 22:30:27 +0000 |
212 |
-Subject: Backport fix from bakefile svn for autoconf 2.65. |
213 |
- |
214 |
-Use AC_REQUIRE() instead of directly using a macro, the latter doesn't work |
215 |
-with autoconf 2.65. |
216 |
- |
217 |
-This is a backport of r1337 from bakefile svn to allow people to use autoconf |
218 |
-2.65 immediately and will become unnecessary when we update to the next |
219 |
-bakefile version. |
220 |
- |
221 |
-git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 |
222 |
- |
223 |
-diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4 |
224 |
-index 4cc4a67..ec0f711 100644 |
225 |
---- a/build/aclocal/bakefile-lang.m4 |
226 |
-+++ b/build/aclocal/bakefile-lang.m4 |
227 |
-@@ -240,7 +240,7 @@ dnl check for different proprietary compilers depending on target platform |
228 |
- dnl _AC_BAKEFILE_PROG_COMPILER(LANG) |
229 |
- AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER], |
230 |
- [ |
231 |
-- AC_PROG_$1 |
232 |
-+ AC_REQUIRE([AC_PROG_$1]) |
233 |
- |
234 |
- dnl Intel compiler can be used under several different OS and even |
235 |
- dnl different architectures (x86, amd64 and Itanium) so it's easier to just |
236 |
|
237 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch |
238 |
deleted file mode 100644 |
239 |
index f497665cef8..00000000000 |
240 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch |
241 |
+++ /dev/null |
242 |
@@ -1,25 +0,0 @@ |
243 |
-From 006b0650b0f390c1e9a19361988b6af7a327e296 Mon Sep 17 00:00:00 2001 |
244 |
-From: nE0sIghT <ykonotopov@×××××.com> |
245 |
-Date: Wed, 5 Aug 2015 12:38:39 +0300 |
246 |
-Subject: [PATCH 2/2] Fixed bakefile version |
247 |
- |
248 |
---- |
249 |
- build/aclocal/bakefile.m4 | 2 +- |
250 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
251 |
- |
252 |
-diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 |
253 |
-index 88478ca..aa04b16 100644 |
254 |
---- a/build/aclocal/bakefile.m4 |
255 |
-+++ b/build/aclocal/bakefile.m4 |
256 |
-@@ -837,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE], |
257 |
- AC_SUBST(OBJCXXFLAGS) |
258 |
- |
259 |
- |
260 |
-- BAKEFILE_BAKEFILE_M4_VERSION="0.2.8" |
261 |
-+ BAKEFILE_BAKEFILE_M4_VERSION="0.2.9" |
262 |
- |
263 |
- dnl includes autoconf_inc.m4: |
264 |
- $1 |
265 |
--- |
266 |
-2.4.6 |
267 |
- |
268 |
|
269 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch |
270 |
deleted file mode 100644 |
271 |
index dc9b1435910..00000000000 |
272 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch |
273 |
+++ /dev/null |
274 |
@@ -1,77 +0,0 @@ |
275 |
-Fix building with C++14, which errors out due to narrowing conversions. |
276 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=592442 |
277 |
- |
278 |
-Patch by Francesco Turco |
279 |
- |
280 |
---- a/src/gtk/bdiag.xbm |
281 |
-+++ b/src/gtk/bdiag.xbm |
282 |
-@@ -1,6 +1,6 @@ |
283 |
- #define bdiag_width 16 |
284 |
- #define bdiag_height 16 |
285 |
- static char bdiag_bits[] = { |
286 |
-- 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04, |
287 |
-- 0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, |
288 |
-- 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01}; |
289 |
-+ (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04, |
290 |
-+ (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, |
291 |
-+ (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, (char)0x01, (char)0x01}; |
292 |
---- a/src/gtk/cdiag.xbm |
293 |
-+++ b/src/gtk/cdiag.xbm |
294 |
-@@ -1,6 +1,6 @@ |
295 |
- #define cdiag_width 16 |
296 |
- #define cdiag_height 16 |
297 |
- static char cdiag_bits[] = { |
298 |
-- 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24, |
299 |
-- 0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, |
300 |
-- 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81}; |
301 |
-+ (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24, |
302 |
-+ (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, |
303 |
-+ (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, (char)0x81, (char)0x81}; |
304 |
---- a/src/gtk/cross.xbm |
305 |
-+++ b/src/gtk/cross.xbm |
306 |
-@@ -1,6 +1,6 @@ |
307 |
- #define cross_width 15 |
308 |
- #define cross_height 15 |
309 |
- static char cross_bits[] = { |
310 |
-- 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, |
311 |
-- 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, |
312 |
-- 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10}; |
313 |
-+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, |
314 |
-+ (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, |
315 |
-+ (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10}; |
316 |
---- a/src/gtk/fdiag.xbm |
317 |
-+++ b/src/gtk/fdiag.xbm |
318 |
-@@ -1,6 +1,6 @@ |
319 |
- #define fdiag_width 16 |
320 |
- #define fdiag_height 16 |
321 |
- static char fdiag_bits[] = { |
322 |
-- 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, |
323 |
-- 0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, |
324 |
-- 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80}; |
325 |
-+ (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20, |
326 |
-+ (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, |
327 |
-+ (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, (char)0x80, (char)0x80}; |
328 |
---- a/src/gtk/horiz.xbm |
329 |
-+++ b/src/gtk/horiz.xbm |
330 |
-@@ -1,6 +1,6 @@ |
331 |
- #define horiz_width 15 |
332 |
- #define horiz_height 15 |
333 |
- static char horiz_bits[] = { |
334 |
-- 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
335 |
-- 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
336 |
-- 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00}; |
337 |
-+ (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, |
338 |
-+ (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, |
339 |
-+ (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00}; |
340 |
---- a/src/gtk/verti.xbm |
341 |
-+++ b/src/gtk/verti.xbm |
342 |
-@@ -1,6 +1,6 @@ |
343 |
- #define verti_width 15 |
344 |
- #define verti_height 15 |
345 |
- static char verti_bits[] = { |
346 |
-- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, |
347 |
-- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, |
348 |
-- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10}; |
349 |
-+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, |
350 |
-+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, |
351 |
-+ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10}; |
352 |
|
353 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch |
354 |
deleted file mode 100644 |
355 |
index db9571438d8..00000000000 |
356 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch |
357 |
+++ /dev/null |
358 |
@@ -1,304 +0,0 @@ |
359 |
-From e87336e8d583044d62b1a9400db4c29f1474fa50 Mon Sep 17 00:00:00 2001 |
360 |
-From: nE0sIghT <ykonotopov@×××××.com> |
361 |
-Date: Wed, 5 Aug 2015 12:37:36 +0300 |
362 |
-Subject: [PATCH 1/2] Backported new libraries search code |
363 |
- |
364 |
---- |
365 |
- acinclude.m4 | 75 ++++++++++++++++++++++++++++++++++++++++++++--- |
366 |
- configure.in | 96 +++++++++++++++++++++++------------------------------------- |
367 |
- 2 files changed, 107 insertions(+), 64 deletions(-) |
368 |
- |
369 |
-diff --git a/acinclude.m4 b/acinclude.m4 |
370 |
-index a44747c..1e307c9 100644 |
371 |
---- a/acinclude.m4 |
372 |
-+++ b/acinclude.m4 |
373 |
-@@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include; |
374 |
- ]) |
375 |
- |
376 |
- dnl --------------------------------------------------------------------------- |
377 |
--dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries |
378 |
--dnl to the full name of the file that was found or leaves it empty if not found |
379 |
-+dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths]) |
380 |
-+dnl sets ac_find_libraries to the full name of the file that was found |
381 |
-+dnl or leaves it empty if not found |
382 |
- dnl --------------------------------------------------------------------------- |
383 |
- AC_DEFUN([WX_PATH_FIND_LIBRARIES], |
384 |
- [ |
385 |
- ac_find_libraries= |
386 |
-- for ac_dir in $1; |
387 |
-+ for ac_dir in $2 $SEARCH_LIB |
388 |
- do |
389 |
- for ac_extension in a so sl dylib dll.a; do |
390 |
-- if test -f "$ac_dir/lib$2.$ac_extension"; then |
391 |
-+ if test -f "$ac_dir/lib$1.$ac_extension"; then |
392 |
- ac_find_libraries=$ac_dir |
393 |
- break 2 |
394 |
- fi |
395 |
-@@ -115,6 +116,72 @@ AC_DEFUN([WX_LINK_PATH_EXIST], |
396 |
- fi |
397 |
- ]) |
398 |
- |
399 |
-+dnl --------------------------------------------------------------------------- |
400 |
-+dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths]) |
401 |
-+dnl |
402 |
-+dnl Tests in a variety of ways for the presence of lib-name |
403 |
-+dnl |
404 |
-+dnl On success, returns any novel path found in ac_find_libraries; else "std" |
405 |
-+dnl and any cflags in ac_find_cflags |
406 |
-+dnl On failure, ac_find_libraries will be empty |
407 |
-+dnl --------------------------------------------------------------------------- |
408 |
-+AC_DEFUN([WX_FIND_LIB], |
409 |
-+[ |
410 |
-+ ac_find_libraries= |
411 |
-+ |
412 |
-+ dnl Try with pkg-config first. It requires its lib-name parameter lowercase |
413 |
-+ fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]` |
414 |
-+ dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it |
415 |
-+ PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null |
416 |
-+ PKG_CHECK_MODULES([$1], [$fl_pkgname], |
417 |
-+ [ |
418 |
-+ dnl Start by assuming there are no novel lib paths |
419 |
-+ ac_find_libraries="std" |
420 |
-+ |
421 |
-+ dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work |
422 |
-+ dnl inside the macro |
423 |
-+ dnl |
424 |
-+ dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines |
425 |
-+ dnl should become: |
426 |
-+ dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS]) |
427 |
-+ dnl AS_VAR_COPY([fl_libs], [$1_LIBS]) |
428 |
-+ eval ac_find_cflags=\$$1_CFLAGS |
429 |
-+ eval fl_libs=\$$1_LIBS |
430 |
-+ |
431 |
-+ dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are |
432 |
-+ dnl added) We only want the path bit, not the lib names |
433 |
-+ for fl_path in $fl_libs |
434 |
-+ do |
435 |
-+ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then |
436 |
-+ dnl there shouldn't be >1 novel path |
437 |
-+ dnl return it without the -L, ready for WX_LINK_PATH_EXIST |
438 |
-+ ac_find_libraries=`echo "$fl_path" | cut -c 3-` |
439 |
-+ fi |
440 |
-+ done |
441 |
-+ ], |
442 |
-+ [ |
443 |
-+ if test "x$ac_find_libraries" = "x"; then |
444 |
-+ dnl Next with AC_CHECK_LIB, if a test function was provided |
445 |
-+ if test "x$2" != "x"; then |
446 |
-+ AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"]) |
447 |
-+ fi |
448 |
-+ fi |
449 |
-+ |
450 |
-+ if test "x$ac_find_libraries" = "x"; then |
451 |
-+ dnl Finally try the search path |
452 |
-+ dnl Output a message again, as AC_CHECK_LIB will just have said "no" |
453 |
-+ AC_MSG_CHECKING([elsewhere]) |
454 |
-+ dnl $3 will occasionally hold extra path(s) to search |
455 |
-+ WX_PATH_FIND_LIBRARIES([$1], [$3]) |
456 |
-+ if test "x$ac_find_libraries" != "x"; then |
457 |
-+ AC_MSG_RESULT([yes]) |
458 |
-+ else |
459 |
-+ AC_MSG_RESULT([no]) |
460 |
-+ fi |
461 |
-+ fi |
462 |
-+ ]) |
463 |
-+]) |
464 |
-+ |
465 |
- dnl =========================================================================== |
466 |
- dnl C++ features test |
467 |
- dnl =========================================================================== |
468 |
-diff --git a/configure.in b/configure.in |
469 |
-index 021845d..9c78ba3 100644 |
470 |
---- a/configure.in |
471 |
-+++ b/configure.in |
472 |
-@@ -2767,7 +2767,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then |
473 |
- x_includes=$ac_find_includes |
474 |
- fi |
475 |
- if test -z "$x_libraries" -o "$x_libraries" = NONE; then |
476 |
-- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt) |
477 |
-+ WX_PATH_FIND_LIBRARIES(Xt) |
478 |
- x_libraries=$ac_find_libraries |
479 |
- fi |
480 |
- fi |
481 |
-@@ -3554,7 +3554,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config |
482 |
- dnl test for external libxpm if we're configured to use it |
483 |
- if test "$wxUSE_GPE" = "yes"; then |
484 |
- AC_MSG_CHECKING(for gpewidget library) |
485 |
-- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget) |
486 |
-+ WX_PATH_FIND_LIBRARIES(gpewidget) |
487 |
- if test "$ac_find_libraries" != "" ; then |
488 |
- WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) |
489 |
- dnl -lgpewidget must be before all GTK libs and |
490 |
-@@ -3567,7 +3567,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config |
491 |
- fi |
492 |
- |
493 |
- dnl AC_MSG_CHECKING(for gpe library) |
494 |
-- dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe) |
495 |
-+ dnl WX_PATH_FIND_LIBRARIES(gpe) |
496 |
- dnl if test "$ac_find_libraries" != "" ; then |
497 |
- dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) |
498 |
- dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe" |
499 |
-@@ -3817,7 +3817,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config |
500 |
- |
501 |
- |
502 |
- AC_MSG_CHECKING(for Motif/Lesstif library) |
503 |
-- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm) |
504 |
-+ WX_PATH_FIND_LIBRARIES(Xm) |
505 |
- |
506 |
- if test "x$ac_find_libraries" != "x" ; then |
507 |
- AC_MSG_RESULT(found in $ac_find_libraries) |
508 |
-@@ -3956,7 +3956,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config |
509 |
- dnl test for external libxpm if we're configured to use it |
510 |
- if test "$wxUSE_LIBXPM" = "sys"; then |
511 |
- AC_MSG_CHECKING(for Xpm library) |
512 |
-- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) |
513 |
-+ WX_PATH_FIND_LIBRARIES(Xpm) |
514 |
- if test "$ac_find_libraries" != "" ; then |
515 |
- WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) |
516 |
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" |
517 |
-@@ -4192,41 +4192,23 @@ dnl --------------------------------------------------------------------------- |
518 |
- dnl wxDisplay Sanity checks |
519 |
- dnl --------------------------------------------------------------------------- |
520 |
- |
521 |
-+USE_XINERAMA=0 |
522 |
- if test "$wxUSE_DISPLAY" = "yes"; then |
523 |
- dnl --------------------------------------------------------------------------- |
524 |
- dnl Xinerama (for unix ) - Brian Victor |
525 |
- dnl --------------------------------------------------------------------------- |
526 |
- if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then |
527 |
-- AC_MSG_CHECKING([for Xinerama]) |
528 |
-- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama) |
529 |
-+ WX_FIND_LIB(Xinerama, XineramaQueryScreens) |
530 |
- if test "$ac_find_libraries" != "" ; then |
531 |
-- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
532 |
-- if test "$ac_path_to_link" != " -L/usr/lib" ; then |
533 |
-- LDFLAGS="$LDFLAGS $ac_path_to_link" |
534 |
-+ if test "$ac_find_libraries" != "std" ; then |
535 |
-+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
536 |
-+ if test "$ac_path_to_link" != " -L/usr/lib" ; then |
537 |
-+ LDFLAGS="$LDFLAGS $ac_path_to_link" |
538 |
-+ fi |
539 |
- fi |
540 |
-+ USE_XINERAMA=1 |
541 |
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" |
542 |
-- AC_MSG_RESULT([yes]) |
543 |
-- |
544 |
-- AC_MSG_CHECKING([for Xxf86vm extension]) |
545 |
-- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm) |
546 |
-- if test "$ac_find_libraries" != "" ; then |
547 |
-- AC_MSG_RESULT([yes]) |
548 |
-- AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], |
549 |
-- [ |
550 |
-- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" |
551 |
-- ], |
552 |
-- [], |
553 |
-- [ |
554 |
-- #if HAVE_X11_XLIB_H |
555 |
-- #include <X11/Xlib.h> |
556 |
-- #endif |
557 |
-- ]) |
558 |
-- else |
559 |
-- AC_MSG_RESULT([no]) |
560 |
-- fi |
561 |
-- |
562 |
- else |
563 |
-- AC_MSG_RESULT([no]) |
564 |
- AC_MSG_WARN([Xinerama not found; disabling wxDisplay]) |
565 |
- wxUSE_DISPLAY="no" |
566 |
- fi |
567 |
-@@ -4243,17 +4225,16 @@ dnl X11 session management |
568 |
- dnl --------------------------------------------------------------------------- |
569 |
- if test "$wxUSE_DETECT_SM" = "yes"; then |
570 |
- if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then |
571 |
-- AC_MSG_CHECKING([for -lSM - X11 session management]) |
572 |
-- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM) |
573 |
-+ WX_FIND_LIB(SM, SmcOpenConnection) |
574 |
- if test "$ac_find_libraries" != "" ; then |
575 |
-- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
576 |
-- if test "$ac_path_to_link" != " -L/usr/lib" ; then |
577 |
-+ if test "$ac_find_libraries" != "std" ; then |
578 |
-+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
579 |
-+ if test "$ac_path_to_link" != " -L/usr/lib" ; then |
580 |
- LDFLAGS="$LDFLAGS $ac_path_to_link" |
581 |
-+ fi |
582 |
- fi |
583 |
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM" |
584 |
-- AC_MSG_RESULT([yes]) |
585 |
- else |
586 |
-- AC_MSG_RESULT([no]) |
587 |
- AC_MSG_WARN([libSM not found; disabling session management detection]) |
588 |
- wxUSE_DETECT_SM="no" |
589 |
- fi |
590 |
-@@ -4295,51 +4276,46 @@ if test "$wxUSE_OPENGL" = "yes"; then |
591 |
- AC_CHECK_HEADER(GL/glu.h, [ |
592 |
- found_gl=0 |
593 |
- |
594 |
-- AC_MSG_CHECKING([for -lGL]) |
595 |
-- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB /opt/graphics/OpenGL/lib],GL) |
596 |
-+ WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib]) |
597 |
- if test "$ac_find_libraries" != "" ; then |
598 |
-- AC_MSG_RESULT([found in $ac_find_libraries]) |
599 |
-- |
600 |
-- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
601 |
-- if test "$ac_path_to_link" != " -L/usr/lib" ; then |
602 |
-+ if test "$ac_find_libraries" != "std" ; then |
603 |
-+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
604 |
-+ if test "$ac_path_to_link" != " -L/usr/lib" ; then |
605 |
- LDFLAGS_GL="$ac_path_to_link" |
606 |
-+ fi |
607 |
- fi |
608 |
- |
609 |
- dnl don't suppose that libGL and libGLU are always in the |
610 |
- dnl same directory -- this is not true for some common |
611 |
- dnl distributions |
612 |
-- AC_MSG_CHECKING([for -lGLU]) |
613 |
-- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU) |
614 |
-+ WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib]) |
615 |
- if test "$ac_find_libraries" != "" ; then |
616 |
-+ if test "$ac_find_libraries" != "std" ; then |
617 |
- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
618 |
- if test "$ac_path_to_link" != " -L/usr/lib" -a \ |
619 |
-- "$ac_path_to_link" != "$LDFLAGS_GL"; then |
620 |
-- LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" |
621 |
-+ "$ac_path_to_link" != "$LDFLAGS_GL" ; then |
622 |
-+ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" |
623 |
- fi |
624 |
-+ fi |
625 |
- |
626 |
- found_gl=1 |
627 |
- OPENGL_LIBS="-lGL -lGLU" |
628 |
-- AC_MSG_RESULT([yes]) |
629 |
-- else |
630 |
-- AC_MSG_RESULT([no]) |
631 |
- fi |
632 |
-- else |
633 |
-- AC_MSG_RESULT([no]) |
634 |
- fi |
635 |
- |
636 |
- if test "$found_gl" != 1; then |
637 |
-- AC_MSG_CHECKING([for -lMesaGL]) |
638 |
-- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL) |
639 |
-+ WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib]) |
640 |
- if test "$ac_find_libraries" != "" ; then |
641 |
-+ if test "$ac_find_libraries" != "std" ; then |
642 |
- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) |
643 |
-- LDFLAGS_GL="$LDFLAGS$ac_path_to_link" |
644 |
-- OPENGL_LIBS="-lMesaGL -lMesaGLU" |
645 |
-- AC_MSG_RESULT([yes]) |
646 |
-- else |
647 |
-- AC_MSG_RESULT([no]) |
648 |
-+ if test "$ac_path_to_link" != " -L/usr/lib" ; then |
649 |
-+ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" |
650 |
-+ fi |
651 |
-+ fi |
652 |
-+ OPENGL_LIBS="-lMesaGL -lMesaGLU" |
653 |
- fi |
654 |
- fi |
655 |
-- ]) |
656 |
-+ ],, [ ]) |
657 |
- ], |
658 |
- [], |
659 |
- [ ]) |
660 |
--- |
661 |
-2.4.6 |
662 |
- |
663 |
|
664 |
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch |
665 |
deleted file mode 100644 |
666 |
index cbe3103a0bc..00000000000 |
667 |
--- a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch |
668 |
+++ /dev/null |
669 |
@@ -1,11 +0,0 @@ |
670 |
-diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in |
671 |
---- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in 2007-07-27 17:57:27.000000000 -0600 |
672 |
-+++ wxPython-src-2.8.7.1/contrib/src/Makefile.in 2007-12-28 17:34:28.000000000 -0600 |
673 |
-@@ -1,6 +1,6 @@ |
674 |
- # $Id$ |
675 |
- |
676 |
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet |
677 |
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia |
678 |
- |
679 |
- all: |
680 |
- @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done |
681 |
|
682 |
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml |
683 |
index e8b0e725749..aa10f7e1f6d 100644 |
684 |
--- a/x11-libs/wxGTK/metadata.xml |
685 |
+++ b/x11-libs/wxGTK/metadata.xml |
686 |
@@ -10,9 +10,6 @@ |
687 |
Enable the wxMediaCtrl class for playing audio and video through |
688 |
gstreamer. |
689 |
</flag> |
690 |
- <flag name="gnome"> |
691 |
- Use <pkg>gnome-base/libgnomeprintui</pkg> for printing tasks. |
692 |
- </flag> |
693 |
<flag name="sdl"> |
694 |
Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for |
695 |
audio. |
696 |
|
697 |
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild |
698 |
deleted file mode 100644 |
699 |
index 5bfab6f5f38..00000000000 |
700 |
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild |
701 |
+++ /dev/null |
702 |
@@ -1,184 +0,0 @@ |
703 |
-# Copyright 1999-2018 Gentoo Foundation |
704 |
-# Distributed under the terms of the GNU General Public License v2 |
705 |
- |
706 |
-EAPI="5" |
707 |
- |
708 |
-inherit autotools eutils flag-o-matic versionator multilib-minimal |
709 |
- |
710 |
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" |
711 |
-HOMEPAGE="https://wxwidgets.org/" |
712 |
- |
713 |
-BASE_PV="$(get_version_component_range 1-3)" |
714 |
-BASE_P="${PN}-${BASE_PV}" |
715 |
- |
716 |
-# we use the wxPython tarballs because they include the full wxGTK sources and |
717 |
-# docs, and are released more frequently than wxGTK. |
718 |
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2" |
719 |
- |
720 |
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
721 |
-IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff" |
722 |
- |
723 |
-SLOT="2.8" |
724 |
- |
725 |
-RDEPEND=" |
726 |
- dev-libs/expat[${MULTILIB_USEDEP}] |
727 |
- odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) |
728 |
- sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) |
729 |
- X? ( |
730 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
731 |
- media-libs/libpng:0=[${MULTILIB_USEDEP}] |
732 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
733 |
- virtual/jpeg:0=[${MULTILIB_USEDEP}] |
734 |
- x11-libs/gtk+:2[${MULTILIB_USEDEP}] |
735 |
- x11-libs/libSM[${MULTILIB_USEDEP}] |
736 |
- x11-libs/libXinerama[${MULTILIB_USEDEP}] |
737 |
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}] |
738 |
- x11-libs/pango[X,${MULTILIB_USEDEP}] |
739 |
- gnome? ( gnome-base/libgnomeprintui:2.2[${MULTILIB_USEDEP}] ) |
740 |
- gstreamer? ( |
741 |
- gnome-base/gconf:2[${MULTILIB_USEDEP}] |
742 |
- media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] |
743 |
- media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] ) |
744 |
- opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) |
745 |
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
746 |
- ) |
747 |
- aqua? ( |
748 |
- x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] |
749 |
- virtual/jpeg:0=[${MULTILIB_USEDEP}] |
750 |
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
751 |
- )" |
752 |
- |
753 |
-DEPEND="${RDEPEND} |
754 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
755 |
- opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) |
756 |
- X? ( x11-base/xorg-proto ) |
757 |
-" |
758 |
- |
759 |
-PDEPEND=">=app-eselect/eselect-wxwidgets-0.7" |
760 |
- |
761 |
-LICENSE="wxWinLL-3 |
762 |
- GPL-2 |
763 |
- odbc? ( LGPL-2 ) |
764 |
- doc? ( wxWinFDL-3 )" |
765 |
- |
766 |
-S="${WORKDIR}/wxPython-src-${PV}" |
767 |
- |
768 |
-src_prepare() { |
769 |
- epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch |
770 |
- epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch |
771 |
- epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 |
772 |
- epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923 |
773 |
- epatch "${FILESDIR}"/${PN}-2.8.12.1-fix-c++14.patch # Bug #592442 |
774 |
- |
775 |
- # Bug #421851 |
776 |
- epatch "${FILESDIR}"/${P}-libdir.patch |
777 |
- epatch "${FILESDIR}"/${P}-bakefile.patch |
778 |
- epatch "${FILESDIR}"/${P}-autoconf.patch |
779 |
- |
780 |
- # prefix https://bugs.gentoo.org/394123 |
781 |
- sed -i -e "s:/usr:${EPREFIX}/usr:g" \ |
782 |
- -e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \ |
783 |
- configure || die |
784 |
- |
785 |
- epatch_user |
786 |
- |
787 |
- mv configure.in configure.ac || die |
788 |
- eautoconf |
789 |
-} |
790 |
- |
791 |
-multilib_src_configure() { |
792 |
- local myconf |
793 |
- |
794 |
- append-flags -fno-strict-aliasing |
795 |
- |
796 |
- # X independent options |
797 |
- myconf="--enable-compat26 |
798 |
- --enable-shared |
799 |
- --enable-unicode |
800 |
- --with-regex=builtin |
801 |
- --with-zlib=sys |
802 |
- --with-expat=sys |
803 |
- $(use_enable debug) |
804 |
- $(use_enable pch precomp-headers) |
805 |
- $(use_with odbc odbc sys) |
806 |
- $(use_with sdl) |
807 |
- $(use_with tiff libtiff sys)" |
808 |
- |
809 |
- # wxGTK options |
810 |
- # --enable-graphics_ctx - needed for webkit, editra |
811 |
- # --without-gnomevfs - bug #203389 |
812 |
- use X && \ |
813 |
- myconf="${myconf} |
814 |
- --enable-graphics_ctx |
815 |
- --enable-gui |
816 |
- --with-libpng=sys |
817 |
- --with-libxpm=sys |
818 |
- --with-libjpeg=sys |
819 |
- $(use_enable gstreamer mediactrl) |
820 |
- $(use_enable opengl) |
821 |
- $(use_with opengl) |
822 |
- $(use_with gnome gnomeprint) |
823 |
- --without-gnomevfs" |
824 |
- |
825 |
- use aqua && \ |
826 |
- myconf="${myconf} |
827 |
- --enable-graphics_ctx |
828 |
- --enable-gui |
829 |
- --with-libpng=sys |
830 |
- --with-libxpm=sys |
831 |
- --with-libjpeg=sys |
832 |
- --with-mac |
833 |
- --with-opengl" |
834 |
- # cocoa toolkit seems to be broken |
835 |
- |
836 |
- # wxBase options |
837 |
- if use !X && use !aqua ; then |
838 |
- myconf="${myconf} |
839 |
- --disable-gui" |
840 |
- fi |
841 |
- |
842 |
- ECONF_SOURCE="${S}" econf ${myconf} |
843 |
-} |
844 |
- |
845 |
-multilib_src_compile() { |
846 |
- emake |
847 |
- |
848 |
- if [[ -d contrib/src ]]; then |
849 |
- cd contrib/src || die |
850 |
- emake |
851 |
- fi |
852 |
-} |
853 |
- |
854 |
-multilib_src_install() { |
855 |
- default |
856 |
- |
857 |
- if [[ -d contrib/src ]]; then |
858 |
- cd contrib/src || die |
859 |
- emake DESTDIR="${D}" install |
860 |
- fi |
861 |
-} |
862 |
- |
863 |
-multilib_src_install_all() { |
864 |
- cd "${S}"/docs || die |
865 |
- dodoc changes.txt readme.txt todo30.txt |
866 |
- newdoc base/readme.txt base_readme.txt |
867 |
- newdoc gtk/readme.txt gtk_readme.txt |
868 |
- |
869 |
- if use doc; then |
870 |
- dodoc -r "${S}"/docs/html |
871 |
- fi |
872 |
- |
873 |
- # Stray windows locale file, causes collisions |
874 |
- local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" |
875 |
- [[ -e ${wxmsw} ]] && rm "${wxmsw}" |
876 |
-} |
877 |
- |
878 |
-pkg_postinst() { |
879 |
- has_version app-eselect/eselect-wxwidgets \ |
880 |
- && eselect wxwidgets update |
881 |
-} |
882 |
- |
883 |
-pkg_postrm() { |
884 |
- has_version app-eselect/eselect-wxwidgets \ |
885 |
- && eselect wxwidgets update |
886 |
-} |