diff --git a/mupdf-no-strip.patch b/mupdf-no-strip.patch new file mode 100644 index 0000000..15d0535 --- /dev/null +++ b/mupdf-no-strip.patch @@ -0,0 +1,15 @@ +Index: mupdf-1.12.0-source/Makerules +=================================================================== +--- mupdf-1.12.0-source.orig/Makerules ++++ mupdf-1.12.0-source/Makerules +@@ -25,8 +25,8 @@ ifeq "$(build)" "debug" + CFLAGS += -pipe -g + LDFLAGS += -g + else ifeq "$(build)" "release" +-CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer +-LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s ++CFLAGS += -pipe -O2 -DNDEBUG ++LDFLAGS += $(LDREMOVEUNREACH) + else ifeq "$(build)" "small" + CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer + LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s diff --git a/mupdf.changes b/mupdf.changes index 13e81c5..39b7d7b 100644 --- a/mupdf.changes +++ b/mupdf.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Feb 14 18:46:28 UTC 2018 - crrodriguez@opensuse.org + +-mupdf-no-strip.patch: fix debuginfo generation + +------------------------------------------------------------------- +Wed Feb 14 18:09:24 UTC 2018 - crrodriguez@opensuse.org + +- Remove xorg-x11-devel from buildrequires + ------------------------------------------------------------------- Mon Feb 12 07:53:53 UTC 2018 - kbabioch@suse.com diff --git a/mupdf.spec b/mupdf.spec index b37568d..307eba8 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -34,6 +34,7 @@ Patch4: CVE-2018-6187.patch Patch5: CVE-2018-6192.patch Patch6: CVE-2018-6544.patch Patch7: CVE-2018-1000051.patch +Patch8: mupdf-no-strip.patch BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: jbig2dec-devel @@ -42,9 +43,10 @@ BuildRequires: libjpeg-devel BuildRequires: openjpeg2-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) Requires: xdg-utils %description @@ -76,7 +78,7 @@ based on mupdf. %patch5 -p1 %patch6 -p1 %patch7 -p1 - +%patch8 -p1 # do not use the inlined copies of build dpendencies except for mujs rm -rf $(ls -d thirdparty/*/ | grep -v mujs) @@ -91,7 +93,7 @@ sed -e s,'INSTALL_APPS := .*','INSTALL_APPS := $(MUTOOL_EXE) $(MUVIEW_X11_CURL_E %build # do no set CFLAGS which is used by the build system itself! -export XCFLAGS="%{optflags} -fPIC -lpthread" +export XCFLAGS="%{optflags} -fPIC -pthread" make %{?_smp_mflags} \ build=release \ verbose=yes \