diff options
| author | Zach van Rijn <me@zv.io> | 2022-05-27 18:52:13 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | 5746ff89b0a7f1902818d9f652768f815cc1975e (patch) | |
| tree | b11c71c9a23dec764680baacfd1ef000eda6b5e2 | |
| parent | 913a67ae6d3add98e9eead0a367100173aaa8bf1 (diff) | |
| download | packages-5746ff89b0a7f1902818d9f652768f815cc1975e.tar.gz packages-5746ff89b0a7f1902818d9f652768f815cc1975e.tar.bz2 packages-5746ff89b0a7f1902818d9f652768f815cc1975e.tar.xz packages-5746ff89b0a7f1902818d9f652768f815cc1975e.zip | |
user/libgd: revert upstream regression. become maintainer. fixes #715.
| -rw-r--r-- | user/libgd/APKBUILD | 11 | ||||
| -rw-r--r-- | user/libgd/revert-318-removal-of-macros.patch | 27 |
2 files changed, 34 insertions, 4 deletions
diff --git a/user/libgd/APKBUILD b/user/libgd/APKBUILD index 25c57f69e..57525510d 100644 --- a/user/libgd/APKBUILD +++ b/user/libgd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=libgd pkgver=2.3.3 -pkgrel=0 +pkgrel=1 pkgdesc="Library for dynamic image creation" url="http://libgd.github.io/" arch="all" @@ -19,7 +19,9 @@ makedepends="autoconf automake bash fontconfig-dev freetype-dev checkdepends="ttf-liberation" subpackages="$pkgname-dev" replaces="gd" -source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz" +source="https://github.com/$pkgname/$pkgname/releases/download/gd-$pkgver/$pkgname-$pkgver.tar.xz + revert-318-removal-of-macros.patch + " # secfixes: # 2.3.3-r0: @@ -65,4 +67,5 @@ dev() { mv "$pkgdir"/usr/bin/bdftogd "$subpkgdir"/usr/bin } -sha512sums="aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c libgd-2.3.3.tar.xz" +sha512sums="aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c libgd-2.3.3.tar.xz +623e312e20f1994c6ae26f7fdac45b0eb7f4e65b83160ca4e22495c37b162b2dbde21ede6aab189e566b8934bb22aafdb80e9263cd87118013233927a2ab3601 revert-318-removal-of-macros.patch" diff --git a/user/libgd/revert-318-removal-of-macros.patch b/user/libgd/revert-318-removal-of-macros.patch new file mode 100644 index 000000000..85ea9c05d --- /dev/null +++ b/user/libgd/revert-318-removal-of-macros.patch @@ -0,0 +1,27 @@ +From f4bc1f5c26925548662946ed7cfa473c190a104a Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 13 Sep 2021 14:57:52 +0200 +Subject: [PATCH] Revert "Fix #318, these macros are not used as planed, we + have separate functions for each" + +This reverts commit bdc281eadb1d58d5c0c7bbc1125ee4674256df08. +--- + src/gd.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/gd.h b/src/gd.h +index 305603952..1ad9e6378 100644 +--- a/src/gd.h ++++ b/src/gd.h +@@ -1604,6 +1604,11 @@ BGD_DECLARE(void) gdImageFlipHorizontal(gdImagePtr im); + BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im); + BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im); + ++#define GD_FLIP_HORINZONTAL 1 /* typo, kept for BC */ ++#define GD_FLIP_HORIZONTAL 1 ++#define GD_FLIP_VERTICAL 2 ++#define GD_FLIP_BOTH 3 ++ + /** + * Group: Crop + * |