haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solve bug with segmentation violation due to recursive call to gmtime_r

Browse Source
This commit is contained in:
Alex Hitech
2025-08-20 14:44:33 +03:00
committed by Gerasim Troeglazov
parent 9bab5a8bda
commit 2e873b6b69
2 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dev-vcs/guitar/guitar-1.2.999~git.recipe
View File

@@ -8,17 +8,20 @@ Features:
HOMEPAGE="https://soramimi.github.io/Guitar/"
COPYRIGHT="2023 S.Fuchita"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
srcGitRev="c7bb0f62d91c9803fd3e2f5b3017d84e6750e833"
SOURCE_URI="https://github.com/soramimi/Guitar/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="603fceb37d82ef5ef53945694a1a339b777225f1c2ca6463ee73e32d3e19d1bb"
SOURCE_FILENAME="Guitar-$portVersion-$srcGitRev.tar.gz"
SOURCE_DIR="Guitar-$srcGitRev"
ADDITIONAL_FILES="guitar.rdef.in"
PATCHES="guitar-$portVersion.patchset"
PATCHES="
guitar-$portVersion.patchset
haiku-dont-override-time_r.patch
"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
ARCHITECTURES="x86 x86_64 !x86_gcc2"
SECONDARY_ARCHITECTURES="x86 x86_64"
PROVIDES="
guitar$secondaryArchSuffix = $portVersion
@@ -27,7 +30,7 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
cmd:git
lib:libcrypto$secondaryArchSuffix
openssl3
lib:libGL$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
@@ -40,7 +43,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcrypto$secondaryArchSuffix >= 3
openssl3_devel
devel:libGL$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix

41
dev-vcs/guitar/patches/haiku-dont-override-time_r.patch Normal file
View File

@@ -0,0 +1,41 @@
diff --git a/filetype.pro b/filetype.pro
index 47691c4..e4aa9ee 100644
--- a/filetype.pro
+++ b/filetype.pro
@@ -34,9 +34,7 @@ SOURCES += \
filetype/file/src/fsmagic.c \
filetype/file/src/funcs.c \
filetype/file/src/getline.c \
- filetype/file/src/gmtime_r.c \
filetype/file/src/is_tar.c \
- filetype/file/src/localtime_r.c \
filetype/file/src/magic.c \
filetype/file/src/pread.c \
filetype/file/src/print.c \
diff --git a/filetype/file/src/gmtime_r.c b/filetype/file/src/gmtime_r.c
index 7e27ed6..bc05d6c 100644
--- a/filetype/file/src/gmtime_r.c
+++ b/filetype/file/src/gmtime_r.c
@@ -15,5 +15,5 @@ gmtime_r(const time_t *t, struct tm *tm)
if (tmp == NULL)
return NULL;
memcpy(tm, tmp, sizeof(*tm));
- return tmp;
+ return tm;
}
diff --git a/filetype/filetype.pri b/filetype/filetype.pri
index 279a5de..932ef59 100644
--- a/filetype/filetype.pri
+++ b/filetype/filetype.pri
@@ -26,11 +26,9 @@ SOURCES += \
filetype/file/src/fsmagic.c \
filetype/file/src/funcs.c \
filetype/file/src/getline.c \
- filetype/file/src/gmtime_r.c \
filetype/file/src/is_csv.c \
filetype/file/src/is_json.c \
filetype/file/src/is_tar.c \
- filetype/file/src/localtime_r.c \
filetype/file/src/magic.c \
filetype/file/src/pread.c \
filetype/file/src/print.c \