- added patches

fix 3c727503c6
  + ImageMagick-correct-time-to-live.patch

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=683
This commit is contained in:
Petr Gajdos 2023-10-13 10:36:06 +00:00 committed by Git OBS Bridge
parent bdba557d44
commit fa248b264e
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,24 @@
diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index 5a6576e67a..d33f2d374a 100644
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -367,7 +367,8 @@ MagickExport time_t GetMagickTime(void)
time_t
epoch;
- epoch=(time_t) StringToDouble(source_date_epoch,(char **) NULL);
+ epoch=(time_t) CastDoubleToLong(StringToDouble(source_date_epoch,
+ (char **) NULL));
if ((epoch > 0) && (epoch <= time((time_t *) NULL)))
constant_magick_time=epoch;
}
@@ -409,7 +410,7 @@ MagickPrivate MagickOffsetType GetMagickTTL(void)
magick_epoch=time((time_t *) NULL);
}
return((MagickOffsetType) GetMagickResourceLimit(TimeResource)-
- (GetMagickTime()-magick_epoch));
+ (time((time_t *) NULL)-magick_epoch));
}
/*

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 13 10:35:49 UTC 2023 - pgajdos@suse.com
- added patches
fix https://github.com/ImageMagick/ImageMagick/commit/3c727503c6ae449160dc92cf6222ebe28ef8fb52
+ ImageMagick-correct-time-to-live.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 12 10:34:25 UTC 2023 - pgajdos@suse.com Thu Oct 12 10:34:25 UTC 2023 - pgajdos@suse.com

View File

@ -56,6 +56,8 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch
#%%ifarch s390x #%%ifarch s390x
Patch5: ImageMagick-s390x-disable-tests.patch Patch5: ImageMagick-s390x-disable-tests.patch
#%%endif #%%endif
# https://github.com/ImageMagick/ImageMagick/commit/3c727503c6ae449160dc92cf6222ebe28ef8fb52
Patch6: ImageMagick-correct-time-to-live.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: dejavu-fonts BuildRequires: dejavu-fonts
BuildRequires: fdupes BuildRequires: fdupes
@ -355,6 +357,7 @@ policy plus disable few other coders for reading and/or writing.
%ifarch s390x %ifarch s390x
%patch5 -p1 %patch5 -p1
%endif %endif
%patch6 -p1
%build %build
# bsc#1088463 # bsc#1088463