[gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/

[gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/

[Pacho Ramos]

commit:     bf48c9c9269af4736ea2be65a8d48c896f007dfa
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 12:52:07 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 12:52:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf48c9c9

gnome-base/librsvg: Add forgotten patch

Package-Manager: portage-2.2.20.1

 .../files/librsvg-2.40.10-gtk-optional.patch       | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch
new file mode 100644
index 0000000..852a830
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch
@@ -0,0 +1,58 @@
+From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+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 <ross.burton@intel.com>
+
+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 miscellaenous tools:      ${build_misc_tools}
+ "
+-- 
+1.7.10.4
\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/files/

[Mart Raudsepp]

commit:     b82014423a4bbef4b707ad3e9d1cb12ea38ed1d0
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 14 22:48:57 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Dec 14 22:49:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8201442

gnome-base/librsvg: add missing newline at end of gtk patch

There was a missing newline at end of line on the git version line.
Completely harmless, but patch complains about it with
"patch unexpectedly ends in middle of line" now. So just add the
newline.

Closes: https://bugs.gentoo.org/657950
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index b7c5b85223d..11c5803d69d 100644
--- a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch
+++ b/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch
@@ -55,4 +55,4 @@ index f7a89dc..1498f72 100644
  	Build miscellaneous tools:      ${build_misc_tools}
  "
 -- 
-1.7.10.4
\ No newline at end of file
+1.7.10.4