1 |
commit: 3e73c1a3aac7e3b3920ddccdad90bd5793bd661b |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 8 09:27:49 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 8 09:29:29 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e73c1a3 |
7 |
|
8 |
x11-libs/gtk+: Remove gtk+-1.2* SLOT |
9 |
|
10 |
Year 2000 called and wanted its toolkit back. |
11 |
|
12 |
Gentoo-bug: 604862 |
13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
14 |
|
15 |
profiles/package.mask | 4 +- |
16 |
x11-libs/gtk+/Manifest | 2 - |
17 |
x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch | 19 - |
18 |
x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch | 696 --------------------- |
19 |
.../gtk+/files/gtk+-1.2.10-automake-1.13.patch | 16 - |
20 |
x11-libs/gtk+/files/gtk+-1.2.10-automake.patch | 126 ---- |
21 |
x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch | 13 - |
22 |
x11-libs/gtk+/files/gtk+-1.2.10-m4.patch | 9 - |
23 |
x11-libs/gtk+/gtk+-1.2.10-r13.ebuild | 102 --- |
24 |
9 files changed, 2 insertions(+), 985 deletions(-) |
25 |
|
26 |
diff --git a/profiles/package.mask b/profiles/package.mask |
27 |
index af908e3a1a..d13e214d75 100644 |
28 |
--- a/profiles/package.mask |
29 |
+++ b/profiles/package.mask |
30 |
@@ -435,8 +435,8 @@ dev-php/Savant3-Plugin-Form |
31 |
|
32 |
# Mart Raudsepp <leio@g.o> (06 Jan 2017) |
33 |
# No releases of this API version since April 2001, abandoned |
34 |
-# in favour of gtk+:2 for 14 years. |
35 |
-# Masked for removal in 30 days. Bug 604862. |
36 |
+# in favour of gtk+:2 for 14 years; bug 604862. |
37 |
+# Removed at 2017-02-08, mask kept for longer display to users. |
38 |
x11-libs/gtk+:1 |
39 |
|
40 |
# Robin H. Johnson <robbat2@g.o> (05 Jan 2017) |
41 |
|
42 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
43 |
index b5b480b605..86a1ca2b70 100644 |
44 |
--- a/x11-libs/gtk+/Manifest |
45 |
+++ b/x11-libs/gtk+/Manifest |
46 |
@@ -1,5 +1,3 @@ |
47 |
-DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020 |
48 |
-DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15 |
49 |
DIST gtk+-2.24.31.tar.xz 12805344 SHA256 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 WHIRLPOOL 6f59d444b28910b0f4cd7d0d0bf04f8e442acd945205679c19e5adf7ca3f8e7406d4095e9ff9ca597882eb937a7551e19af63b6597e7b57c0babe5b061f9110e |
50 |
DIST gtk+-3.20.9.tar.xz 17174872 SHA256 83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 SHA512 5848403959f76633511009231c80a814cfe24a7ba07c9429704f432191e51b54d3e6621ce5b578f79999f21993920af3a45c8d03dad6ba03af5f9a342b32626e WHIRLPOOL 7964b82dabf72b5d45a34565874ba02e0dda09b0f358f640ca0c602c3c7aa4618432829d047794f5f202424c34c837bbdc31ccb3c5457768e252f048afd30107 |
51 |
DIST gtk+-3.22.5.tar.xz 18250876 SHA256 693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334 SHA512 f1969612a89c67fb0414843f3cc51ce91894c9fdfdf6b6e00472d761848b5b1be529d35f2da43c26d345e4b39e81980d2de53d16f194d96775ba21f3c6d0926c WHIRLPOOL 6012dce8f5b55005124a2a51149505b368cf0e8d40dfa267dfe0f696227853d6b9e29f4e21d670449bdd850f4fda79242d60d95644e803143df29675439f6be1 |
52 |
|
53 |
diff --git a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch b/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch |
54 |
deleted file mode 100644 |
55 |
index a3fd198b69..0000000000 |
56 |
--- a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch |
57 |
+++ /dev/null |
58 |
@@ -1,19 +0,0 @@ |
59 |
---- gtk/gtkrc.c.~1.40.2.17.~ 2001-07-10 20:06:35.000000000 +0200 |
60 |
-+++ gtk/gtkrc.c 2003-03-05 16:56:10.000000000 +0100 |
61 |
-@@ -453,7 +453,7 @@ |
62 |
- |
63 |
- if (!initted) |
64 |
- { |
65 |
-- char *locale = setlocale (LC_CTYPE, NULL); |
66 |
-+ char *locale = g_strdup (setlocale (LC_CTYPE, NULL)); |
67 |
- char *p; |
68 |
- |
69 |
- initted = TRUE; |
70 |
-@@ -558,6 +558,7 @@ |
71 |
- |
72 |
- if (tmp) g_free (tmp); |
73 |
- } |
74 |
-+ g_free (locale); |
75 |
- } |
76 |
- |
77 |
- i = 0; |
78 |
|
79 |
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch b/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch |
80 |
deleted file mode 100644 |
81 |
index aa295f2578..0000000000 |
82 |
--- a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch |
83 |
+++ /dev/null |
84 |
@@ -1,696 +0,0 @@ |
85 |
---- gtk+-1.2.10/acinclude.m4.orig 2006-05-24 23:23:51.000000000 -0700 |
86 |
-+++ gtk+-1.2.10/acinclude.m4 2006-05-24 23:23:19.000000000 -0700 |
87 |
-@@ -672,7 +672,7 @@ |
88 |
- AC_DEFINE(HAVE_STPCPY) |
89 |
- fi |
90 |
- |
91 |
-- AM_LC_MESSAGES |
92 |
-+ gt_LC_MESSAGES |
93 |
- AM_GTK_WITH_NLS |
94 |
- |
95 |
- if test "x$CATOBJEXT" != "x"; then |
96 |
---- gtk+-1.2.10/gtk.m4.orig 2006-05-24 23:32:00.000000000 -0700 |
97 |
-+++ gtk+-1.2.10/gtk.m4 2006-05-24 23:36:16.000000000 -0700 |
98 |
-@@ -1,6 +1,11 @@ |
99 |
- # Configure paths for GTK+ |
100 |
- # Owen Taylor 97-11-3 |
101 |
-- |
102 |
-+AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP], |
103 |
-+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], |
104 |
-+ [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], |
105 |
-+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl |
106 |
-+$1 |
107 |
-+AC_DIVERT_POP()])])]) |
108 |
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) |
109 |
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS |
110 |
- dnl |
111 |
---- gtk+-1.2.10/configure.in.orig 2006-05-25 05:45:06.000000000 -0700 |
112 |
-+++ gtk+-1.2.10/configure.in 2006-05-25 05:44:08.000000000 -0700 |
113 |
-@@ -1,6 +1,8 @@ |
114 |
-+builtin(include,gtk.m4) |
115 |
-+ |
116 |
-+ |
117 |
- # Process this file with autoconf to produce a configure script. |
118 |
- AC_INIT(gdk/gdktypes.h) |
119 |
-- |
120 |
- # In the following, there are a the following variants |
121 |
- # of GLib cflags and libs variables |
122 |
- # |
123 |
-@@ -12,12 +14,11 @@ |
124 |
- # glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread |
125 |
- # glib_thread_libs: libs to store in gtk-config for gtk-config gthread |
126 |
- |
127 |
-+AC_CANONICAL_TARGET |
128 |
- # Save this value here, since automake will set cflags later |
129 |
- cflags_set=${CFLAGS+set} |
130 |
- |
131 |
--dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they |
132 |
--dnl are available for $ac_help expansion (don't we all *love* autoconf?) |
133 |
--AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl |
134 |
-+GTK_AC_DIVERT_BEFORE_HELP([ |
135 |
- # |
136 |
- # Making releases: |
137 |
- # GTK_MICRO_VERSION += 1; |
138 |
-@@ -32,9 +33,8 @@ |
139 |
- GTK_MICRO_VERSION=10 |
140 |
- GTK_INTERFACE_AGE=1 |
141 |
- GTK_BINARY_AGE=10 |
142 |
--GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION |
143 |
--dnl |
144 |
--AC_DIVERT_POP()dnl |
145 |
-+GTK_VERSION="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION" |
146 |
-+]) |
147 |
- |
148 |
- AC_SUBST(GTK_MAJOR_VERSION) |
149 |
- AC_SUBST(GTK_MINOR_VERSION) |
150 |
-@@ -44,9 +44,9 @@ |
151 |
- AC_SUBST(GTK_VERSION) |
152 |
- |
153 |
- # libtool versioning |
154 |
--LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION |
155 |
-+LT_RELEASE="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION" |
156 |
- LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE` |
157 |
--LT_REVISION=$GTK_INTERFACE_AGE |
158 |
-+LT_REVISION="$GTK_INTERFACE_AGE" |
159 |
- LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE` |
160 |
- AC_SUBST(LT_RELEASE) |
161 |
- AC_SUBST(LT_CURRENT) |
162 |
-@@ -54,11 +54,8 @@ |
163 |
- AC_SUBST(LT_AGE) |
164 |
- |
165 |
- # For automake. |
166 |
--VERSION=$GTK_VERSION |
167 |
--PACKAGE=gtk+ |
168 |
-- |
169 |
--# Save this value here, since automake will set cflags later |
170 |
--cflags_set=${CFLAGS+set} |
171 |
-+VERSION="$GTK_VERSION" |
172 |
-+PACKAGE="gtk+" |
173 |
- |
174 |
- dnl Initialize automake stuff |
175 |
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) |
176 |
-@@ -67,42 +64,40 @@ |
177 |
- AM_CONFIG_HEADER(config.h) |
178 |
- |
179 |
- dnl Initialize libtool |
180 |
--AM_PROG_LIBTOOL |
181 |
-+AC_PROG_LIBTOOL |
182 |
- |
183 |
- dnl Initialize maintainer mode |
184 |
- AM_MAINTAINER_MODE |
185 |
- |
186 |
--AC_CANONICAL_HOST |
187 |
-- |
188 |
- dnl figure debugging default, prior to $ac_help setup |
189 |
--dnl |
190 |
--AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl |
191 |
-+ |
192 |
-+GTK_AC_DIVERT_BEFORE_HELP([ |
193 |
- if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then |
194 |
-- debug_default=yes |
195 |
-+ debug_default="yes" |
196 |
- else |
197 |
-- debug_default=minimum |
198 |
-+ debug_default="minimum" |
199 |
- fi |
200 |
--AC_DIVERT_POP()dnl |
201 |
-- |
202 |
-+]) |
203 |
- dnl declare --enable-* args and collect ac_help strings |
204 |
--AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) |
205 |
-+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],, |
206 |
-+ [enable_debug="$debug_default"]) |
207 |
- AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]], |
208 |
-- echo $enable_shm, enable_shm="yes") |
209 |
--AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]], |
210 |
-- , enable_ansi=no) |
211 |
-+ [echo "$enable_shm"],[enable_shm="yes"]) |
212 |
-+AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],,[enable_ansi="no"]) |
213 |
- AC_ARG_WITH(glib, [ --with-glib=DIR Use uninstalled copy of glib]) |
214 |
--AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]], |
215 |
-- , enable_xim="yes") |
216 |
--AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback], |
217 |
-- , enable_xim_inst="maybe") |
218 |
--AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) |
219 |
-+AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],,[enable_xim="yes"]) |
220 |
-+AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],, |
221 |
-+ [enable_xim_inst="maybe"]) |
222 |
-+AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],, |
223 |
-+ [enable_rebuilds="yes"]) |
224 |
- AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ]) |
225 |
-- |
226 |
- AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ]) |
227 |
--AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],,with_native_locale=no) |
228 |
-+AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],, |
229 |
-+ [with_native_locale="no"]) |
230 |
-+ |
231 |
- |
232 |
- if test "x$enable_debug" = "xyes"; then |
233 |
-- test "$cflags_set" = set || CFLAGS="$CFLAGS -g" |
234 |
-+ test "$cflags_set" = "set" || CFLAGS="$CFLAGS -g" |
235 |
- GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG" |
236 |
- else |
237 |
- if test "x$enable_debug" = "xno"; then |
238 |
-@@ -113,16 +108,14 @@ |
239 |
- fi |
240 |
- |
241 |
- AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}") |
242 |
-- |
243 |
- # Build time sanity check... |
244 |
- AM_SANITY_CHECK |
245 |
- |
246 |
- # Checks for programs. |
247 |
- AC_PROG_CC |
248 |
- AC_ISC_POSIX |
249 |
--AM_PROG_CC_STDC |
250 |
-+AC_PROG_CC_STDC |
251 |
- AC_PROG_INSTALL |
252 |
--AC_PROG_MAKE_SET |
253 |
- |
254 |
- changequote(,)dnl |
255 |
- if test "x$GCC" = "xyes"; then |
256 |
-@@ -144,7 +137,6 @@ |
257 |
- fi |
258 |
- fi |
259 |
- changequote([,])dnl |
260 |
-- |
261 |
- # Honor aclocal flags |
262 |
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" |
263 |
- |
264 |
-@@ -158,8 +150,7 @@ |
265 |
- AC_CHECK_PROG(INDENT, indent, indent) |
266 |
- |
267 |
- REBUILD=\# |
268 |
--if test "x$enable_rebuilds" = "xyes" && \ |
269 |
-- test -n "$PERL" && \ |
270 |
-+if test "x$enable_rebuilds" = "xyes" && test -n "$PERL" && \ |
271 |
- $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \ |
272 |
- test -n "$AWK" ; then |
273 |
- REBUILD= |
274 |
-@@ -194,55 +185,58 @@ |
275 |
- |
276 |
- dnl Check for nl_langinfo and CODESET |
277 |
- AC_MSG_CHECKING([for nl_langinfo (CODESET)]) |
278 |
--AC_TRY_COMPILE([#include <langinfo.h>], |
279 |
-+AC_TRY_COMPILE([#include <langinfo.h> |
280 |
-+ ], |
281 |
- [char *codeset = nl_langinfo (CODESET);], |
282 |
- AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)]) |
283 |
-- have_codeset=yes, |
284 |
-- have_codeset=no) |
285 |
-+ have_codeset="yes", |
286 |
-+ have_codeset="no" |
287 |
-+) |
288 |
- AC_MSG_RESULT($have_codeset) |
289 |
- |
290 |
- dnl The DU4 header files don't provide library prototypes unless |
291 |
- dnl -std1 is given to the native cc. |
292 |
- AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) |
293 |
- |
294 |
--gtk_save_LIBS=$LIBS |
295 |
-+gtk_save_LIBS="$LIBS" |
296 |
- LIBS="$LIBS -lm" |
297 |
- AC_TRY_RUN([#include <math.h> |
298 |
- int main (void) { return (log(1) != log(1.)); }], |
299 |
- AC_MSG_RESULT(none needed), |
300 |
-- gtk_save_CFLAGS=$CFLAGS |
301 |
-+ [gtk_save_CFLAGS="$CFLAGS" |
302 |
- CFLAGS="$CFLAGS -std1" |
303 |
- AC_TRY_RUN([#include <math.h> |
304 |
- int main (void) { return (log(1) != log(1.)); }], |
305 |
- AC_MSG_RESULT(-std1), |
306 |
- AC_MSG_RESULT() |
307 |
-- CFLAGS=$gtk_save_CFLAGS |
308 |
-- AC_MSG_WARN( |
309 |
-- [No ANSI prototypes found in library. (-std1 didn't work.)]), |
310 |
-- true |
311 |
-- ), |
312 |
-+ CFLAGS="$gtk_save_CFLAGS" |
313 |
-+ AC_MSG_WARN([No ANSI prototypes found in library. (-std1 didn't work.)]), |
314 |
-+ true)], |
315 |
- AC_MSG_RESULT(none needed) |
316 |
- ) |
317 |
--LIBS=$gtk_save_LIBS |
318 |
-+LIBS="$gtk_save_LIBS" |
319 |
- |
320 |
- dnl NeXTStep cc seems to need this |
321 |
- AC_MSG_CHECKING([for extra flags for POSIX compliance]) |
322 |
--AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], |
323 |
-+AC_TRY_COMPILE([#include <dirent.h> |
324 |
-+ ],[DIR *dir;], |
325 |
- AC_MSG_RESULT(none needed), |
326 |
-- gtk_save_CFLAGS=$CFLAGS |
327 |
-+ [gtk_save_CFLAGS="$CFLAGS" |
328 |
- CFLAGS="$CFLAGS -posix" |
329 |
-- AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], |
330 |
-+ AC_TRY_COMPILE([#include <dirent.h> |
331 |
-+ ],[DIR *dir;], |
332 |
- AC_MSG_RESULT(-posix), |
333 |
- AC_MSG_RESULT() |
334 |
-- CFLAGS=$gtk_save_CFLAGS |
335 |
-- AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)]))) |
336 |
-+ CFLAGS="$gtk_save_CFLAGS" |
337 |
-+ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])])) |
338 |
- |
339 |
--if test x$with_glib = xyes ; then |
340 |
-- AC_MSG_ERROR([ |
341 |
--*** Directory must be specified for --with-glib]) |
342 |
-+ |
343 |
-+ |
344 |
-+if test "x$with_glib" = "xyes" ; then |
345 |
-+ AC_MSG_ERROR([*** Directory must be specified for --with-glib]) |
346 |
- fi |
347 |
- |
348 |
--if test x$with_glib = x ; then |
349 |
-+if test "x$with_glib" = "x" ; then |
350 |
- # Look for separately installed glib |
351 |
- |
352 |
- AM_PATH_GLIB(1.2.8,, |
353 |
-@@ -261,7 +255,7 @@ |
354 |
- else |
355 |
- # Use uninstalled glib (assume they got the version right) |
356 |
- |
357 |
-- GLIB_CONFIG=$with_glib/glib-config |
358 |
-+ GLIB_CONFIG="$with_glib/glib-config" |
359 |
- if test -x $GLIB_CONFIG ; then |
360 |
- : |
361 |
- else |
362 |
-@@ -277,9 +271,9 @@ |
363 |
- glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'` |
364 |
- |
365 |
- # canonicalize relative paths |
366 |
-- case $with_glib in |
367 |
-+ case "$with_glib" in |
368 |
- /*) |
369 |
-- glib_dir=$with_glib |
370 |
-+ glib_dir="$with_glib" |
371 |
- ;; |
372 |
- *) |
373 |
- glib_dir="\$(top_builddir)/$with_glib" |
374 |
-@@ -312,61 +306,56 @@ |
375 |
- saved_ldflags="$LDFLAGS" |
376 |
- |
377 |
- CFLAGS="$CFLAGS $X_CFLAGS" |
378 |
--LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS" |
379 |
-+LDFLAGS="$LDFLAGS $X_LDFLAGS" |
380 |
- |
381 |
- if test "x$no_x" = "xyes"; then |
382 |
- AC_MSG_ERROR([ |
383 |
- *** X libraries or include files not found. Check 'config.log' for |
384 |
- *** more details.]) |
385 |
- fi |
386 |
-- |
387 |
- # Checks for libraries. |
388 |
- # Check for the X11 library |
389 |
--AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", |
390 |
-+AC_CHECK_LIB(X11,XOpenDisplay, |
391 |
-+ x_libs="-lX11 $X_EXTRA_LIBS", |
392 |
- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]), |
393 |
-- $X_EXTRA_LIBS) |
394 |
-- |
395 |
-+ $X_EXTRA_LIBS |
396 |
-+) |
397 |
- if test "x$enable_shm" = "xyes"; then |
398 |
- # Check for the Xext library (needed for XShm extention) |
399 |
- AC_CHECK_LIB(Xext, XShmAttach, |
400 |
- x_libs="-lXext $x_libs", |
401 |
- # On AIX, it is in XextSam instead, but we still need -lXext |
402 |
-- AC_CHECK_LIB(XextSam, XShmAttach, |
403 |
-+ [AC_CHECK_LIB(XextSam, XShmAttach, |
404 |
- x_libs="-lXextSam -lXext $x_libs", |
405 |
-- no_xext_lib=yes, $x_libs), |
406 |
-- $x_libs) |
407 |
-+ no_xext_lib="yes", |
408 |
-+ $x_libs |
409 |
-+ )], |
410 |
-+ $x_libs |
411 |
-+ ) |
412 |
- fi |
413 |
-- |
414 |
- # Check for shaped window extension |
415 |
-- |
416 |
- AC_CHECK_LIB(Xext, XShapeCombineMask, |
417 |
-- if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then |
418 |
-+ if test -z "`echo $x_libs | grep \-lXext 2> /dev/null`"; then |
419 |
- x_libs="-lXext $x_libs" |
420 |
- fi |
421 |
-- AC_DEFINE(HAVE_SHAPE_EXT), |
422 |
-- , |
423 |
-- $x_libs) |
424 |
-- |
425 |
-+ AC_DEFINE(HAVE_SHAPE_EXT),, |
426 |
-+ $x_libs |
427 |
-+) |
428 |
- # Check for XConvertCase (X11R6 specific) |
429 |
-- |
430 |
- AC_CHECK_LIB(X11, XConvertCase, |
431 |
-- AC_DEFINE(HAVE_XCONVERTCASE), |
432 |
-- , |
433 |
-- $x_libs) |
434 |
-- |
435 |
-+ AC_DEFINE(HAVE_XCONVERTCASE),, |
436 |
-+ $x_libs |
437 |
-+) |
438 |
- # Check for XIM support. |
439 |
-- |
440 |
--AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback, |
441 |
-- : , |
442 |
-+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,, |
443 |
- enable_xim_inst="no", |
444 |
-- $x_libs) |
445 |
-- |
446 |
-+ $x_libs |
447 |
-+) |
448 |
- # On Solaris, calling XRegisterIMInstantiateCallback seems to |
449 |
- # cause an immediate segfault, so we disable it, unless |
450 |
- # the user specifically forces it to be on. |
451 |
-- |
452 |
--if test x$enable_xim_inst = xmaybe ; then |
453 |
-- case host in |
454 |
-+if test "x$enable_xim_inst" = "xmaybe" ; then |
455 |
-+ case "$host" in |
456 |
- *-*-solaris*) |
457 |
- enable_xim_inst="no" |
458 |
- ;; |
459 |
-@@ -384,16 +373,15 @@ |
460 |
- fi |
461 |
- |
462 |
- x_cflags="$X_CFLAGS" |
463 |
--x_ldflags="$X_LDFLAGS $X_LIBS" |
464 |
-+x_ldflags="$X_LDFLAGS" |
465 |
- |
466 |
- # set up things for XInput |
467 |
-- |
468 |
- if test "x$with_xinput" = "xgxi"; then |
469 |
- AC_MSG_WARN([ |
470 |
- *** The generic XInput support has not been tested for several years |
471 |
- *** and is not known to work with any currently available X servers]) |
472 |
- AC_DEFINE(XINPUT_GXI) |
473 |
-- xinput_progs=gxid |
474 |
-+ xinput_progs="gxid" |
475 |
- x_libs="-lXi $x_libs" |
476 |
- elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then |
477 |
- AC_DEFINE(XINPUT_XFREE) |
478 |
-@@ -413,77 +401,72 @@ |
479 |
- |
480 |
- if test "x$enable_shm" = "xyes"; then |
481 |
- # Check for shared memory |
482 |
-- AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes) |
483 |
-- AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes) |
484 |
-+ AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc="yes") |
485 |
-+ AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm="yes") |
486 |
- |
487 |
- # Check for the X shared memory extension header file |
488 |
- AC_MSG_CHECKING(X11/extensions/XShm.h) |
489 |
- if test "x$no_xext_lib" = "xyes"; then |
490 |
- AC_MSG_RESULT(no) |
491 |
-- no_xshm=yes |
492 |
-+ no_xshm="yes" |
493 |
- else |
494 |
- if test -f "$x_includes/X11/extensions/XShm.h"; then |
495 |
- AC_MSG_RESULT(yes) |
496 |
- AC_DEFINE(HAVE_XSHM_H) |
497 |
- else |
498 |
- AC_MSG_RESULT(no) |
499 |
-- no_xshm=yes |
500 |
-+ no_xshm="yes" |
501 |
- fi |
502 |
- fi |
503 |
- fi |
504 |
-- |
505 |
- # Check if X_LOCALE definition is necessary |
506 |
-- |
507 |
- AC_MSG_CHECKING(need -DX_LOCALE) |
508 |
- |
509 |
- AC_TRY_RUN([ |
510 |
- #include <stdio.h> |
511 |
- #include <locale.h> |
512 |
-- |
513 |
--int |
514 |
--main () |
515 |
-+ int main () |
516 |
- { |
517 |
- return setlocale (LC_ALL, "${with_locale}") == NULL; |
518 |
- }], |
519 |
--need_x_locale=no, |
520 |
--need_x_locale=yes, |
521 |
--need_x_locale=no) |
522 |
-+ need_x_locale="no", |
523 |
-+ need_x_locale="yes", |
524 |
-+ need_x_locale="no" |
525 |
-+) |
526 |
- AC_MSG_RESULT($need_x_locale) |
527 |
- |
528 |
--use_native_locale=no |
529 |
--if test $need_x_locale = yes; then |
530 |
-+use_native_locale="no" |
531 |
-+if test "$need_x_locale" = "yes"; then |
532 |
- GTK_LOCALE_FLAGS="-DX_LOCALE" |
533 |
- else |
534 |
-- if test x$with_native_locale = xyes ; then |
535 |
-+ if test "x$with_native_locale" = "xyes" ; then |
536 |
- AC_MSG_CHECKING(functioning locale support) |
537 |
- |
538 |
-- AC_TRY_COMPILE([#include <stdlib.h>],[ |
539 |
-- char c; |
540 |
-+ AC_TRY_COMPILE([#include <stdlib.h>], |
541 |
-+ [char c; |
542 |
- if (MB_CUR_MAX == 1) { |
543 |
- wctomb(&c, 42); |
544 |
-- } |
545 |
-- ],use_native_locale=yes,) |
546 |
-- |
547 |
-+ }], |
548 |
-+ use_native_locale="yes" |
549 |
-+ ) |
550 |
- AC_MSG_RESULT($use_native_locale) |
551 |
- fi |
552 |
- fi |
553 |
- |
554 |
--if test x$use_native_locale = xyes ; then |
555 |
-+if test "x$use_native_locale" = "xyes" ; then |
556 |
- AC_MSG_CHECKING(if sizeof(wchar_t) == 4) |
557 |
- |
558 |
-- AC_TRY_RUN([ |
559 |
-- #include <stdlib.h> |
560 |
-- |
561 |
-- int |
562 |
-- main () |
563 |
-+ AC_TRY_RUN([#include <stdlib.h> |
564 |
-+ int main () |
565 |
- { |
566 |
- return (sizeof(wchar_t) == 4) ? 0 : 1; |
567 |
-- }], |
568 |
-- ,use_native_locale=no,:) |
569 |
-+ }],, |
570 |
-+ use_native_locale="no" |
571 |
-+ ) |
572 |
- AC_MSG_RESULT($use_native_locale) |
573 |
- fi |
574 |
- |
575 |
--if test $use_native_locale = yes ; then |
576 |
-+if test "$use_native_locale" = "yes" ; then |
577 |
- AC_DEFINE(USE_NATIVE_LOCALE) |
578 |
- fi |
579 |
- |
580 |
-@@ -502,13 +485,17 @@ |
581 |
- |
582 |
- # Check if <sys/select.h> needs to be included for fd_set |
583 |
- AC_MSG_CHECKING([for fd_set]) |
584 |
--AC_TRY_COMPILE([#include <sys/types.h>], |
585 |
-- [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no) |
586 |
--if test $gtk_ok = yes; then |
587 |
-+AC_TRY_COMPILE([#include <sys/types.h> |
588 |
-+ ], |
589 |
-+ [fd_set readMask, writeMask;], |
590 |
-+ gtk_ok="yes", |
591 |
-+ gtk_ok="no" |
592 |
-+) |
593 |
-+if test "$gtk_ok" = "yes"; then |
594 |
- AC_MSG_RESULT([yes, found in sys/types.h]) |
595 |
- else |
596 |
-- AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) |
597 |
-- if test $gtk_ok = yes; then |
598 |
-+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok="yes") |
599 |
-+ if test "$gtk_ok" = "yes"; then |
600 |
- AC_DEFINE(HAVE_SYS_SELECT_H) |
601 |
- AC_MSG_RESULT([yes, found in sys/select.h]) |
602 |
- else |
603 |
-@@ -520,30 +507,35 @@ |
604 |
- # Duplicate `widechar' tests from `glib'. |
605 |
- # Check for wchar.h |
606 |
- AC_MSG_CHECKING(for wchar.h) |
607 |
--AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no) |
608 |
--if test $gtk_ok = yes; then |
609 |
-+AC_TRY_CPP([#include <wchar.h> |
610 |
-+ ], |
611 |
-+ gtk_ok="yes", |
612 |
-+ gtk_ok="no" |
613 |
-+) |
614 |
-+if test "$gtk_ok" = "yes"; then |
615 |
- AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists]) |
616 |
- fi |
617 |
- AC_MSG_RESULT($gtk_ok) |
618 |
- |
619 |
- # Check for wctype.h (for iswalnum) |
620 |
- AC_MSG_CHECKING(for wctype.h) |
621 |
--AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no) |
622 |
--if test $gtk_ok = yes; then |
623 |
-+AC_TRY_CPP([#include <wctype.h>], gtk_ok="yes", gtk_ok="no") |
624 |
-+if test "$gtk_ok" = "yes"; then |
625 |
- AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists]) |
626 |
- fi |
627 |
- AC_MSG_RESULT($gtk_ok) |
628 |
- |
629 |
- # in Solaris 2.5, `iswalnum' is in -lw |
630 |
- GDK_WLIBS= |
631 |
--AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)]) |
632 |
-+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS="-lw")]) |
633 |
- |
634 |
- # The following is necessary for Linux libc-5.4.38 |
635 |
- oLIBS="$LIBS" |
636 |
- LIBS="$LIBS $GDK_WLIBS" |
637 |
- AC_MSG_CHECKING(if iswalnum() and friends are properly defined) |
638 |
--AC_TRY_LINK([#include <stdlib.h>],[ |
639 |
--#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) |
640 |
-+AC_TRY_LINK([#include <stdlib.h> |
641 |
-+ ], |
642 |
-+ [#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) |
643 |
- # ifdef HAVE_WCTYPE_H |
644 |
- # include <wctype.h> |
645 |
- # else |
646 |
-@@ -554,11 +546,13 @@ |
647 |
- #else |
648 |
- # define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) |
649 |
- #endif |
650 |
--iswalnum((wchar_t) 0); |
651 |
--], gtk_ok=yes, gtk_ok=no) |
652 |
-+ iswalnum((wchar_t) 0);], |
653 |
-+ gtk_ok="yes", |
654 |
-+ gtk_ok="no" |
655 |
-+) |
656 |
- LIBS="$oLIBS" |
657 |
- |
658 |
--if test $gtk_ok = no; then |
659 |
-+if test "$gtk_ok" = "no"; then |
660 |
- AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken]) |
661 |
- GDK_WLIBS= |
662 |
- fi |
663 |
-@@ -580,5 +574,5 @@ |
664 |
- gtk/Makefile |
665 |
- gtk/gtkfeatures.h |
666 |
- gdk.pc |
667 |
--gtk+.pc |
668 |
--], [chmod +x gtk-config]) |
669 |
-+gtk+.pc], |
670 |
-+[chmod +x gtk-config]) |
671 |
---- gtk+-1.2.10/gdk/Makefile.am.orig 2006-05-19 02:41:18.000000000 -0700 |
672 |
-+++ gtk+-1.2.10/gdk/Makefile.am 2006-05-19 02:11:54.000000000 -0700 |
673 |
-@@ -21,12 +21,11 @@ |
674 |
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ |
675 |
- -release $(LT_RELEASE) \ |
676 |
- -export-dynamic \ |
677 |
-- @GLIB_DEPLIBS@ \ |
678 |
- @x_ldflags@ \ |
679 |
-- @x_libs@ \ |
680 |
-- -lm \ |
681 |
- @STRIP_END@ |
682 |
- |
683 |
-+libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm |
684 |
-+ |
685 |
- # |
686 |
- # setup source file variables |
687 |
- # |
688 |
-@@ -104,14 +103,13 @@ |
689 |
- EXTRA_PROGRAMS = gxid |
690 |
- bin_PROGRAMS = @xinput_progs@ |
691 |
- LDADDS = @STRIP_BEGIN@ \ |
692 |
-- @x_ldflags@ \ |
693 |
- @x_libs@ \ |
694 |
- @GLIB_LIBS@ \ |
695 |
- -lm \ |
696 |
- @STRIP_END@ |
697 |
- gxid_SOURCES = gxid.c |
698 |
- gxid_LDADD = $(LDADDS) |
699 |
-- |
700 |
-+gxid_LDFLAGS = @x_ldflags@ |
701 |
- |
702 |
- .PHONY: files |
703 |
- |
704 |
---- gtk+-1.2.10/gtk/Makefile.am.orig 2006-05-25 07:40:45.000000000 -0700 |
705 |
-+++ gtk+-1.2.10/gtk/Makefile.am 2006-05-25 07:43:20.000000000 -0700 |
706 |
-@@ -27,13 +27,15 @@ |
707 |
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ |
708 |
- -release $(LT_RELEASE) \ |
709 |
- -export-dynamic \ |
710 |
-- @GLIB_DEPLIBS@ \ |
711 |
- @x_ldflags@ \ |
712 |
-- @x_libs@ \ |
713 |
-- -lm \ |
714 |
- @STRIP_END@ |
715 |
--# $(top_builddir)/gdk/libgdk.la |
716 |
-- |
717 |
-+libgtk_la_LIBADD = @STRIP_BEGIN@ \ |
718 |
-+ $(top_builddir)/gdk/libgdk.la \ |
719 |
-+ @x_libs@ \ |
720 |
-+ @GDK_WLIBS@ \ |
721 |
-+ @GLIB_LIBS@ \ |
722 |
-+ -lm \ |
723 |
-+ @STRIP_END@ |
724 |
- |
725 |
- # |
726 |
- # setup source file variables |
727 |
-@@ -374,14 +376,17 @@ |
728 |
- |
729 |
- |
730 |
- gtkconfdir = $(sysconfdir)/gtk |
731 |
--gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \ |
732 |
-+# removed references to non-existent gtkrc files - tsh |
733 |
-+gtkconf_DATA = \ |
734 |
-+ gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \ |
735 |
- gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \ |
736 |
-- gtkrc.utf-8 gtkrc.iso-8859-2 \ |
737 |
-- gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \ |
738 |
-- gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ |
739 |
-- gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \ |
740 |
-- gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \ |
741 |
-- gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255 |
742 |
-+ gtkrc.iso-8859-2 gtkrc.iso-8859-5 \ |
743 |
-+ gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ |
744 |
-+ gtkrc.iso-8859-15 gtkrc.zh_TW.big5 \ |
745 |
-+ gtkrc.zh_CN gtkrc.cp1251 gtkrc.cp1255 \ |
746 |
-+ gtkrc.ka_GE.georgianacademy \ |
747 |
-+ gtkrc.ka_GE.georgianps \ |
748 |
-+ gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii |
749 |
- |
750 |
- # We create a dummy theme for the default GTK+ theme |
751 |
- install-data-local: |
752 |
-@@ -428,7 +433,6 @@ |
753 |
- LDADDS = @STRIP_BEGIN@ \ |
754 |
- libgtk.la \ |
755 |
- $(top_builddir)/gdk/libgdk.la \ |
756 |
-- @x_ldflags@ \ |
757 |
- @x_libs@ \ |
758 |
- @GDK_WLIBS@ \ |
759 |
- @GLIB_LIBS@ \ |
760 |
-@@ -441,12 +445,20 @@ |
761 |
- testdnd_DEPENDENCIES = $(DEPS) |
762 |
- simple_DEPENDENCIES = $(DEPS) |
763 |
- #testthreads_DEPENDENCIES = $(DEPS) |
764 |
-+ |
765 |
- testgtk_LDADD = $(LDADDS) |
766 |
-+testgtk_LDFLAGS=@x_ldflags@ |
767 |
- testinput_LDADD = $(LDADDS) |
768 |
-+testinput_LDFLAGS = @x_ldflags@ |
769 |
- testselection_LDADD = $(LDADDS) |
770 |
-+testselection_LDFLAGS = @x_ldflags@ |
771 |
- testrgb_LDADD = $(LDADDS) |
772 |
-+testrgb_LDFLAGS = @x_ldflags@ |
773 |
- testdnd_LDADD = $(LDADDS) |
774 |
-+testdnd_LDFLAGS = @x_ldflags@ |
775 |
- simple_LDADD = $(LDADDS) |
776 |
-+simple_LDFLAGS = @x_ldflags@ |
777 |
-+ |
778 |
- #testthreads_LDADD = $(LDADDS) |
779 |
- |
780 |
- .PHONY: files test test-debug |
781 |
|
782 |
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch |
783 |
deleted file mode 100644 |
784 |
index 6df2032c1b..0000000000 |
785 |
--- a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch |
786 |
+++ /dev/null |
787 |
@@ -1,16 +0,0 @@ |
788 |
-Fix build failure with automake-1.13; fixed upstream in >=2.24.15 and >=3.0 |
789 |
-https://bugs.gentoo.org/467520 |
790 |
- |
791 |
-diff --git a/configure.in b/configure.in |
792 |
-index 27294c8..798a259 100644 |
793 |
---- a/configure.in |
794 |
-+++ b/configure.in |
795 |
-@@ -61,7 +61,7 @@ dnl Initialize automake stuff |
796 |
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) |
797 |
- |
798 |
- # Specify a configuration file |
799 |
--AM_CONFIG_HEADER(config.h) |
800 |
-+AC_CONFIG_HEADERS([config.h]) |
801 |
- |
802 |
- dnl Initialize libtool |
803 |
- AC_PROG_LIBTOOL |
804 |
|
805 |
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch |
806 |
deleted file mode 100644 |
807 |
index e7b4474618..0000000000 |
808 |
--- a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch |
809 |
+++ /dev/null |
810 |
@@ -1,126 +0,0 @@ |
811 |
---- docs/Makefile.am |
812 |
-+++ docs/Makefile.am |
813 |
-@@ -166,7 +166,7 @@ |
814 |
- echo $$p; \ |
815 |
- done |
816 |
- |
817 |
--EXTRA_DIST += \ |
818 |
-+EXTRA_DIST = \ |
819 |
- Changes-1.2.txt \ |
820 |
- debugging.txt \ |
821 |
- developers.txt \ |
822 |
---- gdk/Makefile.am |
823 |
-+++ gdk/Makefile.am |
824 |
-@@ -30,7 +30,7 @@ |
825 |
- # setup source file variables |
826 |
- # |
827 |
- # GDK header files for public installation (non-generated) |
828 |
--gdk_public_h_sources = @STRIP_BEGIN@ \ |
829 |
-+gdk_public_h_sources = \ |
830 |
- gdk.h \ |
831 |
- gdkcursors.h \ |
832 |
- gdkrgb.h \ |
833 |
-@@ -38,9 +38,8 @@ |
834 |
- gdkkeysyms.h \ |
835 |
- gdkprivate.h \ |
836 |
- gdktypes.h \ |
837 |
-- gdkx.h \ |
838 |
--@STRIP_END@ |
839 |
--gdk_c_sources = @STRIP_BEGIN@ \ |
840 |
-+ gdkx.h |
841 |
-+gdk_c_sources = \ |
842 |
- gdk.c \ |
843 |
- gdkcc.c \ |
844 |
- gdkcolor.c \ |
845 |
-@@ -71,8 +70,7 @@ |
846 |
- MwmUtil.h \ |
847 |
- gxid_lib.h \ |
848 |
- gxid_proto.h \ |
849 |
-- gxid_lib.c \ |
850 |
--@STRIP_END@ |
851 |
-+ gxid_lib.c |
852 |
- |
853 |
- # |
854 |
- # setup GDK sources and their dependancies |
855 |
-@@ -79,10 +79,6 @@ |
856 |
- # |
857 |
- libgdkinclude_HEADERS = $(gdk_public_h_sources) |
858 |
- libgdk_la_SOURCES = $(gdk_c_sources) |
859 |
--MAINTAINERCLEANFILES += |
860 |
--EXTRA_HEADERS += |
861 |
--EXTRA_DIST += |
862 |
--EXTRA_DIST += |
863 |
- |
864 |
- # |
865 |
- # rules to generate built sources |
866 |
---- gtk/Makefile.am |
867 |
-+++ gtk/Makefile.am |
868 |
-@@ -41,7 +41,7 @@ |
869 |
- # setup source file variables |
870 |
- # |
871 |
- # GTK+ header files for public installation (non-generated) |
872 |
--gtk_public_h_sources = @STRIP_BEGIN@ \ |
873 |
-+gtk_public_h_sources = \ |
874 |
- gtk.h \ |
875 |
- gtkaccelgroup.h \ |
876 |
- gtkaccellabel.h \ |
877 |
-@@ -150,13 +150,12 @@ |
878 |
- gtkvscrollbar.h \ |
879 |
- gtkvseparator.h \ |
880 |
- gtkwidget.h \ |
881 |
-- gtkwindow.h \ |
882 |
--@STRIP_END@ |
883 |
-+ gtkwindow.h |
884 |
- # GTK+ header files that don't get installed |
885 |
- gtk_private_h_sources = @STRIP_BEGIN@ \ |
886 |
- @STRIP_END@ |
887 |
- # GTK+ C sources to build the library from |
888 |
--gtk_c_sources = @STRIP_BEGIN@ \ |
889 |
-+gtk_c_sources = \ |
890 |
- gtkaccelgroup.c \ |
891 |
- gtkaccellabel.c \ |
892 |
- gtkadjustment.c \ |
893 |
-@@ -264,8 +263,7 @@ |
894 |
- gtkwidget.c \ |
895 |
- gtkwindow.c \ |
896 |
- fnmatch.c \ |
897 |
-- fnmatch.h \ |
898 |
--@STRIP_END@ |
899 |
-+ fnmatch.h |
900 |
- # we use our own built_sources variable rules to avoid automake's |
901 |
- # BUILT_SOURCES oddities |
902 |
- # we generate frequently rebuild files piggyback on a stamp file, so sources |
903 |
-@@ -284,10 +282,9 @@ |
904 |
- gtk.defs \ |
905 |
- @STRIP_END@ |
906 |
- # built sources that get installed with the header files |
907 |
--gtk_built_public_sources = @STRIP_BEGIN@ \ |
908 |
-+gtk_built_public_sources = \ |
909 |
- gtkmarshal.h \ |
910 |
-- gtktypebuiltins.h \ |
911 |
--@STRIP_END@ |
912 |
-+ gtktypebuiltins.h |
913 |
- # non-header sources (headers should be specified in the above variables) |
914 |
- # that don't serve as direct make target sources, i.e. they don't have |
915 |
- # their own .lo rules and don't get publically installed |
916 |
-@@ -313,9 +313,8 @@ |
917 |
- # |
918 |
- libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h |
919 |
- libgtk_la_SOURCES = $(gtk_c_sources) |
920 |
--MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources) |
921 |
--EXTRA_HEADERS += |
922 |
--EXTRA_DIST += $(gtk_private_h_sources) |
923 |
-+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources) |
924 |
-+EXTRA_DIST = $(gtk_private_h_sources) |
925 |
- EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) |
926 |
- |
927 |
- # |
928 |
-@@ -323,7 +322,7 @@ |
929 |
- # |
930 |
- # setup autogeneration dependancies |
931 |
- gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc |
932 |
--CLEANFILES += $(gen_sources) |
933 |
-+CLEANFILES = $(gen_sources) |
934 |
- COPYING: $(gtk_built_public_sources) $(gtk_built_sources) |
935 |
- $(OBJECTS): COPYING # this is our oldest-source-stamp |
936 |
- # initial creation of the real stamp-* files |
937 |
|
938 |
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch b/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch |
939 |
deleted file mode 100644 |
940 |
index 7846c17aad..0000000000 |
941 |
--- a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch |
942 |
+++ /dev/null |
943 |
@@ -1,13 +0,0 @@ |
944 |
-pull in string prototypes |
945 |
- |
946 |
---- gdk/gdkinputcommon.h |
947 |
-+++ gdk/gdkinputcommon.h |
948 |
-@@ -24,6 +24,8 @@ |
949 |
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. |
950 |
- */ |
951 |
- |
952 |
-+#include <string.h> |
953 |
-+ |
954 |
- #if defined(XINPUT_GXI) || defined(XINPUT_XFREE) |
955 |
- |
956 |
- /* Forward declarations */ |
957 |
|
958 |
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch b/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch |
959 |
deleted file mode 100644 |
960 |
index 37fb7c2630..0000000000 |
961 |
--- a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch |
962 |
+++ /dev/null |
963 |
@@ -1,9 +0,0 @@ |
964 |
-Fix aclocal warnings: |
965 |
-/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK |
966 |
---- gtk+-1.2.10/gtk.m4 |
967 |
-+++ gtk+-1.2.10/gtk.m4 |
968 |
-@@ -6,3 +6,3 @@ |
969 |
- dnl |
970 |
--AC_DEFUN(AM_PATH_GTK, |
971 |
-+AC_DEFUN([AM_PATH_GTK], |
972 |
- [dnl |
973 |
|
974 |
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild |
975 |
deleted file mode 100644 |
976 |
index e288100362..0000000000 |
977 |
--- a/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild |
978 |
+++ /dev/null |
979 |
@@ -1,102 +0,0 @@ |
980 |
-# Copyright 1999-2015 Gentoo Foundation |
981 |
-# Distributed under the terms of the GNU General Public License v2 |
982 |
-# $Id$ |
983 |
- |
984 |
-EAPI=5 |
985 |
- |
986 |
-GNOME_TARBALL_SUFFIX="gz" |
987 |
-GNOME2_LA_PUNT="yes" |
988 |
- |
989 |
-inherit autotools eutils flag-o-matic gnome2 toolchain-funcs multilib-minimal |
990 |
- |
991 |
-DESCRIPTION="The GIMP Toolkit" |
992 |
-HOMEPAGE="http://www.gtk.org/" |
993 |
-SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2" |
994 |
- |
995 |
-LICENSE="LGPL-2.1+" |
996 |
-SLOT="1" |
997 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" |
998 |
-IUSE="nls debug" |
999 |
- |
1000 |
-# Supported languages and translated documentation |
1001 |
-# Be sure all languages are prefixed with a single space! |
1002 |
-MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi" |
1003 |
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" |
1004 |
- |
1005 |
-RDEPEND=">=dev-libs/glib-1.2.10-r6:1[${MULTILIB_USEDEP}] |
1006 |
- >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] |
1007 |
- >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}] |
1008 |
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] |
1009 |
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]" |
1010 |
-DEPEND="${RDEPEND} |
1011 |
- >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}] |
1012 |
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] |
1013 |
- nls? ( sys-devel/gettext dev-util/intltool )" |
1014 |
- |
1015 |
-MULTILIB_CHOST_TOOLS=(/usr/bin/gtk-config) |
1016 |
- |
1017 |
-src_prepare() { |
1018 |
- append-cflags -std=gnu89 |
1019 |
- epatch "${FILESDIR}"/${P}-m4.patch |
1020 |
- epatch "${FILESDIR}"/${P}-automake.patch |
1021 |
- epatch "${FILESDIR}"/${P}-cleanup.patch |
1022 |
- epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2 |
1023 |
- epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch |
1024 |
- epatch "${FILESDIR}"/${P}-as-needed.patch |
1025 |
- sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198 |
1026 |
- epatch "${FILESDIR}"/${P}-automake-1.13.patch #467520 |
1027 |
- eautoreconf |
1028 |
- gnome2_src_prepare |
1029 |
-} |
1030 |
- |
1031 |
-multilib_src_configure() { |
1032 |
- local myconf= |
1033 |
- use nls || myconf="${myconf} --disable-nls" |
1034 |
- strip-linguas ${MY_AVAILABLE_LINGUAS} |
1035 |
- |
1036 |
- if use debug ; then |
1037 |
- myconf="${myconf} --enable-debug=yes" |
1038 |
- else |
1039 |
- myconf="${myconf} --enable-debug=minimum" |
1040 |
- fi |
1041 |
- |
1042 |
- ECONF_SOURCE="${S}" \ |
1043 |
- gnome2_src_configure \ |
1044 |
- --disable-static \ |
1045 |
- --sysconfdir="${EPREFIX}"/etc \ |
1046 |
- --with-xinput=xfree \ |
1047 |
- --with-x \ |
1048 |
- ${myconf} \ |
1049 |
- GLIB_CONFIG="/usr/bin/${CHOST}-glib-config" |
1050 |
-} |
1051 |
- |
1052 |
-multilib_src_compile() { |
1053 |
- emake CC="$(tc-getCC)" |
1054 |
-} |
1055 |
- |
1056 |
-multilib_src_install() { |
1057 |
- gnome2_src_install |
1058 |
-} |
1059 |
- |
1060 |
-multilib_src_install_all() { |
1061 |
- einstalldocs |
1062 |
- docinto docs |
1063 |
- cd docs |
1064 |
- dodoc *.txt *.gif text/* |
1065 |
- dohtml -r html |
1066 |
- |
1067 |
- #install nice, clean-looking gtk+ style |
1068 |
- insinto /usr/share/themes/Gentoo/gtk |
1069 |
- doins "${FILESDIR}"/gtkrc |
1070 |
-} |
1071 |
- |
1072 |
-pkg_postinst() { |
1073 |
- if [[ -e /etc/X11/gtk/gtkrc ]] ; then |
1074 |
- ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for" |
1075 |
- ewarn "all themes it seems. Please remove it manually as it will not due" |
1076 |
- ewarn "to /env protection." |
1077 |
- fi |
1078 |
- |
1079 |
- echo "" |
1080 |
- einfo "The old gtkrc is available through the new Gentoo gtk theme." |
1081 |
-} |