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

libzip: fix the gcc2 patch so that it also compiles with gcc13

Browse Source
This commit is contained in:
Joachim Mairböck
2025-08-28 14:53:14 +02:00
parent af74abc468
commit 365478c058
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-libs/libzip/libzip-1.11.4.recipe
View File

@@ -20,7 +20,7 @@ PROVIDES="
lib:libzip$secondaryArchSuffix = $libVersionCompat lib:libzip$secondaryArchSuffix = $libVersionCompat
" "
if [ -z "$secondaryArchSuffix" ]; then if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES PROVIDES+="
cmd:zipcmp cmd:zipcmp
cmd:zipmerge cmd:zipmerge
cmd:ziptool cmd:ziptool

8
dev-libs/libzip/patches/libzip-1.11.4.patchset
View File

@@ -55,7 +55,7 @@ index b79873b..dda5da0 100644
2.50.1 2.50.1
From a4e23756bf9c98a5fa3abab6cfe733d469dcf58e Mon Sep 17 00:00:00 2001 From 4c593c933d4b3cf347b933911f0f97bfb08dd09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com> From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Tue, 26 Aug 2025 18:05:10 +0200 Date: Tue, 26 Aug 2025 18:05:10 +0200
Subject: gcc2 fixes Subject: gcc2 fixes
@@ -216,14 +216,14 @@ index ed1704a..212a194 100644
fprintf(stderr, "failed to add file to archive: %s\n", zip_strerror(archive)); fprintf(stderr, "failed to add file to archive: %s\n", zip_strerror(archive));
zip_discard(archive); zip_discard(archive);
diff --git a/src/zipcmp.c b/src/zipcmp.c diff --git a/src/zipcmp.c b/src/zipcmp.c
index 536e9b2..6ee5d5f 100644 index 536e9b2..fe72679 100644
--- a/src/zipcmp.c --- a/src/zipcmp.c
+++ b/src/zipcmp.c +++ b/src/zipcmp.c
@@ -411,6 +411,7 @@ list_directory(const char *name, struct archive *a) { @@ -411,6 +411,7 @@ list_directory(const char *name, struct archive *a) {
size_t prefix_length; size_t prefix_length;
size_t name_length; size_t name_length;
char* normalized_name; char* normalized_name;
+ char *const names[2] = {NULL, NULL}; + char* names[2] = {NULL, NULL};
name_length = strlen(name); name_length = strlen(name);
if (name_length == 0) { if (name_length == 0) {
@@ -292,7 +292,7 @@ index 6666ecb..53f5fc1 100644
2.50.1 2.50.1
From 32213250c5f3fb7d7fd5d7db0edace6488243845 Mon Sep 17 00:00:00 2001 From a02a2fae20cbc6998469e2b5cf4400f45de31cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com> From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Tue, 26 Aug 2025 18:06:03 +0200 Date: Tue, 26 Aug 2025 18:06:03 +0200
Subject: disable rpath Subject: disable rpath