From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- gnome-base/librsvg/Manifest | 5 -- .../files/librsvg-2.40.12-gtk-optional.patch | 58 ------------- .../files/librsvg-2.40.2-vala-out-of-source.patch | 28 ------- gnome-base/librsvg/librsvg-2.40.18.ebuild | 97 ---------------------- gnome-base/librsvg/metadata.xml | 11 --- 5 files changed, 199 deletions(-) delete mode 100644 gnome-base/librsvg/Manifest delete mode 100644 gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch delete mode 100644 gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch delete mode 100644 gnome-base/librsvg/librsvg-2.40.18.ebuild delete mode 100644 gnome-base/librsvg/metadata.xml (limited to 'gnome-base/librsvg') diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest deleted file mode 100644 index 8942de41ecdd..000000000000 --- a/gnome-base/librsvg/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX librsvg-2.40.12-gtk-optional.patch 2192 BLAKE2B 6f04fb0a8ad1cef7847eab6b74708343c558b32256b19c70dc6e90ef8894e59b0992d214261dc1fe5ffcb020b5f2f3dd16fb73747e85cc03f0e017b5c5758281 SHA512 d9af98164138c52781117d72b4245ac03b7049f8743cc7f644314ba10d0e74c0f2f08a7c9d163bdef3e07ca3a66ce75089c23af3562ff0afebbae838c901bddb -AUX librsvg-2.40.2-vala-out-of-source.patch 1066 BLAKE2B 43bb0dfdc90f3fe3084e23ee5d275d92e41a60f7f5c3763180c91232f4543fe93b036ff22a455247b15d09f514bd8a9a4145ac1aec09b444cb9fc5414410c4b9 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f -DIST librsvg-2.40.18.tar.xz 574384 BLAKE2B 964997ef3bd5f8bdcab43e67f22d12458683c0eeee2fa81e7a6199f6a31c7ac11c599327a6a66118000f63549ea735a042c71429635f6dc9bf073f12eab067b6 SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182 -EBUILD librsvg-2.40.18.ebuild 2676 BLAKE2B e47af1be268099f6b78b7ef3b66609e3f69e70d207e1df4bccd002b604638fd166b028de95646c6dfe39b3dcbe090a2e67679e02fc4c42b09f3a53cc0542f27d SHA512 a1f1a21701c19546b0cc78a45b29c4bb8f643829b007f45a1d221477115c5f667e57342338a40e5e566617e5fd6c6f60d361b041a55c4c992ed4d93a83237a1f -MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4 diff --git a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch deleted file mode 100644 index b7c5b85223de..000000000000 --- a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Tue, 19 Nov 2013 16:00:29 +0000 -Subject: [PATCH] configure: add option to enable/disable use of GTK+ - -Distro packagers like predictability and automatically detected optional -dependencies are not predicable. Add a --with-gtk3 option (default to "auto") -for forcibly controlling whether GTK+ will be used or not. - -Signed-off-by: Ross Burton - -https://bugzilla.gnome.org/show_bug.cgi?id=712693 ---- - configure.in | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/configure.in b/configure.in -index f7a89dc..1498f72 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) - # GTK - # =========================================================================== - --PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) -- - GTK3_BINARY_VERSION= - --if test "$have_gtk_3" = "yes"; then -- GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" -+AC_MSG_CHECKING([whether to use GTK+ 3]) -+AC_ARG_WITH([gtk3], -+ [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])], -+ [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])]) -+AC_MSG_RESULT([$with_gtk3]) -+ -+if test "$with_gtk3" = "yes"; then -+ PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) -+ GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" - fi - - AC_SUBST([GTK3_BINARY_VERSION]) - --AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"]) -+AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"]) - - dnl =========================================================================== - dnl GDK-Pixbuf SVG loader -@@ -305,6 +310,6 @@ librsvg-$VERSION - Build introspectable bindings: ${found_introspection} - Build Vala bindings: ${enable_vala} - Build GdkPixbuf loader: ${enable_pixbuf_loader} -- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} -+ GTK 3.0: ${with_gtk3} - Build miscellaneous tools: ${build_misc_tools} - " --- -1.7.10.4 \ No newline at end of file diff --git a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch b/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch deleted file mode 100644 index bda090572a8d..000000000000 --- a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bf4da5524d50e1068f851bcbe50c8f8ae1948d73 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 18 Jun 2014 09:44:51 +0200 -Subject: [PATCH] build: Fix building .vapi out-of-source. - -Rsvg-2.0-custom.vala file resides in $(srcdir), and therefore full path -needs to be given to vapigen. Otherwise, the build fails when build is -performed out-of-source. ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index e881100..dc6b0c9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -257,7 +257,7 @@ VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi - - librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo - librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(srcdir) --librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir Rsvg-$(RSVG_API_VERSION)-custom.vala -+librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir $(srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala - - vapidir = $(datadir)/vala/vapi - vapi_DATA = $(VAPIGEN_VAPIS) --- -2.0.0 - diff --git a/gnome-base/librsvg/librsvg-2.40.18.ebuild b/gnome-base/librsvg/librsvg-2.40.18.ebuild deleted file mode 100644 index 2ab6d776ea39..000000000000 --- a/gnome-base/librsvg/librsvg-2.40.18.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit autotools eutils gnome2 multilib-minimal vala - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="+introspection tools vala" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) - tools? ( >=x11-libs/gtk+-3.10.0:3 ) -" -DEPEND="${RDEPEND} - dev-libs/gobject-introspection-common - dev-libs/vala-common - >=dev-util/gtk-doc-am-1.13 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - vala? ( $(vala_depend) ) -" -# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=653323 - eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=731826 - eapply "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch" - - eautoreconf - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # -Bsymbolic is not supported by the Darwin toolchain - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( --disable-Bsymbolic ) - fi - - # --disable-tools even when USE=tools; the tools/ subdirectory is useful - # only for librsvg developers - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --disable-tools \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_with tools gtk3) \ - $(multilib_native_use_enable vala) \ - --enable-pixbuf-loader \ - "${myconf[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/doc/html doc/html || die - fi -} - -multilib_src_compile() { - # causes segfault if set, see bug #411765 - unset __GL_NO_DSO_FINALIZER - gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postinst -} - -pkg_postrm() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postrm -} diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml deleted file mode 100644 index fb664414b62c..000000000000 --- a/gnome-base/librsvg/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - - Build svg viewer tool - - -- cgit v1.2.3