* Re: [PR PATCH] [Updated] gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
@ 2021-01-30 15:12 ` UsernameRandomlyGenerated
2021-01-30 15:17 ` UsernameRandomlyGenerated
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: UsernameRandomlyGenerated @ 2021-01-30 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]
There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository
https://github.com/UsernameRandomlyGenerated/void-packages gd
https://github.com/void-linux/void-packages/pull/28332
gd: update to 2.3.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gd-28332.patch --]
[-- Type: text/x-diff, Size: 4727 bytes --]
From cc64163138a5af41647ae7a61658652b6ed08fb4 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:04:20 +0100
Subject: [PATCH] gd: update to 2.3.1.
---
srcpkgs/gd/patches/3dd0e308c.patch | 100 -----------------------------
srcpkgs/gd/template | 8 +--
2 files changed, 4 insertions(+), 104 deletions(-)
delete mode 100644 srcpkgs/gd/patches/3dd0e308c.patch
diff --git a/srcpkgs/gd/patches/3dd0e308c.patch b/srcpkgs/gd/patches/3dd0e308c.patch
deleted file mode 100644
index e4c464a0a31..00000000000
--- a/srcpkgs/gd/patches/3dd0e308c.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3dd0e308cbd2c24fde2fc9e9b707181252a2de95 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 5 May 2020 12:02:45 +0200
-Subject: [PATCH] Fix #615: gdImageStringFT() fails for empty strings as of
- libgd 2.3.0 (#633)
-
-We change the return type of `textLayout()` to `ssize_t`, and signal
-failure by returning `-1`, so that laying out an empty string is no
-longer handled as failure. We make sure that no overflow occurs,
-assuming that all `int` values can be fully represented as `ssize_t`.
----
- src/gdft.c | 18 +++++++++---------
- tests/gdimagestringft/.gitignore | 1 +
- tests/gdimagestringft/CMakeLists.txt | 1 +
- tests/gdimagestringft/Makemodule.am | 1 +
- tests/gdimagestringft/bug00615.c | 25 +++++++++++++++++++++++++
- 5 files changed, 37 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimagestringft/bug00615.c
-
-diff --git a/src/gdft.c b/src/gdft.c
-index b483b383..186eefff 100644
---- a/src/gdft.c
-+++ b/src/gdft.c
-@@ -441,7 +441,7 @@ typedef struct {
- uint32_t cluster;
- } glyphInfo;
-
--static size_t
-+static ssize_t
- textLayout(uint32_t *text, int len,
- FT_Face face, gdFTStringExtraPtr strex,
- glyphInfo **glyph_info)
-@@ -459,19 +459,19 @@ textLayout(uint32_t *text, int len,
- !raqm_set_par_direction (rq, RAQM_DIRECTION_DEFAULT) ||
- !raqm_layout (rq)) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- glyphs = raqm_get_glyphs (rq, &count);
- if (!glyphs) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * count);
- if (!info) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- for (i = 0; i < count; i++) {
-@@ -489,7 +489,7 @@ textLayout(uint32_t *text, int len,
- FT_Error err;
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * len);
- if (!info) {
-- return 0;
-+ return -1;
- }
- for (count = 0; count < len; count++) {
- /* Convert character code to glyph index */
-@@ -508,7 +508,7 @@ textLayout(uint32_t *text, int len,
- err = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
- if (err) {
- gdFree (info);
-- return 0;
-+ return -1;
- }
- info[count].index = glyph_index;
- info[count].x_offset = 0;
-@@ -527,7 +527,7 @@ textLayout(uint32_t *text, int len,
- #endif
-
- *glyph_info = info;
-- return count;
-+ return count <= SSIZE_MAX ? count : -1;
- }
-
- /********************************************************************/
-@@ -1108,7 +1108,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
- char *tmpstr = 0;
- uint32_t *text;
- glyphInfo *info = NULL;
-- size_t count;
-+ ssize_t count;
- int render = (im && (im->trueColor || (fg <= 255 && fg >= -255)));
- FT_BitmapGlyph bm;
- /* 2.0.13: Bob Ostermann: don't force autohint, that's just for testing
-@@ -1409,7 +1409,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
-
- count = textLayout (text , i, face, strex, &info);
-
-- if (!count) {
-+ if (count < 0) {
- gdFree (text);
- gdFree (tmpstr);
- gdCacheDelete (tc_cache);
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 4e20db7d1f3..45725334d85 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -1,7 +1,7 @@
# Template file for 'gd'
pkgname=gd
-version=2.3.0
-revision=2
+version=2.3.1
+revision=1
wrksrc="libgd-${version}"
build_style=gnu-configure
configure_args="--without-xpm"
@@ -9,10 +9,10 @@ hostmakedepends="pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel libwebp-devel tiff-devel fontconfig-devel"
short_desc="Graphics library for the dynamic creation of images"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom"
homepage="http://www.libgd.org/"
-license="BSD"
distfiles="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.xz"
-checksum=ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58
+checksum=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b
patch_args="-Np1"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
2021-01-30 15:12 ` [PR PATCH] [Updated] " UsernameRandomlyGenerated
@ 2021-01-30 15:17 ` UsernameRandomlyGenerated
2021-01-30 15:19 ` UsernameRandomlyGenerated
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: UsernameRandomlyGenerated @ 2021-01-30 15:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]
There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository
https://github.com/UsernameRandomlyGenerated/void-packages gd
https://github.com/void-linux/void-packages/pull/28332
gd: update to 2.3.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gd-28332.patch --]
[-- Type: text/x-diff, Size: 4736 bytes --]
From afb106c529dacbf8a67b6302157d84f507ddb3c8 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:04:20 +0100
Subject: [PATCH] gd: update to 2.3.1.
---
srcpkgs/gd/patches/3dd0e308c.patch | 100 -----------------------------
srcpkgs/gd/template | 8 +--
2 files changed, 4 insertions(+), 104 deletions(-)
delete mode 100644 srcpkgs/gd/patches/3dd0e308c.patch
diff --git a/srcpkgs/gd/patches/3dd0e308c.patch b/srcpkgs/gd/patches/3dd0e308c.patch
deleted file mode 100644
index e4c464a0a31..00000000000
--- a/srcpkgs/gd/patches/3dd0e308c.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3dd0e308cbd2c24fde2fc9e9b707181252a2de95 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 5 May 2020 12:02:45 +0200
-Subject: [PATCH] Fix #615: gdImageStringFT() fails for empty strings as of
- libgd 2.3.0 (#633)
-
-We change the return type of `textLayout()` to `ssize_t`, and signal
-failure by returning `-1`, so that laying out an empty string is no
-longer handled as failure. We make sure that no overflow occurs,
-assuming that all `int` values can be fully represented as `ssize_t`.
----
- src/gdft.c | 18 +++++++++---------
- tests/gdimagestringft/.gitignore | 1 +
- tests/gdimagestringft/CMakeLists.txt | 1 +
- tests/gdimagestringft/Makemodule.am | 1 +
- tests/gdimagestringft/bug00615.c | 25 +++++++++++++++++++++++++
- 5 files changed, 37 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimagestringft/bug00615.c
-
-diff --git a/src/gdft.c b/src/gdft.c
-index b483b383..186eefff 100644
---- a/src/gdft.c
-+++ b/src/gdft.c
-@@ -441,7 +441,7 @@ typedef struct {
- uint32_t cluster;
- } glyphInfo;
-
--static size_t
-+static ssize_t
- textLayout(uint32_t *text, int len,
- FT_Face face, gdFTStringExtraPtr strex,
- glyphInfo **glyph_info)
-@@ -459,19 +459,19 @@ textLayout(uint32_t *text, int len,
- !raqm_set_par_direction (rq, RAQM_DIRECTION_DEFAULT) ||
- !raqm_layout (rq)) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- glyphs = raqm_get_glyphs (rq, &count);
- if (!glyphs) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * count);
- if (!info) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- for (i = 0; i < count; i++) {
-@@ -489,7 +489,7 @@ textLayout(uint32_t *text, int len,
- FT_Error err;
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * len);
- if (!info) {
-- return 0;
-+ return -1;
- }
- for (count = 0; count < len; count++) {
- /* Convert character code to glyph index */
-@@ -508,7 +508,7 @@ textLayout(uint32_t *text, int len,
- err = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
- if (err) {
- gdFree (info);
-- return 0;
-+ return -1;
- }
- info[count].index = glyph_index;
- info[count].x_offset = 0;
-@@ -527,7 +527,7 @@ textLayout(uint32_t *text, int len,
- #endif
-
- *glyph_info = info;
-- return count;
-+ return count <= SSIZE_MAX ? count : -1;
- }
-
- /********************************************************************/
-@@ -1108,7 +1108,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
- char *tmpstr = 0;
- uint32_t *text;
- glyphInfo *info = NULL;
-- size_t count;
-+ ssize_t count;
- int render = (im && (im->trueColor || (fg <= 255 && fg >= -255)));
- FT_BitmapGlyph bm;
- /* 2.0.13: Bob Ostermann: don't force autohint, that's just for testing
-@@ -1409,7 +1409,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
-
- count = textLayout (text , i, face, strex, &info);
-
-- if (!count) {
-+ if (count < 0) {
- gdFree (text);
- gdFree (tmpstr);
- gdCacheDelete (tc_cache);
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 4e20db7d1f3..99c02ea45fb 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -1,7 +1,7 @@
# Template file for 'gd'
pkgname=gd
-version=2.3.0
-revision=2
+version=2.3.1
+revision=1
wrksrc="libgd-${version}"
build_style=gnu-configure
configure_args="--without-xpm"
@@ -9,10 +9,10 @@ hostmakedepends="pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel libwebp-devel tiff-devel fontconfig-devel"
short_desc="Graphics library for the dynamic creation of images"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:BSD-like"
homepage="http://www.libgd.org/"
-license="BSD"
distfiles="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.xz"
-checksum=ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58
+checksum=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b
patch_args="-Np1"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
2021-01-30 15:12 ` [PR PATCH] [Updated] " UsernameRandomlyGenerated
2021-01-30 15:17 ` UsernameRandomlyGenerated
@ 2021-01-30 15:19 ` UsernameRandomlyGenerated
2021-02-07 13:25 ` [PR PATCH] [Updated] " UsernameRandomlyGenerated
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: UsernameRandomlyGenerated @ 2021-01-30 15:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New comment by UsernameRandomlyGenerated on void-packages repository
https://github.com/void-linux/void-packages/pull/28332#issuecomment-770227178
Comment:
Test failing related to https://github.com/libgd/libgd/issues/367
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
` (2 preceding siblings ...)
2021-01-30 15:19 ` UsernameRandomlyGenerated
@ 2021-02-07 13:25 ` UsernameRandomlyGenerated
2021-02-07 13:27 ` UsernameRandomlyGenerated
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: UsernameRandomlyGenerated @ 2021-02-07 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]
There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository
https://github.com/UsernameRandomlyGenerated/void-packages gd
https://github.com/void-linux/void-packages/pull/28332
gd: update to 2.3.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gd-28332.patch --]
[-- Type: text/x-diff, Size: 4822 bytes --]
From 6cb0684f44f84bb99ba73bd349de3ea0c0d33512 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:04:20 +0100
Subject: [PATCH] gd: update to 2.3.1.
---
srcpkgs/gd/patches/3dd0e308c.patch | 100 -----------------------------
srcpkgs/gd/template | 10 +--
2 files changed, 6 insertions(+), 104 deletions(-)
delete mode 100644 srcpkgs/gd/patches/3dd0e308c.patch
diff --git a/srcpkgs/gd/patches/3dd0e308c.patch b/srcpkgs/gd/patches/3dd0e308c.patch
deleted file mode 100644
index e4c464a0a31..00000000000
--- a/srcpkgs/gd/patches/3dd0e308c.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3dd0e308cbd2c24fde2fc9e9b707181252a2de95 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 5 May 2020 12:02:45 +0200
-Subject: [PATCH] Fix #615: gdImageStringFT() fails for empty strings as of
- libgd 2.3.0 (#633)
-
-We change the return type of `textLayout()` to `ssize_t`, and signal
-failure by returning `-1`, so that laying out an empty string is no
-longer handled as failure. We make sure that no overflow occurs,
-assuming that all `int` values can be fully represented as `ssize_t`.
----
- src/gdft.c | 18 +++++++++---------
- tests/gdimagestringft/.gitignore | 1 +
- tests/gdimagestringft/CMakeLists.txt | 1 +
- tests/gdimagestringft/Makemodule.am | 1 +
- tests/gdimagestringft/bug00615.c | 25 +++++++++++++++++++++++++
- 5 files changed, 37 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimagestringft/bug00615.c
-
-diff --git a/src/gdft.c b/src/gdft.c
-index b483b383..186eefff 100644
---- a/src/gdft.c
-+++ b/src/gdft.c
-@@ -441,7 +441,7 @@ typedef struct {
- uint32_t cluster;
- } glyphInfo;
-
--static size_t
-+static ssize_t
- textLayout(uint32_t *text, int len,
- FT_Face face, gdFTStringExtraPtr strex,
- glyphInfo **glyph_info)
-@@ -459,19 +459,19 @@ textLayout(uint32_t *text, int len,
- !raqm_set_par_direction (rq, RAQM_DIRECTION_DEFAULT) ||
- !raqm_layout (rq)) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- glyphs = raqm_get_glyphs (rq, &count);
- if (!glyphs) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * count);
- if (!info) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- for (i = 0; i < count; i++) {
-@@ -489,7 +489,7 @@ textLayout(uint32_t *text, int len,
- FT_Error err;
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * len);
- if (!info) {
-- return 0;
-+ return -1;
- }
- for (count = 0; count < len; count++) {
- /* Convert character code to glyph index */
-@@ -508,7 +508,7 @@ textLayout(uint32_t *text, int len,
- err = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
- if (err) {
- gdFree (info);
-- return 0;
-+ return -1;
- }
- info[count].index = glyph_index;
- info[count].x_offset = 0;
-@@ -527,7 +527,7 @@ textLayout(uint32_t *text, int len,
- #endif
-
- *glyph_info = info;
-- return count;
-+ return count <= SSIZE_MAX ? count : -1;
- }
-
- /********************************************************************/
-@@ -1108,7 +1108,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
- char *tmpstr = 0;
- uint32_t *text;
- glyphInfo *info = NULL;
-- size_t count;
-+ ssize_t count;
- int render = (im && (im->trueColor || (fg <= 255 && fg >= -255)));
- FT_BitmapGlyph bm;
- /* 2.0.13: Bob Ostermann: don't force autohint, that's just for testing
-@@ -1409,7 +1409,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
-
- count = textLayout (text , i, face, strex, &info);
-
-- if (!count) {
-+ if (count < 0) {
- gdFree (text);
- gdFree (tmpstr);
- gdCacheDelete (tc_cache);
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 4e20db7d1f3..59182e7399f 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -1,18 +1,20 @@
# Template file for 'gd'
pkgname=gd
-version=2.3.0
-revision=2
+version=2.3.1
+revision=1
wrksrc="libgd-${version}"
build_style=gnu-configure
configure_args="--without-xpm"
hostmakedepends="pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel libwebp-devel tiff-devel fontconfig-devel"
+# There needs to be a font installed for fontconfig/basic test
+checkdepends="liberation-fonts-ttf"
short_desc="Graphics library for the dynamic creation of images"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:BSD-like"
homepage="http://www.libgd.org/"
-license="BSD"
distfiles="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.xz"
-checksum=ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58
+checksum=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b
patch_args="-Np1"
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
` (3 preceding siblings ...)
2021-02-07 13:25 ` [PR PATCH] [Updated] " UsernameRandomlyGenerated
@ 2021-02-07 13:27 ` UsernameRandomlyGenerated
2021-02-07 16:49 ` [PR PATCH] [Updated] " UsernameRandomlyGenerated
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: UsernameRandomlyGenerated @ 2021-02-07 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New comment by UsernameRandomlyGenerated on void-packages repository
https://github.com/void-linux/void-packages/pull/28332#issuecomment-770227178
Comment:
Test failing related to https://github.com/libgd/libgd/issues/367
Edit: I've added liberation fonts to checkdepends for fontconfig/basic test problem, not sure if that's the best way to tackle the problem.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
` (4 preceding siblings ...)
2021-02-07 13:27 ` UsernameRandomlyGenerated
@ 2021-02-07 16:49 ` UsernameRandomlyGenerated
2021-02-07 16:58 ` UsernameRandomlyGenerated
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: UsernameRandomlyGenerated @ 2021-02-07 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]
There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository
https://github.com/UsernameRandomlyGenerated/void-packages gd
https://github.com/void-linux/void-packages/pull/28332
gd: update to 2.3.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gd-28332.patch --]
[-- Type: text/x-diff, Size: 4986 bytes --]
From 2a73984135ccdf43e989fba42cc84c1311e62e2d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:04:20 +0100
Subject: [PATCH] gd: update to 2.3.1.
---
srcpkgs/gd/patches/3dd0e308c.patch | 100 -----------------------------
srcpkgs/gd/template | 15 +++--
2 files changed, 11 insertions(+), 104 deletions(-)
delete mode 100644 srcpkgs/gd/patches/3dd0e308c.patch
diff --git a/srcpkgs/gd/patches/3dd0e308c.patch b/srcpkgs/gd/patches/3dd0e308c.patch
deleted file mode 100644
index e4c464a0a31..00000000000
--- a/srcpkgs/gd/patches/3dd0e308c.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3dd0e308cbd2c24fde2fc9e9b707181252a2de95 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 5 May 2020 12:02:45 +0200
-Subject: [PATCH] Fix #615: gdImageStringFT() fails for empty strings as of
- libgd 2.3.0 (#633)
-
-We change the return type of `textLayout()` to `ssize_t`, and signal
-failure by returning `-1`, so that laying out an empty string is no
-longer handled as failure. We make sure that no overflow occurs,
-assuming that all `int` values can be fully represented as `ssize_t`.
----
- src/gdft.c | 18 +++++++++---------
- tests/gdimagestringft/.gitignore | 1 +
- tests/gdimagestringft/CMakeLists.txt | 1 +
- tests/gdimagestringft/Makemodule.am | 1 +
- tests/gdimagestringft/bug00615.c | 25 +++++++++++++++++++++++++
- 5 files changed, 37 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimagestringft/bug00615.c
-
-diff --git a/src/gdft.c b/src/gdft.c
-index b483b383..186eefff 100644
---- a/src/gdft.c
-+++ b/src/gdft.c
-@@ -441,7 +441,7 @@ typedef struct {
- uint32_t cluster;
- } glyphInfo;
-
--static size_t
-+static ssize_t
- textLayout(uint32_t *text, int len,
- FT_Face face, gdFTStringExtraPtr strex,
- glyphInfo **glyph_info)
-@@ -459,19 +459,19 @@ textLayout(uint32_t *text, int len,
- !raqm_set_par_direction (rq, RAQM_DIRECTION_DEFAULT) ||
- !raqm_layout (rq)) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- glyphs = raqm_get_glyphs (rq, &count);
- if (!glyphs) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * count);
- if (!info) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- for (i = 0; i < count; i++) {
-@@ -489,7 +489,7 @@ textLayout(uint32_t *text, int len,
- FT_Error err;
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * len);
- if (!info) {
-- return 0;
-+ return -1;
- }
- for (count = 0; count < len; count++) {
- /* Convert character code to glyph index */
-@@ -508,7 +508,7 @@ textLayout(uint32_t *text, int len,
- err = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
- if (err) {
- gdFree (info);
-- return 0;
-+ return -1;
- }
- info[count].index = glyph_index;
- info[count].x_offset = 0;
-@@ -527,7 +527,7 @@ textLayout(uint32_t *text, int len,
- #endif
-
- *glyph_info = info;
-- return count;
-+ return count <= SSIZE_MAX ? count : -1;
- }
-
- /********************************************************************/
-@@ -1108,7 +1108,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
- char *tmpstr = 0;
- uint32_t *text;
- glyphInfo *info = NULL;
-- size_t count;
-+ ssize_t count;
- int render = (im && (im->trueColor || (fg <= 255 && fg >= -255)));
- FT_BitmapGlyph bm;
- /* 2.0.13: Bob Ostermann: don't force autohint, that's just for testing
-@@ -1409,7 +1409,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
-
- count = textLayout (text , i, face, strex, &info);
-
-- if (!count) {
-+ if (count < 0) {
- gdFree (text);
- gdFree (tmpstr);
- gdCacheDelete (tc_cache);
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 4e20db7d1f3..e11e3c9c132 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -1,21 +1,28 @@
# Template file for 'gd'
pkgname=gd
-version=2.3.0
-revision=2
+version=2.3.1
+revision=1
wrksrc="libgd-${version}"
build_style=gnu-configure
configure_args="--without-xpm"
hostmakedepends="pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel libwebp-devel tiff-devel fontconfig-devel"
+# There needs to be a font installed for fontconfig/basic test
+checkdepends="liberation-fonts-ttf"
short_desc="Graphics library for the dynamic creation of images"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:BSD-like"
homepage="http://www.libgd.org/"
-license="BSD"
distfiles="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.xz"
-checksum=ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58
+checksum=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b
patch_args="-Np1"
+# Fix test failures for i686
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ export CFLAGS+=" -msse -mfpmath=sse"
+fi
+
post_install() {
vlicense COPYING
}
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
` (5 preceding siblings ...)
2021-02-07 16:49 ` [PR PATCH] [Updated] " UsernameRandomlyGenerated
@ 2021-02-07 16:58 ` UsernameRandomlyGenerated
2021-02-11 22:11 ` [PR PATCH] [Closed]: " ericonr
2021-02-11 22:11 ` ericonr
8 siblings, 0 replies; 10+ messages in thread
From: UsernameRandomlyGenerated @ 2021-02-07 16:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]
There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository
https://github.com/UsernameRandomlyGenerated/void-packages gd
https://github.com/void-linux/void-packages/pull/28332
gd: update to 2.3.1.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28332.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gd-28332.patch --]
[-- Type: text/x-diff, Size: 4981 bytes --]
From 814b2d18f784f0b5196921146e5dba1ac62994c3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 30 Jan 2021 16:04:20 +0100
Subject: [PATCH] gd: update to 2.3.1.
---
srcpkgs/gd/patches/3dd0e308c.patch | 100 -----------------------------
srcpkgs/gd/template | 15 +++--
2 files changed, 10 insertions(+), 105 deletions(-)
delete mode 100644 srcpkgs/gd/patches/3dd0e308c.patch
diff --git a/srcpkgs/gd/patches/3dd0e308c.patch b/srcpkgs/gd/patches/3dd0e308c.patch
deleted file mode 100644
index e4c464a0a31..00000000000
--- a/srcpkgs/gd/patches/3dd0e308c.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 3dd0e308cbd2c24fde2fc9e9b707181252a2de95 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 5 May 2020 12:02:45 +0200
-Subject: [PATCH] Fix #615: gdImageStringFT() fails for empty strings as of
- libgd 2.3.0 (#633)
-
-We change the return type of `textLayout()` to `ssize_t`, and signal
-failure by returning `-1`, so that laying out an empty string is no
-longer handled as failure. We make sure that no overflow occurs,
-assuming that all `int` values can be fully represented as `ssize_t`.
----
- src/gdft.c | 18 +++++++++---------
- tests/gdimagestringft/.gitignore | 1 +
- tests/gdimagestringft/CMakeLists.txt | 1 +
- tests/gdimagestringft/Makemodule.am | 1 +
- tests/gdimagestringft/bug00615.c | 25 +++++++++++++++++++++++++
- 5 files changed, 37 insertions(+), 9 deletions(-)
- create mode 100644 tests/gdimagestringft/bug00615.c
-
-diff --git a/src/gdft.c b/src/gdft.c
-index b483b383..186eefff 100644
---- a/src/gdft.c
-+++ b/src/gdft.c
-@@ -441,7 +441,7 @@ typedef struct {
- uint32_t cluster;
- } glyphInfo;
-
--static size_t
-+static ssize_t
- textLayout(uint32_t *text, int len,
- FT_Face face, gdFTStringExtraPtr strex,
- glyphInfo **glyph_info)
-@@ -459,19 +459,19 @@ textLayout(uint32_t *text, int len,
- !raqm_set_par_direction (rq, RAQM_DIRECTION_DEFAULT) ||
- !raqm_layout (rq)) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- glyphs = raqm_get_glyphs (rq, &count);
- if (!glyphs) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * count);
- if (!info) {
- raqm_destroy (rq);
-- return 0;
-+ return -1;
- }
-
- for (i = 0; i < count; i++) {
-@@ -489,7 +489,7 @@ textLayout(uint32_t *text, int len,
- FT_Error err;
- info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * len);
- if (!info) {
-- return 0;
-+ return -1;
- }
- for (count = 0; count < len; count++) {
- /* Convert character code to glyph index */
-@@ -508,7 +508,7 @@ textLayout(uint32_t *text, int len,
- err = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
- if (err) {
- gdFree (info);
-- return 0;
-+ return -1;
- }
- info[count].index = glyph_index;
- info[count].x_offset = 0;
-@@ -527,7 +527,7 @@ textLayout(uint32_t *text, int len,
- #endif
-
- *glyph_info = info;
-- return count;
-+ return count <= SSIZE_MAX ? count : -1;
- }
-
- /********************************************************************/
-@@ -1108,7 +1108,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
- char *tmpstr = 0;
- uint32_t *text;
- glyphInfo *info = NULL;
-- size_t count;
-+ ssize_t count;
- int render = (im && (im->trueColor || (fg <= 255 && fg >= -255)));
- FT_BitmapGlyph bm;
- /* 2.0.13: Bob Ostermann: don't force autohint, that's just for testing
-@@ -1409,7 +1409,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
-
- count = textLayout (text , i, face, strex, &info);
-
-- if (!count) {
-+ if (count < 0) {
- gdFree (text);
- gdFree (tmpstr);
- gdCacheDelete (tc_cache);
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index 4e20db7d1f3..e3bf7ad531f 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -1,20 +1,25 @@
# Template file for 'gd'
pkgname=gd
-version=2.3.0
-revision=2
+version=2.3.1
+revision=1
wrksrc="libgd-${version}"
build_style=gnu-configure
configure_args="--without-xpm"
hostmakedepends="pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel libwebp-devel tiff-devel fontconfig-devel"
+# There needs to be a font installed for fontconfig/basic test
+checkdepends="liberation-fonts-ttf"
short_desc="Graphics library for the dynamic creation of images"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:BSD-like"
homepage="http://www.libgd.org/"
-license="BSD"
distfiles="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.xz"
-checksum=ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58
+checksum=9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b
-patch_args="-Np1"
+# Fix test failures for i686
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ export CFLAGS+=" -msse -mfpmath=sse"
+fi
post_install() {
vlicense COPYING
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Closed]: gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
` (6 preceding siblings ...)
2021-02-07 16:58 ` UsernameRandomlyGenerated
@ 2021-02-11 22:11 ` ericonr
2021-02-11 22:11 ` ericonr
8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-02-11 22:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]
There's a closed pull request on the void-packages repository
gd: update to 2.3.1.
https://github.com/void-linux/void-packages/pull/28332
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: gd: update to 2.3.1.
2021-01-30 15:05 [PR PATCH] gd: update to 2.3.1 UsernameRandomlyGenerated
` (7 preceding siblings ...)
2021-02-11 22:11 ` [PR PATCH] [Closed]: " ericonr
@ 2021-02-11 22:11 ` ericonr
8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-02-11 22:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28332#issuecomment-777826758
Comment:
The i686 fix looks sketchy, and the test failures are known. I pushed without them, thanks!
^ permalink raw reply [flat|nested] 10+ messages in thread