summaryrefslogtreecommitdiffstats
path: root/debian/patches/app-Print-2-digit-LittleCMS-minor-versions-correctly.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/app-Print-2-digit-LittleCMS-minor-versions-correctly.patch')
-rw-r--r--debian/patches/app-Print-2-digit-LittleCMS-minor-versions-correctly.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/debian/patches/app-Print-2-digit-LittleCMS-minor-versions-correctly.patch b/debian/patches/app-Print-2-digit-LittleCMS-minor-versions-correctly.patch
new file mode 100644
index 0000000..7f8055f
--- /dev/null
+++ b/debian/patches/app-Print-2-digit-LittleCMS-minor-versions-correctly.patch
@@ -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"