summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2013-03-29 19:54:51 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2013-03-29 19:54:51 +0000
commit2e074f73e047fe97437e4a6020da778103ef6d33 (patch)
treee81bbba6934bcbb4dc786304ffc62ac9b62edec9 /gnome-base/librsvg/files
parentClean up old revisions. Clean up keywords of older revisions. Clean up USE=gt... (diff)
downloadhistorical-2e074f73e047fe97437e4a6020da778103ef6d33.tar.gz
historical-2e074f73e047fe97437e4a6020da778103ef6d33.tar.bz2
historical-2e074f73e047fe97437e4a6020da778103ef6d33.zip
Clean up old patches.
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806
Diffstat (limited to 'gnome-base/librsvg/files')
-rw-r--r--gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch33
-rw-r--r--gnome-base/librsvg/files/librsvg-2.34.2-gir-filename.patch39
-rw-r--r--gnome-base/librsvg/files/librsvg-2.36.0-rsvg-convert.1.patch85
3 files changed, 0 insertions, 157 deletions
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 f516e2983c10..000000000000
--- 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/files/librsvg-2.34.2-gir-filename.patch b/gnome-base/librsvg/files/librsvg-2.34.2-gir-filename.patch
deleted file mode 100644
index 044fb7bd5375..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.34.2-gir-filename.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c44813c1abb45467fa9e07bbde01d1fb09cae383 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 23 Nov 2011 17:41:12 -0500
-Subject: [PATCH] Use $RSVG_API_VERSION in the .gir filename
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-$RSVG_API_VERSION == "2.0"
-$RSVG_API_VERSION_U == "2_0"
-
-We want to use 2.0 when referring to the .gir filename, and 2_0 when
-referring to the automake targets derived from the filename. Otherwise,
-parallel make fails.
-
-Thanks to Rafał Mużyło <galtgendo@o2.pl> for pointing this out in
-https://bugs.gentoo.org/show_bug.cgi?id=391215#c10
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664684
----
- Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 511df68..5a8dda3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -235,7 +235,7 @@ INTROSPECTION_GIRS = Rsvg-@RSVG_API_VERSION@.gir
- INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
- INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
--Rsvg-@RSVG_API_VERSION_U@.gir: librsvg-@RSVG_API_MAJOR_VERSION@.la
-+Rsvg-@RSVG_API_VERSION@.gir: librsvg-@RSVG_API_MAJOR_VERSION@.la
-
- Rsvg_@RSVG_API_VERSION_U@_gir_NAMESPACE = Rsvg
- Rsvg_@RSVG_API_VERSION_U@_gir_EXPORT_PACKAGES = librsvg-$(RSVG_API_VERSION)
---
-1.7.8.rc3
-
diff --git a/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-convert.1.patch b/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-convert.1.patch
deleted file mode 100644
index f4b9a0011250..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-convert.1.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 3b246c8cf907b0f2ed491b4fe452bb7f3ee55cfc Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 8 Apr 2012 14:18:24 -0400
-Subject: [PATCH] Rename rsvg.1 to rsvg-convert.1 and update for
- rsvg-convert's options
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673748
----
- Makefile.am | 4 +---
- rsvg-convert.1 | 28 ++++++++++++++++++++--------
- 2 files changed, 21 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8e2732b..1adb278 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -105,9 +105,7 @@ librsvginc_HEADERS = \
- librsvg-features.h \
- librsvg-enum-types.h
-
--if HAVE_GTK_2
--dist_man_MANS = rsvg.1
--endif
-+dist_man_MANS = rsvg-convert.1
-
- rsvg_convert_SOURCES = \
- rsvg-convert.c \
-diff --git a/rsvg-convert.1 b/rsvg-convert.1
-index 51a478d..6af32fd 100644
---- a/rsvg.1
-+++ b/rsvg-convert.1
-@@ -1,12 +1,12 @@
--.TH rsvg 1
-+.TH rsvg-convert 1
- .SH NAME
--rsvg \- Turn SVG files into raster images.
-+rsvg-convert \- turn SVG files into raster images.
- .SH SYNOPSIS
--.B rsvg
--[options] in.svg out.png
-+.B rsvg-convert
-+[options] in.svg > out.png
- .I ""
- .SH DESCRIPTION
--RSVG converts SVG images into PNG, JPEG, and ICO raster images.
-+Converts SVG images into PNG raster images, PDF, PS, or SVG vector images, or dumps of Cairo XML or recording surfaces.
- .SS OPTIONS
- .TP
- .I "\-d \-\-dpi-x number"
-@@ -21,17 +21,29 @@ X Zoom factor, as a percentage. If unspecified, 1.0 is used as the default.
- .I "\-y \-\-y\-zoom number"
- Y Zoom factor, as a percentage. If unspecified, 1.0 is used as the default.
- .TP
-+.I "\-z \-\-\-zoom number"
-+Zoom factor, as a percentage. If unspecified, 1.0 is used as the default.
-+.TP
- .I "\-w \-\-width integer"
- Specify how wide you wish the image to be. If unspecified, the natural width of the image is used as the default.
- .TP
- .I "\-h \-\-height integer"
- Specify how tall you wish the image to be. If unspecified, the natural height of the image is used as the default.
- .TP
--.I "\-f \-\-format [png, jpeg, ico]"
-+.I "\-f \-\-format [png, pdf, ps, svg, xml, recording]"
- Specify the output format you wish the image to be saved in. If unspecified, PNG is used as the default.
- .TP
--.I "\-q \-\-quality integer"
--Specify JPEG compression factor. Number must be between 1 and 100, inclusive.
-+.I "\-o \-\-output filename"
-+Specify the output filename. If unspecified, outputs to stdout.
-+.TP
-+.I "\-a \-\-keep-aspect-ratio"
-+Specify that the aspect ratio is to be preserved. If unspecified, aspect ratio will not be preserved.
-+.TP
-+.I "\-b \-\-background-color [black, white, #abccee, #aaa...]"
-+Specify the background color. If unspecified, none is used as the default.
-+.TP
-+.I "\-\-base-uri uri"
-+Specify the base URI for SVG files. If unspecified, none is used as the default.
- .TP
- .I "\-v \-\-version"
- Display what version of rsvg this is.
---
-1.7.8.5
-