[neon/backports-jammy/lcms2-jammy/Neon/release] debian: merge from salsa
Carlos De Maine
null at kde.org
Fri Mar 3 01:15:56 GMT 2023
Git commit b175f381ba369f9f3af7dc578f4e744ee9287e9c by Carlos De Maine.
Committed on 03/03/2023 at 01:15.
Pushed by carlosdem into branch 'Neon/release'.
merge from salsa
M +10 -0 debian/changelog
M +1 -1 debian/control
D +0 -71 debian/patches/fix-memory-corruption-when-unregistering-plugins.diff
D +0 -33 debian/patches/fix-regression-for-CMYK-colours.patch
M +0 -2 debian/patches/series
https://invent.kde.org/neon/backports-jammy/lcms2-jammy/commit/b175f381ba369f9f3af7dc578f4e744ee9287e9c
diff --git a/debian/changelog b/debian/changelog
index 9f8a5f4..97ba8e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,16 @@ lcms2 (2.15-0neon) jammy; urgency=medium
-- Carlos De Maine <carlosdemaine at gmail.com> Fri, 03 Mar 2023 08:07:46 +1000
+lcms2 (2.14-2) unstable; urgency=medium
+
+ * New patch: allow-to-read-portions-of-tag.diff.
+ Thanks to s3v <c0llapsed at yahoo.it> (Closes: #1028664)
+ * Update copyright information for plugins.
+ Thanks to Florian Ernst <florian_ernst at gmx.net>
+ * Bump standards version to 4.6.2, no changes needed
+
+ -- Thomas Weber <tweber at debian.org> Sun, 19 Feb 2023 22:32:28 +0100
+
lcms2 (2.14-1) unstable; urgency=medium
[ Thomas Weber ]
diff --git a/debian/control b/debian/control
index 4fb3189..593ac0c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Thomas Weber <tweber at debian.org>
Build-Depends: debhelper-compat (= 13), libjpeg-dev, libtiff-dev, zlib1g-dev
Rules-Requires-Root: no
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Homepage: http://www.littlecms.com/
Vcs-Git: https://salsa.debian.org/debian/lcms2.git
Vcs-Browser: https://salsa.debian.org/debian/lcms2
diff --git a/debian/patches/fix-memory-corruption-when-unregistering-plugins.diff b/debian/patches/fix-memory-corruption-when-unregistering-plugins.diff
deleted file mode 100644
index 72d61ff..0000000
--- a/debian/patches/fix-memory-corruption-when-unregistering-plugins.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: fix memory corruption when unregistering plugins
-Author: Marti Maria <marti.maria at littlecms.com>
-Origin: upstream, https://github.com/mm2/Little-CMS/commit/a9e4601ceb3a185d4f78cc0cfbd285cf0c399e9d
-Bug: https://github.com/mm2/Little-CMS/issues/344
-Forwarded: not-needed
-Last-Update: 2023-01-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/plugins/fast_float/testbed/fast_float_testbed.c b/plugins/fast_float/testbed/fast_float_testbed.c
-index ea23c10..addef00 100644
---- a/plugins/fast_float/testbed/fast_float_testbed.c
-+++ b/plugins/fast_float/testbed/fast_float_testbed.c
-@@ -2468,7 +2468,7 @@ int main()
- trace("Installing plug-in ... ");
- cmsPlugin(cmsFastFloatExtensions());
- trace("done.\n\n");
--
-+
- CheckComputeIncrements();
-
- // 15 bit functionality
-@@ -2508,7 +2508,7 @@ int main()
-
- trace("\nAll tests passed OK\n");
-
-- cmsUnregisterPlugins();
-+ cmsDeleteContext(0);
-
- return 0;
- }
-diff --git a/src/cmsplugin.c b/src/cmsplugin.c
-index 7d038d2..1d8c358 100644
---- a/src/cmsplugin.c
-+++ b/src/cmsplugin.c
-@@ -795,9 +795,7 @@ void* _cmsContextGetClientChunk(cmsContext ContextID, _cmsMemoryClient mc)
- // many different plug-ins simultaneously, then there is no way to
- // identify which plug-in to unregister.
- void CMSEXPORT cmsUnregisterPluginsTHR(cmsContext ContextID)
--{
-- struct _cmsContext_struct* ctx = _cmsGetContext(ContextID);
--
-+{
- _cmsRegisterMemHandlerPlugin(ContextID, NULL);
- _cmsRegisterInterpPlugin(ContextID, NULL);
- _cmsRegisterTagTypePlugin(ContextID, NULL);
-@@ -811,9 +809,6 @@ void CMSEXPORT cmsUnregisterPluginsTHR(cmsContext ContextID)
- _cmsRegisterMutexPlugin(ContextID, NULL);
- _cmsRegisterParallelizationPlugin(ContextID, NULL);
-
-- if (ctx->MemPool != NULL)
-- _cmsSubAllocDestroy(ctx->MemPool);
-- ctx->MemPool = NULL;
- }
-
-
-@@ -981,7 +976,14 @@ cmsContext CMSEXPORT cmsDupContext(cmsContext ContextID, void* NewUserData)
- // The ContextID can no longer be used in any THR operation.
- void CMSEXPORT cmsDeleteContext(cmsContext ContextID)
- {
-- if (ContextID != NULL) {
-+ if (ContextID == NULL) {
-+
-+ cmsUnregisterPlugins();
-+ if (globalContext.MemPool != NULL)
-+ _cmsSubAllocDestroy(globalContext.MemPool);
-+ globalContext.MemPool = NULL;
-+ }
-+ else {
-
- struct _cmsContext_struct* ctx = (struct _cmsContext_struct*) ContextID;
- struct _cmsContext_struct fakeContext;
diff --git a/debian/patches/fix-regression-for-CMYK-colours.patch b/debian/patches/fix-regression-for-CMYK-colours.patch
deleted file mode 100644
index c3cc5a6..0000000
--- a/debian/patches/fix-regression-for-CMYK-colours.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: fix regression for CMYK profiles
-Author: Marti Maria, info at littlecms.com
-Origin: upstream, https://github.com/mm2/Little-CMS/commit/328c226af654adb321cedaa5cbe470eebd10e021
-Bug: https://github.com/mm2/Little-CMS/issues/345
-Forwarded: not-needed
-Last-Update: 2023-01-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/plugins/fast_float/src/fast_8_tethra.c b/plugins/fast_float/src/fast_8_tethra.c
-index 84c36a0..a843813 100644
---- a/plugins/fast_float/src/fast_8_tethra.c
-+++ b/plugins/fast_float/src/fast_8_tethra.c
-@@ -364,9 +364,8 @@ cmsBool Optimize8BitRGBTransform(_cmsTransform2Fn* TransformFn,
- // Only on RGB
- if (T_COLORSPACE(*InputFormat) != PT_RGB) return FALSE;
-
-- // This optimization only works on RGB8->RGB8 or RGB8->CMYK8
-- if (T_COLORSPACE(*OutputFormat) != PT_RGB &&
-- T_COLORSPACE(*OutputFormat) != PT_CMYK) return FALSE;
-+ // This optimization only works on RGB8->RGB8
-+ if (T_COLORSPACE(*OutputFormat) != PT_RGB) return FALSE;
-
- OriginalLut = *Lut;
-
-@@ -428,7 +427,7 @@ cmsBool Optimize8BitRGBTransform(_cmsTransform2Fn* TransformFn,
- if (TransReverse[t] == NULL) goto Error;
- }
-
-- // Now inset the reversed curves at the begin of transform
-+ // Now insert the reversed curves at the begin of transform
- LutPlusCurves = cmsPipelineDup(OriginalLut);
- if (LutPlusCurves == NULL) goto Error;
-
diff --git a/debian/patches/series b/debian/patches/series
index b92a496..6308b2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
prepare-for-libtoolizing.patch
-fix-regression-for-CMYK-colours.patch
-fix-memory-corruption-when-unregistering-plugins.diff
manpages-cleanup.patch
More information about the Neon-commits
mailing list