diff --git a/testing/pacparser/APKBUILD b/testing/pacparser/APKBUILD index 0a909793b2d23924abe7bc6ddb4e6ff13d7a0f25..313eea1080a007418e5d82f22ef89efa95da1848 100644 --- a/testing/pacparser/APKBUILD +++ b/testing/pacparser/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=pacparser pkgver=1.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="A library to parse proxy auto-config (PAC) files" url="https://pacparser.manugarg.com/" arch="all" @@ -11,6 +11,7 @@ makedepends="bash python3-dev py3-setuptools" subpackages="py3-$pkgname-pyc:pyc py3-$pkgname:pymod $pkgname-doc $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/manugarg/pacparser/archive/refs/tags/v$pkgver.tar.gz spidermonkey-make.patch + gcc14.patch " # secfixes: @@ -44,4 +45,5 @@ pymod() { sha512sums=" fabbfa5c5ebd2a884187e53db27015b16587cba2ae30da1fdec92ca211b1f0ecd2839222341cd0eca9e709ada4e9efcd686b713e4f1e5621507070a6300ad164 pacparser-1.4.5.tar.gz 99753cfb450e685d866d80e33c58320584c15ec625a0745d4ea2b9d3a6eadb2308563d1b86bdc656a66d255b58a426a89cd5f14ea3b472d04a70a99ef3c1a2bf spidermonkey-make.patch +9fa2a02606a8fae20e36afa4700a62e2c2c2ab174d34d51f6821379520f21167df687bf5d98316916cfdc6451df418b777b67dfcea44d168f417328b9fb12cb0 gcc14.patch " diff --git a/testing/pacparser/gcc14.patch b/testing/pacparser/gcc14.patch new file mode 100644 index 0000000000000000000000000000000000000000..9ccdfa59321c7ff5ac973fdeb99ecd898d193e33 --- /dev/null +++ b/testing/pacparser/gcc14.patch @@ -0,0 +1,32 @@ +Source: https://github.com/manugarg/pacparser/issues/194#issuecomment-2262030966 + +Fix -Wincompatible-pointer-types error with gcc 14. + +``` +jsapi.c: In function 'JS_ConvertArgumentsVA': +jsapi.c:96:35: error: passing argument 5 of 'TryArgumentFormatter' from +incompatible pointer type [-Wincompatible-pointer-types] + 96 | #define JS_ADDRESSOF_VA_LIST(ap) (&(ap)) + | ~^~~~~~ + | | + | __va_list_tag ** +jsapi.c:267:39: note: in expansion of macro 'JS_ADDRESSOF_VA_LIST' + 267 | JS_ADDRESSOF_VA_LIST(ap))) { + | ^~~~~~~~~~~~~~~~~~~~ +jsapi.c:137:44: note: expected '__va_list_tag (*)[1]' but argument is of type '__va_list_tag **' + 137 | jsval **vpp, va_list *app) + | ~~~~~~~~~^~~ +``` + +-- +--- a/src/spidermonkey/js/src/jsapi.c ++++ b/src/spidermonkey/js/src/jsapi.c +@@ -93,7 +93,7 @@ + #ifdef HAVE_VA_LIST_AS_ARRAY + #define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(ap)) + #else +-#define JS_ADDRESSOF_VA_LIST(ap) (&(ap)) ++#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(&(ap))) + #endif + + #if defined(JS_PARANOID_REQUEST) && defined(JS_THREADSAFE)