diff --git a/community/gmni/APKBUILD b/community/gmni/APKBUILD index 98dc4ca842fce08aad0f264832c4b9f5de9c9f11..b9117ae36451ed0ee9d8da6096cfd3a6720821d6 100644 --- a/community/gmni/APKBUILD +++ b/community/gmni/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=gmni pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gemini client" options="!check" # No testsuite url="https://git.sr.ht/~sircmpwn/gmni" @@ -11,6 +11,7 @@ makedepends="bearssl-dev scdoc" subpackages="$pkgname-doc $pkgname-dev" source=" $pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/gmni/archive/$pkgver.tar.gz + gcc14-werror-calloc-transposed-args.patch " build() { ./configure \ @@ -25,4 +26,5 @@ package() { } sha512sums=" bfc5afb13e28fb360997a15660e22887c06e2c208580677a0b6a3c3cdb57a508277406ebf3ba2620a3c0b7d066296e77604d1cbc0473d3939bb6204c55850038 gmni-1.0.tar.gz +bfb06d0a431db7c4661814d2b918b65ce6783b7ceb1809fc29cb95e9eb889ccc6ce15aeef9bf1de8168d0385003769611164e6ada5da2f60f7752ee1bad05213 gcc14-werror-calloc-transposed-args.patch " diff --git a/community/gmni/gcc14-werror-calloc-transposed-args.patch b/community/gmni/gcc14-werror-calloc-transposed-args.patch new file mode 100644 index 0000000000000000000000000000000000000000..4c4572d430f8fa25ef40c0b5586c271360e83870 --- /dev/null +++ b/community/gmni/gcc14-werror-calloc-transposed-args.patch @@ -0,0 +1,39 @@ +Fix -Werror=calloc-transposed-args error in `url.c` with gcc 14. + +``` +src/url.c: In function 'curl_url': +src/url.c:1026:24: error: 'calloc' sizes specified with 'sizeof' in the earlier +argument and not in the later argument [-Werror=calloc-transposed-args] + 1026 | return calloc(sizeof(struct Curl_URL), 1); + | ^~~~~~ +src/url.c:1026:24: note: earlier argument should specify number of elements, +later size of each element +src/url.c: In function 'curl_url_dup': +src/url.c:1046:38: error: 'calloc' sizes specified with 'sizeof' in the earlier +argument and not in the later argument [-Werror=calloc-transposed-args] + 1046 | struct Curl_URL *u = calloc(sizeof(struct Curl_URL), 1); + | ^~~~~~ +src/url.c:1046:38: note: earlier argument should specify number of elements, +later size of each element +``` + +--- gmni-1.0-origin/src/url.c ++++ gmni-1.0/src/url.c +@@ -1023,7 +1023,7 @@ + */ + struct Curl_URL *curl_url(void) + { +- return calloc(sizeof(struct Curl_URL), 1); ++ return calloc(1, sizeof(struct Curl_URL)); + } + + void curl_url_cleanup(struct Curl_URL *u) +@@ -1043,7 +1043,7 @@ + + struct Curl_URL *curl_url_dup(struct Curl_URL *in) + { +- struct Curl_URL *u = calloc(sizeof(struct Curl_URL), 1); ++ struct Curl_URL *u = calloc(1, sizeof(struct Curl_URL)); + if(u) { + DUP(u, in, scheme); + DUP(u, in, user);