commit: 6c3412001640ecb5905f1de5affb5ab707b1136b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 26 23:54:18 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 23:54:18 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6c341200
dev-util/glade: moved to gentoo-x86
---
.../glade/files/glade-3.14.1-doc-version.patch | 29 -------
.../glade/files/glade-3.16.1-underlinking.patch | 71 ----------------
dev-util/glade/glade-3.18.2.ebuild | 94 ----------------------
dev-util/glade/metadata.xml | 5 --
4 files changed, 199 deletions(-)
diff --git a/dev-util/glade/files/glade-3.14.1-doc-version.patch
b/dev-util/glade/files/glade-3.14.1-doc-version.patch
deleted file mode 100644
index 39c9641..0000000
--- a/dev-util/glade/files/glade-3.14.1-doc-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetrom...@gentoo.org>
-Date: Sun, 6 May 2012 22:40:47 -0400
-Subject: [PATCH] Version glade documentation
-
-Rename gnome help files to prevent collision with other versions.
-
-Avoid loading glade-3.8's devhelp files.
----
- help/Makefile.am | 5 ++++-
- src/glade-window.c | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/glade-window.c b/src/glade-window.c
-index 89a4549..4eb8be5 100644
---- a/src/glade-window.c
-+++ b/src/glade-window.c
-@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action,
GladeWindow * window)
- {
- if (glade_util_have_devhelp ())
- {
-- glade_util_search_devhelp ("gladeui", NULL, NULL);
-+ glade_util_search_devhelp ("gladeui-2", NULL, NULL);
- return;
- }
-
---
-1.7.8.6
-
diff --git a/dev-util/glade/files/glade-3.16.1-underlinking.patch
b/dev-util/glade/files/glade-3.16.1-underlinking.patch
deleted file mode 100644
index b97426c..0000000
--- a/dev-util/glade/files/glade-3.16.1-underlinking.patch
+++ /dev/null
@@ -1,71 +0,0 @@
- gladeui/Makefile.am | 4 ++--
- src/Makefile.am | 2 +-
- tests/Makefile.am | 6 +++---
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
-index 87d610c..8fc02a0 100644
---- a/gladeui/Makefile.am
-+++ b/gladeui/Makefile.am
-@@ -19,7 +19,7 @@ glade_previewer_CFLAGS = \
-
- glade_previewer_LDFLAGS = $(AM_LDFLAGS)
-
--glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS)
-+glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) -lm
-
- glade_previewer_SOURCES = \
- glade-previewer.c \
-@@ -263,7 +263,7 @@ introspection_sources = $(libgladeui_2_la_SOURCES)
$(libgladeuiinclude_HEADERS)
- Gladeui-2.0.gir: libgladeui-2.la
- Gladeui_2_0_gir_INCLUDES = Gtk-3.0
- Gladeui_2_0_gir_CFLAGS = $(INCLUDES)
--Gladeui_2_0_gir_LIBS = libgladeui-2.la
-+Gladeui_2_0_gir_LIBS = libgladeui-2.la m
- Gladeui_2_0_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += Gladeui-2.0.gir
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 89e597e..83dd436 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -18,7 +18,7 @@ glade_CFLAGS = \
-
- glade_LDFLAGS = $(AM_LDFLAGS) $(GMODULE_EXPORT_LDFLAGS)
-
--glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS)
-+glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) -lm
-
- BUILT_SOURCES = glade-resources.c glade-resources.h
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index fc96195..3099186 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -28,7 +28,7 @@ progs_ldadd = $(top_builddir)/gladeui/libgladeui-2.la
- create_widgets_CPPFLAGS = $(progs_cppflags)
- create_widgets_CFLAGS = $(progs_cflags)
- create_widgets_LDFLAGS = $(progs_libs)
--create_widgets_LDADD = $(progs_ldadd)
-+create_widgets_LDADD = $(progs_ldadd) -lm
- create_widgets_SOURCES = create-widgets.c
-
- # Test that various types of container widgets
-@@ -37,7 +37,7 @@ create_widgets_SOURCES = create-widgets.c
- add_child_CPPFLAGS = $(progs_cppflags)
- add_child_CFLAGS = $(progs_cflags)
- add_child_LDFLAGS = $(progs_libs)
--add_child_LDADD = $(progs_ldadd)
-+add_child_LDADD = $(progs_ldadd) -lm
- add_child_SOURCES = add-child.c
-
- TOPLEVEL_ORDER_FILES = \
-@@ -63,7 +63,7 @@ toplevel-order-resources.c: $(TOPLEVEL_ORDER_FILES)
- toplevel_order_CPPFLAGS = $(progs_cppflags)
- toplevel_order_CFLAGS = $(progs_cflags)
- toplevel_order_LDFLAGS = $(progs_libs)
--toplevel_order_LDADD = $(progs_ldadd)
-+toplevel_order_LDADD = $(progs_ldadd) -lm
- toplevel_order_SOURCES = \
- toplevel-order.c \
- toplevel-order-resources.c
diff --git a/dev-util/glade/glade-3.18.2.ebuild
b/dev-util/glade/glade-3.18.2.ebuild
deleted file mode 100644
index 0d98e4f..0000000
--- a/dev-util/glade/glade-3.18.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/";
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
-IUSE="+introspection python"
-
-RDEPEND="
- dev-libs/atk[introspection?]
- >=dev-libs/glib-2.32:2
- >=dev-libs/libxml2-2.4.0:2
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.12:3[introspection?]
- x11-libs/pango[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.32 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools
- dev-libs/libxslt
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.41.0
- virtual/pkgconfig
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf requires:
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # To avoid file collison with other slots, rename help module.
- # Prevent the UI from loading glade:3's gladeui devhelp documentation.
- epatch \
- "${FILESDIR}"/${PN}-3.14.1-doc-version.patch \
- "${FILESDIR}"/${PN}-3.16.1-underlinking.patch
-
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-gladeui \
- --enable-libtool-lock \
- $(use_enable introspection) \
- $(use_enable python) \
- ITSTOOL=$(type -P true)
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- # modify Name in .desktop file to avoid confusion with other slots
- sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
- -i data/glade.desktop || die "sed of data/glade.desktop failed"
- # modify name in .devhelp2 file to avoid shadowing with glade:3 docs
- sed -e 's:name="gladeui":name="gladeui-2":' \
- -i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2
failed"
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if ! has_version dev-util/devhelp ; then
- elog "You may want to install dev-util/devhelp for integration
API"
- elog "documentation support."
- fi
-}
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
deleted file mode 100644
index 6e0e2ec..0000000
--- a/dev-util/glade/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>gnome</herd>
-</pkgmetadata>
