- added soname patch (set libmupdf.so soname, so binary has DT_NEEDED tag on soname...

- use our optflags also for shared library

diff --git a/mupdf-soname.patch b/mupdf-soname.patch
new file mode 100644 (file)
index 0000000..9fb01d5
--- /dev/null
+++ b/mupdf-soname.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.18.0-source/Makefile.orig  2020-10-07 12:35:03.000000000 +0200
++++ mupdf-1.18.0-source/Makefile       2021-07-17 07:21:34.738610164 +0200
+@@ -76,7 +76,7 @@
+       $(LINK_CMD)
+ 
+ $(OUT)/%.$(SO):
+-      $(LINK_CMD) $(LIB_LDFLAGS) $(THIRD_LIBS) $(LIBCRYPTO_LIBS)
++      $(LINK_CMD) $(LIB_LDFLAGS) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) -Wl,-soname,$(shell basename $@)
+ 
+ $(OUT)/source/helpers/mu-threads/%.o : source/helpers/mu-threads/%.c
+       $(CC_CMD) $(LIB_CFLAGS) $(THREADING_CFLAGS)

diff --git a/mupdf.spec b/mupdf.spec
index 2fab022e0d12c1fe39b93995f8bf265645e25b4e..1d95cc3ef23fff3ce53f0fd8888b2e7c8c77e9c4 100644 (file)
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -7,6 +7,7 @@ License:        AGPL v3+
 Group:         Applications/Text
 Source0:       https://www.mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz
 # Source0-md5: 6f42be1365350f05270f8776517a3872
+Patch0:                %{name}-soname.patch
 URL:           https://www.mupdf.com/
 BuildRequires: OpenGL-glut-devel
 BuildRequires: curl-devel >= 7.66.0
@@ -90,10 +91,12 @@ Statyczne biblioteki MuPDF.
 
 %prep
 %setup -q -n %{name}-%{version}-source
+%patch0 -p1
 
 # use system libs instead:
 # curl 7.66.0
 # freetype 2.10.0
+# gumbo-parser 0.10.1
 # harfbuzz 2.6.4 + git update (nothing crucial)
 # jbig2dec 0.18
 # libjpeg 9
@@ -118,6 +121,8 @@ LDFLAGS="%{rpmldflags}" \
        libdir=%{_libdir} \
        verbose=yes
 
+CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} -j1 \
        CC="%{__cc}" \
        CXX="%{__cxx}" \