From 53804ba56ebaa102e84002724e2673eca98cf850 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sat, 27 Feb 2016 11:54:08 +0300 Subject: [PATCH] Glade 3.19.0 added. --- dev-util/glade/Manifest | 1 + .../files/glade-3.14.1-doc-version.patch | 29 ++++++ .../files/glade-3.18.1-underlinking.patch | 46 +++++++++ dev-util/glade/glade-3.19.0.ebuild | 96 +++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 dev-util/glade/Manifest create mode 100644 dev-util/glade/files/glade-3.14.1-doc-version.patch create mode 100644 dev-util/glade/files/glade-3.18.1-underlinking.patch create mode 100644 dev-util/glade/glade-3.19.0.ebuild diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest new file mode 100644 index 00000000..fdd69051 --- /dev/null +++ b/dev-util/glade/Manifest @@ -0,0 +1 @@ +DIST glade-3.19.0.tar.xz 3398764 SHA256 a7a3f6d32fbfcc9b754b48a3410bf025e462bc7898e124f0ad8f64c3d7ad6fa2 SHA512 5b8b03720433bc6e108d3ebc72eb2ee4f2e87dc8f6fc9190accb9d56b8dd81e96f23576f58fa3c0bb8a50c5b9becf2f1ef8a80277633a626c035069e5a0f9c4b WHIRLPOOL 3193e169ddeaa3b4b2fa9f1ee38331b7b14d673a297cc1133628b15b9ebcf4e84f355ac8c89a32cda3a3c96a40150bbc33ebc232725881ee4f2445bb40342674 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 new file mode 100644 index 00000000..39c96417 --- /dev/null +++ b/dev-util/glade/files/glade-3.14.1-doc-version.patch @@ -0,0 +1,29 @@ +From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +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.18.1-underlinking.patch b/dev-util/glade/files/glade-3.18.1-underlinking.patch new file mode 100644 index 00000000..f34c03a2 --- /dev/null +++ b/dev-util/glade/files/glade-3.18.1-underlinking.patch @@ -0,0 +1,46 @@ +From 80c9532e39fac397960fc59eb407e596d9e8d2e4 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Mon, 2 Jun 2014 22:41:14 -0400 +Subject: [PATCH] build: Explicitly link libgladeui with libm + +Fixes underlinking failure with ld.gold. + +https://bugzilla.gnome.org/show_bug.cgi?id=724104 +--- + configure.ac | 6 ++++++ + gladeui/Makefile.am | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c86e947..7bf65e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -133,6 +133,12 @@ AC_TRY_LINK([#include ], [va_list ap1, ap2; va_copy(ap1, ap2);], + ]) + + dnl ================================================================ ++dnl libm ++dnl ================================================================ ++AC_CHECK_LIBM ++AC_SUBST(LIBM) ++ ++dnl ================================================================ + dnl Check for gtk-doc + dnl ================================================================ + GTK_DOC_CHECK([1.13],[--flavour no-tmpl]) +diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am +index c63b6a3..77af09c 100644 +--- a/gladeui/Makefile.am ++++ b/gladeui/Makefile.am +@@ -145,7 +145,7 @@ libgladeui_2_la_CFLAGS = \ + $(AM_CFLAGS) + + libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) +-libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) ++libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) $(LIBM) + + libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui + libgladeuiinclude_HEADERS = \ +-- +2.0.0 + diff --git a/dev-util/glade/glade-3.19.0.ebuild b/dev-util/glade/glade-3.19.0.ebuild new file mode 100644 index 00000000..fb02d7a8 --- /dev/null +++ b/dev-util/glade/glade-3.19.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="https://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" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +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 + + # https://bugzilla.gnome.org/show_bug.cgi?id=724104 + epatch "${FILESDIR}"/${PN}-3.18.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 +}