Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updpatch: gd 2.3.3-8 #4085

Merged
merged 1 commit into from
Sep 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions gd/riscv64.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Index: PKGBUILD
===================================================================
--- PKGBUILD (revision 448169)
+++ PKGBUILD (working copy)
@@ -11,9 +11,11 @@
diff --git PKGBUILD PKGBUILD
index 7241fa8..ef9b5e3 100644
--- PKGBUILD
+++ PKGBUILD
@@ -11,9 +11,11 @@ depends=('fontconfig' 'libxpm' 'libwebp' 'libavif' 'libheif')
optdepends=('perl: bdftogd script')
checkdepends=('ttf-liberation')
source=("https://github.com/libgd/libgd/archive/${pkgname}-${pkgver}.tar.gz"
Expand All @@ -16,10 +16,10 @@ Index: PKGBUILD

prepare() {
cd libgd-${pkgname}-${pkgver}
@@ -21,6 +23,10 @@
# Re-add macros that are used in PHP
# See https://github.com/php/php-src/pull/7490
patch -p1 -R -i "$srcdir/bdc281eadb1d58d5c0c7bbc1125ee4674256df08.patch"
@@ -26,6 +28,10 @@ prepare() {
for f in tests/tiff/{tiff_read_bw,tiff_im2im,tiff_dpi}.c; do
echo 'int main() { return 0; }' > $f
done
+
+ # 2 tests fail on aarch64 (and riscv64): https://github.com/libgd/libgd/issues/745
+ # upstream disabled them only for aarch64: https://github.com/libgd/libgd/commit/4ff557bc31fc12fba0a57554bf5f596e7fb3f15b
Expand Down
Loading