From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- gnome-base/libglade/Manifest | 7 ++ .../files/Makefile.in.am-2.4.2-xmlcatalog.patch | 22 +++++ .../files/libglade-2.6.3-fix_tests-page_size.patch | 11 +++ .../files/libglade-2.6.4-enable-extensions.patch | 14 +++ .../files/libglade-2.6.4-gold-glib-2.32.patch | 17 ++++ gnome-base/libglade/libglade-2.6.4-r2.ebuild | 102 +++++++++++++++++++++ gnome-base/libglade/metadata.xml | 11 +++ 7 files changed, 184 insertions(+) create mode 100644 gnome-base/libglade/Manifest create mode 100644 gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch create mode 100644 gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch create mode 100644 gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch create mode 100644 gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch create mode 100644 gnome-base/libglade/libglade-2.6.4-r2.ebuild create mode 100644 gnome-base/libglade/metadata.xml (limited to 'gnome-base/libglade') diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest new file mode 100644 index 000000000000..af82907e460b --- /dev/null +++ b/gnome-base/libglade/Manifest @@ -0,0 +1,7 @@ +AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1121 BLAKE2B 44306faa45d22aedf392202a74dd52ebbd9ac67cf908f3f9c9318e7807b32ed3755df375aa2bfcd116f4a480a67c91e9896421633591c6978b1779f2bfa1775a SHA512 9b183d34df84e3bc4eb8e4484ed59a40d54b4fb33b5f2208e13cd4619bcdacd0276a339d9020505764cb0a99fd83255199eda53b48979656b81850144993be86 +AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf5c5e7eaf74598991c3c80ff8a7bdc620f4b8e3fe9bb8852f88f84af24e5de4436fecbf7152d6ad5dbb96a3ded915dce69a506a941 SHA512 b294e48205725b4c3adc81fc86e28fd49bd902871eee64f21d4c3d14d1c9f65fd98e17aee99c39146d6fb7c128f3669e2bc99523240466c49e271912c20da35d +AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde +AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8 +DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735 +EBUILD libglade-2.6.4-r2.ebuild 2876 BLAKE2B dedbc0a48031f319bcea42aa31e97c6b1926f75875e81bd912d47cc8d79fc12195b48c3558bbefbbe87f6a29d334d077f2f94e655b15c311d9ee09ccf7ba3e89 SHA512 2ef8d6806fb65620e2dad89f8c2930d77a28a7a8090a0b72477e0c34a01e1346e665ce40f524c2b393832a39e310ff832456351ffad4bc88b774a1d18401db9e +MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3 diff --git a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch new file mode 100644 index 000000000000..059cdc20f794 --- /dev/null +++ b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch @@ -0,0 +1,22 @@ +--- a/Makefile.am 2004-11-11 18:56:13.000000000 +0800 ++++ b/Makefile.am 2004-12-06 11:00:24.501734048 +0800 +@@ -24,7 +24,7 @@ + + if HAVE_XMLCATALOG + install-data-local: +- -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) ++# -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + uninstall-local: + -$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + endif +--- a/Makefile.in 2004-11-11 19:21:38.000000000 +0800 ++++ b/Makefile.in 2004-12-06 11:00:49.786890120 +0800 +@@ -819,7 +819,7 @@ + + + @HAVE_XMLCATALOG_TRUE@install-data-local: +-@HAVE_XMLCATALOG_TRUE@ -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) ++@HAVE_XMLCATALOG_TRUE@# -$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + @HAVE_XMLCATALOG_TRUE@uninstall-local: + @HAVE_XMLCATALOG_TRUE@ -$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE) + diff --git a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch new file mode 100644 index 000000000000..37c5b69e544c --- /dev/null +++ b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch @@ -0,0 +1,11 @@ +--- a/tests/test-libglade-gtk.glade 2008-09-27 16:50:40.164242312 +0300 ++++ b/tests/test-libglade-gtk.glade 2008-09-27 16:50:43.460908927 +0300 +@@ -470,7 +470,7 @@ + 100 + 1 + 10 +- 10 ++ 0 + + 1 + 2 diff --git a/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch b/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch new file mode 100644 index 000000000000..9be8fb93bf84 --- /dev/null +++ b/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch @@ -0,0 +1,14 @@ +AC_USE_SYSTEM_EXTENSIONS needed for Solaris + +https://bugs.gentoo.org/show_bug.cgi?id=430090 + +--- a/configure.in ++++ b/configure.in +@@ -22,6 +22,7 @@ + fi + + AC_PROG_CC ++AC_USE_SYSTEM_EXTENSIONS + AC_ISC_POSIX + AC_HEADER_STDC + diff --git a/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch b/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch new file mode 100644 index 000000000000..0696dce58760 --- /dev/null +++ b/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch @@ -0,0 +1,17 @@ + configure.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index e0c52a8..b2a4a4a 100644 +--- a/configure.in ++++ b/configure.in +@@ -46,7 +46,8 @@ PKG_CHECK_MODULES(LIBGLADE, [dnl + libxml-2.0 >= required_libxml_version dnl + atk >= required_atk_version dnl + gtk+-2.0 >= required_gtk_version dnl +- glib-2.0 >= required_glib_version]) ++ glib-2.0 >= required_glib_version dnl ++ gmodule-no-export-2.0 >= required_glib_version]) + + AC_MSG_CHECKING([for native Win32]) + case "$host" in diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild new file mode 100644 index 000000000000..c84622335aa7 --- /dev/null +++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="bz2" +GNOME2_LA_PUNT="yes" + +PYTHON_COMPAT=( python2_7 pypy ) +PYTHON_REQ_USE='xml(+)' + +inherit autotools eutils gnome2 multilib-minimal python-single-r1 virtualx + +DESCRIPTION="Library to construct graphical interfaces at runtime" +HOMEPAGE="https://library.gnome.org/devel/libglade/stable/" + +LICENSE="LGPL-2" +SLOT="2.0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs test tools" +REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] + >=dev-libs/atk-2.10.0[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] + tools? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +pkg_setup() { + use tools && python-single-r1_pkg_setup +} + +src_prepare() { + # patch to stop make install installing the xml catalog + # because we do it ourselves in postinst() + epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch + + # patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort + epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch" + + # Fails with gold due to recent changes in glib-2.32's pkg-config files + epatch "${FILESDIR}/${P}-gold-glib-2.32.patch" + + # Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h + epatch "${FILESDIR}/${P}-enable-extensions.patch" + + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ + glade/Makefile.am glade/Makefile.in || die + + if ! use test; then + sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed" + fi + + gnome2_src_prepare + AT_NOELIBTOOLIZE=yes eautoreconf +} + +multilib_src_configure() { + if ! multilib_is_native_abi || ! use tools; then + export am_cv_pathless_PYTHON=none + fi + + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + $(use_enable static-libs static) + + if multilib_is_native_abi; then + ln -s "${S}"/doc/html doc/html || die + fi +} + +multilib_src_test() { + Xemake check || die "make check failed" +} + +multilib_src_install() { + dodir /etc/xml + gnome2_src_install +} + +multilib_src_install_all() { + local DOCS=( AUTHORS ChangeLog NEWS README ) + einstalldocs +} + +pkg_postinst() { + echo ">>> Updating XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \ + "https://glade.gnome.org/glade-2.0.dtd" \ + "${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog + gnome2_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm + echo ">>> removing entries from the XML catalog" + "${EPREFIX}"/usr/bin/xmlcatalog --noout --del \ + "${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog +} diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml new file mode 100644 index 000000000000..be1a70fa45d5 --- /dev/null +++ b/gnome-base/libglade/metadata.xml @@ -0,0 +1,11 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + + Install libglade-convert Python script. + + -- cgit v1.2.3