added gtk+-3.14.9 that contains the treeview-keyboard-binding-patch: fix the quirky gtk+-treeview keyboard behaviour!
@see https://bugs.launchpad.net/ubuntu/+source/gtk+3.0/+bug/1020756
This commit is contained in:
parent
b7b2ab874f
commit
06ebed093d
17 changed files with 1683 additions and 0 deletions
17
x11-libs/gtk+/Manifest
Normal file
17
x11-libs/gtk+/Manifest
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
AUX gtk+-1.2-locale_fix.patch 419 SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb SHA512 7350d2b60e4d66219ec57ce56f9e2cd3c9c2b5c399d8e35c49243a0383b3455ba4225257bcd1303ad5b4ef98ea6b6ff401afde43b1b3841eeac2527443f7cd33 WHIRLPOOL d9be6ee6014f4a62b6ef962be5fa610084148e479d916838390dce8f2acff525b1ecb6d596d9af4058177eb21753fa7bcadd7fdebc95fe905cd3cf3829d7db1a
|
||||
AUX gtk+-1.2.10-as-needed.patch 19865 SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7 SHA512 e69ab1a967218889dda64e8a87a390140ab70585b0ad031c3d6cbd5431857c0bf9c76300bb0f9ca8dfd703c0297c618d806795df1f18a5ab23fe3f06fb11c5a2 WHIRLPOOL 9281fcda1a9ab7e1542eb466573887ca258aec440d83d64901f9122ab41ab0c91e5bcbedce8abb2c9952f6be2e5459e4a84bf3f0374f5305579c5bbd20dfc0e9
|
||||
AUX gtk+-1.2.10-automake-1.13.patch 450 SHA256 c577ee80d654a254309d198e75cc3212fb7dfc9750627737b73b00a39b21d936 SHA512 2d21c44242f8cc10f15f905b5531ee6bb17795d2e645ff04c6806641e8f323a0fbe5371e2c60200b15bf38c36336447b43d040ca838b555ecdbc3644a089b5ff WHIRLPOOL 931636f180c6bbccffc1619de92be5c48dbcd9f993a5292a07c2c251bca3f80332501e785363a2de24b22cf110d1853512862f265ad6fb63ef284da6b38f07a3
|
||||
AUX gtk+-1.2.10-automake.patch 3270 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2 SHA512 8e603e8c313a87646b3d0b81cd59dfcfcc1f318c7bac58c6fcfde12b1cbbd235b0e6a14ce76643d1a6fccd8507f37e345ff21a2e9273a3a7922e21e1a8515bf7 WHIRLPOOL ce47fe13bad5ef4d659ee83755d703e229f25b3fcd85c38dbbfe6e3381a8400598437a727bb5fb6753462ba54a29ccf1ec51be2f90c63e6f0cbaf47df78b3136
|
||||
AUX gtk+-1.2.10-cleanup.patch 246 SHA256 6db4c8163e3e9032b5195acf230773d9bfd0c383157d65f2d42e4300e2b6a35f SHA512 3111fcad1e3849c9d15613a8dc7fd7ff6d9261d58d3b4d2502ba07eb3c0ded8eadf7e0023f24b3490c56087e93bb00499a82e31314201cdcf8897949b8258466 WHIRLPOOL a1498be29af2186881daec1c9e46f600d4ead23dc48fd99d08241d13697999eead1afa2965249b66c94746163d1a42ae0e24c26b9f954ec85cd1d14142f7c7f0
|
||||
AUX gtk+-1.2.10-m4.patch 220 SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324 SHA512 4900aad1e8b84f3fa9bc497455fe28d521950708e33274da5776f18444f19bdb383d65406142550f2fc6fb7bffe5ac5fd7b1c40ac2d008ab166a1a0c6a8b1d8b WHIRLPOOL d68204ec81a08541b8fd4076f8082882371a21563fed02519563edcbb1d4390600ab86d492703f43115c2a6c7b59ce4a140abd13de18db04a1e775bfa31f0653
|
||||
AUX gtk+-2.24.20-darwin-quartz-pasteboard.patch 435 SHA256 3eaf1b2f534309344f046c1155b29d821c96287360705f13d88e182e720777b1 SHA512 123526aadb43c98490f361b964d709d78b9e10beebb845b71474a4db8eb7bfe1b102a9736b50f4c6e20bb4fa7ad8dafa52e4237f30dcae9094d2575446148126 WHIRLPOOL cf9bde6aac5e34dae5e5788d0a098e2c1230c585cb614a71d784ca587c6f0bc5f874d42d684af2e9d2314df8a2aee23e2a66d8fb36f625f04925374a7ba5bd64
|
||||
AUX gtk+-2.24.24-out-of-source.patch 1487 SHA256 3492f3c22df40f7e0696098eb689b949ce0b6152293aba0a54adb8a859ec5250 SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2 WHIRLPOOL abc0a7572bd27afc3d4b0d0dbae78e93ebfec8c8bbc6787c632de80401d4f0b9f6621ccb0fbae867a70cea8767f97542b7c42c9f532598676d89563677cd79d3
|
||||
AUX gtk+-3.12.2-builtin-icon.patch 916 SHA256 ab655e9de25bc30698312108a87f15ce208004b38800ae802e62133007197758 SHA512 a12d25e92854c0e73ada4edf4ef26ccde18c052c229c2de1ab03feb26759452de804d44c51954584e68aa42ae0fae3c254aae19fd50bf999e6eda2c0c619f467 WHIRLPOOL 2077652a65be2073193cbb6f3fdcf5de7f5c1474cd98bf464b5a6adcca560fb5fc4f86f0ba50fd6da387fdd18c5fde53b4a1395ce3b9ec34f981b376e5f149da
|
||||
AUX gtk+-3.12.2-darwin10.6.patch 1269 SHA256 ecda99fd1a105c09843183b1a2709c605d7c5129f2985fd8a29d32b967eb8537 SHA512 2dafca048fba34f1b06430cc70e90b148dfc325e67dbe90195440609adb60fa4bdea9cb7dd0d16cf039452151271bf137e9c3ea8277a8795e3d0cd719bbc05aa WHIRLPOOL c464c8b573e256b44552150b8bc7be43e2c7112d5a0032be452323bd914830b7b35f04f6240c2ba8d696161753df19ffd7a6ac20626299392877e4e06bc10d5e
|
||||
AUX gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch 6076 SHA256 fd327426d3eb789d724c170c5eea96009b6a60433f6a5af673e0c75c05f15e72 SHA512 0a667456d828325894ec58a51388f2556fcc663cd70957fae4f2ad06e883328f7ea03bcee4702d18ad094628c80603127eaf85d83076cec97b09ff1b43ea9bca WHIRLPOOL 25d6a5975f7d8a98cd6490a15e38564f0172f934ea92e41fb30d72dbea430d2976a4f0b10404836564fc1f1963fac37e2d4e9a916bf1703e912ecbf27a04b8a2
|
||||
AUX gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch_original 6885 SHA256 c67c9dffd0c74a376ac35c971fb435852667dfaee865c384953f28128d64ac0a SHA512 9b43b0506736bbdf10d98593c9f06dccec76e9022eb094d4ae21671f3559be0dd79b9ed6e024ee65c7cd0b1e52c91038095e46806c92c68b57535de53b03ee20 WHIRLPOOL 8c5478b3f12561839eeb7aa740df67bb3cc8d4fe2199f34d7e7e99ae0fccfbfd7b34d90e9c99d7497468c37aaed125bc06c535e5ff0440939926878f9046f284
|
||||
AUX gtk+-non-bash-support.patch 1566 SHA256 2cb0e845deb9092a1bfbe6aca1891c744623d699a7353236637005a666770c2d SHA512 e2331b9d2ebe5a96e19bb01a1191887ff947e73dac91822e5ccdb1a7078adb8f706dc13b188ca884a2651228542ee38959a0afce5a5c5b27060374f7f5462ec5 WHIRLPOOL 39a2276e1aa1fbd2171869ca9a5c9365ea72db57192403871cd2e7317cc1d02611b44b5d254634712598758c77681056f61b75c116047a08c1bb2743f0e2c3ab
|
||||
AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
|
||||
AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
|
||||
DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5 WHIRLPOOL bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa
|
||||
EBUILD gtk+-3.14.9.ebuild 7334 SHA256 54fb7382f1a57b8d341b3b325667748aabdd0671f64406e5406e1e7cd475f60d SHA512 a0697becdf9940387e3dc1d47a7033b6d41b0b2cbcdba711d16e7a6f743b9ec0a12b2a3a1caffe239783e87b1725873cc02ef02c0abfcfc1f5591bc66ec4ccf9 WHIRLPOOL 107f417a674ee985505d72474d640dd02532f261aab6d9a62f7575068ffe3311d662044429fdb5493ab025af852097708ee1013f6f6acdfcd1b196aeb3482141
|
||||
19
x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
Normal file
19
x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
--- gtk/gtkrc.c.~1.40.2.17.~ 2001-07-10 20:06:35.000000000 +0200
|
||||
+++ gtk/gtkrc.c 2003-03-05 16:56:10.000000000 +0100
|
||||
@@ -453,7 +453,7 @@
|
||||
|
||||
if (!initted)
|
||||
{
|
||||
- char *locale = setlocale (LC_CTYPE, NULL);
|
||||
+ char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
|
||||
char *p;
|
||||
|
||||
initted = TRUE;
|
||||
@@ -558,6 +558,7 @@
|
||||
|
||||
if (tmp) g_free (tmp);
|
||||
}
|
||||
+ g_free (locale);
|
||||
}
|
||||
|
||||
i = 0;
|
||||
696
x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
Normal file
696
x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
Normal file
|
|
@ -0,0 +1,696 @@
|
|||
--- gtk+-1.2.10/acinclude.m4.orig 2006-05-24 23:23:51.000000000 -0700
|
||||
+++ gtk+-1.2.10/acinclude.m4 2006-05-24 23:23:19.000000000 -0700
|
||||
@@ -672,7 +672,7 @@
|
||||
AC_DEFINE(HAVE_STPCPY)
|
||||
fi
|
||||
|
||||
- AM_LC_MESSAGES
|
||||
+ gt_LC_MESSAGES
|
||||
AM_GTK_WITH_NLS
|
||||
|
||||
if test "x$CATOBJEXT" != "x"; then
|
||||
--- gtk+-1.2.10/gtk.m4.orig 2006-05-24 23:32:00.000000000 -0700
|
||||
+++ gtk+-1.2.10/gtk.m4 2006-05-24 23:36:16.000000000 -0700
|
||||
@@ -1,6 +1,11 @@
|
||||
# Configure paths for GTK+
|
||||
# Owen Taylor 97-11-3
|
||||
-
|
||||
+AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP],
|
||||
+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
|
||||
+ [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
|
||||
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
||||
+$1
|
||||
+AC_DIVERT_POP()])])])
|
||||
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
||||
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
|
||||
dnl
|
||||
--- gtk+-1.2.10/configure.in.orig 2006-05-25 05:45:06.000000000 -0700
|
||||
+++ gtk+-1.2.10/configure.in 2006-05-25 05:44:08.000000000 -0700
|
||||
@@ -1,6 +1,8 @@
|
||||
+builtin(include,gtk.m4)
|
||||
+
|
||||
+
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
AC_INIT(gdk/gdktypes.h)
|
||||
-
|
||||
# In the following, there are a the following variants
|
||||
# of GLib cflags and libs variables
|
||||
#
|
||||
@@ -12,12 +14,11 @@
|
||||
# glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
|
||||
# glib_thread_libs: libs to store in gtk-config for gtk-config gthread
|
||||
|
||||
+AC_CANONICAL_TARGET
|
||||
# Save this value here, since automake will set cflags later
|
||||
cflags_set=${CFLAGS+set}
|
||||
|
||||
-dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
|
||||
-dnl are available for $ac_help expansion (don't we all *love* autoconf?)
|
||||
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
||||
+GTK_AC_DIVERT_BEFORE_HELP([
|
||||
#
|
||||
# Making releases:
|
||||
# GTK_MICRO_VERSION += 1;
|
||||
@@ -32,9 +33,8 @@
|
||||
GTK_MICRO_VERSION=10
|
||||
GTK_INTERFACE_AGE=1
|
||||
GTK_BINARY_AGE=10
|
||||
-GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
|
||||
-dnl
|
||||
-AC_DIVERT_POP()dnl
|
||||
+GTK_VERSION="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION"
|
||||
+])
|
||||
|
||||
AC_SUBST(GTK_MAJOR_VERSION)
|
||||
AC_SUBST(GTK_MINOR_VERSION)
|
||||
@@ -44,9 +44,9 @@
|
||||
AC_SUBST(GTK_VERSION)
|
||||
|
||||
# libtool versioning
|
||||
-LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
|
||||
+LT_RELEASE="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION"
|
||||
LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
|
||||
-LT_REVISION=$GTK_INTERFACE_AGE
|
||||
+LT_REVISION="$GTK_INTERFACE_AGE"
|
||||
LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
|
||||
AC_SUBST(LT_RELEASE)
|
||||
AC_SUBST(LT_CURRENT)
|
||||
@@ -54,11 +54,8 @@
|
||||
AC_SUBST(LT_AGE)
|
||||
|
||||
# For automake.
|
||||
-VERSION=$GTK_VERSION
|
||||
-PACKAGE=gtk+
|
||||
-
|
||||
-# Save this value here, since automake will set cflags later
|
||||
-cflags_set=${CFLAGS+set}
|
||||
+VERSION="$GTK_VERSION"
|
||||
+PACKAGE="gtk+"
|
||||
|
||||
dnl Initialize automake stuff
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
|
||||
@@ -67,42 +64,40 @@
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl Initialize libtool
|
||||
-AM_PROG_LIBTOOL
|
||||
+AC_PROG_LIBTOOL
|
||||
|
||||
dnl Initialize maintainer mode
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
-AC_CANONICAL_HOST
|
||||
-
|
||||
dnl figure debugging default, prior to $ac_help setup
|
||||
-dnl
|
||||
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
||||
+
|
||||
+GTK_AC_DIVERT_BEFORE_HELP([
|
||||
if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
|
||||
- debug_default=yes
|
||||
+ debug_default="yes"
|
||||
else
|
||||
- debug_default=minimum
|
||||
+ debug_default="minimum"
|
||||
fi
|
||||
-AC_DIVERT_POP()dnl
|
||||
-
|
||||
+])
|
||||
dnl declare --enable-* args and collect ac_help strings
|
||||
-AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
|
||||
+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,
|
||||
+ [enable_debug="$debug_default"])
|
||||
AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]],
|
||||
- echo $enable_shm, enable_shm="yes")
|
||||
-AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
|
||||
- , enable_ansi=no)
|
||||
+ [echo "$enable_shm"],[enable_shm="yes"])
|
||||
+AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],,[enable_ansi="no"])
|
||||
AC_ARG_WITH(glib, [ --with-glib=DIR Use uninstalled copy of glib])
|
||||
-AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],
|
||||
- , enable_xim="yes")
|
||||
-AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],
|
||||
- , enable_xim_inst="maybe")
|
||||
-AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
|
||||
+AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],,[enable_xim="yes"])
|
||||
+AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],,
|
||||
+ [enable_xim_inst="maybe"])
|
||||
+AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,
|
||||
+ [enable_rebuilds="yes"])
|
||||
AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ])
|
||||
-
|
||||
AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
|
||||
-AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],,with_native_locale=no)
|
||||
+AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],,
|
||||
+ [with_native_locale="no"])
|
||||
+
|
||||
|
||||
if test "x$enable_debug" = "xyes"; then
|
||||
- test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
|
||||
+ test "$cflags_set" = "set" || CFLAGS="$CFLAGS -g"
|
||||
GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
|
||||
else
|
||||
if test "x$enable_debug" = "xno"; then
|
||||
@@ -113,16 +108,14 @@
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")
|
||||
-
|
||||
# Build time sanity check...
|
||||
AM_SANITY_CHECK
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_ISC_POSIX
|
||||
-AM_PROG_CC_STDC
|
||||
+AC_PROG_CC_STDC
|
||||
AC_PROG_INSTALL
|
||||
-AC_PROG_MAKE_SET
|
||||
|
||||
changequote(,)dnl
|
||||
if test "x$GCC" = "xyes"; then
|
||||
@@ -144,7 +137,6 @@
|
||||
fi
|
||||
fi
|
||||
changequote([,])dnl
|
||||
-
|
||||
# Honor aclocal flags
|
||||
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
|
||||
|
||||
@@ -158,8 +150,7 @@
|
||||
AC_CHECK_PROG(INDENT, indent, indent)
|
||||
|
||||
REBUILD=\#
|
||||
-if test "x$enable_rebuilds" = "xyes" && \
|
||||
- test -n "$PERL" && \
|
||||
+if test "x$enable_rebuilds" = "xyes" && test -n "$PERL" && \
|
||||
$PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
|
||||
test -n "$AWK" ; then
|
||||
REBUILD=
|
||||
@@ -194,55 +185,58 @@
|
||||
|
||||
dnl Check for nl_langinfo and CODESET
|
||||
AC_MSG_CHECKING([for nl_langinfo (CODESET)])
|
||||
-AC_TRY_COMPILE([#include <langinfo.h>],
|
||||
+AC_TRY_COMPILE([#include <langinfo.h>
|
||||
+ ],
|
||||
[char *codeset = nl_langinfo (CODESET);],
|
||||
AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
|
||||
- have_codeset=yes,
|
||||
- have_codeset=no)
|
||||
+ have_codeset="yes",
|
||||
+ have_codeset="no"
|
||||
+)
|
||||
AC_MSG_RESULT($have_codeset)
|
||||
|
||||
dnl The DU4 header files don't provide library prototypes unless
|
||||
dnl -std1 is given to the native cc.
|
||||
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
|
||||
|
||||
-gtk_save_LIBS=$LIBS
|
||||
+gtk_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -lm"
|
||||
AC_TRY_RUN([#include <math.h>
|
||||
int main (void) { return (log(1) != log(1.)); }],
|
||||
AC_MSG_RESULT(none needed),
|
||||
- gtk_save_CFLAGS=$CFLAGS
|
||||
+ [gtk_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -std1"
|
||||
AC_TRY_RUN([#include <math.h>
|
||||
int main (void) { return (log(1) != log(1.)); }],
|
||||
AC_MSG_RESULT(-std1),
|
||||
AC_MSG_RESULT()
|
||||
- CFLAGS=$gtk_save_CFLAGS
|
||||
- AC_MSG_WARN(
|
||||
- [No ANSI prototypes found in library. (-std1 didn't work.)]),
|
||||
- true
|
||||
- ),
|
||||
+ CFLAGS="$gtk_save_CFLAGS"
|
||||
+ AC_MSG_WARN([No ANSI prototypes found in library. (-std1 didn't work.)]),
|
||||
+ true)],
|
||||
AC_MSG_RESULT(none needed)
|
||||
)
|
||||
-LIBS=$gtk_save_LIBS
|
||||
+LIBS="$gtk_save_LIBS"
|
||||
|
||||
dnl NeXTStep cc seems to need this
|
||||
AC_MSG_CHECKING([for extra flags for POSIX compliance])
|
||||
-AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
|
||||
+AC_TRY_COMPILE([#include <dirent.h>
|
||||
+ ],[DIR *dir;],
|
||||
AC_MSG_RESULT(none needed),
|
||||
- gtk_save_CFLAGS=$CFLAGS
|
||||
+ [gtk_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -posix"
|
||||
- AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
|
||||
+ AC_TRY_COMPILE([#include <dirent.h>
|
||||
+ ],[DIR *dir;],
|
||||
AC_MSG_RESULT(-posix),
|
||||
AC_MSG_RESULT()
|
||||
- CFLAGS=$gtk_save_CFLAGS
|
||||
- AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
|
||||
+ CFLAGS="$gtk_save_CFLAGS"
|
||||
+ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])]))
|
||||
|
||||
-if test x$with_glib = xyes ; then
|
||||
- AC_MSG_ERROR([
|
||||
-*** Directory must be specified for --with-glib])
|
||||
+
|
||||
+
|
||||
+if test "x$with_glib" = "xyes" ; then
|
||||
+ AC_MSG_ERROR([*** Directory must be specified for --with-glib])
|
||||
fi
|
||||
|
||||
-if test x$with_glib = x ; then
|
||||
+if test "x$with_glib" = "x" ; then
|
||||
# Look for separately installed glib
|
||||
|
||||
AM_PATH_GLIB(1.2.8,,
|
||||
@@ -261,7 +255,7 @@
|
||||
else
|
||||
# Use uninstalled glib (assume they got the version right)
|
||||
|
||||
- GLIB_CONFIG=$with_glib/glib-config
|
||||
+ GLIB_CONFIG="$with_glib/glib-config"
|
||||
if test -x $GLIB_CONFIG ; then
|
||||
:
|
||||
else
|
||||
@@ -277,9 +271,9 @@
|
||||
glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
|
||||
|
||||
# canonicalize relative paths
|
||||
- case $with_glib in
|
||||
+ case "$with_glib" in
|
||||
/*)
|
||||
- glib_dir=$with_glib
|
||||
+ glib_dir="$with_glib"
|
||||
;;
|
||||
*)
|
||||
glib_dir="\$(top_builddir)/$with_glib"
|
||||
@@ -312,61 +306,56 @@
|
||||
saved_ldflags="$LDFLAGS"
|
||||
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
|
||||
+LDFLAGS="$LDFLAGS $X_LDFLAGS"
|
||||
|
||||
if test "x$no_x" = "xyes"; then
|
||||
AC_MSG_ERROR([
|
||||
*** X libraries or include files not found. Check 'config.log' for
|
||||
*** more details.])
|
||||
fi
|
||||
-
|
||||
# Checks for libraries.
|
||||
# Check for the X11 library
|
||||
-AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS",
|
||||
+AC_CHECK_LIB(X11,XOpenDisplay,
|
||||
+ x_libs="-lX11 $X_EXTRA_LIBS",
|
||||
AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]),
|
||||
- $X_EXTRA_LIBS)
|
||||
-
|
||||
+ $X_EXTRA_LIBS
|
||||
+)
|
||||
if test "x$enable_shm" = "xyes"; then
|
||||
# Check for the Xext library (needed for XShm extention)
|
||||
AC_CHECK_LIB(Xext, XShmAttach,
|
||||
x_libs="-lXext $x_libs",
|
||||
# On AIX, it is in XextSam instead, but we still need -lXext
|
||||
- AC_CHECK_LIB(XextSam, XShmAttach,
|
||||
+ [AC_CHECK_LIB(XextSam, XShmAttach,
|
||||
x_libs="-lXextSam -lXext $x_libs",
|
||||
- no_xext_lib=yes, $x_libs),
|
||||
- $x_libs)
|
||||
+ no_xext_lib="yes",
|
||||
+ $x_libs
|
||||
+ )],
|
||||
+ $x_libs
|
||||
+ )
|
||||
fi
|
||||
-
|
||||
# Check for shaped window extension
|
||||
-
|
||||
AC_CHECK_LIB(Xext, XShapeCombineMask,
|
||||
- if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then
|
||||
+ if test -z "`echo $x_libs | grep \-lXext 2> /dev/null`"; then
|
||||
x_libs="-lXext $x_libs"
|
||||
fi
|
||||
- AC_DEFINE(HAVE_SHAPE_EXT),
|
||||
- ,
|
||||
- $x_libs)
|
||||
-
|
||||
+ AC_DEFINE(HAVE_SHAPE_EXT),,
|
||||
+ $x_libs
|
||||
+)
|
||||
# Check for XConvertCase (X11R6 specific)
|
||||
-
|
||||
AC_CHECK_LIB(X11, XConvertCase,
|
||||
- AC_DEFINE(HAVE_XCONVERTCASE),
|
||||
- ,
|
||||
- $x_libs)
|
||||
-
|
||||
+ AC_DEFINE(HAVE_XCONVERTCASE),,
|
||||
+ $x_libs
|
||||
+)
|
||||
# Check for XIM support.
|
||||
-
|
||||
-AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
|
||||
- : ,
|
||||
+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,,
|
||||
enable_xim_inst="no",
|
||||
- $x_libs)
|
||||
-
|
||||
+ $x_libs
|
||||
+)
|
||||
# On Solaris, calling XRegisterIMInstantiateCallback seems to
|
||||
# cause an immediate segfault, so we disable it, unless
|
||||
# the user specifically forces it to be on.
|
||||
-
|
||||
-if test x$enable_xim_inst = xmaybe ; then
|
||||
- case host in
|
||||
+if test "x$enable_xim_inst" = "xmaybe" ; then
|
||||
+ case "$host" in
|
||||
*-*-solaris*)
|
||||
enable_xim_inst="no"
|
||||
;;
|
||||
@@ -384,16 +373,15 @@
|
||||
fi
|
||||
|
||||
x_cflags="$X_CFLAGS"
|
||||
-x_ldflags="$X_LDFLAGS $X_LIBS"
|
||||
+x_ldflags="$X_LDFLAGS"
|
||||
|
||||
# set up things for XInput
|
||||
-
|
||||
if test "x$with_xinput" = "xgxi"; then
|
||||
AC_MSG_WARN([
|
||||
*** The generic XInput support has not been tested for several years
|
||||
*** and is not known to work with any currently available X servers])
|
||||
AC_DEFINE(XINPUT_GXI)
|
||||
- xinput_progs=gxid
|
||||
+ xinput_progs="gxid"
|
||||
x_libs="-lXi $x_libs"
|
||||
elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
|
||||
AC_DEFINE(XINPUT_XFREE)
|
||||
@@ -413,77 +401,72 @@
|
||||
|
||||
if test "x$enable_shm" = "xyes"; then
|
||||
# Check for shared memory
|
||||
- AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
|
||||
- AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
|
||||
+ AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc="yes")
|
||||
+ AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm="yes")
|
||||
|
||||
# Check for the X shared memory extension header file
|
||||
AC_MSG_CHECKING(X11/extensions/XShm.h)
|
||||
if test "x$no_xext_lib" = "xyes"; then
|
||||
AC_MSG_RESULT(no)
|
||||
- no_xshm=yes
|
||||
+ no_xshm="yes"
|
||||
else
|
||||
if test -f "$x_includes/X11/extensions/XShm.h"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_XSHM_H)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
- no_xshm=yes
|
||||
+ no_xshm="yes"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
-
|
||||
# Check if X_LOCALE definition is necessary
|
||||
-
|
||||
AC_MSG_CHECKING(need -DX_LOCALE)
|
||||
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <locale.h>
|
||||
-
|
||||
-int
|
||||
-main ()
|
||||
+ int main ()
|
||||
{
|
||||
return setlocale (LC_ALL, "${with_locale}") == NULL;
|
||||
}],
|
||||
-need_x_locale=no,
|
||||
-need_x_locale=yes,
|
||||
-need_x_locale=no)
|
||||
+ need_x_locale="no",
|
||||
+ need_x_locale="yes",
|
||||
+ need_x_locale="no"
|
||||
+)
|
||||
AC_MSG_RESULT($need_x_locale)
|
||||
|
||||
-use_native_locale=no
|
||||
-if test $need_x_locale = yes; then
|
||||
+use_native_locale="no"
|
||||
+if test "$need_x_locale" = "yes"; then
|
||||
GTK_LOCALE_FLAGS="-DX_LOCALE"
|
||||
else
|
||||
- if test x$with_native_locale = xyes ; then
|
||||
+ if test "x$with_native_locale" = "xyes" ; then
|
||||
AC_MSG_CHECKING(functioning locale support)
|
||||
|
||||
- AC_TRY_COMPILE([#include <stdlib.h>],[
|
||||
- char c;
|
||||
+ AC_TRY_COMPILE([#include <stdlib.h>],
|
||||
+ [char c;
|
||||
if (MB_CUR_MAX == 1) {
|
||||
wctomb(&c, 42);
|
||||
- }
|
||||
- ],use_native_locale=yes,)
|
||||
-
|
||||
+ }],
|
||||
+ use_native_locale="yes"
|
||||
+ )
|
||||
AC_MSG_RESULT($use_native_locale)
|
||||
fi
|
||||
fi
|
||||
|
||||
-if test x$use_native_locale = xyes ; then
|
||||
+if test "x$use_native_locale" = "xyes" ; then
|
||||
AC_MSG_CHECKING(if sizeof(wchar_t) == 4)
|
||||
|
||||
- AC_TRY_RUN([
|
||||
- #include <stdlib.h>
|
||||
-
|
||||
- int
|
||||
- main ()
|
||||
+ AC_TRY_RUN([#include <stdlib.h>
|
||||
+ int main ()
|
||||
{
|
||||
return (sizeof(wchar_t) == 4) ? 0 : 1;
|
||||
- }],
|
||||
- ,use_native_locale=no,:)
|
||||
+ }],,
|
||||
+ use_native_locale="no"
|
||||
+ )
|
||||
AC_MSG_RESULT($use_native_locale)
|
||||
fi
|
||||
|
||||
-if test $use_native_locale = yes ; then
|
||||
+if test "$use_native_locale" = "yes" ; then
|
||||
AC_DEFINE(USE_NATIVE_LOCALE)
|
||||
fi
|
||||
|
||||
@@ -502,13 +485,17 @@
|
||||
|
||||
# Check if <sys/select.h> needs to be included for fd_set
|
||||
AC_MSG_CHECKING([for fd_set])
|
||||
-AC_TRY_COMPILE([#include <sys/types.h>],
|
||||
- [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
|
||||
-if test $gtk_ok = yes; then
|
||||
+AC_TRY_COMPILE([#include <sys/types.h>
|
||||
+ ],
|
||||
+ [fd_set readMask, writeMask;],
|
||||
+ gtk_ok="yes",
|
||||
+ gtk_ok="no"
|
||||
+)
|
||||
+if test "$gtk_ok" = "yes"; then
|
||||
AC_MSG_RESULT([yes, found in sys/types.h])
|
||||
else
|
||||
- AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
|
||||
- if test $gtk_ok = yes; then
|
||||
+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok="yes")
|
||||
+ if test "$gtk_ok" = "yes"; then
|
||||
AC_DEFINE(HAVE_SYS_SELECT_H)
|
||||
AC_MSG_RESULT([yes, found in sys/select.h])
|
||||
else
|
||||
@@ -520,30 +507,35 @@
|
||||
# Duplicate `widechar' tests from `glib'.
|
||||
# Check for wchar.h
|
||||
AC_MSG_CHECKING(for wchar.h)
|
||||
-AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
|
||||
-if test $gtk_ok = yes; then
|
||||
+AC_TRY_CPP([#include <wchar.h>
|
||||
+ ],
|
||||
+ gtk_ok="yes",
|
||||
+ gtk_ok="no"
|
||||
+)
|
||||
+if test "$gtk_ok" = "yes"; then
|
||||
AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists])
|
||||
fi
|
||||
AC_MSG_RESULT($gtk_ok)
|
||||
|
||||
# Check for wctype.h (for iswalnum)
|
||||
AC_MSG_CHECKING(for wctype.h)
|
||||
-AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
|
||||
-if test $gtk_ok = yes; then
|
||||
+AC_TRY_CPP([#include <wctype.h>], gtk_ok="yes", gtk_ok="no")
|
||||
+if test "$gtk_ok" = "yes"; then
|
||||
AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists])
|
||||
fi
|
||||
AC_MSG_RESULT($gtk_ok)
|
||||
|
||||
# in Solaris 2.5, `iswalnum' is in -lw
|
||||
GDK_WLIBS=
|
||||
-AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
|
||||
+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS="-lw")])
|
||||
|
||||
# The following is necessary for Linux libc-5.4.38
|
||||
oLIBS="$LIBS"
|
||||
LIBS="$LIBS $GDK_WLIBS"
|
||||
AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
|
||||
-AC_TRY_LINK([#include <stdlib.h>],[
|
||||
-#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
|
||||
+AC_TRY_LINK([#include <stdlib.h>
|
||||
+ ],
|
||||
+ [#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
|
||||
# ifdef HAVE_WCTYPE_H
|
||||
# include <wctype.h>
|
||||
# else
|
||||
@@ -554,11 +546,13 @@
|
||||
#else
|
||||
# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
|
||||
#endif
|
||||
-iswalnum((wchar_t) 0);
|
||||
-], gtk_ok=yes, gtk_ok=no)
|
||||
+ iswalnum((wchar_t) 0);],
|
||||
+ gtk_ok="yes",
|
||||
+ gtk_ok="no"
|
||||
+)
|
||||
LIBS="$oLIBS"
|
||||
|
||||
-if test $gtk_ok = no; then
|
||||
+if test "$gtk_ok" = "no"; then
|
||||
AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken])
|
||||
GDK_WLIBS=
|
||||
fi
|
||||
@@ -580,5 +574,5 @@
|
||||
gtk/Makefile
|
||||
gtk/gtkfeatures.h
|
||||
gdk.pc
|
||||
-gtk+.pc
|
||||
-], [chmod +x gtk-config])
|
||||
+gtk+.pc],
|
||||
+[chmod +x gtk-config])
|
||||
--- gtk+-1.2.10/gdk/Makefile.am.orig 2006-05-19 02:41:18.000000000 -0700
|
||||
+++ gtk+-1.2.10/gdk/Makefile.am 2006-05-19 02:11:54.000000000 -0700
|
||||
@@ -21,12 +21,11 @@
|
||||
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||
-release $(LT_RELEASE) \
|
||||
-export-dynamic \
|
||||
- @GLIB_DEPLIBS@ \
|
||||
@x_ldflags@ \
|
||||
- @x_libs@ \
|
||||
- -lm \
|
||||
@STRIP_END@
|
||||
|
||||
+libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm
|
||||
+
|
||||
#
|
||||
# setup source file variables
|
||||
#
|
||||
@@ -104,14 +103,13 @@
|
||||
EXTRA_PROGRAMS = gxid
|
||||
bin_PROGRAMS = @xinput_progs@
|
||||
LDADDS = @STRIP_BEGIN@ \
|
||||
- @x_ldflags@ \
|
||||
@x_libs@ \
|
||||
@GLIB_LIBS@ \
|
||||
-lm \
|
||||
@STRIP_END@
|
||||
gxid_SOURCES = gxid.c
|
||||
gxid_LDADD = $(LDADDS)
|
||||
-
|
||||
+gxid_LDFLAGS = @x_ldflags@
|
||||
|
||||
.PHONY: files
|
||||
|
||||
--- gtk+-1.2.10/gtk/Makefile.am.orig 2006-05-25 07:40:45.000000000 -0700
|
||||
+++ gtk+-1.2.10/gtk/Makefile.am 2006-05-25 07:43:20.000000000 -0700
|
||||
@@ -27,13 +27,15 @@
|
||||
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||
-release $(LT_RELEASE) \
|
||||
-export-dynamic \
|
||||
- @GLIB_DEPLIBS@ \
|
||||
@x_ldflags@ \
|
||||
- @x_libs@ \
|
||||
- -lm \
|
||||
@STRIP_END@
|
||||
-# $(top_builddir)/gdk/libgdk.la
|
||||
-
|
||||
+libgtk_la_LIBADD = @STRIP_BEGIN@ \
|
||||
+ $(top_builddir)/gdk/libgdk.la \
|
||||
+ @x_libs@ \
|
||||
+ @GDK_WLIBS@ \
|
||||
+ @GLIB_LIBS@ \
|
||||
+ -lm \
|
||||
+ @STRIP_END@
|
||||
|
||||
#
|
||||
# setup source file variables
|
||||
@@ -374,14 +376,17 @@
|
||||
|
||||
|
||||
gtkconfdir = $(sysconfdir)/gtk
|
||||
-gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
|
||||
+# removed references to non-existent gtkrc files - tsh
|
||||
+gtkconf_DATA = \
|
||||
+ gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
|
||||
gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
|
||||
- gtkrc.utf-8 gtkrc.iso-8859-2 \
|
||||
- gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \
|
||||
- gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
|
||||
- gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
|
||||
- gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
|
||||
- gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
|
||||
+ gtkrc.iso-8859-2 gtkrc.iso-8859-5 \
|
||||
+ gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
|
||||
+ gtkrc.iso-8859-15 gtkrc.zh_TW.big5 \
|
||||
+ gtkrc.zh_CN gtkrc.cp1251 gtkrc.cp1255 \
|
||||
+ gtkrc.ka_GE.georgianacademy \
|
||||
+ gtkrc.ka_GE.georgianps \
|
||||
+ gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
|
||||
|
||||
# We create a dummy theme for the default GTK+ theme
|
||||
install-data-local:
|
||||
@@ -428,7 +433,6 @@
|
||||
LDADDS = @STRIP_BEGIN@ \
|
||||
libgtk.la \
|
||||
$(top_builddir)/gdk/libgdk.la \
|
||||
- @x_ldflags@ \
|
||||
@x_libs@ \
|
||||
@GDK_WLIBS@ \
|
||||
@GLIB_LIBS@ \
|
||||
@@ -441,12 +445,20 @@
|
||||
testdnd_DEPENDENCIES = $(DEPS)
|
||||
simple_DEPENDENCIES = $(DEPS)
|
||||
#testthreads_DEPENDENCIES = $(DEPS)
|
||||
+
|
||||
testgtk_LDADD = $(LDADDS)
|
||||
+testgtk_LDFLAGS=@x_ldflags@
|
||||
testinput_LDADD = $(LDADDS)
|
||||
+testinput_LDFLAGS = @x_ldflags@
|
||||
testselection_LDADD = $(LDADDS)
|
||||
+testselection_LDFLAGS = @x_ldflags@
|
||||
testrgb_LDADD = $(LDADDS)
|
||||
+testrgb_LDFLAGS = @x_ldflags@
|
||||
testdnd_LDADD = $(LDADDS)
|
||||
+testdnd_LDFLAGS = @x_ldflags@
|
||||
simple_LDADD = $(LDADDS)
|
||||
+simple_LDFLAGS = @x_ldflags@
|
||||
+
|
||||
#testthreads_LDADD = $(LDADDS)
|
||||
|
||||
.PHONY: files test test-debug
|
||||
16
x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
Normal file
16
x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
Fix build failure with automake-1.13; fixed upstream in >=2.24.15 and >=3.0
|
||||
https://bugs.gentoo.org/467520
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 27294c8..798a259 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -61,7 +61,7 @@ dnl Initialize automake stuff
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
|
||||
|
||||
# Specify a configuration file
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
dnl Initialize libtool
|
||||
AC_PROG_LIBTOOL
|
||||
126
x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
Normal file
126
x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
--- docs/Makefile.am
|
||||
+++ docs/Makefile.am
|
||||
@@ -166,7 +166,7 @@
|
||||
echo $$p; \
|
||||
done
|
||||
|
||||
-EXTRA_DIST += \
|
||||
+EXTRA_DIST = \
|
||||
Changes-1.2.txt \
|
||||
debugging.txt \
|
||||
developers.txt \
|
||||
--- gdk/Makefile.am
|
||||
+++ gdk/Makefile.am
|
||||
@@ -30,7 +30,7 @@
|
||||
# setup source file variables
|
||||
#
|
||||
# GDK header files for public installation (non-generated)
|
||||
-gdk_public_h_sources = @STRIP_BEGIN@ \
|
||||
+gdk_public_h_sources = \
|
||||
gdk.h \
|
||||
gdkcursors.h \
|
||||
gdkrgb.h \
|
||||
@@ -38,9 +38,8 @@
|
||||
gdkkeysyms.h \
|
||||
gdkprivate.h \
|
||||
gdktypes.h \
|
||||
- gdkx.h \
|
||||
-@STRIP_END@
|
||||
-gdk_c_sources = @STRIP_BEGIN@ \
|
||||
+ gdkx.h
|
||||
+gdk_c_sources = \
|
||||
gdk.c \
|
||||
gdkcc.c \
|
||||
gdkcolor.c \
|
||||
@@ -71,8 +70,7 @@
|
||||
MwmUtil.h \
|
||||
gxid_lib.h \
|
||||
gxid_proto.h \
|
||||
- gxid_lib.c \
|
||||
-@STRIP_END@
|
||||
+ gxid_lib.c
|
||||
|
||||
#
|
||||
# setup GDK sources and their dependancies
|
||||
@@ -79,10 +79,6 @@
|
||||
#
|
||||
libgdkinclude_HEADERS = $(gdk_public_h_sources)
|
||||
libgdk_la_SOURCES = $(gdk_c_sources)
|
||||
-MAINTAINERCLEANFILES +=
|
||||
-EXTRA_HEADERS +=
|
||||
-EXTRA_DIST +=
|
||||
-EXTRA_DIST +=
|
||||
|
||||
#
|
||||
# rules to generate built sources
|
||||
--- gtk/Makefile.am
|
||||
+++ gtk/Makefile.am
|
||||
@@ -41,7 +41,7 @@
|
||||
# setup source file variables
|
||||
#
|
||||
# GTK+ header files for public installation (non-generated)
|
||||
-gtk_public_h_sources = @STRIP_BEGIN@ \
|
||||
+gtk_public_h_sources = \
|
||||
gtk.h \
|
||||
gtkaccelgroup.h \
|
||||
gtkaccellabel.h \
|
||||
@@ -150,13 +150,12 @@
|
||||
gtkvscrollbar.h \
|
||||
gtkvseparator.h \
|
||||
gtkwidget.h \
|
||||
- gtkwindow.h \
|
||||
-@STRIP_END@
|
||||
+ gtkwindow.h
|
||||
# GTK+ header files that don't get installed
|
||||
gtk_private_h_sources = @STRIP_BEGIN@ \
|
||||
@STRIP_END@
|
||||
# GTK+ C sources to build the library from
|
||||
-gtk_c_sources = @STRIP_BEGIN@ \
|
||||
+gtk_c_sources = \
|
||||
gtkaccelgroup.c \
|
||||
gtkaccellabel.c \
|
||||
gtkadjustment.c \
|
||||
@@ -264,8 +263,7 @@
|
||||
gtkwidget.c \
|
||||
gtkwindow.c \
|
||||
fnmatch.c \
|
||||
- fnmatch.h \
|
||||
-@STRIP_END@
|
||||
+ fnmatch.h
|
||||
# we use our own built_sources variable rules to avoid automake's
|
||||
# BUILT_SOURCES oddities
|
||||
# we generate frequently rebuild files piggyback on a stamp file, so sources
|
||||
@@ -284,10 +282,9 @@
|
||||
gtk.defs \
|
||||
@STRIP_END@
|
||||
# built sources that get installed with the header files
|
||||
-gtk_built_public_sources = @STRIP_BEGIN@ \
|
||||
+gtk_built_public_sources = \
|
||||
gtkmarshal.h \
|
||||
- gtktypebuiltins.h \
|
||||
-@STRIP_END@
|
||||
+ gtktypebuiltins.h
|
||||
# non-header sources (headers should be specified in the above variables)
|
||||
# that don't serve as direct make target sources, i.e. they don't have
|
||||
# their own .lo rules and don't get publically installed
|
||||
@@ -313,9 +313,8 @@
|
||||
#
|
||||
libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
|
||||
libgtk_la_SOURCES = $(gtk_c_sources)
|
||||
-MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
|
||||
-EXTRA_HEADERS +=
|
||||
-EXTRA_DIST += $(gtk_private_h_sources)
|
||||
+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
|
||||
+EXTRA_DIST = $(gtk_private_h_sources)
|
||||
EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
|
||||
|
||||
#
|
||||
@@ -323,7 +322,7 @@
|
||||
#
|
||||
# setup autogeneration dependancies
|
||||
gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
|
||||
-CLEANFILES += $(gen_sources)
|
||||
+CLEANFILES = $(gen_sources)
|
||||
COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
|
||||
$(OBJECTS): COPYING # this is our oldest-source-stamp
|
||||
# initial creation of the real stamp-* files
|
||||
13
x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
Normal file
13
x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
pull in string prototypes
|
||||
|
||||
--- gdk/gdkinputcommon.h
|
||||
+++ gdk/gdkinputcommon.h
|
||||
@@ -24,6 +24,8 @@
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#if defined(XINPUT_GXI) || defined(XINPUT_XFREE)
|
||||
|
||||
/* Forward declarations */
|
||||
9
x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
Normal file
9
x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
Fix aclocal warnings:
|
||||
/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
|
||||
--- gtk+-1.2.10/gtk.m4
|
||||
+++ gtk+-1.2.10/gtk.m4
|
||||
@@ -6,3 +6,3 @@
|
||||
dnl
|
||||
-AC_DEFUN(AM_PATH_GTK,
|
||||
+AC_DEFUN([AM_PATH_GTK],
|
||||
[dnl
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
gdk_quartz_target_to_pasteboard_type_libgtk_only was moved in
|
||||
a269c2f8d26a588c4b61ad605ef496e89759cc03
|
||||
https://mail.gnome.org/archives/commits-list/2013-March/msg20203.html
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=704766
|
||||
|
||||
--- gtk/gtkclipboard-quartz.c
|
||||
+++ gtk/gtkclipboard-quartz.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "gtktextbuffer.h"
|
||||
#include "gtkquartz.h"
|
||||
#include "gtkalias.h"
|
||||
+#include "quartz/gdkquartz.h"
|
||||
|
||||
enum {
|
||||
OWNER_CHANGE,
|
||||
33
x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
Normal file
33
x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Sun, 18 May 2014 10:50:05 +0200
|
||||
Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir.
|
||||
|
||||
The $gtk_all_c_sources variable contains both supplied and generated
|
||||
sources. The former reside in $srcdir, the latter in the build directory
|
||||
(cwd).
|
||||
|
||||
In order to handle both kinds properly, first try to find each source
|
||||
file in cwd, and then fallback to $srcdir. This makes it possible to use
|
||||
out-of-source builds, and guarantees that fresh-built source files will
|
||||
be used rather than pre-generated copies included in the distribution
|
||||
tarball.
|
||||
---
|
||||
gtk/aliasfilescheck.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
|
||||
index 31b49d4..3636a82 100755
|
||||
--- a/gtk/aliasfilescheck.sh
|
||||
+++ b/gtk/aliasfilescheck.sh
|
||||
@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then
|
||||
fi
|
||||
|
||||
grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
|
||||
-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
|
||||
+{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files
|
||||
|
||||
diff expected-files actual-files && rm -f expected-files actual-files
|
||||
--
|
||||
1.9.3
|
||||
|
||||
29
x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch
Normal file
29
x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From 46ac7e51d96c8ffb41c1c055fbe97474dcf096f8 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 15 Aug 2014 10:37:05 -0400
|
||||
Subject: Include image data in the builtin icon cache
|
||||
|
||||
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index c281666..9369273 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -1779,8 +1779,13 @@ else
|
||||
$(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
endif
|
||||
endif
|
||||
- $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \
|
||||
- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
||||
+ $(AM_V_GEN) $(gtk_update_icon_cache_program) \
|
||||
+ --quiet \
|
||||
+ --force \
|
||||
+ --ignore-theme-index \
|
||||
+ --include-image-data \
|
||||
+ --source builtin_icons stock-icons \
|
||||
+ > gtkbuiltincache.h.tmp && \
|
||||
mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
||||
|
||||
EXTRA_DIST += \
|
||||
--
|
||||
cgit v0.10.1
|
||||
|
||||
39
x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
Normal file
39
x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
Fix for Mac Os 10.7
|
||||
|
||||
src_compile:
|
||||
gtkapplication-quartz-menu.c:265: error: incompatible type for argument 1 of 'roundf'
|
||||
make[4]: *** [libgtk_3_la-gtkapplication-quartz-menu.lo] Error 1
|
||||
|
||||
More info:
|
||||
https://trac.macports.org/ticket/43283
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=727366
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=519058
|
||||
|
||||
--- gtk/gtkapplication-quartz-menu.c.orig 2014-05-08 01:40:39.000000000 +0200
|
||||
+++ gtk/gtkapplication-quartz-menu.c 2014-05-15 11:16:09.000000000 +0200
|
||||
@@ -30,6 +30,16 @@
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
+#if !defined(MAC_OS_X_VERSION_10_7) || \
|
||||
+MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
|
||||
+
|
||||
+@interface NSScreen (LionAPI)
|
||||
+- (CGFloat)backingScaleFactor;
|
||||
+- (NSRect)convertRectToBacking:(NSRect)aRect;
|
||||
+@end
|
||||
+
|
||||
+#endif // 10.7
|
||||
+
|
||||
#define ICON_SIZE 16
|
||||
|
||||
#define BLACK "#000000"
|
||||
@@ -262,7 +272,7 @@
|
||||
}
|
||||
|
||||
theme = gtk_icon_theme_get_default ();
|
||||
- scale = roundf ([[NSScreen mainScreen] backingScaleFactor]);
|
||||
+ scale = [[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)] ? roundf ([[NSScreen mainScreen] backingScaleFactor]) : 1.;
|
||||
info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon, ICON_SIZE, scale, GTK_ICON_LOOKUP_USE_BUILTIN);
|
||||
|
||||
if (info != NULL)
|
||||
|
|
@ -0,0 +1,156 @@
|
|||
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
|
||||
index 0f700f8..3f9e727 100644
|
||||
--- a/gtk/gtktreeview.c
|
||||
+++ b/gtk/gtktreeview.c
|
||||
@@ -1584,22 +1584,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
GTK_MOVEMENT_PAGES, 1);
|
||||
|
||||
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, 1);
|
||||
-
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, -1);
|
||||
-
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, 1);
|
||||
-
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, -1);
|
||||
-
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
|
||||
"move-cursor", 2,
|
||||
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
@@ -1651,6 +1635,16 @@ G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
G_TYPE_BOOLEAN, FALSE);
|
||||
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, TRUE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
+
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, TRUE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
+
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KEY_asterisk, 0,
|
||||
"expand-collapse-cursor-row", 3,
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
@@ -1662,6 +1656,16 @@ G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
G_TYPE_BOOLEAN, TRUE);
|
||||
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0,
|
||||
+ "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0,
|
||||
+ "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, 0,
|
||||
"expand-collapse-cursor-row", 3,
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
@@ -10973,6 +10977,7 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view,
|
||||
gboolean open_all)
|
||||
{
|
||||
GtkTreePath *cursor_path = NULL;
|
||||
+ gboolean return_value = TRUE;
|
||||
|
||||
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
|
||||
return FALSE;
|
||||
@@ -10983,31 +10988,73 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view,
|
||||
cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
|
||||
tree_view->priv->cursor_node);
|
||||
|
||||
- /* Don't handle the event if we aren't an expander */
|
||||
- if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT))
|
||||
- return FALSE;
|
||||
-
|
||||
if (!logical
|
||||
&& gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL)
|
||||
expand = !expand;
|
||||
|
||||
- if (expand)
|
||||
- gtk_tree_view_real_expand_row (tree_view,
|
||||
- cursor_path,
|
||||
- tree_view->priv->cursor_tree,
|
||||
- tree_view->priv->cursor_node,
|
||||
- open_all,
|
||||
- TRUE);
|
||||
+ /* If we are on a collapsed node */
|
||||
+ if (!gtk_tree_view_row_expanded(tree_view, cursor_path))
|
||||
+ {
|
||||
+ if (!expand)
|
||||
+ {
|
||||
+ if (gtk_tree_path_up(cursor_path))
|
||||
+ {
|
||||
+ /* If we try to collapse using arrows, select the parent node */
|
||||
+ if (!logical)
|
||||
+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE);
|
||||
+ /* If we try to collapse a leaf node using minus,
|
||||
+ cancel action and start interactive search */
|
||||
+ else if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT))
|
||||
+ return_value = FALSE;
|
||||
+ }
|
||||
+ }
|
||||
+ else if (GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT))
|
||||
+ {
|
||||
+ gtk_tree_view_real_expand_row (tree_view,
|
||||
+ cursor_path,
|
||||
+ tree_view->priv->cursor_tree,
|
||||
+ tree_view->priv->cursor_node,
|
||||
+ open_all,
|
||||
+ TRUE);
|
||||
+ }
|
||||
+ else
|
||||
+ /* If we try to expand a leaf node, cancel action */
|
||||
+ return_value = !logical;
|
||||
+ }
|
||||
+ /* If we are on a expanded node */
|
||||
+
|
||||
else
|
||||
- gtk_tree_view_real_collapse_row (tree_view,
|
||||
+ {
|
||||
+ if (expand)
|
||||
+ {
|
||||
+ if(open_all)
|
||||
+ {
|
||||
+ gtk_tree_view_real_expand_row (tree_view,
|
||||
cursor_path,
|
||||
tree_view->priv->cursor_tree,
|
||||
tree_view->priv->cursor_node,
|
||||
+ open_all,
|
||||
TRUE);
|
||||
+ }
|
||||
+
|
||||
+ /* If we try to expand using arrows, select the first child */
|
||||
+ if (!logical)
|
||||
+ {
|
||||
+ gtk_tree_path_down(cursor_path);
|
||||
+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE);
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ gtk_tree_view_real_collapse_row (tree_view,
|
||||
+ cursor_path,
|
||||
+ tree_view->priv->cursor_tree,
|
||||
+ tree_view->priv->cursor_node,
|
||||
+ TRUE);
|
||||
+ }
|
||||
|
||||
gtk_tree_path_free (cursor_path);
|
||||
|
||||
- return TRUE;
|
||||
+ return return_value;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
|
@ -0,0 +1,173 @@
|
|||
From 52269786c0a84eeed5faf33c6dd896298e71b2a6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dami=C3=A1n=20Nohales?= <damiannohales@gmail.com>
|
||||
Date: Mon, 2 Jul 2012 20:20:18 -0300
|
||||
Subject: [PATCH] treeview: change keyboard bindings behaviour
|
||||
|
||||
This commit changes the default GtkTreeView behaviour with the keyboard,
|
||||
expanding nodes with right arrow and collapsing it with left arrow,
|
||||
selecting parent and child nodes when appropriate. Users that want to
|
||||
navigate into cells horizontally (a non frecuent use case) will need
|
||||
to press Ctrl+<Left|Right>.
|
||||
---
|
||||
gtk/gtktreeview.c | 107 +++++++++++++++++++++++++++++++++++++----------------
|
||||
1 file changed, 76 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
|
||||
index 73cd0ae..28e6500 100644
|
||||
--- a/gtk/gtktreeview.c
|
||||
+++ b/gtk/gtktreeview.c
|
||||
@@ -1527,22 +1527,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
|
||||
GTK_MOVEMENT_PAGES, 1);
|
||||
|
||||
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, 1);
|
||||
-
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, -1);
|
||||
-
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, 1);
|
||||
-
|
||||
- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0, "move-cursor", 2,
|
||||
- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
- G_TYPE_INT, -1);
|
||||
-
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
|
||||
"move-cursor", 2,
|
||||
G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS,
|
||||
@@ -1594,6 +1578,15 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
G_TYPE_BOOLEAN, FALSE);
|
||||
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, TRUE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, TRUE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
+
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KEY_asterisk, 0,
|
||||
"expand-collapse-cursor-row", 3,
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
@@ -1605,6 +1598,16 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
G_TYPE_BOOLEAN, TRUE);
|
||||
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0,
|
||||
+ "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0,
|
||||
+ "expand-collapse-cursor-row", 3,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE,
|
||||
+ G_TYPE_BOOLEAN, FALSE);
|
||||
gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, 0,
|
||||
"expand-collapse-cursor-row", 3,
|
||||
G_TYPE_BOOLEAN, TRUE,
|
||||
@@ -10812,6 +10815,7 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view,
|
||||
gboolean open_all)
|
||||
{
|
||||
GtkTreePath *cursor_path = NULL;
|
||||
+ gboolean return_value = TRUE;
|
||||
|
||||
if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
|
||||
return FALSE;
|
||||
@@ -10822,31 +10826,72 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view,
|
||||
cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree,
|
||||
tree_view->priv->cursor_node);
|
||||
|
||||
- /* Don't handle the event if we aren't an expander */
|
||||
- if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT))
|
||||
- return FALSE;
|
||||
-
|
||||
if (!logical
|
||||
&& gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL)
|
||||
expand = !expand;
|
||||
-
|
||||
- if (expand)
|
||||
- gtk_tree_view_real_expand_row (tree_view,
|
||||
- cursor_path,
|
||||
- tree_view->priv->cursor_tree,
|
||||
- tree_view->priv->cursor_node,
|
||||
- open_all,
|
||||
- TRUE);
|
||||
+
|
||||
+ /* If we are on a collapsed node */
|
||||
+ if (!gtk_tree_view_row_expanded(tree_view, cursor_path))
|
||||
+ {
|
||||
+ if (!expand)
|
||||
+ {
|
||||
+ if (gtk_tree_path_up(cursor_path))
|
||||
+ {
|
||||
+ /* If we try to collapse using arrows, select the parent node */
|
||||
+ if (!logical)
|
||||
+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE);
|
||||
+ /* If we try to collapse a leaf node using minus,
|
||||
+ cancel action and start interactive search */
|
||||
+ else if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT))
|
||||
+ return_value = FALSE;
|
||||
+ }
|
||||
+ }
|
||||
+ else if (GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT))
|
||||
+ {
|
||||
+ gtk_tree_view_real_expand_row (tree_view,
|
||||
+ cursor_path,
|
||||
+ tree_view->priv->cursor_tree,
|
||||
+ tree_view->priv->cursor_node,
|
||||
+ open_all,
|
||||
+ TRUE);
|
||||
+ }
|
||||
+ else
|
||||
+ /* If we try to expand a leaf node, cancel action */
|
||||
+ return_value = !logical;
|
||||
+ }
|
||||
+ /* If we are on a expanded node */
|
||||
else
|
||||
- gtk_tree_view_real_collapse_row (tree_view,
|
||||
+ {
|
||||
+ if (expand)
|
||||
+ {
|
||||
+ if(open_all)
|
||||
+ {
|
||||
+ gtk_tree_view_real_expand_row (tree_view,
|
||||
cursor_path,
|
||||
tree_view->priv->cursor_tree,
|
||||
tree_view->priv->cursor_node,
|
||||
+ open_all,
|
||||
TRUE);
|
||||
+ }
|
||||
|
||||
- gtk_tree_path_free (cursor_path);
|
||||
+ /* If we try to expand using arrows, select the first child */
|
||||
+ if (!logical)
|
||||
+ {
|
||||
+ gtk_tree_path_down(cursor_path);
|
||||
+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE);
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ gtk_tree_view_real_collapse_row (tree_view,
|
||||
+ cursor_path,
|
||||
+ tree_view->priv->cursor_tree,
|
||||
+ tree_view->priv->cursor_node,
|
||||
+ TRUE);
|
||||
+ }
|
||||
|
||||
- return TRUE;
|
||||
+ gtk_tree_path_free (cursor_path);
|
||||
+
|
||||
+ return return_value;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
56
x11-libs/gtk+/files/gtk+-non-bash-support.patch
Normal file
56
x11-libs/gtk+/files/gtk+-non-bash-support.patch
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
From 43a4a28cdc60ac7347bb89f84cf049cb3401621d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
|
||||
Date: Sun, 26 Oct 2014 01:59:33 +0400
|
||||
Subject: [PATCH] gtk/Makefile.am: Remove bashisms
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- improve portability of ECHO
|
||||
- remove use of shopt
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=738835
|
||||
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Signed-off-by: Rémi Cardona <remi@gentoo.org>
|
||||
---
|
||||
gtk/Makefile.am | 13 +++++--------
|
||||
1 file changed, 5 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
|
||||
index 96c651a..b1478ce 100644
|
||||
--- a/gtk/Makefile.am
|
||||
+++ b/gtk/Makefile.am
|
||||
@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
|
||||
endif
|
||||
|
||||
SUBDIRS = inspector native .
|
||||
-if OS_DARWIN
|
||||
- ECHO="echo"
|
||||
-else
|
||||
- ECHO=echo -e
|
||||
-endif
|
||||
+ECHO=printf '%b\n'
|
||||
|
||||
if HAVE_CLOUDPRINT
|
||||
if HAVE_PAPI_CUPS
|
||||
@@ -1405,12 +1401,13 @@ gtk.gresource.xml: Makefile.am
|
||||
n=`basename $$f`; \
|
||||
$(ECHO) " <file compressed=\"true\">ui/$$n</file>" >> $@; \
|
||||
done; \
|
||||
- shopt -s nullglob; \
|
||||
for s in 16x16 22x22 24x24 32x32 48x48; do \
|
||||
for c in actions status; do \
|
||||
for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \
|
||||
- n=`basename $$f`; \
|
||||
- $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \
|
||||
+ if [ -e "$$f" ] ; then \
|
||||
+ n=`basename $$f`; \
|
||||
+ $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \
|
||||
+ fi; \
|
||||
done; \
|
||||
done; \
|
||||
done; \
|
||||
--
|
||||
2.3.0
|
||||
|
||||
39
x11-libs/gtk+/files/gtkrc
Normal file
39
x11-libs/gtk+/files/gtkrc
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
style "default"
|
||||
|
||||
{
|
||||
font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
|
||||
}
|
||||
|
||||
style "button" = "default"
|
||||
|
||||
{
|
||||
bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
|
||||
}
|
||||
|
||||
style "treeitem"
|
||||
{
|
||||
bg[ACTIVE] = { 0.7, 0.7, 0.9 }
|
||||
}
|
||||
|
||||
style "scrollbar" = "button"
|
||||
{
|
||||
bg[ACTIVE] = {0.6, 0.6, 0.6 }
|
||||
}
|
||||
|
||||
style "status" {
|
||||
bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
|
||||
}
|
||||
|
||||
style "gtk-tooltips" {
|
||||
bg[NORMAL] = "#ffff60"
|
||||
}
|
||||
|
||||
class "GtkWidget" style "default"
|
||||
class "GtkButton" style "button"
|
||||
class "GtkItem" style "button"
|
||||
class "GtkProgressBar" style "status"
|
||||
class "GtkScrollbar" style "scrollbar"
|
||||
class "GtkTreeItem" style "treeitem"
|
||||
widget "gtk-tooltips" style "gtk-tooltips"
|
||||
|
||||
|
||||
4
x11-libs/gtk+/files/settings.ini
Normal file
4
x11-libs/gtk+/files/settings.ini
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
[Settings]
|
||||
gtk-theme-name = Adwaita
|
||||
gtk-icon-theme-name = gnome
|
||||
gtk-cursor-theme-name = Adwaita
|
||||
243
x11-libs/gtk+/gtk+-3.14.9.ebuild
Normal file
243
x11-libs/gtk+/gtk+-3.14.9.ebuild
Normal file
|
|
@ -0,0 +1,243 @@
|
|||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild,v 1.6 2015/03/29 10:20:53 jer Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="yes"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
|
||||
inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
|
||||
|
||||
DESCRIPTION="Gimp ToolKit +"
|
||||
HOMEPAGE="http://www.gtk.org/"
|
||||
|
||||
LICENSE="LGPL-2+"
|
||||
SLOT="3"
|
||||
IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
|
||||
REQUIRED_USE="
|
||||
|| ( aqua wayland X )
|
||||
xinerama? ( X )
|
||||
"
|
||||
|
||||
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
# FIXME: introspection data is built against system installation of gtk+:3
|
||||
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
|
||||
# Use gtk+:2 for gtk-update-icon-cache
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
|
||||
>=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
|
||||
media-libs/fontconfig[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
|
||||
>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
|
||||
>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
|
||||
x11-misc/shared-mime-info
|
||||
|
||||
cloudprint? (
|
||||
>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
|
||||
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
|
||||
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.39 )
|
||||
wayland? (
|
||||
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
|
||||
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
|
||||
>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
|
||||
)
|
||||
X? (
|
||||
>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXrender[${MULTILIB_USEDEP}]
|
||||
x11-libs/libX11[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXext[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXcursor[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXfixes[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXcomposite[${MULTILIB_USEDEP}]
|
||||
x11-libs/libXdamage[${MULTILIB_USEDEP}]
|
||||
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-text/docbook-xsl-stylesheets
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
dev-libs/libxslt
|
||||
dev-libs/gobject-introspection-common
|
||||
>=dev-util/gdbus-codegen-2.38.2
|
||||
>=dev-util/gtk-doc-am-1.20
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig[${MULTILIB_USEDEP}]
|
||||
X? (
|
||||
x11-proto/xextproto[${MULTILIB_USEDEP}]
|
||||
x11-proto/xproto[${MULTILIB_USEDEP}]
|
||||
x11-proto/inputproto[${MULTILIB_USEDEP}]
|
||||
x11-proto/damageproto[${MULTILIB_USEDEP}]
|
||||
xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
test? (
|
||||
media-fonts/font-misc-misc
|
||||
media-fonts/font-cursor-misc )
|
||||
"
|
||||
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
|
||||
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
|
||||
# >=xorg-server-1.11.4 needed for
|
||||
# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<gnome-base/gail-1000
|
||||
!<x11-libs/vte-0.31.0:2.90
|
||||
>=x11-themes/adwaita-icon-theme-3.14
|
||||
X? ( !<x11-base/xorg-server-1.11.4 )
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
|
||||
!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
|
||||
)
|
||||
"
|
||||
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/gtk-query-immodules-3.0
|
||||
)
|
||||
|
||||
strip_builddir() {
|
||||
local rule=$1
|
||||
shift
|
||||
local directory=$1
|
||||
shift
|
||||
sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
|
||||
|| die "Could not strip director ${directory} from build."
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=738835
|
||||
epatch "${FILESDIR}"/${PN}-non-bash-support.patch
|
||||
|
||||
epatch "${FILESDIR}/${P}-treeview-change-keyboard-bindings-behaviour.patch"
|
||||
|
||||
# -O3 and company cause random crashes in applications. Bug #133469
|
||||
replace-flags -O3 -O2
|
||||
strip-flags
|
||||
|
||||
if ! use test ; then
|
||||
# don't waste time building tests
|
||||
strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
|
||||
strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
|
||||
fi
|
||||
|
||||
if ! use examples; then
|
||||
# don't waste time building demos
|
||||
strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
|
||||
strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
|
||||
fi
|
||||
|
||||
epatch_user
|
||||
|
||||
eautoreconf
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# need libdir here to avoid a double slash in a path that libtool doesn't
|
||||
# grok so well during install (// between $EPREFIX and usr ...)
|
||||
ECONF_SOURCE=${S} \
|
||||
gnome2_src_configure \
|
||||
$(use_enable aqua quartz-backend) \
|
||||
$(use_enable broadway broadway-backend) \
|
||||
$(use_enable cloudprint) \
|
||||
$(use_enable colord) \
|
||||
$(use_enable cups cups auto) \
|
||||
$(multilib_native_use_enable introspection) \
|
||||
$(use_enable wayland wayland-backend) \
|
||||
$(use_enable X x11-backend) \
|
||||
$(use_enable X xcomposite) \
|
||||
$(use_enable X xdamage) \
|
||||
$(use_enable X xfixes) \
|
||||
$(use_enable X xkb) \
|
||||
$(use_enable X xrandr) \
|
||||
$(use_enable xinerama) \
|
||||
--disable-papi \
|
||||
--enable-man \
|
||||
--enable-gtk2-dependency \
|
||||
--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
|
||||
|
||||
# work-around gtk-doc out-of-source brokedness
|
||||
if multilib_is_native_abi; then
|
||||
local d
|
||||
for d in gdk gtk libgail-util; do
|
||||
ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# FIXME: this should be handled at eclass level
|
||||
"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
|
||||
|
||||
unset DBUS_SESSION_BUS_ADDRESS
|
||||
unset DISPLAY #527682
|
||||
GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
gnome2_src_install
|
||||
|
||||
# add -framework Carbon to the .pc files, bug #????
|
||||
if use aqua ; then
|
||||
for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
|
||||
sed -e "s:Libs\: :Libs\: -framework Carbon :" \
|
||||
-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
insinto /etc/gtk-3.0
|
||||
doins "${FILESDIR}"/settings.ini
|
||||
|
||||
dodoc AUTHORS ChangeLog* HACKING NEWS* README*
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_pkg_preinst
|
||||
|
||||
multilib_pkg_preinst() {
|
||||
# Make immodules.cache belongs to gtk+ alone
|
||||
local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
|
||||
|
||||
if [[ -e ${EROOT}${cache} ]]; then
|
||||
cp "${EROOT}"${cache} "${ED}"/${cache} || die
|
||||
else
|
||||
touch "${ED}"/${cache} || die
|
||||
fi
|
||||
}
|
||||
multilib_parallel_foreach_abi multilib_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_pkg_postinst
|
||||
|
||||
multilib_pkg_postinst() {
|
||||
gnome2_query_immodules_gtk3 \
|
||||
|| die "Update immodules cache failed (for ${ABI})"
|
||||
}
|
||||
multilib_parallel_foreach_abi multilib_pkg_postinst
|
||||
|
||||
if ! has_version "app-text/evince"; then
|
||||
elog "Please install app-text/evince for print preview functionality."
|
||||
elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
|
||||
elog "add it to your settings.ini file."
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_pkg_postrm
|
||||
|
||||
if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
|
||||
multilib_pkg_postrm() {
|
||||
rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
|
||||
}
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in a new issue