From bb1943543ea40b14147539ec19af60559ebbd1e6 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: May 08 2017 19:13:08 +0000 Subject: Add patch to fix build without Caja-extension --- diff --git a/xreader-1.4.1-fix_build_without_caja.patch b/xreader-1.4.1-fix_build_without_caja.patch new file mode 100644 index 0000000..bfe6fbb --- /dev/null +++ b/xreader-1.4.1-fix_build_without_caja.patch @@ -0,0 +1,48 @@ +From 423b608d2892dec4a08a2e7956b1ad0c95313006 Mon Sep 17 00:00:00 2001 +From: Alexei Sorokin +Date: Mon, 8 May 2017 15:04:14 +0300 +Subject: [PATCH] Fix gtk-doc with no Caja or no Nemo extension building + +--- + help/reference/shell/Makefile.am | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am +index 7f4fde6..b9e7b27 100644 +--- a/help/reference/shell/Makefile.am ++++ b/help/reference/shell/Makefile.am +@@ -97,8 +97,6 @@ GTKDOC_CFLAGS = \ + -I$(top_srcdir)/libview \ + -I$(top_srcdir)/libmisc \ + -I$(top_builddir)/libview \ +- -I$(top_srcdir)/properties-caja \ +- -I$(top_srcdir)/properties-nemo \ + -DXREADERDATADIR=\"$(pkgdatadir)\" \ + -DMATEDATADIR=\"$(datadir)\" \ + -DMATELOCALEDIR=\"$(datadir)/locale\" \ +@@ -118,8 +116,6 @@ GTKDOC_LIBS = \ + $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ + $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ + $(top_builddir)/cut-n-paste/smclient/libsmclient.la \ +- $(top_builddir)/properties-caja/libevproperties.la \ +- $(top_builddir)/properties-nemo/libevproperties.la \ + $(top_builddir)/libdocument/libxreaderdocument.la \ + $(top_builddir)/libview/libxreaderview.la \ + $(top_builddir)/libmisc/libevmisc.la \ +@@ -128,6 +124,16 @@ GTKDOC_LIBS = \ + $(MATE_DESKTOP_LIBS) \ + $(filter-out $(FILTER_OUT),$(wildcard $(top_builddir)/shell/*.o)) + ++if ENABLE_CAJA ++ GTKDOC_CFLAGS+=-I$(top_srcdir)/properties-caja ++ GTKDOC_LIBS+=$(top_builddir)/properties-caja/libevproperties.la ++endif ++ ++if ENABLE_NEMO ++ GTKDOC_CFLAGS+=-I$(top_srcdir)/properties-nemo ++ GTKDOC_LIBS+=$(top_builddir)/properties-nemo/libevproperties.la ++endif ++ + # This includes the standard gtk-doc make rules, copied by gtkdocize. + include $(top_srcdir)/gtk-doc.make + diff --git a/xreader.spec b/xreader.spec index 2304314..d277328 100644 --- a/xreader.spec +++ b/xreader.spec @@ -11,13 +11,16 @@ Name: xreader Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple document viewer License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Patches from upstream. +Patch0: %{url}/pull/133.patch#/%{name}-1.4.1-fix_build_without_caja.patch + BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: intltool @@ -228,6 +231,9 @@ fi %changelog +* Mon May 08 2017 Björn Esser - 1.4.1-2 +- Add patch to fix build without Caja-extension + * Mon May 08 2017 Björn Esser - 1.4.1-1 - New upstream release (rhbz#1448921)