[brasero/f14/master] Add missing patch

Bastien Nocera hadess at fedoraproject.org
Sat Aug 7 13:00:42 UTC 2010


commit 64829f652d00761bca31251cd62120de779cfb86
Author: Bastien Nocera <hadess at hadess.net>
Date:   Sat Aug 7 14:00:38 2010 +0100

    Add missing patch

 compile-nautilus-extension.patch |   46 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)
---
diff --git a/compile-nautilus-extension.patch b/compile-nautilus-extension.patch
new file mode 100644
index 0000000..2f7b44b
--- /dev/null
+++ b/compile-nautilus-extension.patch
@@ -0,0 +1,46 @@
+From 390eace2607f1afea9c80c64533d78c460cbbb19 Mon Sep 17 00:00:00 2001
+From: Luis Medinas <lmedinas at gnome.org>
+Date: Thu, 29 Jul 2010 21:42:26 +0000
+Subject: Make nautilus extension build with GTK+-2.0 again.
+
+Per release team decision to delay GNOME 3.0
+Brasero can be build with GTK+-2.0 and GTK+-3.0
+---
+diff --git a/configure.in b/configure.in
+index ab3ef13..4fd80a9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -277,8 +277,8 @@ AC_SUBST(BRASERO_CANBERRA_CFLAGS)
+ AC_SUBST(BRASERO_CANBERRA_LIBS)
+ 
+ dnl ****************Nautilus**********************************
+-# Note: the extension is built against gtk+3 so we cannot build extension with gtk+2
+-NAUTILUS_REQUIRED=2.31.3
++# Note: the extension is built against gtk+-2.0 so we cannot build extension with gtk+-3.0
++NAUTILUS_REQUIRED=2.22.2
+ 
+ AC_ARG_ENABLE(nautilus,
+ 			AS_HELP_STRING([--enable-nautilus],[Build Nautilus extension [[default=yes]]]),
+@@ -290,17 +290,13 @@ AC_ARG_WITH(nautilusdir,
+ 			[ac_with_nautilusdir=$withval],
+ 			[ac_with_nautilusdir=""])
+ 
+-if test "x$enable_gtk3" = "xyes"; then
+- if test x"$enable_nautilus" = "xyes"; then
+- 	PKG_CHECK_MODULES(NAUTILUS_EXTENSION,
++if test x"$enable_nautilus" = "xyes"; then
++    	PKG_CHECK_MODULES(NAUTILUS_EXTENSION,
+ 			  libnautilus-extension >= $NAUTILUS_REQUIRED,
+ 			  build_nautilus=yes,
+ 			  build_nautilus=no)
+- else
+-	build_nautilus="no"
+- fi
+ else
+- build_nautilus="no"
++	build_nautilus="no"
+ fi
+ 
+ if test x"$build_nautilus" = "xyes"; then
+--
+cgit v0.8.3.1


More information about the scm-commits mailing list