commit: 18b9f07f42032c99d223c5a6e145c4c11c657292 Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Mon Feb 24 14:02:44 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Wed Feb 26 21:11:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b9f07f
www-client/dillo: port to C23 Also add missing test dependency Closes: https://bugs.gentoo.org/944457 Closes: https://github.com/gentoo/gentoo/pull/40731 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> www-client/dillo/Manifest | 1 + ...dillo-3.1.1-r2.ebuild => dillo-3.1.1-r3.ebuild} | 2 ++ www-client/dillo/files/dillo-3.1.1-c23.patch | 33 ++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest index 41538870cff3..e52344fea18e 100644 --- a/www-client/dillo/Manifest +++ b/www-client/dillo/Manifest @@ -1 +1,2 @@ DIST dillo-3.1.1.tar.bz2 1026711 BLAKE2B 81fbaf527f89160bfddf4bc51048dab8f1487b735e6d9cb9679deb46cda666158bb6b0d469ec28691167cd9d9657a12f5d5f5ed5b6c1cb0102963d611b4e2ece SHA512 2f6ad315c246638e91af13fbeb8a846b756c222aaf2275efb1bff6bae08130bb4b8fda9c09cd33925911c424fe536cf7a587e6657de9a13d63733714c86533c1 +DIST dillo-3.2.0.tar.bz2 1093734 BLAKE2B 739eb5e3ea3d1fd47b4a7a94c3bef381593707ffbada7f6e18d587981510ea321720e70c1cf2265880611617d92770499879ea1131b314b70f1d23f0dcd0534c SHA512 d797dd24c7312ad607c1d8e7fe2153860eaf1bb2146108a183ad788ea59319ec11d2160b9a7cca673f3d04474121b57d8dfa73bf3921daebe601794b8cbdea09 diff --git a/www-client/dillo/dillo-3.1.1-r2.ebuild b/www-client/dillo/dillo-3.1.1-r3.ebuild similarity index 96% rename from www-client/dillo/dillo-3.1.1-r2.ebuild rename to www-client/dillo/dillo-3.1.1-r3.ebuild index 59b02fe21509..8712870a6709 100644 --- a/www-client/dillo/dillo-3.1.1-r2.ebuild +++ b/www-client/dillo/dillo-3.1.1-r3.ebuild @@ -38,6 +38,7 @@ RDEPEND=" media-gfx/imagemagick[X] x11-apps/xwd x11-apps/xwininfo + x11-base/xorg-server[xvfb] ) " @@ -57,6 +58,7 @@ DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" PATCHES=( "${FILESDIR}"/${P}-unused-constructor.patch "${FILESDIR}"/${P}-remove-which.patch + "${FILESDIR}"/${P}-c23.patch ) src_prepare() { diff --git a/www-client/dillo/files/dillo-3.1.1-c23.patch b/www-client/dillo/files/dillo-3.1.1-c23.patch new file mode 100644 index 000000000000..fe3355a98d76 --- /dev/null +++ b/www-client/dillo/files/dillo-3.1.1-c23.patch @@ -0,0 +1,33 @@ +Convert function declarations to C23 standard +https://bugs.gentoo.org/944457 +--- a/src/cache.c ++++ b/src/cache.c +@@ -1359,7 +1359,7 @@ + /** + * Callback function for Cache_delayed_process_queue. + */ +-static void Cache_delayed_process_queue_callback() ++static void Cache_delayed_process_queue_callback(void *data) + { + CacheEntry_t *entry; + +--- a/src/jpeg.c ++++ b/src/jpeg.c +@@ -124,7 +124,7 @@ + * static void init_source(j_decompress_ptr cinfo) + * (declaring it with no parameter avoids a compiler warning) + */ +-static void init_source() ++static void init_source(struct jpeg_decompress_struct *cinfo) + { + } + +@@ -181,7 +181,7 @@ + * static void term_source(j_decompress_ptr cinfo) + * (declaring it with no parameter avoids a compiler warning) + */ +-static void term_source() ++static void term_source(struct jpeg_decompress_struct *cinfo) + { + } +
