Accepting request 1117649 from graphics
- added patches
fix 3c727503c6
+ ImageMagick-correct-time-to-live.patch
OBS-URL: https://build.opensuse.org/request/show/1117649
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=284
This commit is contained in:
commit
65876b1e00
24
ImageMagick-correct-time-to-live.patch
Normal file
24
ImageMagick-correct-time-to-live.patch
Normal 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));
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
|
||||
|
@ -56,6 +56,8 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch
|
||||
#%%ifarch s390x
|
||||
Patch5: ImageMagick-s390x-disable-tests.patch
|
||||
#%%endif
|
||||
# https://github.com/ImageMagick/ImageMagick/commit/3c727503c6ae449160dc92cf6222ebe28ef8fb52
|
||||
Patch6: ImageMagick-correct-time-to-live.patch
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: dejavu-fonts
|
||||
BuildRequires: fdupes
|
||||
@ -355,6 +357,7 @@ policy plus disable few other coders for reading and/or writing.
|
||||
%ifarch s390x
|
||||
%patch5 -p1
|
||||
%endif
|
||||
%patch6 -p1
|
||||
|
||||
%build
|
||||
# bsc#1088463
|
||||
|
Loading…
x
Reference in New Issue
Block a user