Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
syslinux
Commits:
0ec3105a by Christian Hesse at 2024-09-30T11:19:53+02:00
use the patches I sent upstream
Still wondering if the project is kind of alive, though...
- - - - -
4 changed files:
- .SRCINFO
- 0026-include.patch → 0026-add-missing-include.patch
- 0027-type-size-t.patch → 0027-use-correct-type-for-size.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -33,8 +33,8 @@ pkgbase = syslinux
source = 0025-reproducible-build.patch
source = 0005-Workaround-multiple-definition-of-symbol-errors.patch
source = 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
- source = 0026-include.patch
- source = 0027-type-size-t.patch
+ source = 0026-add-missing-include.patch
+ source = 0027-use-correct-type-for-size.patch
sha256sums =
68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd
sha256sums =
b9692be0cce43811c1b04053072ac50dd7b39bbc2ba7bcbe0e4387668af8df08
sha256sums =
5f86b5813465c48ba7bd178389aacb5149ff0b5f2467ab1772a4f862c5b15d41
@@ -47,8 +47,8 @@ pkgbase = syslinux
sha256sums =
9a76f6f75a42485bc337163ba38068b09f7889bdc1a4e191408898f10de36662
sha256sums =
7e41e17e8cbc7287d6c3c9eb0a7b682cd8d3252030856b338050c21dff9bf05a
sha256sums =
d7410d0ff89a15e2a100faf1546d730e043dde15c295974564144e00a93f03a3
- sha256sums =
a33897c9aa687482e5daa501ed4e30e6057d3b4f3e356e61ccffbf43ef7a37e6
- sha256sums =
bf699f6bb0f3a61e5024f0a0afd4405366c2e9d54c9c21ff658ab82eae070379
+ sha256sums =
e16e051d17ead7e6457a479a1e2226160ca9aae3d607c0c25fa3677522aa9280
+ sha256sums =
7f2ce9e16ddcca1a55b32bddfd39c7f190eed9d8df4319bbd6b07e0a2607e662
makedepends_x86_64 = lib32-glibc
pkgname = syslinux
=====================================
0026-include.patch → 0026-add-missing-include.patch
=====================================
@@ -1,3 +1,13 @@
+From af0194e9705d11cb0e609b2256d6481cc879b9ef Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Mon, 30 Sep 2024 10:39:02 +0200
+Subject: [PATCH] add missing include
+
+This fixes a comiler error on missing include.
+---
+ com32/lib/syslinux/debug.c | 1 +
+ 1 file changed, 1 insertion(+)
+
diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c
index d9ab863f..e8f53d57 100644
--- a/com32/lib/syslinux/debug.c
=====================================
0027-type-size-t.patch → 0027-use-correct-type-for-size.patch
=====================================
@@ -1,3 +1,14 @@
+From 8999f7cdd69e9130707984421c08069cbeb6a967 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Mon, 30 Sep 2024 10:34:31 +0200
+Subject: [PATCH] use correct type for size
+
+The field in `struct data_area` does not have an address, but a size.
+This fixes compiler error with incompatible type.
+---
+ com32/chain/chain.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/com32/chain/chain.h b/com32/chain/chain.h
index 5e155b39..7e319b4e 100644
--- a/com32/chain/chain.h
=====================================
PKGBUILD
=====================================
@@ -41,8 +41,8 @@ source=(git+https://repo.or.cz/syslinux.git#commit=$_commit
0025-reproducible-build.patch
0005-Workaround-multiple-definition-of-symbol-errors.patch
0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
- 0026-include.patch
- 0027-type-size-t.patch
+ 0026-add-missing-include.patch
+ 0027-use-correct-type-for-size.patch
)
sha256sums=('68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd'
'b9692be0cce43811c1b04053072ac50dd7b39bbc2ba7bcbe0e4387668af8df08'
@@ -56,8 +56,8 @@
sha256sums=('68114f20d8cd35803053d8633d2ada641b264978d6fcf46ee132ad9447a727bd'
'9a76f6f75a42485bc337163ba38068b09f7889bdc1a4e191408898f10de36662'
'7e41e17e8cbc7287d6c3c9eb0a7b682cd8d3252030856b338050c21dff9bf05a'
'd7410d0ff89a15e2a100faf1546d730e043dde15c295974564144e00a93f03a3'
- 'a33897c9aa687482e5daa501ed4e30e6057d3b4f3e356e61ccffbf43ef7a37e6'
- 'bf699f6bb0f3a61e5024f0a0afd4405366c2e9d54c9c21ff658ab82eae070379')
+ 'e16e051d17ead7e6457a479a1e2226160ca9aae3d607c0c25fa3677522aa9280'
+ '7f2ce9e16ddcca1a55b32bddfd39c7f190eed9d8df4319bbd6b07e0a2607e662')
_targets='bios efi64 efi32'
@@ -83,8 +83,8 @@ prepare() {
patch -p1 < ../0005-Workaround-multiple-definition-of-symbol-errors.patch
patch -p1 <
../0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
- patch -p1 < ../0026-include.patch
- patch -p1 < ../0027-type-size-t.patch
+ patch -p1 < ../0026-add-missing-include.patch
+ patch -p1 < ../0027-use-correct-type-for-size.patch
# do not swallow efi compilation output to make debugging easier
sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/0ec3105a2ecf937ea7d5c0472e597872a3c77835
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/syslinux/-/commit/0ec3105a2ecf937ea7d5c0472e597872a3c77835
You're receiving this email because of your account on gitlab.archlinux.org.
