From 8fc08491f26431ec46b36d6ebef9551f3773b96f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2023 23:17:55 +0000 Subject: gentoo auto-resync : 09:12:2023 - 23:17:54 --- x11-apps/Manifest.gz | Bin 13820 -> 13828 bytes x11-apps/xdm/Manifest | 2 + x11-apps/xdm/files/xdm-1.1.14-c99.patch | 38 +++++++++++ x11-apps/xdm/xdm-1.1.14-r1.ebuild | 83 +++++++++++++++++++++++ x11-apps/xkbutils/Manifest | 2 + x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch | 43 ++++++++++++ x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild | 22 ++++++ x11-apps/xlsfonts/Manifest | 2 + x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch | 66 ++++++++++++++++++ x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild | 19 ++++++ 10 files changed, 277 insertions(+) create mode 100644 x11-apps/xdm/files/xdm-1.1.14-c99.patch create mode 100644 x11-apps/xdm/xdm-1.1.14-r1.ebuild create mode 100644 x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch create mode 100644 x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild create mode 100644 x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch create mode 100644 x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild (limited to 'x11-apps') diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz index f070cc5c2aea..18cf8ce7491b 100644 Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index ba495ad85ae9..7e89de264db4 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -1,4 +1,6 @@ AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7cde7fa33964cbc4f51aa41a537a027749e40c69c3f8543c41924d9d05b54226a0e4400a3a1 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555 +AUX xdm-1.1.14-c99.patch 1486 BLAKE2B 5a8ce9665c0027bf255b1bb5dc42c141ac569dafd156e170ee90a69195473487caa980f06647e9e757bdef68c08f52a5b704b9d9440a724a9ffe46831ea5b168 SHA512 cc6d04207af46fddb423ad16ebce103d8ceafa9c5304c9f2c9f9ddb3606a186948d22e23c70636c90cd52588b1884744de17798447057960d71d955b52dfac42 DIST xdm-1.1.14.tar.xz 419324 BLAKE2B e1c4f1db1af670171e80b7ab759f8e477c84997a873401eb27042590eebe457b38dc7bc998c42e954012ce06c1f4c216655a9c2809a22d88e372c9f7b57e0ff0 SHA512 8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 +EBUILD xdm-1.1.14-r1.ebuild 1862 BLAKE2B ad99928f70d581d2e5025bbd790d7764f56d7f1b52c194b48c7235ff0432982fca2ff60d379d922d86228b62e61808e8ffc927d9626f9b27364d1f5672e320d9 SHA512 3f4553f9b760e58e234a5e53f34d874ce15d99ae1ab1e25c4dacd7c0a616e36e4a2c9a3466dd4138fabaf6d7d34fa694cc4156e4450c5965114f112fab61efbb EBUILD xdm-1.1.14.ebuild 1804 BLAKE2B 4f15036dc5280c9c05df6c58d2006c7e9db36f4084222e3e6bbaf0938201435275d140d7e3fc8e6de521d7deb0bade0823532cc89f3a1b10afb719904d9f259f SHA512 3284cd0d0d310e6539f2580dbbf838a8afdb276db8105a7e9fd1dec0baacb2bbc4a8ef38b7ad67c9685e06e7099fa41036b85c71454fe25ccfa672e92b1924a9 MISC metadata.xml 334 BLAKE2B bb9f203babfde01fc5cce539d89df522147c0a2e58fea1453f826749fa1399722e3dbaf301a2e23509c074c757ff25676bf67ef0b9f1c0ed958f909778ba1dbe SHA512 361b9416bd1b55df4466e419b407c2ce3d4eabefb301cab1c702c8fc961de78ab28894550cb1287418d3398b2611fa60ddfe370cd506be863eeddf2792f75b25 diff --git a/x11-apps/xdm/files/xdm-1.1.14-c99.patch b/x11-apps/xdm/files/xdm-1.1.14-c99.patch new file mode 100644 index 000000000000..a72d961e3f60 --- /dev/null +++ b/x11-apps/xdm/files/xdm-1.1.14-c99.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/919207 +https://gitlab.freedesktop.org/xorg/app/xdm/-/issues/15 +https://gitlab.freedesktop.org/xorg/app/xdm/-/merge_requests/18 + +From bccb77746528134aa2e865ca4f44fd9424738b3f Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Tue, 5 Dec 2023 17:25:28 -0800 +Subject: [PATCH] Fix -Wincompatible-pointer-types warning from gcc (issue #15) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +chooser.c:280:26: warning: passing argument 2 of ‘XawListChange’ from + incompatible pointer type [-Wincompatible-pointer-types] + 280 | XawListChange (list, newTable, size, 0, TRUE); + | ^~~~~~~~ + | | + | char ** +In file included from chooser.c:59: +/usr/include/X11/Xaw/List.h:170:27: note: expected ‘const char **’ but + argument is of type ‘char **’ + 170 | _Xconst char **list, + +Closes: #15 +Signed-off-by: Alan Coopersmith +--- a/chooser/chooser.c ++++ b/chooser/chooser.c +@@ -277,7 +277,7 @@ RebuildTable (int size) + newTable[i] = names->fullname; + qsort (newTable, size, sizeof (char *), HostnameCompare); + } +- XawListChange (list, newTable, size, 0, TRUE); ++ XawListChange (list, (_Xconst char **) newTable, size, 0, TRUE); + free (NameTable); + NameTable = newTable; + NameTableSize = size; +-- +GitLab diff --git a/x11-apps/xdm/xdm-1.1.14-r1.ebuild b/x11-apps/xdm/xdm-1.1.14-r1.ebuild new file mode 100644 index 000000000000..05afdd6ad05a --- /dev/null +++ b/x11-apps/xdm/xdm-1.1.14-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 pam systemd + +DEFAULTVT=vt7 + +DESCRIPTION="X.Org xdm application" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="pam systemd truetype xinerama xpm" + +RDEPEND=" + x11-apps/sessreg + x11-apps/xconsole + x11-apps/xinit + x11-apps/xrdb + x11-apps/xsm + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXaw + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + virtual/libcrypt:= + pam? ( sys-libs/pam ) + systemd? ( >=sys-apps/systemd-209:= ) + truetype? ( + x11-libs/libXrender + x11-libs/libXft + ) + xinerama? ( x11-libs/libXinerama ) + xpm? ( x11-libs/libXpm ) + elibc_glibc? ( dev-libs/libbsd )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.14-c99.patch +) + +src_prepare() { + sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \ + xdm.service.in || die + + # Disable XDM-AUTHORIZATION-1 (bug #445662). + # it causes issue with libreoffice and SDL games (bug #306223). + sed -i -e '/authorize/a DisplayManager*authName: MIT-MAGIC-COOKIE-1' \ + config/xdm-config.in || die + + xorg-3_src_prepare +} + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 + $(use_with pam) + $(use_with systemd systemd-daemon) + $(use_with truetype xft) + $(use_with xinerama) + $(use_enable xpm xpm-logos) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-default-vt=${DEFAULTVT} + --with-xdmconfigdir=/etc/X11/xdm + ) + xorg-3_src_configure +} + +src_install() { + xorg-3_src_install + + exeinto /usr/$(get_libdir)/X11/xdm + doexe "${FILESDIR}"/Xsession + + use pam && pamd_mimic system-local-login xdm auth account session + + # Keep /var/lib/xdm. This is where authfiles are stored. See #286350. + keepdir /var/lib/xdm +} diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest index 3365215af0c9..616689d5b841 100644 --- a/x11-apps/xkbutils/Manifest +++ b/x11-apps/xkbutils/Manifest @@ -1,3 +1,5 @@ +AUX xkbutils-1.0.5-c99.patch 1694 BLAKE2B 8328ec46960c72206931981c447db6b3444f6c44b3722ab0d5aa1fa2efa5b18c48d0997530ddc9e7a416aaf3d13f11561bc514838ccb081c3a6cd41dd1ba8942 SHA512 f7e5a746615c3013dbc7a60082652fa29dd36f477def85786e249fb7f39127b4048b0001f1d5a0e8c9dd24cbacc43de314d352eff0dda8f41d8fd12e6ba55c42 DIST xkbutils-1.0.5.tar.xz 129344 BLAKE2B ac2572b31638120dd5c5e92497f9cde4b43df7ab0f13882f5f1fbac71084dc112a1f9e34d10adf5a4eb83b1b1636ab2388ae8675be5ac1048a3913ac7b0d7f53 SHA512 0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77 +EBUILD xkbutils-1.0.5-r1.ebuild 441 BLAKE2B be1d8f3fbe2d9af03ccf37389e43aef4b8b69b150e7b86c7af27403246cba87c7e924554b0994b1418511171a1de3b03f538d2311e37f0b0189deba50dbe38b8 SHA512 b06828a9011d31dfeb054609c976edb3398f7700715a9e78ad5aa8280ba114faaeeb4795c36467a8fe708482f0a8052cf53c872dc8abf3a8a2a321d10ba8989b EBUILD xkbutils-1.0.5.ebuild 384 BLAKE2B 44b1fa6c0cf58369132f2b25969977ab746a98e3e2e6e0a5efb3a4f1ac48aaeee184e5d75f3248fa94ae1408daff4408231c263b4d75074e146f6042f8bb9625 SHA512 46fe3a2533c28cfc699096c8229595794e64a63d0c08946727d23931878b92ed72226be7ce8afd66781814209487c6ff50ea7e322e82a3fa1642174242e51218 MISC metadata.xml 339 BLAKE2B 7b4be159854a72eeb269ac7349edb97862748cebb7d7b37d858dd2283f791890caeef442fa44cd804bd4a776c66666db4e327e3b8b5417d15007940702af2ac6 SHA512 bb940fa2dca293434d965d7fd443dae05b1b70dc34c2939389c367875c71a0e6c6e632dd95d2c75e0a85b682ecd6c0131030c069c50f2ada4d3782b9e238e95f diff --git a/x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch b/x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch new file mode 100644 index 000000000000..c396361762a1 --- /dev/null +++ b/x11-apps/xkbutils/files/xkbutils-1.0.5-c99.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/919190 +https://gitlab.freedesktop.org/xorg/app/xkbutils/-/issues/2 +https://gitlab.freedesktop.org/xorg/app/xkbutils/-/merge_requests/4 + +From 5f875c8a6bc12d47ad655ba820031bb917f321c0 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Tue, 5 Dec 2023 15:01:42 -0800 +Subject: [PATCH 3/3] xkbwatch: Fix -Wincompatible-pointer-types warning (Issue + #2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes warning from gcc 13 that is becoming an error in gcc 14 + +xkbwatch.c:92:34: warning: passing argument 7 of ‘XtOpenApplication’ + from incompatible pointer type [-Wincompatible-pointer-types] + 92 | fallback_resources, + | ^~~~~~~~~~~~~~~~~~ + | | + | char ** +In file included from xkbwatch.c:31: +.../X11/Intrinsic.h:1473:5: note: expected ‘const char **’ but + argument is of type ‘char **’ + 1473 | String* /* fallback_resources */, + | ^~~~~~~ + +Closes: #2 +Signed-off-by: Alan Coopersmith +--- a/xkbwatch.c ++++ b/xkbwatch.c +@@ -72,7 +72,7 @@ main(int argc, char *argv[]) + static Arg vArgs[] = { {XtNorientation, (XtArgVal) XtorientVertical} }; + static Arg onArgs[] = { {XtNon, (XtArgVal) True} }; + static Arg offArgs[] = { {XtNon, (XtArgVal) False} }; +- static char *fallback_resources[] = { ++ static String fallback_resources[] = { + "*Box*background: grey50", + "*Box*borderWidth: 0", + "*Box*vSpace: 1", +-- +GitLab + diff --git a/x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild b/x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild new file mode 100644 index 000000000000..8c507f49ed57 --- /dev/null +++ b/x11-apps/xkbutils/xkbutils-1.0.5-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org xkbutils application" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXaw" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.5-c99.patch +) diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest index 0059fac5e79d..bcb7979d3dca 100644 --- a/x11-apps/xlsfonts/Manifest +++ b/x11-apps/xlsfonts/Manifest @@ -1,3 +1,5 @@ +AUX xlsfonts-1.0.7-c99.patch 1977 BLAKE2B d5ea871a65ac98b3824abadb908c143a650203329dea71f85ccde658e7ab659d75161f78b371fa63277546984ba7c4831e1b61936b9b1b118a34509e3d5e7422 SHA512 0509888df5df180ae6110746ec0c01c5ffcec39c8f8bee4284eb6b68daf040456e25964f81755689bed2d8e18a41c4e0cb7a6ac1054a1b6d31549fe983869a68 DIST xlsfonts-1.0.7.tar.xz 126888 BLAKE2B 13f2e2007c38f7d1724e6ffd0c7fe9a3b887a150f50107b892327c3620e4ffdbd4ae1191a9764cc4000d6422fe0f331dcbef11c0b50013ff2d94b699c0cba1ee SHA512 ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0 +EBUILD xlsfonts-1.0.7-r1.ebuild 430 BLAKE2B 394277360cb6f7270edec83bd0971e2ce8a157076e64176e627b6dd51fe675dc4140b947ac93515a6e03b20ac08afd5f896b23a8b6d92e6e0b65057c1b1c06e8 SHA512 d1f0ee536b13f48c3b273b15024c954ca3ad0ea4a49059d1b79b2e8c79dc9589629178bdfc1d9ac18b7d0f569054b1aae9525c3d37b617f6ed7e40596372f0b1 EBUILD xlsfonts-1.0.7.ebuild 374 BLAKE2B 1f0b35c19a7eb3fd8ff305e7bbecfc3d134aa4868232a2f6524520b3e4c01500ea9bafc0268be6f53bfb92c0af5e20db63a0686da215791d039f0030ab59d55a SHA512 ec42309ee7029474c86c96347d39a7871cdb8c71ec8877e0553a53022ea6691b98d2d82007161741aa12e225e24ff7c8595e1cd5425bed2e56f0d87f898656be MISC metadata.xml 339 BLAKE2B 74d5aa130fe25b67c3e40ff2701c5c73a65abf68021cde0cdda962614636e53a519109c21ba05df8282a10e1bcd05f0a03d1bf1722c5f107d8ecdac954b975ac SHA512 88d098e3081965ed422be6b64d4a96389c1461fdaa21d1180bf91f36e8da2fcaa6c37b23b884b887a5371decc40b225e8d9942e0aabb69e5f9ab42a7082ffa36 diff --git a/x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch b/x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch new file mode 100644 index 000000000000..55b767bb6a26 --- /dev/null +++ b/x11-apps/xlsfonts/files/xlsfonts-1.0.7-c99.patch @@ -0,0 +1,66 @@ +https://bugs.gentoo.org/919204 +https://gitlab.freedesktop.org/xorg/app/xlsfonts/-/issues/1 +https://gitlab.freedesktop.org/xorg/app/xlsfonts/-/merge_requests/6 + +From c92bb3e8243773535cecc4f347437a59d01dbfef Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Tue, 5 Dec 2023 15:41:28 -0800 +Subject: [PATCH 2/2] Fix -Wincompatible-pointer-types warning from gcc (issue + #1) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +xlsfonts.c: In function ‘get_list’: +xlsfonts.c:204:23: warning: assignment to ‘char **’ from incompatible + pointer type ‘const char **’ [-Wincompatible-pointer-types] + 204 | fonts = &pattern; + | ^ + +Closes: #1 +Signed-off-by: Alan Coopersmith +--- + xlsfonts.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/xlsfonts.c b/xlsfonts.c +index b834637..39aba13 100644 +--- a/xlsfonts.c ++++ b/xlsfonts.c +@@ -56,6 +56,7 @@ static int long_list = L_SHORT; + static int nnames = N_START; + static int font_cnt = 0; + static int min_max; ++static char wild_string[] = "*"; + + typedef struct { + char *name; +@@ -65,7 +66,7 @@ typedef struct { + static FontList *font_list = NULL; + + /* Local prototypes */ +-static void get_list(const char *pattern); ++static void get_list(char *pattern); + static int compare(const void *arg1, const void *arg2); + static void show_fonts(void); + static void copy_number(char **pp1, char **pp2, int n1, int n2); +@@ -180,7 +181,7 @@ main(int argc, char **argv) + } + + if (argcnt == 0) +- get_list("*"); ++ get_list(wild_string); + + show_fonts(); + +@@ -189,7 +190,7 @@ main(int argc, char **argv) + } + + static void +-get_list(const char *pattern) ++get_list(char *pattern) + { + int available = nnames + 1, i; + char **fonts; +-- +GitLab diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild new file mode 100644 index 000000000000..8964da7f9ca4 --- /dev/null +++ b/x11-apps/xlsfonts/xlsfonts-1.0.7-r1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org xlsfonts application" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.7-c99.patch +) -- cgit v1.2.3