diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-util/glade | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-util/glade')
-rw-r--r-- | dev-util/glade/Manifest | 2 | ||||
-rw-r--r-- | dev-util/glade/files/glade-3.14.1-doc-version.patch | 29 | ||||
-rw-r--r-- | dev-util/glade/files/glade-3.18.1-underlinking.patch | 46 | ||||
-rw-r--r-- | dev-util/glade/glade-3.18.3.ebuild | 96 | ||||
-rw-r--r-- | dev-util/glade/glade-3.8.5.ebuild | 51 | ||||
-rw-r--r-- | dev-util/glade/metadata.xml | 5 |
6 files changed, 229 insertions, 0 deletions
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest new file mode 100644 index 000000000000..9f18ac1f85b7 --- /dev/null +++ b/dev-util/glade/Manifest @@ -0,0 +1,2 @@ +DIST glade-3.18.3.tar.xz 3266400 SHA256 ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452 SHA512 6e98d6ba98118fde4066f983024818528ac8c82d176896e2c5c62a19094377df4bf4c6b4edd028cd72bf8744c807c28a930e467f2a23670537b02af327b683f8 WHIRLPOOL 4e1e86b86216739007b3524464a5fcaf07c66ba5adc36a3c497c0c411401fffc6345db2722a1b0f85d1e1e13c920553014e4eac3bdbbd2dcc7ddbd8ac7cb41a3 +DIST glade3-3.8.5.tar.xz 2322076 SHA256 58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735 SHA512 722a33f1a1ec3baa785bf3c6f7f5ec2cbe7cf6fe44c9c26d33728de16f2856cbb1ace0cd38c5b5356081e326666cc82fd00f2b6af53bd06bb832079610042985 WHIRLPOOL 672c38822dd04e43e2a3c6642fa34e9e485172d943a0abd5e16f7f378f73bc9126768955d9aad431960f5966be8edaa26a755ca28e2644a790c111e0b6c0142d 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 000000000000..39c9641719a4 --- /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 <tetromino@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.18.1-underlinking.patch b/dev-util/glade/files/glade-3.18.1-underlinking.patch new file mode 100644 index 000000000000..f34c03a2da58 --- /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 <tetromino@gentoo.org> +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 <stdarg.h>], [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.18.3.ebuild b/dev-util/glade/glade-3.18.3.ebuild new file mode 100644 index 000000000000..7c8b395af4ae --- /dev/null +++ b/dev-util/glade/glade-3.18.3.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="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" +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 +} diff --git a/dev-util/glade/glade-3.8.5.ebuild b/dev-util/glade/glade-3.8.5.ebuild new file mode 100644 index 000000000000..7bbc82cba077 --- /dev/null +++ b/dev-util/glade/glade-3.8.5.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="yes" +GNOME_ORG_MODULE="glade3" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit eutils gnome2 python-single-r1 + +DESCRIPTION="A user interface designer for GTK+ and GNOME" +HOMEPAGE="http://glade.gnome.org/" + +LICENSE="GPL-2+ FDL-1.1+" +SLOT="3/11" # subslot = suffix of libgladeui-1.so +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="gnome python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/glib-2.8:2 + >=x11-libs/gtk+-2.24:2 + >=dev-libs/libxml2-2.4:2 + gnome? ( + >=gnome-base/libgnomeui-2 + >=gnome-base/libbonoboui-2 ) + python? ( + ${PYTHON_DEPS} + >=dev-python/pygtk-2.10:2 ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.35 + virtual/pkgconfig + sys-devel/gettext + >=app-text/gnome-doc-utils-0.9 + app-text/docbook-xml-dtd:4.1.2 +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + gnome2_src_configure \ + --enable-libtool-lock \ + $(use_enable gnome) \ + $(use_enable python) +} diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml new file mode 100644 index 000000000000..da6fd63d0085 --- /dev/null +++ b/dev-util/glade/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>gnome</herd> +</pkgmetadata> |