diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-20 00:10:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-20 00:10:57 +0100 |
| commit | d6ca4e4f90cb75c323b5988eefa96a04c0d36908 (patch) | |
| tree | 8197fc88451976470c871e991b75a9d40c240270 /app-text/xdvik | |
| parent | e8df704cf9b5e9e517317b8912377c0a8ca0d11e (diff) | |
gentoo auto-resync : 20:06:2024 - 00:10:56
Diffstat (limited to 'app-text/xdvik')
| -rw-r--r-- | app-text/xdvik/Manifest | 3 | ||||
| -rw-r--r-- | app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch | 40 | ||||
| -rw-r--r-- | app-text/xdvik/xdvik-22.87.06-r1.ebuild | 6 |
3 files changed, 5 insertions, 44 deletions
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest index 4abf88c3c5d9..ca274e5303c8 100644 --- a/app-text/xdvik/Manifest +++ b/app-text/xdvik/Manifest @@ -1,7 +1,6 @@ -AUX xdvik-22.87.06-c99-fix.patch 1617 BLAKE2B dc48cda41619b660f5a3c2a775896376b0a90a562852faca5e00f21e1c6d428f4829978360fcc390d7c5af9b5375a12885589c9b07f8da6f4343cfc303a6e403 SHA512 b85985a5582c439814535dc86d1e911fa908388aa1c32fa9d3c54c40c732234c36d4daca488210ac828ef9f5a2f356fb33518dde80558ee876dd52c979b4da0d AUX xdvik-22.87.06-configure-clang16.patch 1275 BLAKE2B 6d3e3108330ab2098b8712146d0c6c0aa866da21291562f69707219e098d3effb1b9404fe014e6f860fd5c65ae0d1d9bb5ced185f995ded7f71263dec7b8fb17 SHA512 bd0e59ca66d113510a35917a2ba0c1118d276a558836213e7a9e0485465a029e25abdd44131793e7697639f4c6617dc208494debaf8366144931e77c4e344dd2 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f DIST xdvik_192.png 77893 BLAKE2B 533910801cd981a39c42851be2779f98ecf7fcec8ef2a167005521e39d8ef66d8eb806b382451ebf88da62ba61afba82b8d15a60ef6ba347bd2ff848f10253ed SHA512 7fa6becc3601df01134cd163e461780b9ab4ee855788e38dc3d255d491294c033f040326016df7671ff301cc8f91462209e1fda5e50cb383f5407f0c1021d71d -EBUILD xdvik-22.87.06-r1.ebuild 3024 BLAKE2B 82f3f44181c563465c098e4dcb8ce4d3ccfa9ee98a0b3ed01dad77fa450cbd54d2fe5344bfc97d8dd2b79e4a0cefeb2aa0aea9019a7c92693a33de7f700c75f9 SHA512 e47cc5014835c6aa7e29ccebb834769051d1ae1fae34150cc197caeb5074acbe000ca32c1e9c5059cda1d984f7e6d83a67666374250bfcc9d93b97348bbfd7a0 +EBUILD xdvik-22.87.06-r1.ebuild 3187 BLAKE2B 391a922f541f7de372b3c5718a3902aefc2741021b906ccd3b2d3e7983276b0ef887c28d154b5d532e5b1d8543fc33dbd8a6485f693d93853ea982a3c6f99b40 SHA512 b4f522f7a3cc4f33dd46453584d7645aac1dfa526fce5f17138b55b66a3002ac6a1d326a02c35928a6031d6fe2480bb3ba0e387c5ff5658f6020541809c9c74b MISC metadata.xml 595 BLAKE2B 200debd0214e5985f3f59cabdac72252b556edef5224c77f5dbd91de347f57ab492dd0f7ce846c335179344bc9215b02af61572ff859c9c44ca947235ce5062b SHA512 bf925b9c9738c62f26ebbb2f88782597d6cee471a19258b553e0dc7aa397443149adfceba6cfcdd045196eecc3319541b980850ba5e572f51266da1945b65e4a diff --git a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch deleted file mode 100644 index 4c16f0abd9c4..000000000000 --- a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001 -From: Christopher Fore <csfore@posteo.net> -Date: Thu, 15 Feb 2024 15:20:34 -0500 -Subject: [PATCH] xdvik/gui: Fix compilation on GCC 14 - -Starting in GCC 14, what used to be warnings from incompatible pointer -types are now errors. - -https://www.gnu.org/software/gcc/gcc-14/porting_to.html - -Error message: -gui/pagesel.c:541:41: error: passing argument 2 of `XawListChange' from -incompatible pointer type [-Wincompatible-pointer-types] - 541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0, - | ~~~~~~~~~^~~~~~~~~~~~ - | | - | char ** - -This mismatch is simply from XawListChange taking in a const whilst the -argument given was not a const. - -Gentoo bug: https://bugs.gentoo.org/919069 -Signed-off-by: Christopher Fore <csfore@posteo.net> ---- - texk/xdvik/gui/pagesel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gui/pagesel.c b/gui/pagesel.c -index 945ae760fa..913db11264 100644 ---- a/gui/pagesel.c -+++ b/gui/pagesel.c -@@ -538,7 +538,7 @@ xaw_update_list(void) - button_width = get_panel_width() - 2 * (resource.btn_side_spacing + resource.btn_border_width); - /* delete and re-create list */ - ASSERT(total_pages <= (int)page_info.index_size, ""); -- XawListChange(LIST_WIDGET, page_info.page_labels, 0, -+ XawListChange(LIST_WIDGET, (char**) page_info.page_labels, 0, - MAX(button_width, pagelist_width), False); - /* restore selected item */ - if (idx != XAW_LIST_NONE) { diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild index b41e96e30510..61fa93f0c7a1 100644 --- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild +++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild @@ -17,6 +17,9 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 IUSE="motif neXt Xaw3d emacs" +# require >=libXaw-1.0.16 for suitable XawListChange API, see +# - https://bugs.gentoo.org/919069 +# - https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/d0fcbd9722ad691ca0b5873c98e8e9c236fa718b DEPEND=">=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi @@ -29,7 +32,7 @@ DEPEND=">=media-libs/freetype-2.9.1-r2:2 neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( x11-libs/libXaw ) + !Xaw3d? ( >=x11-libs/libXaw-1.0.16 ) ) ) dev-libs/kpathsea:=" @@ -42,7 +45,6 @@ BDEPEND="app-alternatives/lex PATCHES=( "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch - "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch ) src_prepare() { |