diff options
Diffstat (limited to 'x11-libs')
56 files changed, 2009 insertions, 207 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz Binary files differindex fc7c3fcf1660..959a5839c5b9 100644 --- a/x11-libs/Manifest.gz +++ b/x11-libs/Manifest.gz diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest index 46d8e9f6f1e0..149e22f85195 100644 --- a/x11-libs/fox/Manifest +++ b/x11-libs/fox/Manifest @@ -7,5 +7,5 @@ DIST fox-1.7.84.tar.gz 5879987 BLAKE2B 803a698eb5d976a04dd30b03a3c65f840d09e1732 EBUILD fox-1.6.57-r3.ebuild 2716 BLAKE2B a05a83cf05d89281eaf2ff0aa541e5158b11eebe4e0b7df6d8504688cb9ac2238c6d1d62a96ff7080f8f357019af16c2ff6e571b5a044b0d04da915f62d8ecff SHA512 b9ef945852b7abe98cd538ac2b85fb23cb2f2839d5f688c2452860c53ad9df213a4c0de6cc8d19cb8a2604a70d4ac81dc936eb6bf0bbd9bff52728f8685905c2 EBUILD fox-1.7.67-r1.ebuild 2933 BLAKE2B d5c7f8cd71a1b630bbbf891acc2a0cc292e42ed56d8e7d7c7b682cc6af00ffe07f77e7180e6aa835424f2d6a8a965348d8ff3624a1de59b4337c1e63a22daff3 SHA512 a41cefd75344bf768fe3fd1c5863139a0a653d2aa7e73af449ce368ada8c7654c2896c22a4009b0ffa1bd7e57eb20621c6978e1f7849d4f2c37b06bde2662d2e EBUILD fox-1.7.67-r2.ebuild 3596 BLAKE2B 39bc68a4767df31681f6ee8ae584d6019813a9f68fb3d8f7800f0be5a2d8905d9600a91a740ccd3c60cf8d374e59d5f1648a4dcd08dc685935e515e15d1ab225 SHA512 ab98bb2d7fc89c8bebb2bf8c009848256d057b781ce147d85fee70a8860ce2b73c5e5d1a1d31ef3353b4c58145d05ab3bf906ae2fa5fba8eb3cd2ef02871f8ae -EBUILD fox-1.7.84.ebuild 2822 BLAKE2B e1c08e6f8ef697834c944f4e1be94a5bcae5cb0a9bbe563a96ad15542e9d74f335b877776e2e47203fa3e715b883d0800d59db31f79927a0d5c4444cbd1a1b95 SHA512 d28107586dccbdcb37e5f5e7153d6e847baa2a7dd5eb31f2a8c554faf0f9930232d99e9121e58c501bac7ca466d178a90812cedfc679a5bc7aba47df4b62ea37 +EBUILD fox-1.7.84.ebuild 2835 BLAKE2B cbc98b7a3a8ea04cdc9af374fe24f21b0017692658fd8166b052c8535604b9d9e1f3d97e98572ab69371b584c914da5727466e29d133b052024b1b1ea5241f72 SHA512 742605d9dde4b0f8c94e42f344d666cbf768c32c8f478d7f720a29bb13b932d2ff2a5b40ec2109e2929a1c906336eee38716543ebcefe5e3169a9f3f53a76b40 MISC metadata.xml 353 BLAKE2B e9db8b14c07f63f450153af626408d7007471113ba54acad5aa97aac5258d02fe6702db354cce45ceca20444756f5ceb0c46dbacb6fae28fb06320f24221cbbb SHA512 26adab0c5f6876716fa0c87398e9d4009d162d4d202d0455d987837617316aecf8096b10c2a99a5529f7b9d5a324f9aa386d11d0f22c574114acebd15e30fdaa diff --git a/x11-libs/fox/fox-1.7.84.ebuild b/x11-libs/fox/fox-1.7.84.ebuild index 33e6f56e8667..baab848c2236 100644 --- a/x11-libs/fox/fox-1.7.84.ebuild +++ b/x11-libs/fox/fox-1.7.84.ebuild @@ -65,6 +65,8 @@ src_prepare() { } src_configure() { + filter-lto + use debug || append-cppflags -DNDEBUG # Not using --enable-release because of the options it sets like no SSP diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index e5d2f07dea54..67f6360b2603 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,3 +1,5 @@ DIST gdk-pixbuf-2.42.10.tar.xz 6519776 BLAKE2B b6bec388b70a971ea5b336001920fdf433bcbc539d54e62c7b6198e968f0bd3560ef9adc94215b64b01e7d5db69c95d5a1d32654b38b051fceb75e93666b3385 SHA512 ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a +DIST gdk-pixbuf-2.42.12.tar.xz 6525072 BLAKE2B 718a96c9efb836a275692ccbc403df0eb285918c5867d344406f660898c7ce8aad8cce7187faf7f6e9cdcfd1b051d5384f57644d946b888baddbaafb8f99309c SHA512 ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8 EBUILD gdk-pixbuf-2.42.10-r1.ebuild 2611 BLAKE2B 1c36d8ebc003375c67b1a65e68a02f9d7e0224fda1aeb88fdcc9572799ea525d888e91c553189c768f08f6cb81d44376d5e8eb3d03721a610f6c04c9f0809d97 SHA512 90d2cecde576fdd05123accba3927e8d3307a95007376024586fda0bc8be2c90b7a7feacbb9bcffe31efcfb5b36bed71003cdda70db9058c1645f5385e48e9e8 +EBUILD gdk-pixbuf-2.42.12.ebuild 2665 BLAKE2B ada55bcb49300bb063b902d975523f9158bc38f809cb8a3458474bc9fb8e7906535b0376bd0fbae5e5f3e785132c84ac8f8da13a56a36eeef8cb4e2a8dc40bc4 SHA512 2f69ad173b296ac62d5e53af45cbeeec782f4e1d83ab243e447e23a92c549cc74f49f3fa76550d01637d03721411639e41cf28c7cd24e41bf9414001a975294f MISC metadata.xml 413 BLAKE2B ef1599cbeba0cb882a3c2f3b1783ce2dbd965e86106c85531033d609d4535108522454c17b6384a458d723d9c8751c3880896a3f67cf09add1e4649db36adc16 SHA512 3527aab03be85d82f776f1a05887a69cf91c803692dd88d848d3a3878d41e9acce6b2294dd64eb9756b9b450893e542d62fc80b7544823a70e7573533c3b0a39 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild new file mode 100644 index 000000000000..3a669285f2af --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson-multilib multilib xdg + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="gtk-doc +introspection gif jpeg test tiff" +RESTRICT="!test? ( test )" + +# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review +DEPEND=" + >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-3.9.2:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.3 + dev-libs/glib:2 + dev-libs/libxslt + dev-python/docutils + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) +) + +src_prepare() { + default + xdg_environment_reset +} + +multilib_src_configure() { + local emesonargs=( + -Dpng=enabled + $(meson_feature gif) + -Dothers=enabled + $(meson_feature tiff) + $(meson_feature jpeg) + -Dbuiltin_loaders=png,jpeg + -Drelocatable=false + #native_windows_loaders + $(meson_use test tests) + -Dinstalled_tests=false + -Dgio_sniffing=true + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_feature introspection) + $(meson_native_true man) + ) + + meson_src_configure +} + +multilib_src_install_all() { + einstalldocs + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die + fi +} + +pkg_preinst() { + xdg_pkg_preinst + + multilib_pkg_preinst() { + # Make sure loaders.cache belongs to gdk-pixbuf alone + local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" + + if [[ -e ${EROOT}/${cache} ]]; then + cp "${EROOT}"/${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst + multilib_foreach_abi gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + xdg_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache + fi +} diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 172107efdce7..9f6acd724cf6 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,4 @@ +AUX 0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch 2662 BLAKE2B 153fd8af510f664ec3f6414ad905a3c93aacb65d8c8fd9a26949cb2094a986a67a52113efcfc6918003fe710673f52aeba3d428dd5b2e2e4831f2e632a6690d0 SHA512 218c22980df3dc76af6bae2930c2d9b9da64f0e902dc05ff392527250e8377ec61170c2b31119e2a9672bcb1f2d6c88355b09f56f5b5b5c4bfd2f2e9bcc2e773 AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b42dad26d44bda2f1a9b36ee7dae0f8e7c072f5a8e492d01429bb4ae679f886b3ef0fb9952bef5a08e75720908f2e8d616d SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48 AUX gtk+-2.24.33-Fix-casts.patch 6906 BLAKE2B 80247597a4bb6c84ed71d1c572125c28b2696f8f2571d3816fa44fa744a7cdb2a4cee744906b3172ee88c0d623a1ed0dbfc53c832561e0bc906fec7ebc3621e0 SHA512 0a26e9b726a2233ff5d1c1c2a4be0867c42e5127daf2c8312d68e64aa5e887deed36bb9af755db74c3d7aafd2f45bdec1e03d445d73cda325d73f75a88dfad3e @@ -11,8 +12,9 @@ DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade DIST gtk+-3.24.41.tar.xz 13188312 BLAKE2B fbded114fe2b5c1c7bffe79d0a22d559f97081eb972baf31b5c9bd7190bd1ea2875f1c632d3f3be8233377299f1df15bbffbe45d50cc7ff588e034eb41eb8f6e SHA512 aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98 DIST gtk+-3.24.42.tar.xz 13226980 BLAKE2B 04675abfa056d19a8324c8310789227e661458cfa356b670ba79d61a9498fa1c65161d19799d33d717742912cdddc3400a548573809d5dd4e0f289d0c75e88d9 SHA512 53e86e35d33f82384f1d40bd91feee67be68bc9003abd095842991441b1f2ee11a5b431168963270d3ffc0c653d26673ca97cdd55a8f577ef21dbd5d6004b643 -EBUILD gtk+-2.24.33-r3.ebuild 9873 BLAKE2B 2c8a9b6615fbf5a53f6bc4ffbe35455029a9401886a7c74258c52a542615a47ef67b3cc59a1b96fab194d8ce4106469d13b7466462473265b3c7d83beb5e14ff SHA512 c807aa90c4289afcebd66ea67b77dd844ff74e3aa7f54ddd0276b4d6df5286f5331ff5a05a88133f67ef4fcee50fb671e96d064acb40b0c03d69043d780be4e2 +EBUILD gtk+-2.24.33-r3.ebuild 9931 BLAKE2B 1066095a81e7be9b64759f7cccf5075d21d4099411acf347fd30f380b404805a9f4c54c31a5f7c4658b6be1415f6514e04d7d186f856fdf89d9628d585fd0718 SHA512 42336975f81a8d970503adc40275c6ce0520607a37dd20d247c1c00133237cc16e27aea155a42a65c39ef8bf978c80295dcb3f2f88c3850917447e1d177b7d96 EBUILD gtk+-3.24.35.ebuild 6975 BLAKE2B 0f546d052435348f1eb7fe32c286e599d949d078170034f43ff145ad37f5b7212bf39bbd6efe6e6a700ea9d803145b44f1c20db411676b0e43a7cbe78685e3aa SHA512 8567a382f37b0ee50ab8a38104ed9027b4b36f97e23db6ea9ed62d9031e2526d8382fd483363bb5d3133b1178a1addf747218945fd52f845e2540a729bd90a4e +EBUILD gtk+-3.24.41-r1.ebuild 5981 BLAKE2B 6b4b7eb34902d257ecbdbb2fe720b0c3e83ec58d913deb621a3989b54a4565131a58e265c6f2b094f7b548b9fbd69d6428547698fbcf0a976e6324a62820b437 SHA512 7ed4c45594d29298fbc79f516f25dbb2c0f3eb48e607efc2a76438b845f718710c25503f9a8568550d4414e1d7c0a18c9800d206b0c8a56f2a7c744fdde9b4a8 EBUILD gtk+-3.24.41.ebuild 5698 BLAKE2B 3def6d5a97f192594a6359bcff0b2642ed7a5c1ff6b281837990944b3a8ad09c81ffeb93ce06c07f86131753fd7e9aac59e5ab68da628add7888315c9c1789b2 SHA512 fb3b785c371b06d039214d34b4376b5b86ee0dd5919c0d8fd2313d2f35c21ff3952a465477bcb3b42e772065d7c551de7b5d42601cab3bf273e8a3aacc0f837c -EBUILD gtk+-3.24.42.ebuild 6106 BLAKE2B 2e7e08718937b727150964b40893f4471a496f7b6ea40d220dad361aac752941dc5c90447660305ab42274ed2ae062d3377e59ba89eff494fb4926821c8e98a5 SHA512 955dc6d1c78dc373f0e149aa7e6e36b198d2efc38dd9af989ca64bfc50e429c2d4dbfeccc1705354050585091ed0b8417212878c5ec1c7a583a2004c8036a29e +EBUILD gtk+-3.24.42-r1.ebuild 6389 BLAKE2B 6954e8c418b92bbaf598a7a6d73454fdfd56ba348613a589db0f83e94f1d7ed38ff9e9b034f9f932fcc70ea5ee09fab7817e5dbd518389da26ea1ea1c5a05461 SHA512 4a1b39bee58a3825a21708878bcf32bb8ea0e3ca685651d2b05defb139c5827739659bc1dba2262eb391381e2480d5c828dcce7ffb625aba2df2331475b9ff96 MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e diff --git a/x11-libs/gtk+/files/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch b/x11-libs/gtk+/files/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch new file mode 100644 index 000000000000..26c56b86fe89 --- /dev/null +++ b/x11-libs/gtk+/files/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch @@ -0,0 +1,90 @@ +From 25bdad805bb9e16032baf4480e9c1e432ddef49b Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Wed, 19 Jun 2024 21:28:31 -0400 +Subject: [PATCH] gdk: add a "poison" macro to hide GDK_WINDOWING_* + +Many packages perform automagic dependencies on gdk's backend +implementations by checking if the macro is defined and then using the +code it unlocks, rather than having a buildsystem option such as +-Dwayland=true. + +It's unfeasible to patch every such package's source code to add +configure options and respect them. Instead add a truly filthy hack and +permit gtk itself to selectively show or hide the windowing system in +use. + +By default, we assume this macro is never defined. It should only ever +be defined inside an ebuild, as such: + +``` +use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND +use X || append-cflags -DGENTOO_GTK_HIDE_X11 +``` + +When seen, this will prevent code using "#ifdef GDK_WINDOWING_*" from +seeing the define, so the automagic dependency won't be picked up. It +will also cause any attempt to #include the backend-specific headers to +bug out. + +Bug: https://bugs.gentoo.org/624960 +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + gdk/gdkconfig.h.meson | 7 +++++++ + gdk/wayland/gdkwayland.h | 4 ++++ + gdk/x11/gdkx.h | 4 ++++ + 3 files changed, 15 insertions(+) + +diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson +index 7db19e0470..6bee207e94 100644 +--- a/gdk/gdkconfig.h.meson ++++ b/gdk/gdkconfig.h.meson +@@ -10,9 +10,16 @@ + G_BEGIN_DECLS + + ++#ifndef GENTOO_GTK_HIDE_X11 + #mesondefine GDK_WINDOWING_X11 ++#endif ++ + #mesondefine GDK_WINDOWING_BROADWAY ++ ++#ifndef GENTOO_GTK_HIDE_WAYLAND + #mesondefine GDK_WINDOWING_WAYLAND ++#endif ++ + #mesondefine GDK_WINDOWING_WIN32 + #mesondefine GDK_WINDOWING_QUARTZ + +diff --git a/gdk/wayland/gdkwayland.h b/gdk/wayland/gdkwayland.h +index 2b79295add..5f0e9cfa81 100644 +--- a/gdk/wayland/gdkwayland.h ++++ b/gdk/wayland/gdkwayland.h +@@ -25,6 +25,10 @@ + #ifndef __GDK_WAYLAND_H__ + #define __GDK_WAYLAND_H__ + ++#ifdef GENTOO_GTK_HIDE_WAYLAND ++ #error "A Gentoo ebuild has hidden wayland and it cannot be used in this compilation unit. Please file a bug if you see this error." ++#endif ++ + #include <gdk/gdk.h> + + #define __GDKWAYLAND_H_INSIDE__ +diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h +index 1f64bccb6d..256c83015e 100644 +--- a/gdk/x11/gdkx.h ++++ b/gdk/x11/gdkx.h +@@ -25,6 +25,10 @@ + #ifndef __GDK_X_H__ + #define __GDK_X_H__ + ++#ifdef GENTOO_GTK_HIDE_X11 ++ #error "A Gentoo ebuild has hidden x11 and it cannot be used in this compilation unit. Please file a bug if you see this error." ++#endif ++ + #include <gdk/gdk.h> + + #include <X11/Xlib.h> +-- +2.44.2 + diff --git a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild index d6e8c26b77a2..a2a634581869 100644 --- a/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.33-r3.ebuild @@ -134,6 +134,8 @@ src_prepare() { # -O3 and company cause random crashes in applications, bug #133469 replace-flags -O3 -O2 strip-flags + # Not compatible with C23 decls + append-flags -std=gnu17 if ! use test ; then # don't waste time building tests diff --git a/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild new file mode 100644 index 000000000000..685d8096273c --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.41-r1.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2 meson-multilib multilib toolchain-funcs virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + test? ( X ) + xinerama? ( X ) +" +RESTRICT="!test? ( test )" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.2.0:= + >=media-libs/libepoxy-1.4[X(+)?,egl(+),${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + cloudproviders? ( net-libs/libcloudproviders[${MULTILIB_USEDEP}] ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.32 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + media-libs/libglvnd[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + X? ( x11-base/xorg-proto ) +" +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + gnome-base/librsvg[${MULTILIB_USEDEP}] + >=x11-themes/adwaita-icon-theme-3.14 + vim-syntax? ( app-vim/gtk-syntax ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.20 + wayland? ( dev-util/wayland-scanner ) + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig + x11-libs/gdk-pixbuf:2 + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) + test? ( sys-apps/dbus ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0$(get_exeext) +) + +PATCHES=( + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + "${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch + # Gentoo-specific patch to add a "poison" macro support, allowing other ebuilds + # with USE="-wayland -X" to trick gtk into claiming that it wasn't built with + # such support. + # https://bugs.gentoo.org/624960 + "${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch +) + +src_prepare() { + default + + # The border-image-excess-size.ui test is known to fail on big-endian platforms + # See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904 + if [[ $(tc-endian) == big ]]; then + sed -i \ + -e "/border-image-excess-size.ui/d" \ + -e "/^xfails =/a 'border-image-excess-size.ui'," \ + testsuite/reftests/meson.build || die + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use aqua quartz_backend) + $(meson_use broadway broadway_backend) + $(meson_use cloudproviders) + $(meson_use examples demos) + $(meson_use examples) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_bool introspection) + $(meson_use sysprof profiler) + $(meson_use wayland wayland_backend) + $(meson_use X x11_backend) + -Dcolord=$(usex colord yes no) + -Dprint_backends=$(usex cups cups,file,lpr file,lpr) + -Dxinerama=$(usex xinerama yes no) + # Include backend immodules into gtk itself, to avoid problems like + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a + # user overridden GTK_IM_MODULE envvar + -Dbuiltin_immodules=backend + -Dman=true + $(meson_use test tests) + -Dtracker3=false + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" --timeout-multiplier 4 || die +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + # Skip README.win32.md that would get installed by default + DOCS=( NEWS README.md ) + einstalldocs +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make immodules.cache belongs to gtk+ alone + local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}${cache}" "${ED}${cache}" || die + else + touch "${ED}${cache}" || die + fi + } + multilib_parallel_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_query_immodules_gtk3 \ + || die "Update immodules cache failed (for ${ABI})" + } + multilib_parallel_foreach_abi multilib_pkg_postinst + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your settings.ini file." + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + } + multilib_foreach_abi multilib_pkg_postrm + fi +} diff --git a/x11-libs/gtk+/gtk+-3.24.42.ebuild b/x11-libs/gtk+/gtk+-3.24.42-r1.ebuild index 655c05a8a518..b87f4ebae8bb 100644 --- a/x11-libs/gtk+/gtk+-3.24.42.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.42-r1.ebuild @@ -95,6 +95,11 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache "${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch + # Gentoo-specific patch to add a "poison" macro support, allowing other ebuilds + # with USE="-wayland -X" to trick gtk into claiming that it wasn't built with + # such support. + # https://bugs.gentoo.org/624960 + "${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch ) src_prepare() { diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest index 9e1a40a5a542..80fab5776740 100644 --- a/x11-libs/gtksourceview/Manifest +++ b/x11-libs/gtksourceview/Manifest @@ -1,4 +1,5 @@ AUX 2.0/gentoo.lang 3901 BLAKE2B 774a8c7c01e8188339d1ae4b10df39b58ef78015cc2eb7cd3a723d025c1ae9ff2567dd84e56a2d9f2fd47d78b9ef26517dd76cb6e114aaab8eca452c8097712c SHA512 62c3257663eb684c1eeddb8393d8529e63c2535aa2c2839c76cac2a75f0c059025aa22db5e1bb569242526f1f2ee53708c7339e81eb37843f876be498762f9fc +AUX 3.24.11-gcc14.patch 2157 BLAKE2B 3ad0dbafb78355160353893e1026e8e19f07ff172b6689d6314efc1a444bcd503677a3ca9a7310ecca811c4f8dd8b88aba4c7a213cb3f35dd12d63fa016ee52b SHA512 88e7b6c90977d7a799e24f1d83b8d9de183bc318bf6a313c3f5e808851e1102311a77469bc33994ff67f7c16bc7273b580fbb7c9bd29f6147efdbcb65e43f4ea AUX 4.6-gentoo.lang 3889 BLAKE2B 1797c9e3ef615b36f3098104295fbadee18b8434d299bbab9603c5a00abdfb51c3a7db2f937885d8aa191067fd6e2ffbc1cf278b0d9333c67bcb07e24be5a7ba SHA512 a4ca3f24df56556c5d42aac19d36608d20466287b9e364154b1877c2a5aeab82a374fdf7dc64afbabbf9269d5a8fa88e1dd59d8a24a52fab219db09ec29a3d98 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d @@ -6,5 +7,6 @@ DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3ac DIST gtksourceview-4.8.4.tar.xz 1159636 BLAKE2B 0fb649522ff904993b7673c380b8ffb6458c0727b6af906e5328d972fb5385a2a668c2ca45b7dd3533f9f00b2ed9eaade55ee7b20a0b75fb1c031b917c27af2d SHA512 9e4262e52a92b3a052f33b799622d4fd4dcc7cc5355df12f160d0e60a6d6c135bc52f07eb40c06b357d5d74bec7228d4ec545a69ee5af69429d4170cc1e2243d EBUILD gtksourceview-2.10.5-r3.ebuild 1305 BLAKE2B d6d6830436119a7550be63b44b4737fb745ed6e4fdf4a6d68a6872cb0fa96d2cdbb7585c98cc0876431a390f945aa30a2122062681a9b2f98105c156596b6f60 SHA512 db11a86746c23457d021ea518f31eb8efca6333231d4365c9a4fdfbb1154940786dd86db9cb26a1c140e2012ad2f4100fd6cceb41c93fb379e56c684a2fffdbb EBUILD gtksourceview-3.24.11-r1.ebuild 1209 BLAKE2B e697e419c583f0c0d284dc0c8b20dd1e73bcc87285c14187c4927626ffacae8de6893f477f3a450fdf56d0e63e9330b0fec7321a5c5e362f92c83553225956c3 SHA512 d3e8d711d16a1b5ab40748ec753309b5ea02707aa50d87da63b5399bb9acb48da8e2eea3cfd9205ff63a1982077288f2c077d3ff440d7825bac0c926256c1525 +EBUILD gtksourceview-3.24.11-r2.ebuild 1263 BLAKE2B 2efa23714d539e9fe757624bfad57ad861ed3d4790d0af93df0683e66cb19f95a3a629b6aa2fa8fef2708f1d773bfeafd6d2c6077825abbd35526610cbba79a0 SHA512 497eb88c2d413896a6ea10863317e59cee2fb2042902f1a0bba27115f1e8231f1e5e5407fb6513323438d8f9001ebae907859f3a665ca898f684be8c7ddc764c EBUILD gtksourceview-4.8.4.ebuild 1745 BLAKE2B 9ee0364e2e94ff4f4488c6121399029168d9e7313fd3cac388bc5d4e5903b4e22a9fa0fae79d9459d69625b52d9b45bf5270e9cf72b22d2bc035daedee822af6 SHA512 75e72c9cf96f145e68d8fae62885d5c034c816eba58ba57f1c601d28508d53aaca6eaadca5c9eb84f4856c8db15964009198e68e9e011dbfadc72ee19d79896e MISC metadata.xml 430 BLAKE2B 97632c64552f8f8414314de16a73981465cdce4c553d550618ebaf6fdfd1ef100e32c008b6442cbbea68ad1f97ca0631f332ed9bc4fc1884fbf4ecc608b70ec0 SHA512 3c8df69407d401080882427ca5d135a462d246fc29878dbef7b0614e1ab150cb0c9349f5398397cb7c94adc854271066000a0d4ac118f8be342e2a02464e8ff9 diff --git a/x11-libs/gtksourceview/files/3.24.11-gcc14.patch b/x11-libs/gtksourceview/files/3.24.11-gcc14.patch new file mode 100644 index 000000000000..161d060183fe --- /dev/null +++ b/x11-libs/gtksourceview/files/3.24.11-gcc14.patch @@ -0,0 +1,62 @@ + +Patch from: +https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/16db686c0b3170d9ec4d7c7eda4a8e9c0fb1c544 + +From 16db686c0b3170d9ec4d7c7eda4a8e9c0fb1c544 Mon Sep 17 00:00:00 2001 +From: Martin Blanchard <martin.blanchard@codethink.co.uk> +Date: Mon, 26 Feb 2018 14:26:59 +0000 +Subject: [PATCH] View: fix includes (implicit declarations) + +https://bugzilla.gnome.org/show_bug.cgi?id=793842 +--- + gtksourceview/gtksourceview.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c +index 7d567157c..4e086464f 100644 +--- a/gtksourceview/gtksourceview.c ++++ b/gtksourceview/gtksourceview.c +@@ -40,8 +40,9 @@ + #include "gtksourcemark.h" + #include "gtksourcemarkattributes.h" + #include "gtksourcestylescheme.h" +-#include "gtksourcecompletionprovider.h" ++#include "gtksourcecompletion.h" + #include "gtksourcecompletion-private.h" ++#include "gtksourcecompletionprovider.h" + #include "gtksourcegutter.h" + #include "gtksourcegutter-private.h" + #include "gtksourcegutterrendererlines.h" + +Patch from: +https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/b25e71c57fc934a7ce36e51826af9fa7c2cf9a80 + +From b25e71c57fc934a7ce36e51826af9fa7c2cf9a80 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org> +Date: Thu, 14 Dec 2017 13:03:15 +0100 +Subject: [PATCH] View: fix assignment from incompatible pointer type + +GLib now propagates types with g_object_ref(). + +At that code path we are sure that buffer is a GtkSourceBuffer since +there is a condition if (GTK_SOURCE_IS_BUFFER (buffer)). +--- + gtksourceview/gtksourceview.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c +index 21424be97..e642ce360 100644 +--- a/gtksourceview/gtksourceview.c ++++ b/gtksourceview/gtksourceview.c +@@ -1531,7 +1531,7 @@ set_source_buffer (GtkSourceView *view, + { + GtkSourceBufferInternal *buffer_internal; + +- view->priv->source_buffer = g_object_ref (buffer); ++ view->priv->source_buffer = g_object_ref (GTK_SOURCE_BUFFER (buffer)); + + g_signal_connect (buffer, + "highlight-updated", +-- +GitLab + diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild new file mode 100644 index 000000000000..3ba07b75a29d --- /dev/null +++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VALA_USE_DEPEND="vapigen" +inherit gnome2 vala virtualx + +DESCRIPTION="A text widget implementing syntax highlighting and other features" +HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="3.0/3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="glade +introspection +vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.48:2 + >=dev-libs/libxml2-2.6:2 + >=x11-libs/gtk+-3.20:3[introspection?] + glade? ( >=dev-util/glade-3.9:3.10 ) + introspection? ( >=dev-libs/gobject-introspection-1.42:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + >=dev-build/gtk-doc-am-1.25 + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +PATCHES=( "${FILESDIR}/3.24.11-gcc14.patch" ) + +src_configure() { + use vala && vala_setup + + gnome2_src_configure \ + $(use_enable glade glade-catalog) \ + $(use_enable introspection) \ + $(use_enable vala) +} + +src_test() { + virtx emake check +} + +src_install() { + gnome2_src_install + + insinto /usr/share/${PN}-3.0/language-specs + doins "${FILESDIR}"/2.0/gentoo.lang +} diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest index 8fc7ae8aaff3..917b6557d09c 100644 --- a/x11-libs/libFS/Manifest +++ b/x11-libs/libFS/Manifest @@ -1,3 +1,5 @@ +DIST libFS-1.0.10.tar.xz 293016 BLAKE2B 305d4343f84389805c9eb04e176fa9b291e784cf8636dfde929370ad9ffa66d63956afc643ca53cce22163bd54e5f222e44cb956e55e43a24dd3594c9bfc8ea9 SHA512 f4dc361b7e1dcc1f348ea86e96c5a60ff40c5168b6097f00d8a5db2b86d089cfca12ac13dbde5ce3b53279b7eb8773ed6dcd9c678c2e95363ffa5127ecaacee7 DIST libFS-1.0.9.tar.xz 287416 BLAKE2B b4425ab4ce1c9e4e0c283419231e2966f462a6c9225ff8bd056b5ec41c7a6a96e35bd2edd47ce6bfad87040c6042f19619f32f8f045262da5609af5c55b03fe4 SHA512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8 +EBUILD libFS-1.0.10.ebuild 414 BLAKE2B 776bba092127b4b8d1dc6c575b27e47519f0b7d7468727e56900aff00c5ac8000a6481e9a99aece44962029004350d3dfc09b60b4bfed2fe09e9db882df290ca SHA512 79c831f22ce05d4553ad1bd729269a13a9abbb71baea67081ceb4133e625de7104533623a688d19f8c0c1bb34925575548d19f35df0b10f3953c0a852a0f30fd EBUILD libFS-1.0.9.ebuild 408 BLAKE2B 90e5efe8b55d23cae411c78f51f6a4520ac4b2fa9bfc2e142df2804ff215a6a8224a34f57ebe749bf457d4409a63a972b92f688e2166553c1a95421ef28fee11 SHA512 ba9f0f9404540c1e3e31548e4cf23afb2dedbb0d28cd1abe3eab5ff0a1ab9617a466eebcd9e39eff01b8991f1ac55c2aff1b5d08693529fe00b28b4b6f0ecd34 MISC metadata.xml 336 BLAKE2B 63758b2250f1678012f938bfb7826c03e447991e3aba5c233e16df68dbaae033b1f14d77833c85238efe0eedd90314f5e8b2e1cfcac824bd5a034e7e575f244f SHA512 f2b85263c274822c779720160b79a4c243896f7169c9aa88181ed805c3f5808cd48aec07eeb0e2faedfb1b3ef467846243e2cfec925e8eeafb58f6d228a3aac1 diff --git a/x11-libs/libFS/libFS-1.0.10.ebuild b/x11-libs/libFS/libFS-1.0.10.ebuild new file mode 100644 index 000000000000..6723c0cad72c --- /dev/null +++ b/x11-libs/libFS/libFS-1.0.10.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 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 FS library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + +DEPEND=" + x11-base/xorg-proto + x11-libs/xtrans" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 + ) + xorg-3_src_configure +} diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest index a3abf8e8ec2a..1cddaf10af8f 100644 --- a/x11-libs/libX11/Manifest +++ b/x11-libs/libX11/Manifest @@ -1,3 +1,5 @@ +DIST libX11-1.8.10.tar.xz 1839380 BLAKE2B 72ff400e1aad5bcb04e5dd3fb43f7767fad47e38cf628382cd5ffd5a204efc4de4f626027dddbbc7e10f80f8eaee0bcdf9792d9d012256366920f7ae0cffcb15 SHA512 f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1 DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96 +EBUILD libX11-1.8.10.ebuild 978 BLAKE2B 4d1f4922df24c95c37b7f11daff615cd2173bcb1511ced34d7fa90c832239665606c27301fc7d4ba97e933bd31703d3e948d96b0db83b807f441b43467247789 SHA512 39a3d37527c13d0ac0086f5bc681d415e7fe94d538945d887b905a67cab7952d43c993005ad55c905bd583d5c43ad771ed5d86628742ed17949503d5eb01fb4b EBUILD libX11-1.8.9.ebuild 1006 BLAKE2B a70633b8c19d537ca5ef8f12df093ddbe9de7990c662e83ebb9bb2b70156865436cd7016a19b4a06f931d07dddf616882b0b7a05374f2c3cb7fe2735f1c12687 SHA512 096882e9eac263a0f2cf9e8603157fb978fb6f237e6a083b9f9508aa73a653432063222a3788ecab449b87617d6eeea247c77d91035e1c3d0040fb484b96fa5d MISC metadata.xml 395 BLAKE2B 7912fcccfd8d8a4c9c1e5601783a0668679506638511ee719bf7bb95f99415fe95a417343060cf5ca3fe918ab1f9847f74861af36d3c712afa321272cd13cf66 SHA512 c2956ef519fe59d0f713732059224568b9d7c34579654b71993b02227a512c1ac3057dc7f81c6bc93834fd4fee212f1ae26f4055ea92f3eb7524da7d9e690f8f diff --git a/x11-libs/libX11/libX11-1.8.10.ebuild b/x11-libs/libX11/libX11-1.8.10.ebuild new file mode 100644 index 000000000000..8e6be4ce72de --- /dev/null +++ b/x11-libs/libX11/libX11-1.8.10.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX=xz +inherit toolchain-funcs xorg-3 + +# Note: please bump this with x11-misc/compose-tables +DESCRIPTION="X.Org X11 library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}] + x11-misc/compose-tables +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans +" +BDEPEND="test? ( dev-lang/perl )" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + $(use_with doc xmlto) + $(use_enable doc specs) + --enable-ipv6 + --without-fop + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" + CPP="$(tc-getPROG CPP cpp)" + ) + xorg-3_src_configure +} + +src_install() { + xorg-3_src_install + rm -rf "${ED}"/usr/share/X11/locale || die +} diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest index 2bcaa4a76a7b..00f35fe0d24c 100644 --- a/x11-libs/libXfont2/Manifest +++ b/x11-libs/libXfont2/Manifest @@ -1,3 +1,5 @@ DIST libXfont2-2.0.6.tar.xz 446848 BLAKE2B 77e1fd0af5dae4f7d7cec5b9cbd20414df2c66699270ae46f81f6d21f6725b56bb0df9cea504a7a930084a4a759d7dcc3e204ab6c94dfcf0ff0006289f09a68d SHA512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd +DIST libXfont2-2.0.7.tar.xz 453012 BLAKE2B d20001c0e7ce90e0efea25f17d09d5671b0dafacfe7d34dfd3eabe377d75899f3eea6e266d043e8d917ff38585e778ddcb4179f0cbfe15845e4d8584f154eaad SHA512 f703127df5d5b1093c9b73e019153ed7799523573d52e61d344209f0acfd4df42e11be12bdd1880479c47c2b70de581a4f2ef74e199e9b1ac438f426593d56b0 EBUILD libXfont2-2.0.6-r1.ebuild 859 BLAKE2B 5ec03158ef6d264a6806aa3c727169f9150f35c388db4d46c8667990216ce1991969844d67c69e6f4fad836929fa49e1102db482bec63b975dc55bbdfa9b0e55 SHA512 858bbbcaa094b000edd69ecebaca8245276a84dfbc923809d666e7f37a7e4b57f7d81449b1ec61fcd5cb79594a9d2fdc832da37d38265b8d9db8b5cb7d0c66d6 +EBUILD libXfont2-2.0.7.ebuild 867 BLAKE2B e2a0edb60300d78877ea9b0b5db6cda98cca7443bdee7cad0356e7dc7912509d8e08035468c6c753ad4fcee98c14eebf3fbbf8cf065d0aee8163e6eec5dbcb92 SHA512 a6c14e59cac670bbe5d1347c02ac08fb1f3279215935b7f8553b275e4083fcd842d88e0f0d0af93f2c3fe8ce3fc59062c67196772198a9d70e55dacd3215a659 MISC metadata.xml 574 BLAKE2B 7dd74ab652b5e72d852ab5e826d9025c8a81d1eb475d7b936e87f5baf9a726275475cf1e016816165c4a12b124b3fa238b84093c29115b98fcfd196181a4ed11 SHA512 788a597733e4defd54b0a4667b9b83a04991b3519442d2cb180ca1eb775c76c3936be572820d84b1c8db568b59d1288cc03e362a68ccd1e544042acc8b7af550 diff --git a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild new file mode 100644 index 000000000000..a99af0682a7e --- /dev/null +++ b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_PACKAGE_NAME=libxfont +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xfont library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="bzip2 truetype" + +RDEPEND="sys-libs/zlib + elibc_glibc? ( || ( >=sys-libs/glibc-2.38 dev-libs/libbsd ) ) + x11-libs/libfontenc + bzip2? ( app-arch/bzip2 ) + truetype? ( >=media-libs/freetype-2 )" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 + $(use_enable doc devel-docs) + $(use_with doc xmlto) + $(use_with bzip2) + $(use_enable truetype freetype) + --without-fop + ) + xorg-3_src_configure +} diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest index 63bcba51834b..c7c62e2c2a87 100644 --- a/x11-libs/libXmu/Manifest +++ b/x11-libs/libXmu/Manifest @@ -1,5 +1,3 @@ -DIST libXmu-1.1.4.tar.xz 349264 BLAKE2B fe78cd3f529402394c19842b31b2451da2b16dc768b5aac1d157feea0af06b04dbe2be879d17c7ccff08630c0bdab0abbb853bc5672340f55da0cd1412db9df6 SHA512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1 DIST libXmu-1.2.1.tar.xz 364888 BLAKE2B fca2e16c663483c0147f87830d6a583bb32026719901bd0aa7b7c4e81b18667b7152e0dd0805e22faf51b62e86cffd7a9423c366f1cafd3af007807cf9965262 SHA512 05a30e5961e00e940ad7ec4eb94ec482b5cbe808585972bf70c849333af3fddf4ae4bd87895d706507fb3a94ed0fb73ea161e0e27dc2840323a1a1af49c0e8a3 -EBUILD libXmu-1.1.4.ebuild 705 BLAKE2B db0ba4d1ecb79a63c520a0511248d609e6f9752907916632d101313e33cc63232a9fa7eeda4710b4f3ed427489f746975c1f3145697027fecaf099c6c38c4962 SHA512 a06028fdd2c26907ae221c09f1aa4ba582de30035f3c72798de4cbe5bde2bb523ab07572078744fa5f3b28d936cb5d78d2171fcb4b2688096bca85f8df079107 EBUILD libXmu-1.2.1.ebuild 790 BLAKE2B b13efd480abe54076ba4f94fc1813d7b3e645ff583df9d12c1e14e4fe991ddb68a66516f34a902f809589a6cfb59a38893736bbc1f19ee138d5aae8424f8ba08 SHA512 ad87bf102623aa3303b4c8c0794f17ad4335f3548a7910605449a19a186644a70b647b2ec430c236eea88bc5ca5ae8e84a18865780b29bda720178500593c6d7 MISC metadata.xml 337 BLAKE2B b3db98afa249caf8d23a610701683c053a774b136ba51d685c87c3630710500bf1926bc93b7c793cf57e0041aee5219f25ec0ce8d0cef5e1387000853c62d272 SHA512 ffccc841608e1f4aaebb2a4bf72fae9f6893268b2497686f0b3037c2cea6b8e11555d6576cb3684d44735ef117e80bb1fcb32d758471e0d92df8257fd3dbc705 diff --git a/x11-libs/libXmu/libXmu-1.1.4.ebuild b/x11-libs/libXmu/libXmu-1.1.4.ebuild deleted file mode 100644 index b2834adda38a..000000000000 --- a/x11-libs/libXmu/libXmu-1.1.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -XORG_DOC=doc -XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 - -DESCRIPTION="X.Org Xmu library" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_enable doc docs) - $(use_with doc xmlto) - --without-fop - ) - xorg-3_src_configure -} diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest index d1ecee7ba086..af270dbbfcca 100644 --- a/x11-libs/libXtst/Manifest +++ b/x11-libs/libXtst/Manifest @@ -1,3 +1,5 @@ DIST libXtst-1.2.4.tar.xz 287636 BLAKE2B 6c3e6154f221530158b8275ee638934c633f2e812333df0093a01663c416ded0b6be509578cca78d51c6b540ab17379e1e0503bf296abe3112f1afeda12e4af9 SHA512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d +DIST libXtst-1.2.5.tar.xz 291748 BLAKE2B daf9d3c5412623a06c8579b341c1ab6e720719c4f3151acf5c735ea08c79c33800993d55cd9f9e8660be85e290fac641e5e9266deb4d317d9957ced847b1ebb1 SHA512 848fa580d7abccd48c9ca3440f92e299839ada0912ed60d38d4d4f5bf37431cd02d7059265ab4e524c3e2cb9c368b9b90b863d1ed97d74979ef8811fc5e635a9 EBUILD libXtst-1.2.4.ebuild 596 BLAKE2B 09cbeeab6c53a75fea271b6a9ac9ed796e134ce9874977fa1c3b5c2e2c437df4c198d164f928d318d38ae0c7180b6c2876ca135c2b5cd60c540f902d7298b83b SHA512 9707a10b201c38c94e59103364db241f927a9ec2430b4ee6a1df9dada4205dd582ee67ad7e8dc9bcd4953f0e93eef22b9212f8beb1bdd0beacb910ccf2002c4d +EBUILD libXtst-1.2.5.ebuild 603 BLAKE2B f1fa5dff96b3d6da7caf55513b41f60309c072622ca4f6ad854760aa4ac5249f65eb20df01825e4918f8efbbf6ee686a27dce0394eedae904742ea227d92a5ed SHA512 547b89a7b9322dd71289effd4e0362e65e01b8b540b63521d2a298a46d20fdd85f45cedb024649d593af3c45df63c0ba81da7d6f0d03bf7e8be2ac0c5d566d6b MISC metadata.xml 338 BLAKE2B 87a7a857c72d92a698c6ca2b9d6274b3a03edda1e5b4b84cb66f6c581f1ac428a7ad912c7c63ecc2554bda3c84fcaeeff108504237562499452934ef6ae4cf49 SHA512 6957dbdc6e6fe3186ff4ef7979cbf1f237ee942c1c6b3534b2833db2a799e765c244f1d6531f20d97011cb8901939dffc43e34d8f22ce4d977730fcff51f3e23 diff --git a/x11-libs/libXtst/libXtst-1.2.5.ebuild b/x11-libs/libXtst/libXtst-1.2.5.ebuild new file mode 100644 index 000000000000..bc2419f863b0 --- /dev/null +++ b/x11-libs/libXtst/libXtst-1.2.5.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libclxclient/Manifest b/x11-libs/libclxclient/Manifest index 6bab61b48797..f71eb663fd20 100644 --- a/x11-libs/libclxclient/Manifest +++ b/x11-libs/libclxclient/Manifest @@ -1,5 +1,6 @@ AUX libclxclient-3.9.2-Makefile.patch 1130 BLAKE2B a4d811b7bb964f2339d99838f3caa9088e4469bc8cd0ec18de1a4d0d87e53b1c62c797b239a3b1172a673c7d2f87c05f829fc72e4cb32c7d69a02bf31ddb64e6 SHA512 fe2d6bc14d5746786314792ddaaadac5f4d6e977cdf4e34ec58288e867c854082c93120e06002da17daf0c9709eb2074aa53603b2c99b8ad8bd9a1e9efe1eefd AUX libclxclient-3.9.2-enumip-include-fix.patch 310 BLAKE2B e0218f39b551978be1cf9318f21e53146c8e75826afd7e5f0cefcf43c434e3b64f3fb373386efd13b085b9b02bb631b5826b7441f9b73256097147dbb23c7b63 SHA512 3ff284c85635ea04b45f4640ab5a89a4d13b7933dc66bdb0310d5a4e1283b32d2d9078a9bf74f70f31636fb085d6ff8123d743d1750012cdf7549d8b1ad065e0 DIST clxclient-3.9.2.tar.bz2 29991 BLAKE2B ffd56894e0bcf09e2b6e4c882830e3c3a3a88f3778fe6a2c8b2ceb9336f8ce9cf28193da8e8c86987475e95e3ea2c07319bd82e88ad820b39167cfba9eefd7c3 SHA512 38c2782e58df24c2dfcb936fc9cfe4d44016055fb1aa52ef8e789bf8ec327f45f2f7a91f18012e4b0c6f253f6f10329d6d1e9fc341017ace3f2b6fa050592049 +EBUILD libclxclient-3.9.2-r1.ebuild 1091 BLAKE2B fd84f362704dc03a4ca6d366cf9988d162fae25bd0f1b634f297c807a9ae59346c6d477b9ef74d00ed6416b470c35af272e3544286d221813f12f2acabac02f5 SHA512 7f1bc231688574a407135a5b7679b6d8e95f15efd64d197b9506196c821c8de6d7216af086a948a28247cab745e884ed7fcc1c2357b6f7905daf452ccbeab577 EBUILD libclxclient-3.9.2.ebuild 1105 BLAKE2B 3e03c3029abaa1846233262888b6f51cb248020be22400e88eae00053fce6b29f0e2baaff6859096b433b64c510501de6b54269ac447315d47e246bc5d9633d9 SHA512 43b45473f7100d01af072cfd4c17e1d657d8b28245d1201b6efa6ad8f517a7571488a607fa87712c5ad28ee68ac27acb062e41e123d004e2ab260b142d4f4412 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/x11-libs/libclxclient/libclxclient-3.9.2-r1.ebuild b/x11-libs/libclxclient/libclxclient-3.9.2-r1.ebuild new file mode 100644 index 000000000000..e072d0a3ce2a --- /dev/null +++ b/x11-libs/libclxclient/libclxclient-3.9.2-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="C++ wrapper library around the X Window System API" +HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/index.html" +SRC_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${PV}.tar.bz2" +S="${WORKDIR}/clxclient-${PV}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +CDEPEND=" + dev-libs/libclthreads + media-libs/freetype:2 + x11-libs/libX11 + x11-libs/libXft +" +RDEPEND="${CDEPEND}" +DEPEND="${CDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( AUTHORS ) + +PATCHES=( + "${FILESDIR}/${P}-Makefile.patch" + "${FILESDIR}/${P}-enumip-include-fix.patch" +) + +src_compile() { + tc-export CXX + local prefix="${EPREFIX}/usr" + cd "${S}/source" + emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)" +} + +src_install() { + default + + local prefix="${ED}/usr" + cd "${S}/source" + emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)" install +} diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index 5c8257f9d9f5..9ef394408257 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -3,7 +3,7 @@ DIST libdrm-2.4.120.tar.xz 479564 BLAKE2B 218d674da334c32aae27a31c10992cb276b085 DIST libdrm-2.4.121.tar.xz 480840 BLAKE2B 23b8c68e12e5d3ed34dcf9577ef934e7990526018f76933a35434c7ea69ba081850e2d4e00e783880bcfe570d62910161364515ce8fde715743abbcb39d3ffb4 SHA512 cc8816d61884caa0e404348d1caeb0b2952fb50e1dc401716adfe08121096e2a67826db0bda0d8b163d67c5ee048870177670d5eac28a5abe5792d09ba77ab2e DIST libdrm-2.4.122.tar.xz 481012 BLAKE2B ca6aaf0fe55dfcfe33a0d39a7b3ea07aa4cbe772294ec7f419a4edbb40cbce14c399e180e35dd781ef225a16daae8f40d4893599eb018b68cc78e4e981f2e6e2 SHA512 ea6bac94416d4ba0e9805e142ae62904236bc49f803d4fc10c92968a4df64c818dd42524ad7a4e988062836783a148e27094050bb2754f751a368627f794ad13 EBUILD libdrm-2.4.120.ebuild 2504 BLAKE2B 5eedee47428f90d087f504967d815c8ebdc267d95d494782487f72665e9a7f6a21320b2f26ff4636f0653f27f41f5bb207adcb3a5ee0eef53aaab9c7087e8e1b SHA512 cfd79db679571f5917292f0bd3ff5a035c4eaaf515071d1eb55f8cb8fd33c36cf94a3563420df6d3b8f444582aab6d337e8c7ed2f136be953635b6e38ece42e2 -EBUILD libdrm-2.4.121.ebuild 2450 BLAKE2B e0d5de54f588cc447a40615c57ad7bdade9ffcf88cc7e824097740f45f61c9eaa18806b204111cd476c6ff84d16f553ffbb22372c856e52193fbbffbb9f6410d SHA512 3994ffcfcf06ea86d998112d8e4112164921a8371971fb79837ea9904e0cab425c81a54584333764ff1a7f0f2b9505fe2791f9a7e4f293ace8adfd586a15b7c5 -EBUILD libdrm-2.4.122.ebuild 2450 BLAKE2B e0d5de54f588cc447a40615c57ad7bdade9ffcf88cc7e824097740f45f61c9eaa18806b204111cd476c6ff84d16f553ffbb22372c856e52193fbbffbb9f6410d SHA512 3994ffcfcf06ea86d998112d8e4112164921a8371971fb79837ea9904e0cab425c81a54584333764ff1a7f0f2b9505fe2791f9a7e4f293ace8adfd586a15b7c5 +EBUILD libdrm-2.4.121.ebuild 2443 BLAKE2B f02a2fa57b2e768b237b79d5ef99234d7cc36a801d6b01e9fd22958791af004ebb74aa876b1f41c5a502307f023593c4c9ecc9d01d22558acbf6cec5f6489a8d SHA512 05fa9ff23e026f61c225c71dbee0d84c7cdb92cb55729e5b8b6843f37696f1ea5f89f1ed5e9bb73eaae7eaeaae36c8d71d9d59dc8170c059037b9289d5f9f973 +EBUILD libdrm-2.4.122.ebuild 2443 BLAKE2B f02a2fa57b2e768b237b79d5ef99234d7cc36a801d6b01e9fd22958791af004ebb74aa876b1f41c5a502307f023593c4c9ecc9d01d22558acbf6cec5f6489a8d SHA512 05fa9ff23e026f61c225c71dbee0d84c7cdb92cb55729e5b8b6843f37696f1ea5f89f1ed5e9bb73eaae7eaeaae36c8d71d9d59dc8170c059037b9289d5f9f973 EBUILD libdrm-9999.ebuild 2450 BLAKE2B e0d5de54f588cc447a40615c57ad7bdade9ffcf88cc7e824097740f45f61c9eaa18806b204111cd476c6ff84d16f553ffbb22372c856e52193fbbffbb9f6410d SHA512 3994ffcfcf06ea86d998112d8e4112164921a8371971fb79837ea9904e0cab425c81a54584333764ff1a7f0f2b9505fe2791f9a7e4f293ace8adfd586a15b7c5 MISC metadata.xml 410 BLAKE2B 86cda23d38e7b6f3581545fcd036c4d6233380e3a61b3ad8a94b8fef4eb8ae3f3a9bd4680b0cac219c0decd4c2df58bf731fce668787b0b3bf7d88f054110a8d SHA512 5c10acae8f229f49f789c0447988a4a48cb2f7de996b9d0a68fe67c0a217d405bc4face3be503562210da7f480a17aebd64d6ae9b38d8d2ff2dc031c41b438d5 diff --git a/x11-libs/libdrm/libdrm-2.4.121.ebuild b/x11-libs/libdrm/libdrm-2.4.121.ebuild index 3f5e53d9399c..75538252e16f 100644 --- a/x11-libs/libdrm/libdrm-2.4.121.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.121.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library" HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" if [[ ${PV} != 9999* ]]; then SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" diff --git a/x11-libs/libdrm/libdrm-2.4.122.ebuild b/x11-libs/libdrm/libdrm-2.4.122.ebuild index 3f5e53d9399c..75538252e16f 100644 --- a/x11-libs/libdrm/libdrm-2.4.122.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.122.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library" HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" if [[ ${PV} != 9999* ]]; then SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest index 5d68c043ae43..b3967770057d 100644 --- a/x11-libs/libfm-qt/Manifest +++ b/x11-libs/libfm-qt/Manifest @@ -5,5 +5,5 @@ DIST libfm-qt-2.0.2.tar.xz 412452 BLAKE2B ce63a75722769fcef4766461bea66f26579c0a EBUILD libfm-qt-1.1.0.ebuild 931 BLAKE2B 7b692ffe4c5c8a5e68f5ee0aa027a67175112312a0252676072710264f50ac593f8a8452c2be4e536996234345bcf72344ecc20abe16a4fa57a96265c243db8a SHA512 271f4e854e6af084a747045d1c1aab3e27d060c9c71bd31e68e22faa392897ade82e5aa3ab542a3623c3e71d96d6020ae961d1480e2dc26c5275521c01c48fd4 EBUILD libfm-qt-1.3.0.ebuild 931 BLAKE2B 6c42fe45d382abc369b7484ff2141bb64bccab5d28e290e62c8720688a0c38b93d5bdf7de867c06a9882d613a9898c43f78b9551f240d7147b2127db289a35c7 SHA512 6a3bb9727eac58abaadb5d27360094f039d648a851f32d5800d1d65d99ec53a10f57fe20db312be843ea8b5c6c38d38415ea4add693eb6f32de6c78417c9053c EBUILD libfm-qt-1.4.0.ebuild 992 BLAKE2B c52ee99411c3e2599ff52ed8d19b01a9ac0cc65f9e8919a08129d3be2e2387c015ecec3189b5fb251cc34de65a84dcfbee723aa2bce570b1f9fced82654bf65e SHA512 28de9f402c22b464940a9784ebab97f3b6a4034b2f65eef90bacf78db163d8977b0f189d3561db22a1d27736e46ec8e0969c05d186ee5c34e46f75fe977da25a -EBUILD libfm-qt-2.0.2-r1.ebuild 886 BLAKE2B 7dc1e366e38385e1e99c1d85fcea8cd7d77f5b3f7bdb83896449db439730afedafe752ad12878df47e57b8838e19c869c23fd1176f6bc97953bfe8eedf568a66 SHA512 9a33f2212d93302b2fb92fd094faa9f215225f847a7a4edcdcb9ad0995e5bd65987657f59e85e7b41720cfdfd98d7c5b59563e3659e87c1fd23c080233378543 +EBUILD libfm-qt-2.0.2-r1.ebuild 900 BLAKE2B c384322929b89e39101dfc3227e41fd1409283a0d5094cacc8b5c6052cd248e43d3ffc0273fab9048ba82e633ed8748a20ed30c2db51556aacdee7bbd471373e SHA512 180d83f4b597440194128fcb1ca7b0b99dbf8bb230586fe96a10583ddb37b49dd63f61ea650de59de80bd537998ad56e120e5b7df53776255a63b42be5e1678e MISC metadata.xml 315 BLAKE2B 1ca0894e1b787a755d024f95c4b09659b300f957f5cf69958bb3801e464eb84385303bbde99be3b491fc85e4202656dfefd40e5aa97ba47533307bfe07d40a0a SHA512 f9df6f22d74db03f845ad296b50e6d53e204867b2f00cbb04448c33f5ed3d22af6de3f9c58238f0e657aa4b963e467db74864d94266e5fa6923f2cb9c330e56c diff --git a/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild index d62b65e910f1..68dc836d6898 100644 --- a/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild +++ b/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~riscv" fi LICENSE="BSD GPL-2+ LGPL-2.1+" diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest index 1aac682ed29e..7216b038cc7c 100644 --- a/x11-libs/libgxim/Manifest +++ b/x11-libs/libgxim/Manifest @@ -1,3 +1,4 @@ +AUX libgxim-0.5.0-gcc14.patch 1255 BLAKE2B c52309c711b0e6ebe1d38fa780203188d516f38e70f9df4deb5906ac3a1b0d61b935c1320cf16636ba8bf1b242ceae7ef8badd0e2b702a86135b9239cbfea252 SHA512 d9eb9bd7f84e9d3a2040c57f3f934cd8e6a6f5777995c82d15646aa430a4da39aa0579eab8b215730e18220c770b4088800c4bfa5caf7ac3f7da1ee5dd9e644e DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7 -EBUILD libgxim-0.5.0.ebuild 1340 BLAKE2B e2f0a4657e5216850a62d12ea4610f5f1108612906b2dca500ce131040c145ddcc182e1b80fde811ee7ba2af7f221c77b7d71d4bb34fd169a0d0c8144f7ecfcc SHA512 69efea58125e6c89b8329776d8f3c8b50f313de307b914eb6dd9156afaecb603d3b8f083106495bc7cdfd5f15a727ce6fdbaf05ced7a57c195fbb531ed8204a3 +EBUILD libgxim-0.5.0-r1.ebuild 1522 BLAKE2B c25401dd49173482f41d4a2e5ed978d46fb1a73f69df479ebf8fce369da519daecdfa3dd35487b500e2b431280c94c6aca39a4404b1f8a57f188bf26b05fbf7f SHA512 3411049d68af540e931b15058a7a299ecebc92b8b4480f4f903ecd27ee12e9f4f6e155f6976ff2f3c8ae1a454fa9d42129d9ffb31fdeae4456ba8be4df771db9 MISC metadata.xml 316 BLAKE2B c6389aed019cb4f4667f4d452f72634648dedac018e25c520805c761d8f2d161d0b63ef698b4229db3d619495dfa031ac4ec7a74d77d399c47ac2e603aa830c0 SHA512 1e797b6c97a0fe8a4cb0dedc6688a36b63a37b0ca11ea1e5b52ef43c84433eb9b4dd0951a7ebbff6aa10201af18fdeb404f7e6241b69814bbf245c218e60a51a diff --git a/x11-libs/libgxim/files/libgxim-0.5.0-gcc14.patch b/x11-libs/libgxim/files/libgxim-0.5.0-gcc14.patch new file mode 100644 index 000000000000..36e62471d591 --- /dev/null +++ b/x11-libs/libgxim/files/libgxim-0.5.0-gcc14.patch @@ -0,0 +1,40 @@ +From 274976ff39d9142169a18655f5013e66233ac9c8 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Wed, 14 Feb 2018 13:20:40 +0900 +Subject: [PATCH] Fix a build fail + +--- + libgxim/gximcore.c | 2 -- + libgxim/gximprotocol10.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libgxim/gximcore.c b/libgxim/gximcore.c +index a92c413..3955d01 100644 +--- a/libgxim/gximcore.c ++++ b/libgxim/gximcore.c +@@ -26,9 +26,7 @@ + #endif + + #include <glib/gi18n-lib.h> +-#ifdef GNOME_ENABLE_DEBUG + #include <gdk/gdkx.h> +-#endif /* GNOME_ENABLE_DEBUG */ + #include "gximacc.h" + #include "gximconnection.h" + #include "gximmarshal.h" +diff --git a/libgxim/gximprotocol10.c b/libgxim/gximprotocol10.c +index 04887a5..65bd4df 100644 +--- a/libgxim/gximprotocol10.c ++++ b/libgxim/gximprotocol10.c +@@ -2073,7 +2073,7 @@ g_xim_protocol10_closure_real_parser_error(GXimProtocol *proto, + msg = g_strdup_printf("Unable to parse the protocol %s properly", + g_xim_protocol_name(major_opcode)); + +- g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg); ++ g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg); + switch (major_opcode) { + case G_XIM_CONNECT: + case G_XIM_AUTH_REQUIRED: +-- +2.45.0 + diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0-r1.ebuild index 3a0811f9cd0d..f7a149908a9b 100644 --- a/x11-libs/libgxim/libgxim-0.5.0.ebuild +++ b/x11-libs/libgxim/libgxim-0.5.0-r1.ebuild @@ -33,6 +33,12 @@ BDEPEND="${RUBY_DEPS} AT_M4DIR="m4macros" +PATCHES=( + # backport upstream fix for gcc 14 implicit function declarations and by + # extension, LTO type mismatches. Also fixes format-security. + "${FILESDIR}"/${P}-gcc14.patch +) + src_prepare() { sed -i \ -e "/PKG_CHECK_MODULES/s/\(check\)/$(usex test '\1' _)/" \ diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest index cd8bd85ebfb5..61675ac7d28a 100644 --- a/x11-libs/libxcb/Manifest +++ b/x11-libs/libxcb/Manifest @@ -1,5 +1,3 @@ -DIST libxcb-1.16.1.tar.xz 455368 BLAKE2B 91d489eaf8b0bfb0c02a4d974f72871963dc86cdf60478d618636d580974b260ab822ab33c7174e05dc45adf01e53e423a7449550b7b43fabb3917f7d99219c0 SHA512 e3afdae1c0e2a5ae2add7b2c4fdd3283cb86023ef6448f5b8b29a4bb72c274e34eaf0fc7523762bcd3f5116910fe7374490e8f26c25744301563ced80acc3e7f DIST libxcb-1.17.0.tar.xz 455208 BLAKE2B e2a35606981c00f9f18e5590cdc26c7c2efd8f832c37dc4dc82db47e2870bf4ff48786162c5a8eb713cb5f3a305eb22d334e4b0ff631bf0e047f1b79cb0701d3 SHA512 945b1f28e8b407a4d0ebf88c99ef3cbef763fd75e6eaa8e971946e44ce8dbe9b478c56ae85aaaadab7fdb25987e88570d9d4fb9ad2febd6d6bf21d644a0e10d0 -EBUILD libxcb-1.16.1.ebuild 1380 BLAKE2B 3835fb7840152ebad25362ded7e0c2fb78d590ed8f656bb200e91b1357df9c7baaa19c83a7d84b99ad29a9854110789fc218056acaee10cfa804cbe5d003f957 SHA512 ce7a12deceab6e609c58cac75007b25c092985358c06f9780e984da8f9fa00dea4429cac5379ef094354280eba43b8b7729e6df4c9c02a208925411091879098 EBUILD libxcb-1.17.0.ebuild 1392 BLAKE2B ebbe9e4a356332a5a263c8d92bec5e131a2da725134064482ee4fb6456a059aaae6a99ac69f711427fc12359b9cea7aaefb01e816c6295bcf234bd1a91c79614 SHA512 533718e744ec8119876091ec105894e04964d719bd137f3d2f3a7f75725ed9e8fb9e735f2c9bf4af8c80e134512a7fbb0aeddc2b59ac38794e44fcfab97eb194 MISC metadata.xml 470 BLAKE2B 9f530dabef12ece5a3ccaade8000872e1a89cfef4833ca4d6a4c5e157510516fec18f18e7dbe4ae88ac4059acff9fd099832c3614d12d9742af03167def25f16 SHA512 884ca6cde9de9394a67493b5ec40475873e363ad2530470ebbc0e080f55594bf02787b02960ad172ba05e736c80a6b9c33aa9c2ceaf1b47005f6f47b0895c1a3 diff --git a/x11-libs/libxcb/libxcb-1.16.1.ebuild b/x11-libs/libxcb/libxcb-1.16.1.ebuild deleted file mode 100644 index 23c3464ff0fd..000000000000 --- a/x11-libs/libxcb/libxcb-1.16.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="xml(+)" - -XORG_TARBALL_SUFFIX="xz" -XORG_MULTILIB=yes -XORG_DOC=doc - -inherit python-any-r1 xorg-3 - -DESCRIPTION="X C-language Bindings library" -HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc selinux test +xkb" -RESTRICT="!test? ( test )" -SLOT="0/1.12" - -RDEPEND=" - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - >=x11-base/xcb-proto-1.16.0 - elibc_Darwin? ( dev-libs/libpthread-stubs ) - test? ( dev-libs/check[${MULTILIB_USEDEP}] ) -" -# Note: ${PYTHON_USEDEP} needs to go verbatim -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep '>=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]') - doc? ( app-text/doxygen[dot] ) - test? ( dev-libs/libxslt ) -" - -python_check_deps() { - python_has_version ">=x11-base/xcb-proto-1.16.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup - xorg-3_pkg_setup -} - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_enable doc devel-docs) - $(use_enable selinux) - ) - xorg-3_src_configure -} diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest index ef14641f916c..15fd6c329edc 100644 --- a/x11-libs/libxkbcommon/Manifest +++ b/x11-libs/libxkbcommon/Manifest @@ -1,3 +1,4 @@ +AUX libxkbcommon-1.7.0-symbol-ver.patch 3905 BLAKE2B 4dd577bf14806a854009dd6065841be6c4ccb900336aab79b4d41e164e9e85ac00c513a644f30a1aaf60c1de84780e8ffd356c3325b20e2ec5890bbfa0145999 SHA512 7acb5488683bd0d27b7decafbd9231b30ebf5dc6e089a48873dffac6be16290fc7ea6409f0539eac1cc35a17df88c0fde3cb91fcf7d337366ab785ef1f6013dd DIST libxkbcommon-1.7.0.tar.xz 534312 BLAKE2B b85cd8a78fce3c624e0c64c26a37b6d99bb8b8f3de489c6909826f53bdb6d33842f7ffcf955f6a9a8eb57cad53fc9756bd15d05aeb813b0f92985827243949a8 SHA512 4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5 -EBUILD libxkbcommon-1.7.0.ebuild 1800 BLAKE2B 3ff0a87b69159bba55da65e28e11baf189626ebf6f618d231d5ff75fb9f0a38ef8a5d44b3d8cffba2494df89b62a285ec8f7bdd743bc0ef25c1ed6e5379257d3 SHA512 310a38ffa4ce0c92fcf827e76a17520952fa7fb0c80c496a1e25d6e3237ea8e9a057faa181827b461a05d18c8bedc8bcaa343cd615720eb153a269f53d56f668 +EBUILD libxkbcommon-1.7.0-r1.ebuild 1864 BLAKE2B e92b0bfd9e7eb3b8c7b1e1a16f5c44855554de257f9ace8ddacb0129e00407782d078377d6e01fa92081e412ea4b93c10eb1d05980b0941ff5b61806cdce7a3e SHA512 cb1f2003410412023de28bc19f7ff5ea12c6e11ab2dd2477aa892f691116c7dbd85d42c4324d8bc9f86a89709e7f92efc1264e04c3090172d1a1d72fec9ec9da MISC metadata.xml 470 BLAKE2B 4edc4923d3888c12474fb659cf1fb1177c600fba9e8fd34fd6be284c979313bb3282d0fa9084c0aee29d9413e68947dd0ee2d241af4e78b2eb06887d2d684f6b SHA512 e19a6e154a79578d5641dfdbef8e963794b14ef0b0f63450dba2d24044e83b517991a72d81598420567978dcecb9d4e4f0eb9e4cf63e0b562d3e41aa80b39a87 diff --git a/x11-libs/libxkbcommon/files/libxkbcommon-1.7.0-symbol-ver.patch b/x11-libs/libxkbcommon/files/libxkbcommon-1.7.0-symbol-ver.patch new file mode 100644 index 000000000000..6defb3563b78 --- /dev/null +++ b/x11-libs/libxkbcommon/files/libxkbcommon-1.7.0-symbol-ver.patch @@ -0,0 +1,104 @@ +Avoid breaking with older binutils (silently not having versioned symbols). + +https://github.com/xkbcommon/libxkbcommon/commit/621e31014cbc985bd99d778260ad11a5fee783da +https://github.com/xkbcommon/libxkbcommon/commit/1d8a25d6f10ecfc638d7a889bf7d42f79c692a40 + +From 621e31014cbc985bd99d778260ad11a5fee783da Mon Sep 17 00:00:00 2001 +From: Pierre Le Marre <dev@wismill.eu> +Date: Tue, 16 Jul 2024 07:00:53 +0200 +Subject: [PATCH] build: Require meson >= 0.58 + +This will enable f-strings and allow us to simplify the build file. +--- + meson.build | 14 ++++---------- + 2 files changed, 5 insertions(+), 10 deletions(-) + create mode 100644 changes/build/+meson_bump.breaking.md + +--- a/meson.build ++++ b/meson.build +@@ -7,7 +7,7 @@ project( + 'warning_level=2', + 'b_lundef=true', + ], +- meson_version : '>= 0.52.0', ++ meson_version : '>= 0.58.0', # Released on May 2021 + ) + pkgconfig = import('pkgconfig') + cc = meson.get_compiler('c') +@@ -270,9 +270,7 @@ dep_libxkbcommon = declare_dependency( + link_with: libxkbcommon, + include_directories: include_directories('include'), + ) +-if meson.version().version_compare('>= 0.54.0') +- meson.override_dependency('xkbcommon', dep_libxkbcommon) +-endif ++meson.override_dependency('xkbcommon', dep_libxkbcommon) + pkgconfig.generate( + libxkbcommon, + name: 'xkbcommon', +@@ -341,9 +339,7 @@ You can disable X11 support with -Denable-x11=false.''') + link_with: libxkbcommon_x11, + include_directories: include_directories('include'), + ) +- if meson.version().version_compare('>= 0.54.0') +- meson.override_dependency('xkbcommon-x11', dep_libxkbcommon_x11) +- endif ++ meson.override_dependency('xkbcommon-x11', dep_libxkbcommon_x11) + pkgconfig.generate( + libxkbcommon_x11, + name: 'xkbcommon-x11', +@@ -409,9 +405,7 @@ if get_option('enable-xkbregistry') + link_with: libxkbregistry, + include_directories: include_directories('include'), + ) +- if meson.version().version_compare('>= 0.54.0') +- meson.override_dependency('xkbregistry', dep_libxkbregistry) +- endif ++ meson.override_dependency('xkbregistry', dep_libxkbregistry) + endif + + man_pages = [] + +From 1d8a25d6f10ecfc638d7a889bf7d42f79c692a40 Mon Sep 17 00:00:00 2001 +From: Pierre Le Marre <dev@wismill.eu> +Date: Fri, 12 Jul 2024 11:10:46 +0200 +Subject: [PATCH] build: Check for --undefined-version support + +Gate the use of `--undefined-version` in the linker because it breaks on +older GNU `ld`: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58272. +--- + meson.build | 11 +++++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index e8451b69..d0738468 100644 +--- a/meson.build ++++ b/meson.build +@@ -142,10 +142,17 @@ configh_data.set('_CRT_NONSTDC_NO_DEPRECATE', 1) + # Reduce unnecessary includes on MSVC. + configh_data.set('WIN32_LEAN_AND_MEAN', 1) + ++xkbcommon_map = meson.current_source_dir() / 'xkbcommon.map' ++ + # Supports -Wl,--version-script? ++if cc.has_link_argument('-Wl,--undefined-version') ++ extra_linker_args = ',--undefined-version' ++else ++ extra_linker_args = '' ++endif + have_version_script = cc.links( + 'int main(){}', +- args: '-Wl,--undefined-version,--version-script=' + meson.current_source_dir()/'xkbcommon.map', ++ args: f'-Wl,--version-script=@xkbcommon_map@@extra_linker_args@', + name: '-Wl,--version-script', + ) + +@@ -235,7 +242,7 @@ libxkbcommon_sources = [ + libxkbcommon_link_args = [] + libxkbcommon_link_deps = [] + if have_version_script +- libxkbcommon_link_args += '-Wl,--version-script=' + meson.current_source_dir()/'xkbcommon.map' ++ libxkbcommon_link_args += f'-Wl,--version-script=@xkbcommon_map@' + libxkbcommon_link_deps += 'xkbcommon.map' + elif cc.get_argument_syntax() == 'msvc' + libxkbcommon_def = custom_target('xkbcommon.def', diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.7.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.7.0-r1.ebuild index 3fe9b0eff71b..0130d3df99eb 100644 --- a/x11-libs/libxkbcommon/libxkbcommon-1.7.0.ebuild +++ b/x11-libs/libxkbcommon/libxkbcommon-1.7.0-r1.ebuild @@ -41,6 +41,10 @@ DEPEND="${RDEPEND} tools? ( wayland? ( >=dev-libs/wayland-protocols-1.12 ) ) " +PATCHES=( + "${FILESDIR}"/libxkbcommon-1.7.0-symbol-ver.patch +) + pkg_setup() { if use test; then python-any-r1_pkg_setup diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest index aeff0c0fae55..51d9c2737f6c 100644 --- a/x11-libs/motif/Manifest +++ b/x11-libs/motif/Manifest @@ -2,4 +2,5 @@ AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4 DIST motif-2.3.8-patches-5.tar.xz 6156 BLAKE2B b8d1ac1f2bea3521c97b506ecb480ea92c64708376c1bd9c00b853109568527f82eb8f87bd50d78afe9e15a4c84aab51f32598a12b040f7d67ae0dee422c0366 SHA512 594b39ded4e932789baf906e5e7e3cc402f1940cba147b35ae43aba52f65522ba48a05f3193ed9f8ff5c03fed1b517bfde35b38c189e1e7169745c8b97a5d924 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55 EBUILD motif-2.3.8-r5.ebuild 3389 BLAKE2B 3d05d0064452bec7fac76d034a8cd7bd24f8e2822a0afca73b3eeb6a571cdc008afed4fe128d856fd7454ce16ee8508b14ab86bd194f79c77675204d50e42e95 SHA512 1ab9d512185faddd3319248f07d60c241af08311c1d516ab74be6b6a00d7d0f726b30653f93f79051b80330cc7ec6be1f10226c356854d16ad5db1c82870fb86 +EBUILD motif-2.3.8-r6.ebuild 3305 BLAKE2B 5bfdcd50d788777a8c73bc110140e65904d57d4066f64355d9c7a06d2ac05ab215c213dc9fff8066f38794522a323e8bcaa38e98272e877f4583a530abd4b264 SHA512 631a2490644649b95478a6cbcb36997909b2aedc86ec8d17adcf0de7d11de95f7823b90b3d8bef0760e57fecf1d2af471f078a44d6deddbdbd6592ca51a196d4 MISC metadata.xml 445 BLAKE2B 4cfd68cffe9f6c0fdccff74526669d1585ce47949682b911becb4508f40a13493be2a55b5cff6a90c0c9556b330a96bb478dbef2e1b16e4f4baf7a323d88ada3 SHA512 d8ada4a3a14db837ab11752d55bfec960de6a631fd4bbfa569dc4a09d8b3ff3f6908339888e83ad56c716ae9d940111c36030db870f2765b86db2303ed2fbaba diff --git a/x11-libs/motif/motif-2.3.8-r6.ebuild b/x11-libs/motif/motif-2.3.8-r6.ebuild new file mode 100644 index 000000000000..384fce5bf78d --- /dev/null +++ b/x11-libs/motif/motif-2.3.8-r6.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs multilib-minimal + +DESCRIPTION="The Motif user interface component toolkit" +HOMEPAGE="https://sourceforge.net/projects/motif/ + https://motif.ics.com/" +SRC_URI="https://downloads.sourceforge.net/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz + https://dev.gentoo.org/~ulm/distfiles/${P}-patches-5.tar.xz" + +LICENSE="LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft" + +RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[${MULTILIB_USEDEP}] ) + png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) + unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) + xft? ( + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + )" + +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-misc/xbitmaps" + +BDEPEND="sys-devel/flex + dev-util/byacc" + +src_prepare() { + eapply ../patch + eapply_user + + # remove files generated by flex #864533 + rm tools/wml/{wmllex,wmluiltok}.c || die + + AT_M4DIR=. eautoreconf + + # get around some LANG problems in make (#15119) + LANG=C + + # bug #80421 + filter-flags -ftracer + + # -Werror=lto-type-mismatch + filter-lto + + # feel free to fix properly if you care + append-flags -fno-strict-aliasing + + # for Solaris Xos_r.h :( + [[ ${CHOST} == *-solaris2.11 ]] \ + && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3 + + if use !elibc_glibc && use !elibc_musl && use unicode; then + # libiconv detection in configure script doesn't always work + # http://bugs.motifzone.net/show_bug.cgi?id=1423 + export LIBS="${LIBS} -liconv" + fi + + # avoid mismatch of lex variants #936172 + export LEX=flex + # "bison -y" causes runtime crashes #355795 + export YACC=byacc + + # remember the name of the C compiler for the native ABI + MY_NATIVE_CC=$(tc-getCC) +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --with-x \ + --disable-printing \ + $(use_enable static-libs static) \ + $(use_enable motif22-compatibility) \ + $(use_enable unicode utf8) \ + $(use_enable xft) \ + $(use_enable jpeg) \ + $(use_enable png) +} + +multilib_src_compile() { + if ! multilib_is_native_abi; then + # The wmluiltok build tool is linked with libfl.a, so always + # compile it for the native ABI + emake -C tools/wml CC="${MY_NATIVE_CC}" \ + wmluiltok_LDADD="-lfl" wmluiltok + fi + emake +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use examples; then + emake -C demos DESTDIR="${D}" install-data + dodir /usr/share/doc/${PF}/demos + mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die + fi +} + +multilib_src_install_all() { + # mwm default configs + insinto /usr/share/X11/app-defaults + newins "${FILESDIR}"/Mwm.defaults Mwm + + # cleanup + rm -rf "${ED}"/usr/share/Xm || die + find "${D}" -type f -name "*.la" -delete || die + + dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO +} diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest index 5f34b286e4f0..74badfd14813 100644 --- a/x11-libs/qtermwidget/Manifest +++ b/x11-libs/qtermwidget/Manifest @@ -1,6 +1,6 @@ DIST qtermwidget-1.4.0.tar.xz 190320 BLAKE2B 993674562bb15e423fc4dbfa1b99a839fe8fea52e4c49f2629858d01d8ac4a50750845b507fafa4b0bdf6337fef77458793d002388986923d8f55b321de3bb9b SHA512 b688290eff52bd77e4a9f342062b52bf7a03a8ba66fc86583875472d0c0b0414d59ea0ad6cde64117cc49061944eacd17950724b23f74bb6ada4995917a094bc DIST qtermwidget-2.0.1.tar.xz 191548 BLAKE2B ec3155d8a92f606790c635c315df6809483b93d8976b24725288c030889a2010c88a7ac48f0dc8ed3011fbfd75e819dfd6213259c3d893b7bddc4927e14e6dfd SHA512 ba9bc9203428e54137ed1e5865bf9260e1d64bedda8e766a92fe16277179fdc83a95c5b6df42ba3ab82babb00543e50ec48faf26668f7af26716ac98ab6da62e EBUILD qtermwidget-1.4.0.ebuild 677 BLAKE2B cd7bf5c8dae79471fe41e4bd2d3ef956b20bd429f26334baca88bf46f0085ce2d58cdb20b66da43fd16d3cc7e79f2f715c547b50706107c2325e406e71950b57 SHA512 65b23b6e1be03e393d6f266530ece7c1d8e617e95774624c314344602942ca1df3d8289ebabb0861dcae031acd04b9cc69fcac083e1840107f0bc3ed84d3d0c9 -EBUILD qtermwidget-2.0.1.ebuild 601 BLAKE2B 468bccdf4917e48c6c8ed23b5ad97e1ea73bb64cf8392a48220b21f81064f708d17b221457959446063f7eba61230c4a9054e095f4e48228b43a6253296b3ccf SHA512 5b05eae478c3a1b0e3b3a8133e2ee3561ecbc989e80bb5435aa3a0dfa24accfeaeb37723727891daeb7e250c1322e17ef1d3efd18cec9553ccf1b91d700f823e +EBUILD qtermwidget-2.0.1.ebuild 615 BLAKE2B d2e27d255c472646229fe82e112659f414e7f9526cc1e3247698f2db10695d051a34ef3e5cd2487fa02b638ac9bcfe6a0ebd896a6e44b181ae7bc7d45d655d08 SHA512 faa0385bb0d80cd097870579f8611fdd50551b06dc927e23772fab68b4be6b429d2c419b1bf5b620e1694748be6bad63f87cb1923c6c59b03e36460c1318eb40 EBUILD qtermwidget-9999.ebuild 601 BLAKE2B 468bccdf4917e48c6c8ed23b5ad97e1ea73bb64cf8392a48220b21f81064f708d17b221457959446063f7eba61230c4a9054e095f4e48228b43a6253296b3ccf SHA512 5b05eae478c3a1b0e3b3a8133e2ee3561ecbc989e80bb5435aa3a0dfa24accfeaeb37723727891daeb7e250c1322e17ef1d3efd18cec9553ccf1b91d700f823e MISC metadata.xml 592 BLAKE2B 0d2c8417ebd737779172fa9d4f20ac7ac43b2c0f0e8af1bc78a1c1cb03931c74786093e059c42c5da4990b894c46f9b74aa53f5fd7acf361aafcc42593518ff6 SHA512 af3edbac8d3e9973f931cd480f5ad19476dbcc05580b2586b69ee86828986c4e446464c501d217c9b0f74191b0d6e5ab190daf778bff7e43af87d1a64fb5ad52 diff --git a/x11-libs/qtermwidget/qtermwidget-2.0.1.ebuild b/x11-libs/qtermwidget/qtermwidget-2.0.1.ebuild index ba12747178e9..5c8c5cbd88fc 100644 --- a/x11-libs/qtermwidget/qtermwidget-2.0.1.ebuild +++ b/x11-libs/qtermwidget/qtermwidget-2.0.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~riscv" fi LICENSE="BSD GPL-2 LGPL-2+" diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 5dc7e4c9e8fb..7fd1a144aa26 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,9 +1,14 @@ AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 BLAKE2B 27ee298761155789aba19b77dcad97abbf2524a69de4540c38b814fa566e8f3e4003925570a12b75d85f56cb1b047c1895eb8c74df8c81f8334785dfc5055913 SHA512 983c7f4ab44417a5ca0e00f428882650b8a5c250aba328e8255bffb25cdff0505f0fa3a635d722a27467ac44e4e2880f8631b7ff3b20a35ea4e57db9537807ab AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b +AUX vte-0.76.3-stdint.patch 808 BLAKE2B 71117a42992ca12841e06719594604069c7ade0eb9289270cb5b2b2befc7cad500265a1d2f5cfe3d3af827efd55ff7db736d577f0d3d3855d6fb0cb27aee3e28 SHA512 bfd67775251fbb4f4488d0692c423a1622d60a4f0a0e84dff0082081cf14da57b6e4093d047fe3dda1078efa88ede433a354e80b85d7f198b6f264e3588cb61c DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7 DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1 DIST vte-0.74.0-command-notify.patch.xz 9248 BLAKE2B 30917bc72d2b3fd917178f49c26f023d40d37e9a44a896c44e55345396d0bfdb1b109f8b2fdead96c31f92f5febcc397f2899511647c3adf3c2aace2be8ffa94 SHA512 fc0bb3cfa70fc5e1384c44fcce6d6a76957d0dd72f61a882d9df22d55dd06fcee4e7bd2a136c443158fe403992befe5d7ce5970b8b657b690b3875ff5171ea83 DIST vte-0.74.2.tar.bz2 505422 BLAKE2B 243eabfb26c0ec65d0b202437ae79265440256941dae4263e9d6dc9afea24d0fbbd7d421864a90b54d2ba953cd60a2b5a41aef9fb9e53396176bcc71400eef82 SHA512 203dd0f8606b8979cde01781412e0dbab3cb8857828e55f6d69ecfc2e4d58d53430aa5c61a2203e122c772ba1f6c5b739d3c03456b133580e76d511d67f3f534 +DIST vte-0.76.3-a11y-implement-GtkAccessibleText.patch.xz 9548 BLAKE2B 2c34f44cff5e1abf00358984c8000a3d7bce3b020be08052d016ca69864f9ab9b1a22ca6709dd5e78a13c8e43a6c4ace1fc1e74f5be83a9988c2b0083880ab95 SHA512 490ec91f27a8a873ee03f8aebb222217c85b2f865e6662dcc5efc1d9fe3765c966d4e9cd8691c4f1779e232139822eb1aa0f464e7090da96c6c17b556f642927 +DIST vte-0.76.3-command-notify.patch.xz 4336 BLAKE2B d3fd8eef9c3322af20ceac4678635edbb00159fa88147a897f655a5920c638da19fff10e08215a891df2cdd5721cd808b6041d84e74980a9f129e07de621526b SHA512 1c974ae97823659bee873036d656423255fae2b71baa4f4221b656055d69d55120f5cccfe3d9e514a64a2c5f87f94c1e4b47b4a2a233faf28ca06a959efe3e3b +DIST vte-0.76.3.tar.bz2 564747 BLAKE2B 1ad65a18ca1aa2371dd74ef3ebaf1aa44358c4a1cbcfa39296fde10e03a76cdbdd2ca7f229f1b4507016e8b986824407d937952a45306eab5e6c0ca5ee9cec8b SHA512 8b7e18831e99ac92159f7b39c6404879cebf22f1f2dcb3feb38cad61f374767f631923c219e153551e9f30ee75c1e8e975fbbf3a6027b9c62ba4f948e3c9f199 EBUILD vte-0.68.0.ebuild 2804 BLAKE2B f18d23929fb1a09090acf7fde6e1c3c11901056d515e5ba4cc3d110ba983fca52c8a57d10c0f3d54b3d42d08129bed89462298758a10e160cb8bd8824cc76fff SHA512 bec9bd7247f9111fdb64cb71cc798cd5fbdc4b78cf545d20d210ff3aeba234e49e27836c92d863116044eeccf03928b05f88de4527a8121b4b6f9cea7770580b EBUILD vte-0.74.2.ebuild 3335 BLAKE2B d0e8c981daaca68888bc794529b7076d6b9dbd3779297ab3f339597407f106768c4c94b8fe4279a4d7f18b591f107004ace5747675debe010153a444e589558f SHA512 dccdafdfbf01391c87914c5d9bc25b782297ad91989f6bf6b83c65744e4a152544b4232cc9ef78d4f66161eaf4536f8741117ceae54e09591561f0c46d6becd0 +EBUILD vte-0.76.3.ebuild 3684 BLAKE2B 6a9ea807d4a553ca2969341340c0238c0115699fefdd9c17e57a3a702c8119ef61feb25e71fad815ce9a6baeb2e9f5566d3a9d0beb7533d9b97dce2a5cc96745 SHA512 88d879ff70bec7f4123dfaf26c227dea9bd89ddcb1405f0b1ebbae2766632a7bb2463c9ed1ecb300fd629d08e526218c528b7c23ea7adccd0dbc23a0809fd1cf MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d diff --git a/x11-libs/vte/files/vte-0.76.3-stdint.patch b/x11-libs/vte/files/vte-0.76.3-stdint.patch new file mode 100644 index 000000000000..26c640e0ae7f --- /dev/null +++ b/x11-libs/vte/files/vte-0.76.3-stdint.patch @@ -0,0 +1,34 @@ + +Fix compilation with gcc-14. + +Bug: https://bugs.gentoo.org/937617 +Bug: https://gitlab.gnome.org/GNOME/vte/-/issues/2807 + +Patch from: +https://gitlab.gnome.org/GNOME/vte/-/commit/0d393b6cd6a24f53eaefa16764b9453a1483acf5 + +From 0d393b6cd6a24f53eaefa16764b9453a1483acf5 Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe@src.gnome.org> +Date: Mon, 12 Aug 2024 18:42:37 +0200 +Subject: [PATCH] lib: Include stdint.h where needed + +Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2807 +--- + src/vte/vteregex.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/vte/vteregex.h b/src/vte/vteregex.h +index 10c5088b8..c9e4f75db 100644 +--- a/src/vte/vteregex.h ++++ b/src/vte/vteregex.h +@@ -23,6 +23,7 @@ + + #include <glib.h> + #include <glib-object.h> ++#include <stdint.h> + + #include "vtemacros.h" + +-- +GitLab + diff --git a/x11-libs/vte/vte-0.76.3.ebuild b/x11-libs/vte/vte-0.76.3.ebuild new file mode 100644 index 000000000000..e18dd0ef6bbc --- /dev/null +++ b/x11-libs/vte/vte-0.76.3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic gnome.org meson python-any-r1 vala xdg + +DESCRIPTION="Library providing a virtual terminal emulator widget" +HOMEPAGE="https://gitlab.gnome.org/GNOME/vte/" + +# Upstream is hostile and refuses to upload tarballs. +SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" +SRC_URI="${SRC_URI} + !vanilla? ( + https://dev.gentoo.org/~pacho/${PN}/${P}-command-notify.patch.xz + https://dev.gentoo.org/~pacho/${PN}/${P}-a11y-implement-GtkAccessibleText.patch.xz ) +" +# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+) +LICENSE="LGPL-3+ GPL-3+" + +SLOT="2.91" # vte_api_version in meson.build +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" + +DEPEND=" + >=x11-libs/gtk+-3.24.22:3[introspection?] + >=x11-libs/cairo-1.0 + >=dev-libs/fribidi-1.0.0 + >=dev-libs/glib-2.72:2 + crypt? ( >=net-libs/gnutls-3.2.7:0= ) + icu? ( dev-libs/icu:= ) + >=x11-libs/pango-1.22.0 + >=dev-libs/libpcre2-10.21:= + systemd? ( >=sys-apps/systemd-220:= ) + >=app-arch/lz4-1.9 + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) + x11-libs/pango[introspection?] +" +RDEPEND="${DEPEND} + ~gui-libs/vte-common-${PV}[systemd?] +" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/libxml2:2 + dev-util/glib-utils + gtk-doc? ( dev-util/gi-docgen ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +PATCHES=( "${FILESDIR}/${PN}-0.76.3-stdint.patch" ) + +src_prepare() { + default + use vala && vala_setup + xdg_environment_reset + + use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch + + if ! use vanilla; then + # From https://src.fedoraproject.org/rpms/vte291/raw/f40/f/0001-add-notification-and-shell-precmd-preexec.patch + # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere + eapply "${WORKDIR}"/${P}-command-notify.patch + # From https://src.fedoraproject.org/rpms/vte291/raw/f40/f/0001-a11y-implement-GtkAccessibleText.patch + # Migrate to GTK4 and add VteTerminal:enable-a11y feature flag + eapply "${WORKDIR}"/${P}-a11y-implement-GtkAccessibleText.patch + fi + + # -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter + sed -e '/ggdb3/d' -i meson.build || die + sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die +} + +src_configure() { + # Upstream don't support LTO & error out on it in meson.build + filter-lto + + local emesonargs=( + -Da11y=true + $(meson_use debug) + $(meson_use gtk-doc docs) + $(meson_use introspection gir) + -Dfribidi=true # pulled in by pango anyhow + -Dglade=true + $(meson_use crypt gnutls) + -Dgtk3=true + -Dgtk4=false + $(meson_use icu) + $(meson_use systemd _systemd) + $(meson_use vala vapi) + ) + meson_src_configure +} + +src_install() { + # not meson_src_install because this would include einstalldocs, which + # would result in file collisions with gui-libs/vte + meson_install + + # Remove files that are provided by gui-libs/vte-common + rm "${ED}"/usr/libexec/vte-urlencode-cwd || die + rm "${ED}"/etc/profile.d/vte.sh || die + rm "${ED}"/etc/profile.d/vte.csh || die + if use systemd; then + rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die + fi + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/ || die + mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die + fi +} diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index f969402f2985..e672a0535f68 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -8,6 +8,7 @@ AUX wxGTK-3.2.1-prefer-lib64-in-tests.patch 1016 BLAKE2B b2d7cac45af6a0e5e118c86 AUX wxGTK-3.2.1-wayland-control.patch 6150 BLAKE2B 4aef8ab0fb4e2352afba139cc539f77b1c0825ee7c4a33c0f2fc41bcbadd943a90c55dced954f362f73995d2232d54b1815725a0c5d03325c64d0a00d92191aa SHA512 995eeb0409293247756eddde8bf8fcee87ded284bb0f9faac27ae511483e0131e4802bdb9d93063097273e83b55b08328dd0380639fcb265352991cf3d34fc1d AUX wxGTK-3.2.2.1-backport-pr24197.patch 3030 BLAKE2B b005f114f03f4791fc3a94ab0ffd807dfa20fc7ccb36af58336010b3c3d5de262f53615cd99369e7d013c741f4b070417568e1671144287c2e8ed3c6f9a68880 SHA512 d358517a34a5040ee51055e4d67807e24e344f5ad0a8809939fd1cc708a7a409e564cb88fbffd95c6b8ef901fb00ed65423e745038675948d8c93052f222acaa AUX wxGTK-3.2.2.1-dont-break-flags.patch 1373 BLAKE2B 2ae7524b2f80cc562dc6a62a823e1e0d904213de4c11346995d7014490843ad6f7111c5b39b5d147a39beaf07b627b8f13378bfdc1ea129a24230054ccf8aad4 SHA512 3cb557dc51b7694a9e935b14d4c4ab430a75c3de091f697d3291e04b78cd0b3b6a8c7fc3c4afc32a2692d32f43cf4bb52655a4230ac1b38cd101f903f136f2e4 +AUX wxGTK-3.2.5-dont-break-flags.patch 565 BLAKE2B 87d05449f43c455089389aee4750480596f521f4ef97c54b3bb3825b8383625432b97dc10229ec214ad5ebca89802902455600def5be29d55128089dc99ea934 SHA512 7f551bc56a72db2a34058bf4880521b171727a9ab93acbf518ec88a54dd68952d914ea6fb1e848bb6fc158f1ad2225388d35c6cb8daafc79c55d06691273b3e4 AUX wxGTK-configure-tests.patch 560 BLAKE2B 86a735c58abc8690cd943ff58a39140a636c56dcde08f47d27dbdcf99790216ebe0f4524f2f7cd67e35748c32adaee377c4e8a4b606975115c666cbc453b5173 SHA512 f02b708e5de66a4a7dce9f1adef1ebd1461ef68acee502b54d514a0ce4e5fe998eaad9a9ec7b1bec9aa4d8803a4042111ea4cddafe8e2f68d3d122faf90465df AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f031214691fe7d5cd8c283faf9511fff260735d9dcd293e6377be0e96a6521e84ceae4560f2fef8fc7e7ed5642cd6 SHA512 649551eeacc9915f249ece1c3ed79959f0f0129e54373bfbe84ea5fbf2b8e0ba7778d6a22ac6f165e5d4e85a3ea4320274296b1b2a8e623acb11300fe44478f8 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9 @@ -18,10 +19,14 @@ DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651 DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d DIST wxWidgets-3.2.2.1-docs-html.tar.bz2 18109775 BLAKE2B bb5dad886c2ba64feb9ec3be05f2cd4bcfb127d55f0a0af6d0aa59ee8f47663e39e7fcb3c0472cfdda9fbf99f1d32e07ff29604261e168f3b4218b9b5b61abc2 SHA512 9b883e1c611ac78f7b8457ffd8682c614d7653f561215c48e6239b6394cc4c084b34d6c55fe84fb7b76b38189591e94dc4596242f9e8653d2c72ae6f4b3a6293 DIST wxWidgets-3.2.2.1.tar.bz2 27339515 BLAKE2B e761e768dbb32bf76dbabf27aa9feb634760aa214c2d8f85f9b4284700d01390617c275a855fa3ae28481a38233f3a71f8560e5a8a360d7b72ace2603c551327 SHA512 289d61ea2abd75a329aafcbd347ab84b136f31fca01dd902593f661691ecd30a4416286ff501c4257baa6765cf356ade3087eb8609af9a44599cfdc20e2f03a6 +DIST wxWidgets-3.2.5-docs-html.tar.bz2 18205089 BLAKE2B 8bf09c0f9698e72e425a4e4fcbd57498851c93f02dca33fadcd785e04f3927807ff65e8b7dbecaadde64b2bf7653e950a93c5d522ff4e27a8e3baaa85ef6c692 SHA512 cc80c827c4f8607ef38e435eb7fd5dab9fcad5e93ab81bca262d212f5a061b85093d1bc1a1bdc82a7422c4744b6fdd5c82f3142b6a497e85067f571ce9513f5e +DIST wxWidgets-3.2.5.tar.bz2 27539152 BLAKE2B e262860b5d64d30576bbe61913d14c98c7e56bc1f108696abe0d446145e8c8cea3711bae4f3248c7def06ee988ee4441652376113ad2b4f04402249d7c1e6961 SHA512 b5bd8e4b53b7c44f79b76a39de0071d14e1f0325e66b7a9f2c7f1934a4146be3c78332f610119f7ba46ca4cd1055272a3d8937ad46665ce5abd867a803f22c86 EBUILD wxGTK-3.0.4-r5.ebuild 3855 BLAKE2B a5767a56c2ce7ffaa0c992edb38d13af09c6c13c68f7365d4ed9403614d9dfface7570559286081aa8cca8ab1fb5a05835c5d1b9031a7e57c87eedce3868e311 SHA512 12a803bee87b1341e5948672b8d501b4199fbcf36f4392458ad527e06f8b61e83d3fce029299666b8614f9ced6a099070ffdce028e3e12f11efcc8083ca8ea09 EBUILD wxGTK-3.0.5.1-r1.ebuild 5652 BLAKE2B af627de9327d718ac25c163fee1acc37cde2038bcac5404923388095c8ef266a8b200ba611fa75f13e75dde6492d820f16659a88ad921ae26d1118960e73077a SHA512 9e5daee2d0f0646a653c6319e4327eb6f13c4e45c91259ab5ba119a1e9914aec97dd5b9e5050dc0dc85081825d60c0201e6aea3f620a9d20c1772d6399dac51a EBUILD wxGTK-3.0.5.1-r2.ebuild 5717 BLAKE2B 128f0cbb13c6c614c9a8c429b63684bb071f77b91b294ab1bf633447d999c6c91b68f3a159c9e306a917e447a77bd4dc43640df8bd7b27b1fd16d873d2b1c7f4 SHA512 a835963df5be7019be620fc389c5c7b001a484b387ed385798b957caafa08e570e55056d5e119a9b007a8d01041e5c1eade639f7251b67ebf315cce73dc6cb6a EBUILD wxGTK-3.0.5.1-r3.ebuild 6183 BLAKE2B d25f3bb3cd43ec16838210c7bd8610326901f32c8ec048317135fdee7a85154635c9a58994d46d6a2dcd929dd51de5a4deb5bbe29a3b6b186d22c05465e25261 SHA512 d35fcf24275da1ed9bf2645853236cbf69d57c2a657751f8f51ae5002e39c348a92491a016931b95c08a8f2b9f0bcbf9933ce4ee05b6387d05c85dab4fd5ebcc EBUILD wxGTK-3.2.2.1-r3.ebuild 7778 BLAKE2B 56582d7235c516fb948290ea02554f109462e097ca4c428d6bd6f274e6aed62079f83e30906e4fa5334dfb5daacaae2f3cb8661252a82231b79cdc835442924f SHA512 4531ae289f92e9b34a06373cd6fef4b12785dbf31e0955f1e736aa6f5f23bccb138bd152a21c3067885ac7ff9ca1e8c8a761aa8cbff59ee0ea8efacff311be8f EBUILD wxGTK-3.2.2.1-r4.ebuild 8244 BLAKE2B 4b5e09d7454294b9957b1f119ef48cfc3aacab1aa19ac0a4df3a9eacb8f9bea05ef717f6daef56f51b9f4bb0d6d96af5702598d7175766f6643803f9ea639ad0 SHA512 25b256411735e2bdfc916be37a02276190327009e5626f9310814ad580631aa9afc60300e1afac1313000fd3ca426f69aad721d950b965fd8e071db67084e8de +EBUILD wxGTK-3.2.2.1-r5.ebuild 8411 BLAKE2B ab8c97eefcfd43ca1027af21e6feae4de8997d95052c5610ee37f49399dd275c8e09c05497e318014e33dfd4301a4d5ccc05ad247420ba4cd1a5e2d5f8bb0b23 SHA512 f720e92f5ed79b9d744e65a4a343bfe37dfd02155bbe25c1a675cca2f93c496a87764bf63270f9f85a8d3ac71bf86217b03412957555c58d17352f1ad01a20d9 +EBUILD wxGTK-3.2.5.ebuild 8251 BLAKE2B bac092fc43bbd8de3e546742ec830e80fbf7395874a3b9a0cfc797945b63353d486b9e142d9b713ac860177c749dc4535241519f085312fa95771dfd47100789 SHA512 b57bcb01056c395addcf32cd00886ae3b4562d99910e7c704d9fff20538d0ea6e0c33064a72fb7856dbe4ff7ecb820b668af56ff71bcfe865b7e75590c76750c MISC metadata.xml 756 BLAKE2B 336ffb3375ee9092de02d0808d0a44f7f5bcbc6e4a845c12b6466af0b91f3397c2b335e5433917361a060db43d6cb836cde0f87be2059214f314fa6726199e2d SHA512 190b72992c64b43b46e28ca2f730e1897a5f740ba211b859c816b4892256284feb579fbce06cb1939b774ae989dc68754f5a57f6375cfca50d7770d0c2ed47ed diff --git a/x11-libs/wxGTK/files/wxGTK-3.2.5-dont-break-flags.patch b/x11-libs/wxGTK/files/wxGTK-3.2.5-dont-break-flags.patch new file mode 100644 index 000000000000..329e0a8a80da --- /dev/null +++ b/x11-libs/wxGTK/files/wxGTK-3.2.5-dont-break-flags.patch @@ -0,0 +1,18 @@ +--- wxWidgets-3.2.5/configure.orig 2024-07-20 05:18:49.509254253 +0000 ++++ wxWidgets-3.2.5/configure 2024-07-20 05:20:47.575983942 +0000 +@@ -45700,13 +45700,8 @@ + + dedup_flags() + { +- printf "%s " "$@" | +- awk 'BEGIN { RS=" "; ORS=" " } +- { +- if ($0=="") next +- if ($0=="-arch" || $0=="-framework") { x=$0; next } +- if (x!="") x=x " " $0; else x=$0; if (!seen[x]++) print x; x="" +- }' ++ # Gentoo: Don't hack out flags, parsing them is complex. ++ printf '%s ' "$@" + } + + WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild new file mode 100644 index 000000000000..9fd9ff23eff6 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r5.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal flag-o-matic + +WXSUBVERSION="${PV}-gtk3" # 3.2.1-gtk3 +WXVERSION="$(ver_cut 1-3)" # 3.2.1 +# Make sure that this matches the number of components in ${PV} +WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3 +WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3 + +DESCRIPTION="GTK version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://wxwidgets.org/" +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" + +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" +SLOT="${WXRELEASE}" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit X" +REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-eselect/eselect-wxwidgets-20131230 + dev-libs/expat[${MULTILIB_USEDEP}] + dev-libs/libpcre2[pcre16,pcre32,unicode] + sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + curl? ( net-misc/curl ) + lzma? ( app-arch/xz-utils ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-3.24.41-r1:3[wayland?,X?,${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXtst + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + media-libs/fontconfig + x11-libs/pango[${MULTILIB_USEDEP}] + keyring? ( app-crypt/libsecret ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}] + ) + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/opengl[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland ) + ) + spell? ( app-text/gspell:= ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:4= ) + )" +DEPEND="${RDEPEND} + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) + >=app-eselect/eselect-wxwidgets-20131230 + virtual/pkgconfig" + +# Note about the gst-plugin-base dep: The build system queries for it, +# but doesn't link it for some reason? Either way - probably best to +# depend on it anyway. +# Note about the wayland dep: Appears to be only required for the OpenGL +# canvas, and it seems impossible to disable the X dependency, unless +# I'm missing something. This is an automagic header dep, though. + +PATCHES=( + #"${WORKDIR}"/wxGTK-3.0.5_p20210214/ + "${FILESDIR}/${PN}-3.2.1-gtk3-translation-domain.patch" + #"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}/${PN}-3.2.1-configure-tests.patch" + "${FILESDIR}/${PN}-3.2.1-wayland-control.patch" + "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch" + "${FILESDIR}/${PN}-3.2.2.1-dont-break-flags.patch" + "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch" +) + +src_prepare() { + default + + # find . -iname Makefile.in -not -path ./samples'/*' \ + # | xargs grep -l WX_RELEASE + local versioned_makefiles=( + ./tests/benchmarks/Makefile.in + ./tests/Makefile.in + ./utils/emulator/src/Makefile.in + ./utils/execmon/Makefile.in + ./utils/wxrc/Makefile.in + ./utils/helpview/src/Makefile.in + ./utils/hhp2cached/Makefile.in + ./utils/screenshotgen/src/Makefile.in + ./utils/ifacecheck/src/Makefile.in + ./Makefile.in + ./demos/life/Makefile.in + ./demos/bombs/Makefile.in + ./demos/fractal/Makefile.in + ./demos/forty/Makefile.in + ./demos/poem/Makefile.in + ) + + # Versionating + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ + -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ + -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ + "${versioned_makefiles[@]}" || die + + sed -i \ + -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ + -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ + -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ + -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ + configure || die +} + +multilib_src_configure() { + # defang automagic dependencies, bug #927952 + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cflags -DGENTOO_GTK_HIDE_X11 + + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + # X independent options + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat30 + --enable-xrc + $(use_with sdl) + $(use_with lzma liblzma) + # Currently defaults to curl, could change. Watch the VDB! + $(use_enable curl webrequest) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + + # Don't hard-code libdir's prefix for wx-config + --libdir='${prefix}'/$(get_libdir) + ) + + # By default, we now build with the GLX GLCanvas because some software like + # PrusaSlicer does not yet support EGL: + # + # https://github.com/prusa3d/PrusaSlicer/issues/9774 . + # + # A solution for this is being developed upstream: + # + # https://github.com/wxWidgets/wxWidgets/issues/22325 . + # + # Any software that needs to use OpenGL under Wayland can be patched like + # this to run under xwayland: + # + # https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82 . + # + # Check that the macro wxUSE_GLCANVAS_EGL is set to 1. + # + myeconfargs+=( "--disable-glcanvasegl" ) + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug && myeconfargs+=( --enable-debug=max ) + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && myeconfargs+=( + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-gtk=3 + --with-libpng=sys + --with-libjpeg=sys + + # Choosing to enable this unconditionally seems fair, pcre2 is + # almost certain to be installed. + --with-regex=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys) + $(use_enable keyring secretstore) + $(use_enable spell spellcheck) + $(use_enable test tests) + $(use_enable wayland) + ) + + # wxBase options + ! use X && myeconfargs+=( --disable-gui ) + + # wxWidgets installs a configuration file with a reference to EGREP. + # Autoconf discovers these programs via full paths, which is + # unnecessary and fails if a build happened on a merged-usr system + # but is being used on a split-usr system. Bug #927920. + export ac_cv_path_SED="sed" + export ac_cv_path_EGREP="grep -E" + export ac_cv_path_EGREP_TRADITIONAL="grep -E" + export ac_cv_path_FGREP="grep -F" + export ac_cv_path_GREP="grep" + export ac_cv_path_lt_DD="dd" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + emake -C tests + (cd tests && ./test '~[.]~[net]') || die +} + +multilib_src_install_all() { + cd docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. ) + einstalldocs + + # Unversioned links + rm "${ED}"/usr/bin/wx-config || die + rm "${ED}"/usr/bin/wxrc || die + + # version bakefile presets + pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die + local f + for f in wx*; do + mv "${f}" "${f/wx/wx32gtk3}" || die + done + popd >/dev/null || die +} + +pkg_postinst() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/wxGTK/wxGTK-3.2.5.ebuild b/x11-libs/wxGTK/wxGTK-3.2.5.ebuild new file mode 100644 index 000000000000..59e334adfaa1 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.2.5.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal flag-o-matic + +WXSUBVERSION="${PV}-gtk3" # 3.2.5-gtk3 +WXVERSION="$(ver_cut 1-3)" # 3.2.5 +# Make sure that this matches the number of components in ${PV} +WXRELEASE="$(ver_cut 1-2)-gtk3" # 3.2-gtk3 +WXRELEASE_NODOT=${WXRELEASE//./} # 32-gtk3 + +DESCRIPTION="GTK version of wxWidgets, a cross-platform C++ GUI toolkit" +HOMEPAGE="https://wxwidgets.org/" +SRC_URI=" + https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2 + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" +S="${WORKDIR}/wxWidgets-${PV}" + +LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" +SLOT="${WXRELEASE}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X curl doc debug keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit" +REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) keyring? ( X )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-eselect/eselect-wxwidgets-20131230 + dev-libs/expat[${MULTILIB_USEDEP}] + dev-libs/libpcre2[pcre16,pcre32,unicode] + sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] ) + curl? ( net-misc/curl ) + lzma? ( app-arch/xz-utils ) + X? ( + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[wayland?,${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXtst + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + media-libs/fontconfig + x11-libs/pango[${MULTILIB_USEDEP}] + keyring? ( app-crypt/libsecret ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-bad:1.0[${MULTILIB_USEDEP}] + ) + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/opengl[${MULTILIB_USEDEP}] + wayland? ( dev-libs/wayland ) + ) + spell? ( app-text/gspell:= ) + tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:4.1= ) + )" +DEPEND="${RDEPEND} + opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto )" +BDEPEND=" + test? ( >=dev-util/cppunit-1.8.0 ) + >=app-eselect/eselect-wxwidgets-20131230 + virtual/pkgconfig" + +# Note about the gst-plugin-base dep: The build system queries for it, +# but doesn't link it for some reason? Either way - probably best to +# depend on it anyway. +# Note about the wayland dep: Appears to be only required for the OpenGL +# canvas, and it seems impossible to disable the X dependency, unless +# I'm missing something. This is an automagic header dep, though. + +PATCHES=( + #"${WORKDIR}"/wxGTK-3.0.5_p20210214/ + "${FILESDIR}/${PN}-3.2.1-gtk3-translation-domain.patch" + #"${FILESDIR}"/wxGTK-ignore-c++-abi.patch #676878 + "${FILESDIR}/${PN}-3.2.1-configure-tests.patch" + "${FILESDIR}/${PN}-3.2.1-wayland-control.patch" + "${FILESDIR}/${PN}-3.2.1-prefer-lib64-in-tests.patch" + "${FILESDIR}/${PN}-3.2.5-dont-break-flags.patch" + "${FILESDIR}/${PN}-3.2.2.1-backport-pr24197.patch" +) + +src_prepare() { + default + + # find . -iname Makefile.in -not -path ./samples'/*' \ + # | xargs grep -l WX_RELEASE + local versioned_makefiles=( + ./tests/benchmarks/Makefile.in + ./tests/Makefile.in + ./utils/emulator/src/Makefile.in + ./utils/execmon/Makefile.in + ./utils/wxrc/Makefile.in + ./utils/helpview/src/Makefile.in + ./utils/hhp2cached/Makefile.in + ./utils/screenshotgen/src/Makefile.in + ./utils/ifacecheck/src/Makefile.in + ./Makefile.in + ./demos/life/Makefile.in + ./demos/bombs/Makefile.in + ./demos/fractal/Makefile.in + ./demos/forty/Makefile.in + ./demos/poem/Makefile.in + ) + + # Versionating + sed -i \ + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\ + -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\ + -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\ + -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \ + "${versioned_makefiles[@]}" || die + + sed -i \ + -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \ + -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \ + -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \ + -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \ + configure || die +} + +multilib_src_configure() { + # Workaround for bug #915154 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + # X independent options + local myeconfargs=( + --with-zlib=sys + --with-expat=sys + --enable-compat30 + --enable-xrc + $(use_with sdl) + $(use_with lzma liblzma) + # Currently defaults to curl, could change. Watch the VDB! + $(use_enable curl webrequest) + + # PCHes are unstable and are disabled in-tree where possible + # See bug #504204 + # Commits 8c4774042b7fdfb08e525d8af4b7912f26a2fdce, fb809aeadee57ffa24591e60cfb41aecd4823090 + $(use_enable pch precomp-headers) + + # Don't hard-code libdir's prefix for wx-config + --libdir='${prefix}'/$(get_libdir) + ) + + # By default, we now build with the GLX GLCanvas because some software like + # PrusaSlicer does not yet support EGL: + # + # https://github.com/prusa3d/PrusaSlicer/issues/9774 . + # + # A solution for this is being developed upstream: + # + # https://github.com/wxWidgets/wxWidgets/issues/22325 . + # + # Any software that needs to use OpenGL under Wayland can be patched like + # this to run under xwayland: + # + # https://github.com/visualboyadvance-m/visualboyadvance-m/commit/aca206a721265366728222d025fec30ee500de82 . + # + # Check that the macro wxUSE_GLCANVAS_EGL is set to 1. + # + myeconfargs+=( "--disable-glcanvasegl" ) + + # debug in >=2.9 + # there is no longer separate debug libraries (gtk2ud) + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. + # http://docs.wxwidgets.org/3.0/overview_debugging.html + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c + use debug && myeconfargs+=( --enable-debug=max ) + + # wxGTK options + # --enable-graphics_ctx - needed for webkit, editra + # --without-gnomevfs - bug #203389 + use X && myeconfargs+=( + --enable-graphics_ctx + --with-gtkprint + --enable-gui + --with-gtk=3 + --with-libpng=sys + --with-libjpeg=sys + + # Choosing to enable this unconditionally seems fair, pcre2 is + # almost certain to be installed. + --with-regex=sys + --without-gnomevfs + $(use_enable gstreamer mediactrl) + $(multilib_native_use_enable webkit webview) + $(use_with libnotify) + $(use_with opengl) + $(use_with tiff libtiff sys) + $(use_enable keyring secretstore) + $(use_enable spell spellcheck) + $(use_enable test tests) + $(use_enable wayland) + ) + + # wxBase options + ! use X && myeconfargs+=( --disable-gui ) + + # wxWidgets installs a configuration file with a reference to EGREP. + # Autoconf discovers these programs via full paths, which is + # unnecessary and fails if a build happened on a merged-usr system + # but is being used on a split-usr system. Bug #927920. + export ac_cv_path_SED="sed" + export ac_cv_path_EGREP="grep -E" + export ac_cv_path_EGREP_TRADITIONAL="grep -E" + export ac_cv_path_FGREP="grep -F" + export ac_cv_path_GREP="grep" + export ac_cv_path_lt_DD="dd" + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + emake -C tests + (cd tests && ./test '~[.]~[net]') || die +} + +multilib_src_install_all() { + cd docs || die + dodoc changes.txt readme.txt + newdoc base/readme.txt base_readme.txt + newdoc gtk/readme.txt gtk_readme.txt + + use doc && HTML_DOCS=( "${WORKDIR}"/wxWidgets-${PV}-docs-html/. ) + einstalldocs + + # Unversioned links + rm "${ED}"/usr/bin/wx-config || die + rm "${ED}"/usr/bin/wxrc || die + + # version bakefile presets + pushd "${ED}"/usr/share/bakefile/presets >/dev/null || die + local f + for f in wx*; do + mv "${f}" "${f/wx/wx32gtk3}" || die + done + popd >/dev/null || die +} + +pkg_postinst() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} + +pkg_postrm() { + has_version -b app-eselect/eselect-wxwidgets \ + && eselect wxwidgets update +} diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest index 4bf2a2b17c6b..97eada985d95 100644 --- a/x11-libs/xapp/Manifest +++ b/x11-libs/xapp/Manifest @@ -1,7 +1,9 @@ AUX 0001-don-t-install-pastebin-upload-wrapper.patch 699 BLAKE2B b8acb6a54f18dfd5a6e74a462ccd2ff869ca09912a084ea7369fae5adabe974250f7d5aedb11a21de81c49530049d3516dd610242cb5a85bc78ed44c04331769 SHA512 b2d43ae457b1f8ad1ede0a3fdfa9ee0a34697b10bf25e44c91bd0be36b2f3ecfa8729b77732b0e7d32cc267fd75d071496b0263a37277f14e2d0d4ae9c433149 +AUX xapp-2.8.4-multiple-python-targets.patch 2581 BLAKE2B 710b864a41718dbd26263523baa6223e34771ced588152a2a985757979637d2e49eab7257ba1678cea6ffd5aab924f9ddb6e49c6584e97ee11aac48f98622cd3 SHA512 6a82ddb2cf4bff3929366c07613f866f354577cf1d487b20338853bf4bc22efba765405c057a678a02ffc0af1a91f1282693357650031707dbd378fa6de9f83e +AUX xapp-2.8.4-optional-introspection.patch 2894 BLAKE2B 4b6e19bfea20aff1b6a335480382222018a81d2a792e43a046348601c476f5d5f6aa8bb3fdfc63091c3b8187326c0edd4168f1c45fb552a9b279e900e224c9bf SHA512 dcabc7976bb86fe4707b8a8cad1e74d6558d02c62e2121235747eeadc4276d45e6bae3a94c3cfc44ca7f95ab92468be81cbf254750a0e9ec4f144f722e9cafa0 AUX xapp-optional-de-options.patch 3309 BLAKE2B 4760a70b3e5a5806925f0e33ead8282990069302f4b6c4ff1899804010c4dfea6c4d97983c5acf57d523bfee7a6b12ae4e2e8d7736ab2258f8159897c2df79b7 SHA512 d4b5c613ac2f630b5f105572605429b064cd824f6ebc2f354207cdf253a33811af2f2ac7e3c10e21638de9856c035816396a05c96a298da0777ac146b540ff73 -DIST xapp-2.6.1.tar.gz 270606 BLAKE2B 0f2572b2e9ec4056bea0fc532f5327bd6de4741719a49b68180d45ff00fcea9b760acb362fc39d3f2dc9d94001b7021267a8a84c067aa90c5a201a46be76e97c SHA512 f96006fffac67b312caba644e8da75209c443688b08254b9bb5b17eb9148e66b35a8b1fe336e8880c7b950f8fc696884d8f5d610092c2cb44357ad3bf3ef43c7 DIST xapp-2.8.2.tar.gz 272539 BLAKE2B 1e2fb92b976196c2e9f36e322656ee40252e4c358a13361a054ead88e6fa3df35a53f1b0ee594df4189a68c1739c4a040558fac533ace095536fcc1dca76954b SHA512 97d19b95626a37fc08a0a159be741de5d9bcc034484e977bd739b91bd37122fcf2f3479285d544282a92c8fa180b116db1ad5e96fe19284c62287d3c5b135163 -EBUILD xapp-2.6.1.ebuild 2279 BLAKE2B 7d758493c6c7cf1a2e62d2a878e3bad9e69c39936ab9712dc25506616226f2f957764ea6cac0e7de5712d544981cfe06c1b7a91be6d5421525622714ac1d9fb7 SHA512 3727448dcad306c21f8abc40f0c82bc0041457b3670b52c258e51080e5b28c8db6c7b53ec5e03cf074caadc062f6f1c6fa7a49463d031e7fc37d83b49cbd8e78 +DIST xapp-2.8.5.tar.gz 274241 BLAKE2B 86b38dcab542e934f65e2fb11a5c1e7a5e26e8c725c5c91fed7bec6e0676f40ab6fd85b0421378e4860271ef1c9954d8c5a42b465232670d3d695dcda0734e0b SHA512 133a01309f0bc33a0aa73ee86eb8900573b4ab5b84e9e503b04b246448bce0b05880403288a739c5e252a2276311afba86c9c687887dd6e8c528734e328c6ee7 EBUILD xapp-2.8.2-r1.ebuild 2369 BLAKE2B ef7266d7c90cee31fefee2ead6c275e9641b619fb9351264062686598ce08044884ed346b1c67b00bd5a3d6825a1b26b55011e29813d4b158b09018e509e52a9 SHA512 89497ba2d7cba4c794808aba824c1f142d75e182f313147f523c00c733dd4663d4fee771b940eced242ca7decb0baf689eb256fbbc4367f770ae32639d98f5da +EBUILD xapp-2.8.5.ebuild 2414 BLAKE2B 91073544e63da6711d6e2d3a8fbb34eca31fff38104f85c75a30806cefa8fb743f3def99b30f5a6f7ee09a024039db8351f44c186ca702d340cdf6aa1de55c23 SHA512 f10f5db6148a5b81ff17bd5eed5f85e258cd2b4f717b5320731bf1c1b27251e1133ce637bf8fe60e397f9e8c8567611a6fbe5746a88ab8a72045345fa8d88d01 MISC metadata.xml 661 BLAKE2B aaf60791b7e8739d7418edd95ff2bfb7429de931c54ccd6c770e752f7f0b45b84a7720add07ecb9ae046064b12d14640b7fe1ab85f6f2a73dc0c0d80eaf13d43 SHA512 27f7fa4138c5d870f1299999711032d7a4c2f628efd8b73ef75d801645950ff9894f970b917501877ef845c0c6fa38ea24c6fa475f25a260f24a2925fcdc47e7 diff --git a/x11-libs/xapp/files/xapp-2.8.4-multiple-python-targets.patch b/x11-libs/xapp/files/xapp-2.8.4-multiple-python-targets.patch new file mode 100644 index 000000000000..861b58c06c19 --- /dev/null +++ b/x11-libs/xapp/files/xapp-2.8.4-multiple-python-targets.patch @@ -0,0 +1,80 @@ +From db45d22173d427eee3d673dc63b60b12c206b31d Mon Sep 17 00:00:00 2001 +From: Sparky Bluefang <sparky@bluefang-logic.com> +Date: Sun, 23 Jun 2024 17:10:47 -0400 +Subject: [PATCH] Allow installing gi override to multiple python installations + +--- + meson_options.txt | 9 +++++++-- + pygobject/meson.build | 33 +++++++++++++++++++++------------ + 2 files changed, 28 insertions(+), 14 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index 3ea5310..ccee240 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,10 +9,15 @@ option('deprecated_warnings', + description: 'Show build warnings for deprecations' + ) + option('py-overrides-dir', +- type : 'string', +- value : '', ++ type : 'array', ++ value : [], + description: 'Path to pygobject overrides directory' + ) ++option('python_target', ++ type: 'array', ++ value: ['python3'], ++ description: 'Python installation to target to lookup if py-overrides-dir not supplied' ++) + option('status-notifier', + type: 'boolean', + value: true, +diff --git a/pygobject/meson.build b/pygobject/meson.build +index da219f7..d5ffc09 100644 +--- a/pygobject/meson.build ++++ b/pygobject/meson.build +@@ -3,22 +3,31 @@ pygobject = dependency('pygobject-3.0', + required: true, + ) + +-override_dir = get_option('py-overrides-dir') ++override_dirs = get_option('py-overrides-dir') + +-if override_dir == '' +- exec = find_program(['python3', 'python']) ++if override_dirs.length() == 0 or override_dirs[0] == '' ++ override_dirs = [] + +- r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)', check: false) ++ pymod = import('python') ++ python_targets = get_option('python_target') + +- if r.returncode() != 0 +- error('Error getting the GObject Introspection override directory: ' + r.stderr()) +- endif ++ foreach python_target : python_targets ++ python_install = pymod.find_installation(python_target) + +- override_dir = r.stdout().strip() ++ r = run_command(python_install, '-c', 'import gi;print(gi._overridesdir)', check: false) ++ ++ if r.returncode() != 0 ++ error('Error getting the GObject Introspection override directory: ' + r.stderr()) ++ endif ++ ++ override_dirs += r.stdout().strip() ++ endforeach + endif + +-message('PyGObject overrides dir: ' + override_dir) ++message('PyGObject overrides dirs: @0@'.format(override_dirs)) + +-install_data(['XApp.py'], +- install_dir: override_dir, +-) ++foreach override_dir : override_dirs ++ install_data(['XApp.py'], ++ install_dir: override_dir, ++ ) ++endforeach diff --git a/x11-libs/xapp/files/xapp-2.8.4-optional-introspection.patch b/x11-libs/xapp/files/xapp-2.8.4-optional-introspection.patch new file mode 100644 index 000000000000..4e9c0cc12a2d --- /dev/null +++ b/x11-libs/xapp/files/xapp-2.8.4-optional-introspection.patch @@ -0,0 +1,102 @@ +From 00f52c9f025b78aefd47637e2dd2c0cc8fd44d64 Mon Sep 17 00:00:00 2001 +From: Sparky Bluefang <sparky@bluefang-logic.com> +Date: Thu, 13 Jun 2024 22:49:12 -0400 +Subject: [PATCH] Add option to disable building introspection and vala + bindings. + +--- + libxapp/meson.build | 38 ++++++++++++++++++++++---------------- + meson.build | 5 ++++- + meson_options.txt | 10 ++++++++++ + 3 files changed, 36 insertions(+), 17 deletions(-) + +diff --git a/libxapp/meson.build b/libxapp/meson.build +index d4034cb..c419b8f 100644 +--- a/libxapp/meson.build ++++ b/libxapp/meson.build +@@ -119,16 +119,18 @@ libxapp_dep = declare_dependency( + sources: [ xapp_headers, dbus_headers ] + ) + +-gir = gnome.generate_gir(libxapp, +- namespace: 'XApp', +- nsversion: '1.0', +- sources: xapp_headers + xapp_sources + dbus_headers + xapp_enums, +- identifier_prefix: 'XApp', +- symbol_prefix: 'xapp_', +- export_packages: 'xapp', +- includes: ['GObject-2.0', 'Gtk-3.0'], +- install: true +-) ++if get_option('introspection') ++ gir = gnome.generate_gir(libxapp, ++ namespace: 'XApp', ++ nsversion: '1.0', ++ sources: xapp_headers + xapp_sources + dbus_headers + xapp_enums, ++ identifier_prefix: 'XApp', ++ symbol_prefix: 'xapp_', ++ export_packages: 'xapp', ++ includes: ['GObject-2.0', 'Gtk-3.0'], ++ install: true ++ ) ++endif + + pkg.generate( + libraries: libxapp, +@@ -144,12 +146,16 @@ install_data(['xapp-glade-catalog.xml'], + install_dir : join_paths(get_option('datadir'), 'glade/catalogs') + ) + +-gnome.generate_vapi('xapp', +- packages: ['glib-2.0', 'gio-unix-2.0', 'gtk+-3.0'], +- sources: gir[0], +- metadata_dirs: meson.current_source_dir(), +- install: true +-) ++if get_option('vapi') ++ assert(is_variable('gir'), 'vapi requires introspection to be enabled') ++ ++ gnome.generate_vapi('xapp', ++ packages: ['glib-2.0', 'gio-unix-2.0', 'gtk+-3.0'], ++ sources: gir[0], ++ metadata_dirs: meson.current_source_dir(), ++ install: true ++ ) ++endif + + if not app_lib_only + gtk3_module = shared_module( +diff --git a/meson.build b/meson.build +index 1783747..8b72f4b 100644 +--- a/meson.build ++++ b/meson.build +@@ -47,7 +47,10 @@ top_inc = include_directories('.') + subdir('libxapp') + subdir('po') + subdir('schemas') +-subdir('pygobject') ++ ++if get_option('introspection') ++ subdir('pygobject') ++endif + + if not app_lib_only + subdir('icons') +diff --git a/meson_options.txt b/meson_options.txt +index 3ea5310..5bfb661 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -38,3 +38,13 @@ option('xfce', + value: true, + description: 'Install xfce specific items.' + ) ++option('introspection', ++ type: 'boolean', ++ value: true, ++ description: 'Enable GObject Introspection.' ++) ++option('vapi', ++ type: 'boolean', ++ value: true, ++ description: 'Enable Vala bindings.' ++) diff --git a/x11-libs/xapp/xapp-2.6.1.ebuild b/x11-libs/xapp/xapp-2.6.1.ebuild deleted file mode 100644 index 352c01c40923..000000000000 --- a/x11-libs/xapp/xapp-2.6.1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..11} ) -VALA_USE_DEPEND="vapigen" - -inherit gnome2-utils vala meson python-r1 - -DESCRIPTION="Cross-desktop libraries and common resources" -HOMEPAGE="https://github.com/linuxmint/xapp/" -LICENSE="LGPL-3" - -SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" - -SLOT="0" -IUSE="gtk-doc introspection mate" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - dev-libs/libdbusmenu[gtk3] - gnome-base/libgnomekbd:= - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] - >=x11-libs/gtk+-3.16.0:3[introspection?] - x11-libs/libxkbfile - x11-libs/libX11 - x11-libs/pango - - mate? ( - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - ${PYTHON_DEPS} - $(vala_depend) - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-util/gdbus-codegen - dev-util/glib-utils - sys-apps/dbus - sys-devel/gettext - - gtk-doc? ( dev-util/gtk-doc ) -" - -src_prepare() { - vala_src_prepare - default - - # don't install distro specific tools - sed -i "s/subdir('scripts')/#&/" meson.build || die - - # make mate integrations optional - if ! use mate; then - sed -i "s/subdir('mate')/#&/" status-applets/meson.build || die - fi - - # Fix meson helpers - python_setup - python_fix_shebang . -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dpy-overrides-dir="/pygobject" - ) - meson_src_configure -} - -src_install() { - meson_src_install - - # copy pygobject files to each active python target - # work-around for "py-overrides-dir" only supporting a single target - install_pygobject_override() { - PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) - einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}" - mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die - cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die - python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/" - } - python_foreach_impl install_pygobject_override - rm -r "${D}/pygobject" || die -} - -pkg_postinst() { - xdg_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_icon_cache_update - gnome2_schemas_update -} diff --git a/x11-libs/xapp/xapp-2.8.5.ebuild b/x11-libs/xapp/xapp-2.8.5.ebuild new file mode 100644 index 000000000000..7cfc706b52e5 --- /dev/null +++ b/x11-libs/xapp/xapp-2.8.5.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +VALA_USE_DEPEND="vapigen" + +inherit gnome2-utils vala meson python-r1 + +DESCRIPTION="Cross-desktop libraries and common resources" +HOMEPAGE="https://github.com/linuxmint/xapp/" + +SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="LGPL-3 xfce? ( GPL-3 )" +SLOT="0" + +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" +IUSE="gtk-doc introspection mate vala xfce" +REQUIRED_USE="${PYTHON_REQUIRED_USE} vala? ( introspection )" + +DEPEND=" + >=dev-libs/glib-2.44.0:2 + dev-libs/libdbusmenu[gtk3] + gnome-base/libgnomekbd:= + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] + >=x11-libs/gtk+-3.22.0:3[introspection?] + x11-libs/libxkbfile + x11-libs/libX11 + x11-libs/pango +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} + + introspection? ( + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/gdbus-codegen + dev-util/glib-utils + sys-apps/dbus + sys-devel/gettext + + gtk-doc? ( + dev-util/gtk-doc + ) + + introspection? ( + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) + + vala? ( + $(vala_depend) + ) +" + +PATCHES=( + # Make introspection/vala optional + # https://github.com/linuxmint/xapp/pull/184 + "${FILESDIR}"/${PN}-2.8.4-optional-introspection.patch + + # Allow multiple gobject installation targets + # https://github.com/linuxmint/xapp/pull/183 + "${FILESDIR}"/${PN}-2.8.4-multiple-python-targets.patch + + # Don't install pastebin upload wrapper + "${FILESDIR}"/0001-don-t-install-pastebin-upload-wrapper.patch +) + +src_prepare() { + use vala && vala_setup + + default + + # Fix meson helpers + python_setup + python_fix_shebang . +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc docs) + $(meson_use introspection) + $(meson_use mate) + $(meson_use vala vapi) + $(meson_use xfce) + ) + + if use introspection; then + local xapp_python_targets=() + + get_xapp_python_targets() { + xapp_python_targets+=("${EPYTHON}") + } + python_foreach_impl get_xapp_python_targets + + emesonargs+=( + -Dpython_target="$(echo "${xapp_python_targets[@]}" | tr ' ' ,)" + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + if use introspection; then + python_foreach_impl python_optimize + fi +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/x11-libs/xcb-imdkit/Manifest b/x11-libs/xcb-imdkit/Manifest index f31c3ba453c1..c6ffee210672 100644 --- a/x11-libs/xcb-imdkit/Manifest +++ b/x11-libs/xcb-imdkit/Manifest @@ -1,5 +1,5 @@ DIST xcb-imdkit-1.0.8.tar.zst 580618 BLAKE2B 760f9a65692986b2bbb359f919e209a5c0ef42b302b25dbb1892cf9bc986b3d9c05963ac454bc4b3ad42f7c2b3549cb5e1c3bbd29fcb39aa03490cb20c00c2d6 SHA512 318106904d1dca79d006e91f21dd965ff486be72edc790a79100908e588e8c26b9faa505daa45d59789feeac8f01a132f14c9509ac68c8ebc43af5719774443d DIST xcb-imdkit-1.0.9.tar.zst 580633 BLAKE2B b153c10c87460da8e1e06133c9ce05302e8f4408551ce4b5a962a5b52b9256635c03b8d5224f826cdf229136f92865254716682dd5b2adcf44b3848086fb641e SHA512 b63e4698e4c6c918923e58f38aa096366025d960f362ef9c84d47cb3f4fc1e01f231342839552019ccf256b1de1e108bb395057ea2beb2d009c245954296b321 EBUILD xcb-imdkit-1.0.8.ebuild 654 BLAKE2B d768b5e73abab2cc74ec0c0f4334dd91f44052fb5e936c3e5b63976a758408dcca877be77038e6657de8c8955c7b1f9bcd66d65192705a77b240f5bcca46c12e SHA512 b7c57676504aa05bb3922ba25acd48a5e58ad3f0e808b4c123239af444ae40102931c02a933bc012201d9aa4efa19a7190ca062d4972f2902f01167ac7c57cb3 -EBUILD xcb-imdkit-1.0.9.ebuild 654 BLAKE2B d768b5e73abab2cc74ec0c0f4334dd91f44052fb5e936c3e5b63976a758408dcca877be77038e6657de8c8955c7b1f9bcd66d65192705a77b240f5bcca46c12e SHA512 b7c57676504aa05bb3922ba25acd48a5e58ad3f0e808b4c123239af444ae40102931c02a933bc012201d9aa4efa19a7190ca062d4972f2902f01167ac7c57cb3 +EBUILD xcb-imdkit-1.0.9.ebuild 652 BLAKE2B d0b9a14aa4bb527619a6cf80c530f60506daef6484e981fb359fab23a0b62cdf7dbe76bfaa4279a13319d3c61ef1889a0369e07304cbbc27e738b1b593e60684 SHA512 0f2079e873b000413553769562f88de9ace77a11c73ccf042a973c5f385bc8d3d3fff10df62e1d23734957be5835fe4eef592dafc9fc1b49262e54f32452e374 MISC metadata.xml 620 BLAKE2B 53c4d07dd7404fc13572d6611654a66c5ec54b898175385075c6994e45de993022f2a1a42b4c42f901ab3c68b6a317d6c7e5492a9a9380da79cff426ad16f477 SHA512 491151816522ecd61808e8e7c64b05977ebc4f7ef19e9c2cdb74ccf003ced19217d283b23bf1fa1e049661b2606bbd459215bb503a9488c9c1c047facb193bcc diff --git a/x11-libs/xcb-imdkit/xcb-imdkit-1.0.9.ebuild b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.9.ebuild index fe5d788eb8b3..6559aa8cc6f6 100644 --- a/x11-libs/xcb-imdkit/xcb-imdkit-1.0.9.ebuild +++ b/x11-libs/xcb-imdkit/xcb-imdkit-1.0.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.fcitx-im.org/fcitx5/${PN}/${P}.tar.zst" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" RDEPEND=" x11-libs/libxcb |