callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d/patches: Print 2-digit lcms minor versions correctly

Browse Source 
Related to #900819, #986192.
This commit is contained in:
Simon McVittie
2021-04-03 11:48:09 +01:00
parent cc9413dee3
commit 78b1892365
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
debian/patches/app-Print-2-digit-LittleCMS-minor-versions-correctly.patch vendored Normal file
View File

@ -0,0 +1,41 @@
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2021 11:18:30 +0100
Subject: app: Print 2-digit LittleCMS minor versions correctly
LittleCMS 2.12.0 defines LCMS_VERSION as 2120. We want to print that
as 2.12.0, not 2.2.0.
Bug: https://gitlab.gnome.org/GNOME/gimp/-/issues/6505
Bug-Debian: https://bugs.debian.org/900819
Bug-Debian: https://bugs.debian.org/986192
Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/429
---
app/sanity.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/sanity.c b/app/sanity.c
index 0ad044a..7360fd0 100644
--- a/app/sanity.c
+++ b/app/sanity.c
@@ -402,16 +402,16 @@ sanity_check_lcms (void)
"built against.\n\n"
"Please make sure that the installed LittleCMS version\n"
"is at least %d.%d and that headers and library match.",
- LCMS_VERSION / 1000, LCMS_VERSION % 100 / 10,
- lcms_version / 1000, lcms_version % 100 / 10,
- LCMS_VERSION / 1000, LCMS_VERSION % 100 / 10);
+ LCMS_VERSION / 1000, LCMS_VERSION % 1000 / 10,
+ lcms_version / 1000, lcms_version % 1000 / 10,
+ LCMS_VERSION / 1000, LCMS_VERSION % 1000 / 10);
}
if (lcms_version < (LCMS_REQUIRED_MAJOR * 1000 +
LCMS_REQUIRED_MINOR * 10))
{
const gint lcms_major_version = lcms_version / 1000;
- const gint lcms_minor_version = lcms_version % 100 / 10;
+ const gint lcms_minor_version = lcms_version % 1000 / 10;
return g_strdup_printf
("Liblcms2 version too old!\n\n"

1
debian/patches/series vendored
View File

@ -1,2 +1,3 @@
app-Print-2-digit-LittleCMS-minor-versions-correctly.patch
01_hurd_ftbfs.patch
02_hurd_ftbfs.patch