rpms/mupdf
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust to changed leptonica lib name

Browse Source 
In version 1.8.0, leptonica changed their lib/autotools name from lept
to leptonica for consistency. Adjust for the new name (merge only to
branches with leptonica >= 1.8.0).
This commit is contained in:
Michael J Gruber 2023-12-26 19:36:03 +01:00
parent b7dac2a662
commit b6cb9a1f3a
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0001-adjust-to-changed-leptonica-lib-name.patch Normal file
View File

@ -0,0 +1,43 @@
From 694dc02d9f44c32d5e3d2a5b8659d3508a62dab6 Mon Sep 17 00:00:00 2001
Message-ID: <694dc02d9f44c32d5e3d2a5b8659d3508a62dab6.1703615581.git.mjg@fedoraproject.org>
From: Michael J Gruber <mjg@fedoraproject.org>
Date: Tue, 26 Dec 2023 19:30:45 +0100
Subject: [PATCH] adjust to changed leptonica lib name
In version 1.8.0, leptonica changed their lib/autotools name from lept
to leptonica for consistency. Adjust uncoditionally and watch out for
the version in packaging.
---
Makerules | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makerules b/Makerules
index f25a8ce0b..981ef35aa 100644
--- a/Makerules
+++ b/Makerules
@@ -148,7 +148,7 @@ SYS_MUJS_LIBS := -lmujs
SYS_OPENJPEG_LIBS := -lopenjp2
SYS_ZLIB_LIBS := -lz
SYS_TESSERACT_LIBS := -ltesseract
-SYS_LEPTONICA_LIBS := -llept
+SYS_LEPTONICA_LIBS := -lleptonica
ifneq "$(CLUSTER)" ""
CFLAGS += -DCLUSTER
@@ -219,10 +219,10 @@ else ifeq ($(OS),Linux)
SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
endif
- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
+ HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'leptonica >= 1.7.4' && echo yes)
ifeq ($(HAVE_SYS_LEPTONICA),yes)
- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
+ SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags leptonica)
+ SYS_LEPTONICA_LIBS := $(shell pkg-config --libs leptonica)
endif
HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
--
2.43.0.282.g96018603fa

1
mupdf.spec
View File

@ -16,6 +16,7 @@ Source1: %{name}.desktop
Source2: %{name}-gl.desktop
# https://github.com/ArtifexSoftware/mupdf/pull/42
Patch1: dc339ceab37d962e91527068321790768262a42c.patch
Patch2: 0001-adjust-to-changed-leptonica-lib-name.patch
BuildRequires: gcc gcc-c++ make binutils desktop-file-utils coreutils pkgconfig
BuildRequires: openjpeg2-devel desktop-file-utils
BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel