[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
commit: 7a029594c850603a417d3575fd43132377f541f3
Author: Mart Raudsepp gentoo org>
AuthorDate: Fri Jan 18 21:05:54 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Fri Jan 18 21:05:54 2019 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7a029594
x11-libs/gtk+: Remove very outdated live ebuild
It's gtk4 into SLOT=3, tries to build with autotools (isn't a thing
for gtk4 git), and hasn't been synced with other changes for over
3 years, it seems. On top of that, later blind fixes broke the
dependency string.
Closes: https://bugs.gentoo.org/674514
Signed-off-by: Mart Raudsepp gentoo.org>
.../gtk+-3.16.2-remove_update-icon-cache.patch | 24 --
x11-libs/gtk+/files/gtk+-non-bash-support.patch| 56 -
x11-libs/gtk+/files/settings.ini | 4 -
x11-libs/gtk+/gtk+-.ebuild | 265 -
x11-libs/gtk+/metadata.xml | 23 --
5 files changed, 372 deletions(-)
diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
deleted file mode 100644
index b121dd57..
--- a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider
-Date: Thu, 16 Apr 2015 23:51:51 +0200
-Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS
-
- gtk/Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 83dfe31..a5afc03 100644
a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1380,7 +1380,6 @@ endif
- #
- bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
-- gtk-update-icon-cache \
- gtk-encode-symbolic-svg \
- gtk-launch
-
---
-2.0.5
-
diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch
b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
deleted file mode 100644
index a1aac42c..
--- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 43a4a28cdc60ac7347bb89f84cf049cb3401621d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?=
-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
-Signed-off-by: Rémi Cardona
- 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) "ui/$$n" >> $@; \
- 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) "icons/$$s/$$c/$$n" >> $@; \
-+if [ -e "$$f" ] ; then \
-+ n=`basename $$f`; \
-+ $(ECHO) "icons/$$s/$$c/$$n" >> $@; \
-+fi; \
- done; \
- done; \
- done; \
---
-2.3.0
-
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
deleted file mode 100644
index a65c0a81..
--- a/x11-libs/gtk+/files/settings.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Settings]
-gtk-theme-name = Adwaita
-gtk-icon-theme-name = gnome
-gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-.ebuild b/x11-libs/gtk+/gtk+-.ebuild
deleted file mode 100644
index b6b62d7d..
--- a/x11-libs/gtk+/gtk+-.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-if [[ ${PV} = ]]; then
- inherit gnome2-live
-fi
-
-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 )
-"
-
-if [[ ${PV} = ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
commit: e8432718a163db9e0c2389815e034678413b247e
Author: Rémi Cardona remi AT gentoo DOT org
AuthorDate: Sun Nov 30 15:51:35 2014 +
Commit: Remi Cardona remi AT gentoo DOT org
CommitDate: Sun Nov 30 15:52:17 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e8432718
x11-libs/gtk+: Fix build with dash as /bin/sh
See bug #525928.
---
x11-libs/gtk+/files/gtk+-non-bash-support.patch | 29 +
x11-libs/gtk+/gtk+-3.14.5.ebuild| 6 -
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch
b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
new file mode 100644
index 000..efd13e6
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
@@ -0,0 +1,29 @@
+From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy alexan...@tsoy.me
+Date: Sun, 26 Oct 2014 01:59:33 +0400
+Subject: [PATCH] gtk/Makefile.am: improve portability of ECHO
+
+---
+ gtk/Makefile.am | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index f60bec8..e923940 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
+--
+2.0.4
+
diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.5.ebuild
index 122f8e6..98e6e47 100644
--- a/x11-libs/gtk+/gtk+-3.14.5.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
GCONF_DEBUG=no
GNOME2_LA_PUNT=yes
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+inherit eutils flag-o-matic autotools gnome2 multilib virtualx multilib-minimal
DESCRIPTION=Gimp ToolKit +
HOMEPAGE=http://www.gtk.org/;
@@ -108,6 +108,9 @@ strip_builddir() {
}
src_prepare() {
+ # see bug #525928
+ epatch ${FILESDIR}/${PN}-non-bash-support.patch
+
# -O3 and company cause random crashes in applications. Bug #133469
replace-flags -O3 -O2
strip-flags
@@ -128,6 +131,7 @@ src_prepare() {
strip_builddir SRC_SUBDIRS examples Makefile.in
fi
+ eautoreconf
gnome2_src_prepare
}
[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/
commit: ce681553520b9ea3372eb3d7c9aa360a2f2b8c94
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Apr 20 15:38:08 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ce681553
x11-libs/gtk+: QAed
* Packagekit support was dropped.
* Cosmetic changes to dependencies.
* Fix keywords.
* Sync live ebuild.
---
.../gtk+/files/gtk+-3.3.18-fallback-theme.patch| 81 --
x11-libs/gtk+/gtk+-3.12.0.ebuild | 17 +++--
x11-libs/gtk+/gtk+-.ebuild | 41 ++-
3 files changed, 28 insertions(+), 111 deletions(-)
diff --git a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
deleted file mode 100644
index 7f5d0a1..000
--- a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1a3f790830c2db70eb3369e684c3cd8ac3b8051b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev tetrom...@gentoo.org
-Date: Wed, 14 Mar 2012 23:08:53 -0400
-Subject: [PATCH] settings: fall back to settings.ini gtk theme if requested
- theme fails
-
-If a gtk3 application is run in gnome2 and the settings daemon uses
-xsettings to request a gtk2 theme with no gtk3 version (which is the
-case by default), then instead of failing to load any theme, we should
-attempt to fall back to the theme specified in settings.ini files.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654108
- gtk/gtksettings.c | 23 +++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index 2e17430..354ba34 100644
a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -115,6 +115,7 @@ struct _GtkSettingsPrivate
- GtkCssProvider *theme_provider;
- GtkCssProvider *key_theme_provider;
- GtkStyleProperties *style;
-+ gchar *fallback_gtk_theme_name;
- };
-
- typedef enum
-@@ -1528,6 +1529,8 @@ gtk_settings_finalize (GObject *object)
- if (priv-style)
- g_object_unref (priv-style);
-
-+ g_free (priv-fallback_gtk_theme_name);
-+
- G_OBJECT_CLASS (gtk_settings_parent_class)-finalize (object);
- }
-
-@@ -1889,6 +1892,12 @@ apply_queued_setting (GtkSettings *settings,
- if (pspec-param_id == PROP_COLOR_SCHEME)
- merge_color_scheme (settings, tmp_value, qvalue-source);
-
-+ if (!g_strcmp0 (pspec-name, gtk-theme-name) qvalue-source ==
GTK_SETTINGS_SOURCE_DEFAULT)
-+{
-+ g_free (priv-fallback_gtk_theme_name);
-+ priv-fallback_gtk_theme_name = g_value_dup_string (tmp_value);
-+}
-+
- if (priv-property_values[pspec-param_id - 1].source = qvalue-source)
- {
- g_value_copy (tmp_value, priv-property_values[pspec-param_id -
1].value);
-@@ -2594,6 +2603,10 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
- }
- i++;
- }
-+
-+ g_free (priv-fallback_gtk_theme_name);
-+ priv-fallback_gtk_theme_name = NULL;
-+
- g_object_thaw_notify (G_OBJECT (settings));
- g_free (pspecs);
- }
-@@ -2881,6 +2894,16 @@ settings_update_theme (GtkSettings *settings)
-
- if (!provider)
- provider = gtk_css_provider_get_named (theme_name, NULL);
-+
-+ /* If we failed, fall back to the theme from settings.ini */
-+ if (!provider priv-fallback_gtk_theme_name
*priv-fallback_gtk_theme_name
-+ g_strcmp0 (theme_name, priv-fallback_gtk_theme_name))
-+{
-+ provider = gtk_css_provider_get_named
(priv-fallback_gtk_theme_name, NULL);
-+
-+ if (!provider)
-+provider = gtk_css_provider_get_named
(priv-fallback_gtk_theme_name, NULL);
-+}
- }
-
- /* If we didn't find the named theme, fall back */
---
-1.7.8.5
-
diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.0.ebuild
index d891bcc..ee97028 100644
--- a/x11-libs/gtk+/gtk+-3.12.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.10.8.ebuild,v 1.4
2014/04/16 07:49:22 ago Exp $
+# $Header: $
EAPI=5
GCONF_DEBUG=no
@@ -18,12 +18,12 @@ SLOT=3
# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
# I tried this and got it all compiling, but the end result is unusable as it
# horribly mixes up the backends -- grobian
-IUSE=aqua cloudprint colord cups debug examples +introspection packagekit
test vim-syntax wayland X xinerama
+IUSE=aqua cloudprint colord cups debug 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
