wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 14:43:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libzen: update to 0.4.40.

Browse source
This commit is contained in:
John 2022-12-23 00:18:07 +01:00
parent 84ffb2c67c
commit 3895d93fb9
2 changed files with 2 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
srcpkgs/libzen/files/proper-mt-fix.patch
View file

@ -39,72 +39,3 @@ index c0ff266..62a1bf5 100644
dnl #########################################################################
dnl ### Output
dnl #########################################################################
diff --git a/Source/ZenLib/Format/Http/Http_Cookies.cpp b/Source/ZenLib/Format/Http/Http_Cookies.cpp
index 1345aa0..eb41690 100644
--- a/Source/ZenLib/Format/Http/Http_Cookies.cpp
+++ b/Source/ZenLib/Format/Http/Http_Cookies.cpp
@@ -86,7 +86,21 @@ void Cookies::Create_Lines(std::ostream& Out)
if (Cookie->second.Expires!=(time_t)-1)
{
char Temp[200];
- if (strftime(Temp, 200, "%a, %d-%b-%Y %H:%M:%S GMT", gmtime(&Cookie->second.Expires)))
+ #if defined(HAVE_GMTIME_R)
+ struct tm Gmt_Temp;
+ struct tm *Gmt=gmtime_r(&Cookie->second.Expires, &Gmt_Temp);
+ #elif defined(_MSC_VER)
+ struct tm Gmt_Temp;
+ errno_t gmtime_s_Result=gmtime_s(&Gmt_Temp , &Cookie->second.Expires);
+ struct tm* Gmt=gmtime_s_Result?NULL:&Gmt_Temp;
+ #else
+ #ifdef __GNUC__
+ #warning "This version of ZenLib is not thread safe"
+ #endif
+ struct tm *Gmt=gmtime(&Cookie->second.Expires);
+ #endif
+
+ if (strftime(Temp, 200, "%a, %d-%b-%Y %H:%M:%S GMT", Gmt))
Out << "; expires=" << Temp;
}
if (!Cookie->second.Path.empty())
diff --git a/Source/ZenLib/Ztring.cpp b/Source/ZenLib/Ztring.cpp
index 6b705c3..069e001 100644
--- a/Source/ZenLib/Ztring.cpp
+++ b/Source/ZenLib/Ztring.cpp
@@ -1312,7 +1312,7 @@ Ztring& Ztring::Date_From_Seconds_1970 (const int32s Value)
Ztring& Ztring::Date_From_Seconds_1970 (const int64s Value)
{
time_t Time=(time_t)Value;
- #if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE || _POSIX_SOURCE
+ #if defined(HAVE_GMTIME_R)
struct tm Gmt_Temp;
struct tm *Gmt=gmtime_r(&Time, &Gmt_Temp);
#elif defined(_MSC_VER)
@@ -1320,6 +1320,9 @@ Ztring& Ztring::Date_From_Seconds_1970 (const int64s Value)
errno_t gmtime_s_Result=gmtime_s(&Gmt_Temp , &Time);
struct tm* Gmt=gmtime_s_Result?NULL:&Gmt_Temp;
#else
+ #ifdef __GNUC__
+ #warning "This version of ZenLib is not thread safe"
+ #endif
struct tm *Gmt=gmtime(&Time);
#endif
if (!Gmt)
@@ -1352,7 +1355,7 @@ Ztring& Ztring::Date_From_Seconds_1970 (const int64s Value)
Ztring& Ztring::Date_From_Seconds_1970_Local (const int32u Value)
{
time_t Time=(time_t)Value;
- #if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE || _POSIX_SOURCE
+ #if defined(HAVE_LOCALTIME_R)
struct tm Gmt_Temp;
struct tm *Gmt=localtime_r(&Time, &Gmt_Temp);
#elif defined(_MSC_VER)
@@ -1360,6 +1363,9 @@ Ztring& Ztring::Date_From_Seconds_1970_Local (const int32u Value)
errno_t localtime_s_Result=localtime_s(&Gmt_Temp , &Time);
struct tm* Gmt=localtime_s_Result?NULL:&Gmt_Temp;
#else
+ #ifdef __GNUC__
+ #warning "This version of ZenLib is not thread safe"
+ #endif
struct tm *Gmt=localtime(&Time);
#endif
Ztring DateT;

4
srcpkgs/libzen/template
View file

@ -1,6 +1,6 @@
# Template build file for 'libzen'.
pkgname=libzen
version=0.4.38
version=0.4.40
revision=1
short_desc="Shared library for libmediainfo and mediainfo"
homepage="http://mediaarea.net/MediaInfo"
@ -8,7 +8,7 @@ maintainer="Georg Schabel <gescha@posteo.de>"
license="zlib"
distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname}_${version}.tar.gz"
checksum=ad98fccec235ed76a40e7da8856f0bcc9c8d07cafe4c3ce30c47407760add786
checksum=54d492552d97004d5323a9f1bdf397af4ffe20ae633c5f7874d073a21388c805
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"