From 65a1a144e66496d746998a54d2c5ad7cf53252cb Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 4 Mar 2024 11:42:16 -0500 Subject: [PATCH 1/3] dev-lang/php: some more implicit function decl fixes for 8.1.x Closes: https://bugs.gentoo.org/925877 Signed-off-by: Michael Orlitzky --- .../php/files/php-8.1.27-implicit-decls.patch | 72 +++++++++++++++++++ ...-8.1.27-r1.ebuild => php-8.1.27-r2.ebuild} | 7 ++ 2 files changed, 79 insertions(+) create mode 100644 dev-lang/php/files/php-8.1.27-implicit-decls.patch rename dev-lang/php/{php-8.1.27-r1.ebuild => php-8.1.27-r2.ebuild} (99%) diff --git a/dev-lang/php/files/php-8.1.27-implicit-decls.patch b/dev-lang/php/files/php-8.1.27-implicit-decls.patch new file mode 100644 index 0000000000000..443b02ba17c21 --- /dev/null +++ b/dev-lang/php/files/php-8.1.27-implicit-decls.patch @@ -0,0 +1,72 @@ +From 79df2b9dcbe0388667c832b2c702ca3158330ed7 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Mon, 4 Mar 2024 11:48:01 -0500 +Subject: [PATCH] ext/iconv/config.m4: add missing stdio.h include. + +The next generation of C compilers is going to enforce the C standard +more strictly: + + https://wiki.gentoo.org/wiki/Modern_C_porting + +One warning that will eventually become an error is +-Wimplicit-function-declaration. This is relatively easy to catch in +most code (it will fail to compile), but inside of autoconf tests it +can go unnoticed because many feature-test compilations fail by +design. For example, + + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[iconv_ccs_init(NULL, NULL);]])]... + +is designed to fail if iconv_ccs_init() is not in iconv.h. On the +other hand, + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + int main() { + printf("%d", _libiconv_version); + return 0; + } + +should pass if _libiconv_version is defined. If the user has +-Werror=implicit-function-declaration in his CFLAGS, however, +it will not: + + $ export CFLAGS="$CFLAGS -Werror=implicit-function-declaration" + $ ./configure + ... + checking if using GNU libiconv... no + +This is because the stdio.h header that defines printf() is missing: + + conftest.c:240:3: error: implicit declaration of function 'printf' + [-Werror=implicit-function-declaration] + 240 | printf("%d", _libiconv_version); + | ^~~~~~ + conftest.c:239:1: note: include '' or provide a declaration + of 'printf' + +This commit adds the include, correcting the test with any compiler +that balks at implicit function definitions. + +(Backport to php-8.1.27) + +Closes GH-10751 +--- + ext/iconv/config.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index ac57c81e..b8044bf2 100644 +--- a/ext/iconv/config.m4 ++++ b/ext/iconv/config.m4 +@@ -30,6 +30,7 @@ if test "$PHP_ICONV" != "no"; then + AC_MSG_CHECKING([if using GNU libiconv]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include ++#include + int main() { + printf("%d", _libiconv_version); + return 0; +-- +2.43.0 + diff --git a/dev-lang/php/php-8.1.27-r1.ebuild b/dev-lang/php/php-8.1.27-r2.ebuild similarity index 99% rename from dev-lang/php/php-8.1.27-r1.ebuild rename to dev-lang/php/php-8.1.27-r2.ebuild index ee3853ec58931..38bbbc21e31c9 100644 --- a/dev-lang/php/php-8.1.27-r1.ebuild +++ b/dev-lang/php/php-8.1.27-r2.ebuild @@ -149,6 +149,7 @@ PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" "${FILESDIR}/php-capstone-optional.patch" "${FILESDIR}/php-8.1.27-gcc14-libxml.patch" + "${FILESDIR}/php-8.1.27-implicit-decls.patch" ) # ARM/Windows functions that are expected to be undefined. @@ -158,6 +159,12 @@ QA_CONFIG_IMPL_DECL_SKIP=( _controlfp_s ) +# Functions from alternate iconv implementations (bug 925268) +QA_CONFIG_IMPL_DECL_SKIP+=( + iconv_ccs_init + cstoccsid +) + php_install_ini() { local phpsapi="${1}" From 9662525ed260e60568b1d0eb52e482aa8bf01df2 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 4 Mar 2024 12:06:45 -0500 Subject: [PATCH 2/3] x11-drivers/xf86-input-wacom: Version bump to 1.2.1 Signed-off-by: Matt Turner --- x11-drivers/xf86-input-wacom/Manifest | 1 + .../xf86-input-wacom-1.2.1.ebuild | 81 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.1.ebuild diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest index 14116aae65dab..072015325a840 100644 --- a/x11-drivers/xf86-input-wacom/Manifest +++ b/x11-drivers/xf86-input-wacom/Manifest @@ -1 +1,2 @@ DIST xf86-input-wacom-1.2.0.tar.bz2 647874 BLAKE2B c59e605bacb2694c2e322faba9b030112ffb57f916c816cbcb9a946fa063713c0590e1ea29273f73a84f4360b5bc5241c9768d7e61d77dfc9fb0af72b1a6f1cc SHA512 34817b87318d1fcf885e6427436a54d748a1c910026e6af0a22fafb461b227ca566cf06846f1f57c0d66412d5a3b20c95f014a71f8ef394ea8ca360a5f902318 +DIST xf86-input-wacom-1.2.1.tar.bz2 655198 BLAKE2B 0597b9c4e05ddd696943e1a03eaf1543db78ba895d8ac3d29cf6fe0a185236eb522a8511a2757c5eb965e35283e2bd4c08e4416548de1f76456d0d27575f5eaa SHA512 b8fd8496bf297ac0e44f36e8d84131600b689e27f35368895795302d4fd60d83ae9da9773c71007cf4f2b1c02d1aec27280d789821f17c57ec47b988c4f4c3bb diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.1.ebuild new file mode 100644 index 0000000000000..d0c9b40ae40e0 --- /dev/null +++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.2.1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd udev xorg-3 meson + +DESCRIPTION="Driver for Wacom tablets and drawing devices" +HOMEPAGE="https://linuxwacom.github.io/" +LICENSE="GPL-2" +SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libwacom-2:= + >=x11-base/xorg-server-1.13:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXinerama + virtual/libudev:=" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +pkg_pretend() { + linux-info_pkg_setup + + if kernel_is lt 3 17; then + if ! linux_config_exists \ + || ! linux_chkconfig_present TABLET_USB_WACOM \ + || ! linux_chkconfig_present INPUT_EVDEV; then + echo + ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel" + ewarn " Device Drivers --->" + ewarn " Input device support --->" + ewarn " <*> Event interface" + ewarn " [*] Tablets --->" + ewarn " <*> Wacom Intuos/Graphire tablet support (USB)" + echo + fi + else + if ! linux_config_exists \ + || ! linux_chkconfig_present HID_WACOM; then + echo + ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel" + ewarn " Device Drivers --->" + ewarn " HID support --->" + ewarn " Special HID drivers --->" + ewarn " <*> Wacom Intuos/Graphire tablet support (USB)" + echo + fi + fi +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_configure() { + xorg-3_flags_setup + + local emesonargs=( + -Dsystemd-unit-dir="$(systemd_get_systemunitdir)" + -Dudev-rules-dir="$(get_udevdir)/rules.d" + $(meson_feature test unittests) + -Dwacom-gobject=disabled + ) + meson_src_configure +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} From ec501209f57087c14155e00e8226ea106b67afbd Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 4 Mar 2024 12:07:41 -0500 Subject: [PATCH 3/3] x11-libs/libXcursor: EAPI=8 Signed-off-by: Matt Turner --- x11-libs/libXcursor/libXcursor-1.2.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/libXcursor/libXcursor-1.2.2.ebuild b/x11-libs/libXcursor/libXcursor-1.2.2.ebuild index f8df8fc652ce5..d35af65cf491c 100644 --- a/x11-libs/libXcursor/libXcursor-1.2.2.ebuild +++ b/x11-libs/libXcursor/libXcursor-1.2.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MULTILIB=yes XORG_TARBALL_SUFFIX=xz