Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zathura-plugin-pdf-mupdf for
openSUSE:Factory checked in at 2023-03-07 16:50:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zathura-plugin-pdf-mupdf (Old)
and /work/SRC/openSUSE:Factory/.zathura-plugin-pdf-mupdf.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zathura-plugin-pdf-mupdf"
Tue Mar 7 16:50:45 2023 rev:7 rq:1069883 version:0.4.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/zathura-plugin-pdf-mupdf/zathura-plugin-pdf-mupdf.changes
2022-12-15 19:26:07.888372511 +0100
+++
/work/SRC/openSUSE:Factory/.zathura-plugin-pdf-mupdf.new.31432/zathura-plugin-pdf-mupdf.changes
2023-03-07 16:51:11.741856741 +0100
@@ -1,0 +2,9 @@
+Tue Mar 7 01:12:09 UTC 2023 - llyyr <[email protected]>
+
+- Add patch 0001-Don-t-link-against-gumbo.patch to allow building
+ without linking against gumbo
+- Add patch 0002-Revert-Rework-detection-of-mupdf.patch to unbreak mupdf
+ detection keep building this on life support.
+- Build with external libs
+
+-------------------------------------------------------------------
New:
----
0001-Don-t-link-against-gumbo.patch
0002-Revert-Rework-detection-of-mupdf.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zathura-plugin-pdf-mupdf.spec ++++++
--- /var/tmp/diff_new_pack.ympJCJ/_old 2023-03-07 16:51:12.473860600 +0100
+++ /var/tmp/diff_new_pack.ympJCJ/_new 2023-03-07 16:51:12.477860622 +0100
@@ -1,7 +1,7 @@
#
# spec file for package zathura-plugin-pdf-mupdf
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,16 +25,20 @@
Group: Productivity/Office/Other
URL: https://pwmt.org/projects/zathura-pdf-mupdf/
Source:
https://pwmt.org/projects/%{realname}/download/%{realname}-%{version}.tar.xz
+Patch1: 0001-Don-t-link-against-gumbo.patch
+Patch2: 0002-Revert-Rework-detection-of-mupdf.patch
BuildRequires: cmake
-BuildRequires: libgumbo-devel
BuildRequires: meson
BuildRequires: mupdf-devel-static >= 1.20
BuildRequires: pkgconfig
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(girara-gtk3)
BuildRequires: pkgconfig(jbig2dec)
+BuildRequires: pkgconfig(lept)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libopenjp2)
+BuildRequires: pkgconfig(mujs)
+BuildRequires: pkgconfig(tesseract)
BuildRequires: pkgconfig(zathura) >= 0.5.2
Requires: mupdf >= 1.20
Requires: zathura >= 0.5.2
@@ -46,10 +50,12 @@
%prep
%setup -q -n %{realname}-%{version}
+%patch1 -p1
+%patch2 -p1
%build
export CFLAGS="%{optflags}"
-%meson
+%meson -Dlink-external=true
%meson_build
%install
++++++ 0001-Don-t-link-against-gumbo.patch ++++++
>From 9eabe363db92c006d7542dca38619f2d0d65dd3a Mon Sep 17 00:00:00 2001
From: llyyr <[email protected]>
Date: Tue, 7 Mar 2023 06:39:12 +0530
Subject: [PATCH] Don't link against gumbo
---
meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/meson.build b/meson.build
index c7b5a8b..1f628af 100644
--- a/meson.build
+++ b/meson.build
@@ -40,7 +40,6 @@ else
libjpeg = dependency('libjpeg')
libjbig2dec = cc.find_library('jbig2dec')
libopenjp2 = dependency('libopenjp2')
- gumbo = dependency('gumbo')
tesseract = dependency('tesseract')
leptonica = dependency('lept')
mujs = dependency('mujs')
@@ -49,7 +48,6 @@ else
libjpeg,
libjbig2dec,
libopenjp2,
- gumbo,
tesseract,
leptonica,
mujs
--
2.39.2
++++++ 0002-Revert-Rework-detection-of-mupdf.patch ++++++
>From fe541d1ac43ff4590c371c6f2b5678f355535974 Mon Sep 17 00:00:00 2001
From: llyyr <[email protected]>
Date: Tue, 7 Mar 2023 07:13:50 +0530
Subject: [PATCH] Revert "Rework detection of mupdf"
This reverts commit 49a85efb915bfed933d251f6074b807d0e1ef385.
---
meson.build | 17 +++++------------
meson_options.txt | 6 ++++++
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/meson.build b/meson.build
index 1f628af..e35f679 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ zathura = dependency('zathura', version: '>=0.5.2')
girara = dependency('girara-gtk3')
glib = dependency('glib-2.0')
cairo = dependency('cairo')
-mupdf = dependency('mupdf', required: false)
+mupdf = cc.find_library('mupdf')
mupdfthird = cc.find_library('mupdf-third')
build_dependencies = [
@@ -27,30 +27,23 @@ build_dependencies = [
girara,
glib,
cairo,
+ mupdf,
+ mupdfthird
]
-if not mupdf.found()
- # normal build of mupdf
- mupdf = cc.find_library('mupdf')
- build_dependencies += [mupdf, mupdfthird]
-else
- # build from Debian's libmupdf-dev
- build_dependencies += [mupdf, mupdfthird]
-
+if get_option('link-external')
libjpeg = dependency('libjpeg')
libjbig2dec = cc.find_library('jbig2dec')
libopenjp2 = dependency('libopenjp2')
tesseract = dependency('tesseract')
leptonica = dependency('lept')
- mujs = dependency('mujs')
build_dependencies += [
libjpeg,
libjbig2dec,
libopenjp2,
tesseract,
- leptonica,
- mujs
+ leptonica
]
endif
diff --git a/meson_options.txt b/meson_options.txt
index c8df610..db9d0c5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,9 @@
+option('link-external',
+ type: 'boolean',
+ value: false,
+ description: 'Link external libraries required by mupdf.'
+)
+
option('plugindir',
type: 'string',
value: '',
--
2.39.2
