diff options
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 | 8 |
3 files changed, 48 insertions, 3 deletions
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest index 1c3b442221ff..c8eb60a38cf9 100644 --- a/app-text/xdvik/Manifest +++ b/app-text/xdvik/Manifest @@ -1,6 +1,7 @@ +AUX xdvik-22.87.06-c99-fix.patch 1625 BLAKE2B 2f864420f2480af1b7d6cc4b155b82dd65de8e9c86149c533d990e1894d76ed1776f6c4b2f06ab2c614e79f9631153c977222ea2f2680d5066dc9db95c79c1b1 SHA512 f4f40cdf2e3633e272a3ee70228017a343b857c48a3d1ed719685dd544903065d19886e231c7357be9be0f176f80546ccde4f7c16f022e6b127e64f841af0282 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 2984 BLAKE2B d48bd3934a0be92d0f8109bd0d4ab701ec1b01a33a77d441a79ba0618047158383a14a17d133f705774775b25d8f6c14e92e22ecb0807275210271e2f307bfab SHA512 6a9179ae1e07d3c54662653204f5697c98436a685e4763c4614ead246fb98f118fa07cc002cfcd00d03411cdad4ad1d393ef2aaba2f67d80fddf9ca5206b0c47 +EBUILD xdvik-22.87.06-r1.ebuild 3010 BLAKE2B d09e5825827c79149a78d0de4903fd98d9e2b30d421347ffb2cc92b7b48dfe45fad281387f1362ab910f369010a2f20ee36eae52ab3d569ce57bacfed2911a3a SHA512 4f031d83ffe674752947b15c92a2a411069ea578b51093f7d755105edcfe04fb9dc9a69d3919dc83831f2c708902c70cf52be3bbf0baed59ea85678ae779a926 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 new file mode 100644 index 000000000000..d22c473f42d3 --- /dev/null +++ b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch @@ -0,0 +1,40 @@ +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, (_Xconst 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 42dbb86d80dd..4e52dfa0e6d1 100644 --- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild +++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild @@ -34,11 +34,16 @@ DEPEND=">=media-libs/freetype-2.9.1-r2:2 dev-libs/kpathsea:=" RDEPEND="${DEPEND} virtual/latex-base - !<app-text/texlive-2007" +" BDEPEND="app-alternatives/lex app-alternatives/yacc virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch + "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch +) + src_prepare() { default @@ -51,7 +56,6 @@ src_prepare() { cd "${WORKDIR}/${P}" || die cd "${S}" || die - eapply "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch eautoreconf } |