From 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Jul 2022 08:43:51 +0100 Subject: gentoo auto-resync : 21:07:2022 - 08:43:51 --- gui-libs/gtk/Manifest | 3 - .../gtk/files/gtk-4.6.4-update-shadow-size.patch | 33 ---- gui-libs/gtk/gtk-4.6.4-r1.ebuild | 217 --------------------- 3 files changed, 253 deletions(-) delete mode 100644 gui-libs/gtk/files/gtk-4.6.4-update-shadow-size.patch delete mode 100644 gui-libs/gtk/gtk-4.6.4-r1.ebuild (limited to 'gui-libs/gtk') diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest index 4dccd0ab9abf..c3aca7da4a62 100644 --- a/gui-libs/gtk/Manifest +++ b/gui-libs/gtk/Manifest @@ -1,8 +1,5 @@ -AUX gtk-4.6.4-update-shadow-size.patch 1128 BLAKE2B b21dc510effcaaedd196ea586b06a1150798fc58d529f337af3d072cf8b4ca2f5df1a1f0104caa9095e79fc9a0f3984f961bc86a72f9c47e190bea48cdba5fdf SHA512 31f2a10d29721c7321315c10a75ecc0fd47d410debebe60205341c690ae03f7742ae92c4030d78d3e2ed3bfd79e73b8f7fddcb862414052ef1b1c624c2c01dca -DIST gtk-4.6.4.tar.xz 23074696 BLAKE2B 90368cc0023dcdba63f2412e67a65a0f4238f1c29e9faee969ada897c3fe21f55e7eb0f5470fc025692b4ea3af2956a32140db060663591b149186c2888cccc6 SHA512 ef18e3d084757a627f09f226cfe8da18634466575b726dd6200b74e65e0a7fc33fa8d8f609c2de09a907dfd6ca90af66e15015612675dc89d43de6e711b173e6 DIST gtk-4.6.5.tar.xz 23082944 BLAKE2B 18855d5002a544a66b6129514633f9b560b224f7c654859aa3a545142879d6aa8835edd2373706ade3f701846e9cae3653237860bd07c45d81642bc67b6ef9c2 SHA512 a7bf28f6b9f5259fe1333432c205aeb8673f5f32ea0b1878c0724676f148e2d1680fe63ed9594ab5b92120d3497f06cddc5cde428247b3fc876e5785b3dd47ca DIST gtk-4.6.6.tar.xz 23085304 BLAKE2B 2f0eacb9aaa3fad4e8d99feeadc93e04151f6c4552412d5b7485b972e97c8c9a7296143b39791e9e3230546770174a208ba6906179b9fed37414ee83a1980abb SHA512 b743d99029d7d51db19396641023eefd5d25bbacbd89ad6660d43e382b26fe6cc5e9ce8f0dbb3f4ac7d2143db617ea0c2e2d3cc8926fc93d735eb76ffb2f8309 -EBUILD gtk-4.6.4-r1.ebuild 5855 BLAKE2B a1c698550bf011059c0259fa305f68a1956a3137f56650d9f90635db68cc36ae057085487ec15fc663fe6c9952a80e4053d0ca6189976b0b666f8339d063b74a SHA512 4cec07ccb62eced1351cd07fed7711c1dd8343f3d74e0dfdb5a790d7555a88372613952e6df1e06b35647f1aba126ab058aa57496fddbb49d567b3f5ca9aed63 EBUILD gtk-4.6.5.ebuild 5745 BLAKE2B c090fbea68e8d23d71acbffa6edb1aeeb8e608b590bdd91b4cc62cfe87dc2d1cf9188b32f40ced56dab76720f405cd72b96a9122025b139baf31d30b410d378a SHA512 8882fa618521b5142904b8cee86eab996f3ab11cefa3727e9b3e58b409cbe9968a644f64790233f8629b8dcc0ba63e645c9b480e929921c5c2440cef2d8e3238 EBUILD gtk-4.6.6.ebuild 5751 BLAKE2B 86ced14f38da4d73952ba9696731fbb320ca0aeb982f10d94d59431c45e7f085a4f8b42eeb86ebb8a92b054e9692168ce10daf0cf95d3f079f1962325186fa21 SHA512 4c57a850a9aafe4a8f48c88d7a97d0652fbdbbda2cab4689fe6f5665526f54067c1212aeb9261c2f471a26490b602ee396ff6d7ce376021d3bc0c3b676da1fb6 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779 diff --git a/gui-libs/gtk/files/gtk-4.6.4-update-shadow-size.patch b/gui-libs/gtk/files/gtk-4.6.4-update-shadow-size.patch deleted file mode 100644 index af69d4ad64e9..000000000000 --- a/gui-libs/gtk/files/gtk-4.6.4-update-shadow-size.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 213490099b7d24664ac635f25c9cf224d6a3e702 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -Date: Thu, 26 May 2022 04:36:14 +0200 -Subject: [PATCH] x11: Always update shadow size - -Not updating shadow size unconditionally would lead to shadow size not -being set on map, which would lead mutter to think that we are a Window -without extents and then become confused when we suddenly set some. - -Make sure that doesn't happen by always having shadows set on map, just -like GTK3. - -Fixes #4136 ---- - gdk/x11/gdksurface-x11.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c -index 8567d83eb8..fb3b0bd7df 100644 ---- a/gdk/x11/gdksurface-x11.c -+++ b/gdk/x11/gdksurface-x11.c -@@ -280,7 +280,7 @@ compute_toplevel_size (GdkSurface *surface, - gdk_toplevel_size_init (&size, bounds_width, bounds_height); - gdk_toplevel_notify_compute_size (GDK_TOPLEVEL (surface), &size); - -- if (size.shadow.is_valid && update_geometry) -+ if (size.shadow.is_valid) - { - update_shadow_size (surface, - size.shadow.left, --- -GitLab - diff --git a/gui-libs/gtk/gtk-4.6.4-r1.ebuild b/gui-libs/gtk/gtk-4.6.4-r1.ebuild deleted file mode 100644 index e1624ee52cca..000000000000 --- a/gui-libs/gtk/gtk-4.6.4-r1.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg - -DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces" -HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/" - -LICENSE="LGPL-2+" -SLOT="4" -IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c" -REQUIRED_USE=" - || ( aqua wayland X ) - test? ( introspection ) -" - -KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" - -COMMON_DEPEND=" - >=dev-libs/fribidi-0.19.7 - >=dev-libs/glib-2.66.0:2 - >=media-libs/graphene-1.9.1[introspection?] - >=media-libs/libepoxy-1.4[X(+)?] - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?] - >=x11-libs/pango-1.50.0[introspection?] - media-libs/libpng:0= - media-libs/tiff:0= - media-libs/libjpeg-turbo:0= - >=media-libs/harfbuzz-2.1.0:= - x11-misc/shared-mime-info - - colord? ( >=x11-misc/colord-0.1.9:0= ) - cups? ( >=net-print/cups-2.0 ) - ffmpeg? ( media-video/ffmpeg ) - gstreamer? ( - >=media-libs/gst-plugins-bad-1.12.3 - >=media-libs/gst-plugins-base-1.12.3[opengl] - ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - vulkan? ( media-libs/vulkan-loader:= ) - wayland? ( - >=dev-libs/wayland-1.20.0 - >=dev-libs/wayland-protocols-1.23 - media-libs/mesa[wayland] - >=x11-libs/libxkbcommon-0.2 - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3 - media-libs/fontconfig - media-libs/mesa[X(+)] - x11-libs/libX11 - >=x11-libs/libXi-1.8 - x11-libs/libXext - >=x11-libs/libXrandr-1.5 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXdamage - x11-libs/libXinerama - ) -" -DEPEND="${COMMON_DEPEND} - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - 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 - >=x11-themes/adwaita-icon-theme-3.14 -" -BDEPEND=" - dev-libs/gobject-introspection-common - introspection? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - ) - dev-python/docutils - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - test? ( - dev-libs/glib:2 - wayland? ( dev-libs/weston[headless] ) - ) -" - -PATCHES=( - # Fix https://gitlab.gnome.org/GNOME/gtk/-/issues/4136 - "${FILESDIR}/${P}-update-shadow-size.patch" -) - -python_check_deps() { - python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return -} - -pkg_setup() { - use introspection && python-any-r1_pkg_setup -} - -src_prepare() { - default - xdg_environment_reset - - # dev-python/docutils installs rst2man.py, not rst2man - sed -i -e "s/'rst2man'/'rst2man.py'/" docs/reference/gtk/meson.build || die - # Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache - sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die - # Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598 - sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die - sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die -} - -src_configure() { - local emesonargs=( - # GDK backends - $(meson_use X x11-backend) - $(meson_use wayland wayland-backend) - $(meson_use broadway broadway-backend) - -Dwin32-backend=false - $(meson_use aqua macos-backend) - - # Media backends - $(meson_feature ffmpeg media-ffmpeg) - $(meson_feature gstreamer media-gstreamer) - - # Print backends - $(meson_feature cups print-cups) - - # Optional dependencies - $(meson_feature vulkan) - -Dcloudproviders=disabled # cloudprovider is not packaged in Gentoo yet - $(meson_feature sysprof) - -Dtracker=disabled # tracker3 is not packaged in Gentoo yet - $(meson_feature colord) - # Expected to fail with GCC < 11 - # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993 - $(meson_feature cpu_flags_x86_f16c f16c) - - # Documentation and introspection - -Dgtk_doc=false # we ship pregenerated API docs from tarball - -Dman-pages=true - $(meson_feature introspection) - - # Demos and binaries - $(meson_use examples build-examples) - $(meson_use examples demos) - $(meson_use test build-tests) - -Dinstall-tests=false - ) - meson_src_configure -} - -src_test() { - "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - - if use X; then - einfo "Running tests under X" - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11 - fi - - if use wayland; then - einfo "Running tests under Weston" - - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" - - weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 & - compositor=$! - export WAYLAND_DISPLAY=wayland-5 - - GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland - - exit_code=$? - kill ${compositor} - fi -} - -src_install() { - meson_src_install - - insinto /usr/share/gtk-doc/html - # This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional - doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}} -} - -pkg_preinst() { - xdg_pkg_preinst - gnome2_schemas_savelist -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - 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 - - if use examples ; then - optfeature "syntax highlighting in gtk4-demo" app-text/highlight - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} -- cgit v1.2.3