From 72925a6040a4d14f2b799a9731c4ec182195bffd Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Jul 31 2017 16:06:15 +0000 Subject: Fix the build --- diff --git a/brasero-3.12.1-fix-build.patch b/brasero-3.12.1-fix-build.patch new file mode 100644 index 0000000..9fe89bf --- /dev/null +++ b/brasero-3.12.1-fix-build.patch @@ -0,0 +1,108 @@ +From 55f4f7267612d2977b470b2b20e5802fbb1ef019 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 31 May 2016 16:27:57 +0100 +Subject: [PATCH] build: Use -Wno-error=format-nonliteral + +Let's get Brasero building for another year. +--- + libbrasero-burn/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am +index ed71f238..70622a63 100644 +--- a/libbrasero-burn/Makefile.am ++++ b/libbrasero-burn/Makefile.am +@@ -17,9 +17,10 @@ AM_CPPFLAGS = \ + $(BRASERO_GLIB_CFLAGS) \ + $(BRASERO_GIO_CFLAGS) \ + $(BRASERO_GTK_CFLAGS) \ +- $(BRASERO_LIBNOTIFY_CFLAGS) \ ++ $(BRASERO_LIBNOTIFY_CFLAGS) \ + $(BRASERO_GSTREAMER_CFLAGS) \ +- $(BRASERO_CANBERRA_CFLAGS) ++ $(BRASERO_CANBERRA_CFLAGS) \ ++ -Wno-error=format-nonliteral + + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` + RECMARSHALFILES = libbrasero-marshal.h libbrasero-marshal.c +-- +2.13.0 + +From 7ed500b063c1a1cea7d07f41d22e0be3d3b7ab22 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 31 May 2016 16:45:03 +0100 +Subject: [PATCH] build: Use -Wno-error=format-y2k + +Because two digits are enough for everybody. +--- + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index ba1b0e69..55b933f3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,7 +24,8 @@ AM_CPPFLAGS = \ + $(BRASERO_LIBXML_CFLAGS) \ + $(BRASERO_SEARCH_CFLAGS) \ + $(BRASERO_PL_PARSER_CFLAGS) \ +- $(BRASERO_SM_CFLAGS) ++ $(BRASERO_SM_CFLAGS) \ ++ -Wno-error=format-y2k + + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` + RECMARSHALFILES = brasero-marshal.h brasero-marshal.c +-- +2.13.0 + +From 14d03eecba21becb0a9c05609ae98764a4b6d155 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi +Date: Tue, 31 May 2016 17:08:16 +0100 +Subject: [PATCH] build: Disable format-y2k error + +--- + nautilus/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am +index 72eed5a0..01dfe69a 100644 +--- a/nautilus/Makefile.am ++++ b/nautilus/Makefile.am +@@ -22,7 +22,8 @@ AM_CPPFLAGS = \ + -DSHAREDIR=\""$(datadir)"\" \ + -DDATADIR=\""$(datadir)/brasero"\" \ + $(NAUTILUS_EXTENSION_CFLAGS) \ +- $(DISABLE_DEPRECATED) ++ $(DISABLE_DEPRECATED) \ ++ -Wno-error=format-y2k + + @INTLTOOL_DESKTOP_RULE@ + +-- +2.13.0 + +From 7cf9d3146d0782d1ff3a594f59d50f0cdd14688d Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Sat, 22 Jul 2017 21:30:19 -0400 +Subject: [PATCH] build: Allow building with tracker2 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index da450778..186e1a63 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -388,7 +388,7 @@ AC_ARG_ENABLE(search, + if test x"$enable_search" != "xno"; then + # Try to figure out the tracker API version to use + tracker_api="0.10" +- m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0]], ++ m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0], [2.0]], + [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED], + [tracker_api="VERSION"]) + ]) +-- +2.13.0 + diff --git a/brasero.spec b/brasero.spec index 7f4f9fa..0cf82f8 100644 --- a/brasero.spec +++ b/brasero.spec @@ -10,6 +10,8 @@ URL: http://www.gnome.org/projects/brasero/ Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/3.12/%{name}-%{version}.tar.gz Patch0: brasero-libdvdcss.patch +# Backported from upstream +Patch1: brasero-3.12.1-fix-build.patch BuildRequires: gtk3-devel >= 2.99.0 BuildRequires: glib2-devel >= 2.15.6 @@ -87,9 +89,11 @@ developing brasero applications. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +autoreconf -fi %configure \ --enable-nautilus \ --enable-libburnia \