diff options
author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-09-17 13:58:02 +0200 |
---|---|---|
committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-09-17 13:58:02 +0200 |
commit | a832e3ab26ec836dac99e06f0744c576f3b0df4e (patch) | |
tree | cfa2a01a37795d2f91674e06329f148e85e5ce88 /gnome-base | |
parent | add tracker scm (diff) | |
download | keruspe-a832e3ab26ec836dac99e06f0744c576f3b0df4e.tar.gz keruspe-a832e3ab26ec836dac99e06f0744c576f3b0df4e.tar.bz2 keruspe-a832e3ab26ec836dac99e06f0744c576f3b0df4e.zip |
cleanup
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/librsvg/Manifest | 4 | ||||
-rw-r--r-- | gnome-base/librsvg/files/fix-g_const.patch | 103 | ||||
-rw-r--r-- | gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch | 33 | ||||
-rw-r--r-- | gnome-base/librsvg/librsvg-2.34.0-r2.ebuild | 66 |
4 files changed, 0 insertions, 206 deletions
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest deleted file mode 100644 index 05476587..00000000 --- a/gnome-base/librsvg/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX fix-g_const.patch 3969 RMD160 560597116d4f152b50039993987a4af384024d2b SHA1 857ea21389855afa705aadd962ff82bf4ced6a68 SHA256 bfe8b5e658fc3b71085f54e4cdea387916abd27976b1306c81becd9360c23c99 -AUX librsvg-2.34.0-automagic-gtk.patch 1420 RMD160 8b1740121a13ef1edaef44f6c6293f140432ab71 SHA1 91fd1a8713fe1296b30e2e3281cd72087c96ae4b SHA256 56e63ee0f4bd9baea7244fddc18622e88902bf0ccbfa18700c111157b05e4ef7 -EBUILD librsvg-2.34.0-r2.ebuild 1858 RMD160 755046020164d5d72ae4f864e74fc78e39b2a52a SHA1 322d604c4d18569a356bd8d95091326b5372b2b8 SHA256 21bfcf762702d6362b6fbd46b1d910df0a6c22fd5ae5da9749edd6dc95a705e7 -DIST librsvg-2.34.0.tar.bz2 516994 RMD160 02638bcf084156e4e209a325a20e99d2e88e9fd8 SHA1 59e01568a6b201fc45828a76b942f790859cddeb SHA256 9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd diff --git a/gnome-base/librsvg/files/fix-g_const.patch b/gnome-base/librsvg/files/fix-g_const.patch deleted file mode 100644 index 92630d8e..00000000 --- a/gnome-base/librsvg/files/fix-g_const.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 01c1c36070184d67f4e0b925acf82a0c0a509558 Mon Sep 17 00:00:00 2001 -From: Javier Jardón <jjardon@gnome.org> -Date: Thu, 09 Jun 2011 16:21:03 +0000 -Subject: Use "const" instead G_CONST_RETURN - -https://bugzilla.gnome.org/show_bug.cgi?id=652213 ---- -diff --git a/rsvg-base.c b/rsvg-base.c -index 6d7a5c3..9fd065a 100644 ---- a/rsvg-base.c -+++ b/rsvg-base.c -@@ -1102,7 +1102,7 @@ rsvg_handle_set_base_gfile (RsvgHandle *handle, - * Returns: the base uri, possibly null - * Since: 2.8 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_base_uri (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -@@ -1246,7 +1246,7 @@ rsvg_drawing_ctx_free (RsvgDrawingCtx * handle) - * - * Since: 2.9 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_metadata (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -@@ -1268,7 +1268,7 @@ rsvg_handle_get_metadata (RsvgHandle * handle) - * - * Since: 2.4 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_title (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -@@ -1290,7 +1290,7 @@ rsvg_handle_get_title (RsvgHandle * handle) - * - * Since: 2.4 - */ --G_CONST_RETURN char * -+const char * - rsvg_handle_get_desc (RsvgHandle * handle) - { - g_return_val_if_fail (handle, NULL); -diff --git a/rsvg-private.h b/rsvg-private.h -index 85bd7ac..288c2de 100644 ---- a/rsvg-private.h -+++ b/rsvg-private.h -@@ -275,7 +275,7 @@ typedef void (*RsvgPropertyBagEnumFunc) (const char *key, const char *value, gpo - RsvgPropertyBag *rsvg_property_bag_new (const char **atts); - RsvgPropertyBag *rsvg_property_bag_ref (RsvgPropertyBag * bag); - void rsvg_property_bag_free (RsvgPropertyBag * bag); --G_CONST_RETURN char *rsvg_property_bag_lookup (RsvgPropertyBag * bag, const char *key); -+const char *rsvg_property_bag_lookup (RsvgPropertyBag * bag, const char *key); - guint rsvg_property_bag_size (RsvgPropertyBag * bag); - void rsvg_property_bag_enumerate (RsvgPropertyBag * bag, RsvgPropertyBagEnumFunc func, - gpointer user_data); -diff --git a/rsvg-styles.c b/rsvg-styles.c -index 7498ec9..13b952e 100644 ---- a/rsvg-styles.c -+++ b/rsvg-styles.c -@@ -1557,7 +1557,7 @@ rsvg_property_bag_free (RsvgPropertyBag * bag) - g_hash_table_unref (bag); - } - --G_CONST_RETURN char * -+const char * - rsvg_property_bag_lookup (RsvgPropertyBag * bag, const char *key) - { - return (const char *) g_hash_table_lookup (bag, (gconstpointer) key); -diff --git a/rsvg.h b/rsvg.h -index 41c4127..13e0838 100644 ---- a/rsvg.h -+++ b/rsvg.h -@@ -126,8 +126,8 @@ gboolean rsvg_handle_close (RsvgHandle * handle, GError ** error); - GdkPixbuf *rsvg_handle_get_pixbuf (RsvgHandle * handle); - GdkPixbuf *rsvg_handle_get_pixbuf_sub (RsvgHandle * handle, const char *id); - --G_CONST_RETURN char *rsvg_handle_get_base_uri (RsvgHandle * handle); --void rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri); -+const char *rsvg_handle_get_base_uri (RsvgHandle * handle); -+void rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri); - - void rsvg_handle_get_dimensions (RsvgHandle * handle, RsvgDimensionData * dimension_data); - -@@ -163,9 +163,9 @@ RsvgHandle *rsvg_handle_new_from_stream_sync (GInputStream *input_stream, - - /* Accessibility API */ - --G_CONST_RETURN char *rsvg_handle_get_title (RsvgHandle * handle); --G_CONST_RETURN char *rsvg_handle_get_desc (RsvgHandle * handle); --G_CONST_RETURN char *rsvg_handle_get_metadata (RsvgHandle * handle); -+const char *rsvg_handle_get_title (RsvgHandle * handle); -+const char *rsvg_handle_get_desc (RsvgHandle * handle); -+const char *rsvg_handle_get_metadata (RsvgHandle * handle); - - RsvgHandle *rsvg_handle_new_from_data (const guint8 * data, gsize data_len, GError ** error); - RsvgHandle *rsvg_handle_new_from_file (const gchar * file_name, GError ** error); --- -cgit v0.9 diff --git a/gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch b/gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch deleted file mode 100644 index f516e298..00000000 --- a/gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.in.old 2011-06-22 13:44:43.000000000 +0200 -+++ configure.in 2011-06-23 15:12:46.000000000 +0200 -@@ -235,14 +235,28 @@ - [],[enable_gtk_theme=yes]) - AC_MSG_RESULT([$enable_gtk_theme]) - -+AC_MSG_CHECKING([which gtk+ version to compile against]) -+AC_ARG_WITH([gtk], -+ [AS_HELP_STRING([--with-gtk=2.0|3.0|both],[which gtk+ version to compile against (default: 2.0)])], -+ [case "$with_gtk" in -+ 2.0|3.0|both) ;; -+ *) AC_MSG_ERROR([invalid gtk version specified]) ;; -+ esac], -+ [with_gtk=2.0]) -+AC_MSG_RESULT([$with_gtk]) -+ - have_gtk_2=no - have_gtk_3=no - GTK2_BINARY_VERSION= - GTK3_BINARY_VERSION= - - if test "x$enable_gtk_theme" = "xyes" -o "x$enable_pixbuf_loader" = "xyes"; then -- PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= $GTK2_REQUIRED],[have_gtk_2=yes],[have_gtk_2=no]) -- PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) -+case "$with_gtk" in -+ 2.0) PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= $GTK2_REQUIRED],[have_gtk_2=yes],[have_gtk_2=no]);; -+ 3.0) PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]);; -+ both) PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= $GTK2_REQUIRED],[have_gtk_2=yes],[have_gtk_2=no]) -+ PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]);; -+esac - - if test "$have_gtk_2" = "yes"; then - GTK2_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`" diff --git a/gnome-base/librsvg/librsvg-2.34.0-r2.ebuild b/gnome-base/librsvg/librsvg-2.34.0-r2.ebuild deleted file mode 100644 index 2bfe80ab..00000000 --- a/gnome-base/librsvg/librsvg-2.34.0-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" -GCONF_DEBUG="no" - -inherit gnome2 multilib eutils autotools - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="http://librsvg.sourceforge.net/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc +gtk gtk3 tools" - -RDEPEND=">=media-libs/fontconfig-1.0.1 - >=media-libs/freetype-2 - >=dev-libs/glib-2.24:2 - >=x11-libs/cairo-1.2 - >=x11-libs/pango-1.10 - >=dev-libs/libxml2-2.4.7:2 - >=dev-libs/libcroco-0.6.1 - || ( x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 ) - gtk? ( >=x11-libs/gtk+-2.16:2 ) - gtk3? ( >=x11-libs/gtk+-2.90.0:3 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12 - doc? ( >=dev-util/gtk-doc-1.13 )" -# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf - -pkg_setup() { - # croco is forced on to respect SVG specification - G2CONF="${G2CONF} - --disable-static - $(use_enable tools) - $(use_enable gtk gtk-theme) - --with-croco - --enable-pixbuf-loader" - use gtk && ! use gtk3 && G2CONF+=" --with-gtk=2.0" - use gtk && use gtk3 && G2CONF+=" --with-gtk=both" - ! use gtk && use gtk3 && G2CONF+=" --with-gtk=3.0 --enable-gtk-theme" - - DOCS="AUTHORS ChangeLog README NEWS TODO" -} - -src_prepare() { - epatch ${FILESDIR}/fix-g_const.patch - gnome2_src_prepare - - # Fix automagic gtk+ dependency, bug #371290 - epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch" - eautoreconf -} - -pkg_postinst() { - gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" -} - -pkg_postrm() { - gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" -} |