diff options
Diffstat (limited to 'x11-wm')
18 files changed, 27 insertions, 623 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 9813451cc9a9..036a074ce529 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index 5a8a2aa26a9e..7997e3e31eb5 100644 --- a/x11-wm/icewm/Manifest +++ b/x11-wm/icewm/Manifest @@ -1,8 +1,8 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 DIST icewm-2.8.0.tar.lz 1745937 BLAKE2B dc5c4c6e4b5f067881176a0f72914f971dbae3daa475ed7ca00dbf3f687aae97874a0cf2e94b0d22d45f7dc221390c0658674e9aad3ea19d21a171b6d478c4be SHA512 552d1da9ceb96c6c14a0dfd596656a56fb289716a787fb75e54b49ef6df84747a4999ce733a6ffb9ff7a1e4c0243253fc3f2fa7a2251e7f3987ab9f33c0a1b30 -DIST icewm-2.9.3.tar.lz 1760889 BLAKE2B f28ad3819bd89c70ae17df9bd3dfda6e5769be41a6206744fb13486b97a96618595da465654aca09ed43cabd5082feef70fe486f4ad679747bf6195ec4776f2e SHA512 c3aff2076bc293da4f42a72e02b44d3e4c972bfe4ceb0c0b9054f876c1ad1a6c0d43cf76db5422af8c907bfad222fb0e93c72070b93eac8fcdda8fb680f8691c DIST icewm-2.9.4.tar.lz 1761065 BLAKE2B 2063e50924b446b46bbed057d60493f1a753991dc2049cc5628dcf7e8eff7fe5bcadfa1d5a651c92bac57270a948b8201a8c8e072228741583bbe3941fb128d5 SHA512 19aedfb15315b7d376bc4a0fabfaadcbd8754927daf752618d6d2b877c6a01d57ced0247454f058da24b355b3d6ec9a7341f1bab7fd17c8c9317b16624ec44c1 +DIST icewm-2.9.5.tar.lz 1768082 BLAKE2B 1e8c4885dcf6e912647d4f785e811b38eed3e8761213345c4687f6c347356e99f213eded7a5534bf3f9b8335dbaf1665b6fbfd8503f24cb98b79d7c7f3380b04 SHA512 5bfe5bf1edeead54f2046adfb21e31a23af1e86c018e7c6934309a3a47aae6b7c1bd0365460c062ad7a1e1fa9734a3f0425e1e7a2cfc2652ac123c1f1a92ae96 EBUILD icewm-2.8.0.ebuild 2945 BLAKE2B e3eb96395c915d19bf7eca3e93b6f8bd9eb0fdd355a997b77a4892a83a980f2d36e53283626094a82cb97f07c033979a7c5154ff5a714e2751a7e1537338946a SHA512 44524828aa2f0d752ada604cb4f8fae4534d236a5d0bc836f713bf7df385795ccc9fa522690da51a5d4503671b974d8c9538afc94cb0518fc28f825a20c860b0 -EBUILD icewm-2.9.3.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c EBUILD icewm-2.9.4.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c +EBUILD icewm-2.9.5.ebuild 2949 BLAKE2B 59c8d51cc721ac2bada2a6efd8b5c135f29b988bb833d2268a87c690299d86b7cfc6cae69749af177acb9fd3440a7ca16580ae0ae311278b8ad65c4309b44b7e SHA512 f3b80189c40aa59f9f4ad41ea5310779abbc00f214a6f7a66557c60ed3cd80d7a47db9b4987046beb1e7890600d96bec945036ea5557ba182d6f435021cf857c MISC metadata.xml 748 BLAKE2B 340b1eea319761630ad5bc22dc734fbfc2492acb263f03ea267e3c37c6c2928ba23cde5ee670c9265dae8bc3f78cdacf584c32d6c65219e859cf6df3b283be4d SHA512 4ba0d01e983f7a6c16ce6da6a7f54fb962154d50db8b820855e2c0dda7609526fc1aae039b469c27eaf6bd09a71b3c951c58b2a84d8aea9ce9fce4a5eff48b46 diff --git a/x11-wm/icewm/icewm-2.9.3.ebuild b/x11-wm/icewm/icewm-2.9.5.ebuild index 0b653160bbb5..0b653160bbb5 100644 --- a/x11-wm/icewm/icewm-2.9.3.ebuild +++ b/x11-wm/icewm/icewm-2.9.5.ebuild diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index c0aa55b2e28a..972131a174e2 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -1,3 +1,3 @@ -DIST metacity-3.40.0.tar.xz 1970260 BLAKE2B 4ccd38b0ceaeef7145d28b1f4e579aebe75e1506af8097e97e5422f39e04ae9d1e259f17cc08dc68fe71d4eb082311c736dbcfafb4a3a775f6ddcce5ce77b859 SHA512 f9eeb0b08bb302c5fb0d174a4df97b253255741d507e94200820d3ebe9e89f179c9096b8e56798836fc84cbe1ac76b27fee6762f3d41373280c4726bc7cba2ff -EBUILD metacity-3.40.0.ebuild 1289 BLAKE2B 28173f7b0d4fb1b04989fbbb5493a1ecc411596fc2e3c46c4bf7055af263e4d932d97c5308cde8029c9dd0ae99086b321619362038be525841c68f17aa1640de SHA512 350d190678b0273d8aba6d5d79f99f7d374d554cf52dea360cb3db76b827b9f813d8bee2d5835e556cd90af19287ebcd7e9fb55b01d786f6578a1566af6c149a +DIST metacity-3.42.0.tar.xz 1969372 BLAKE2B 0f6e5ab3f84dcc2e9c776a2eed9725311e5395d8761f2d4bc618d92d623c761252bee62bc4e17e4bea65706e248fecfa4c8a031d2be7d2728e0e736a38f23264 SHA512 5b2f22a798e50a332384acf7bc40104c1978184cb4448dcd55d35196e4736388c1fee6e0e63962f947354a17b3bc72a635413e7285224c8b3c1872379e47f24d +EBUILD metacity-3.42.0.ebuild 1289 BLAKE2B e8e88ffe427a12eea29b28f319f19ff574efb31029c728c174e188be1cf55db0e5b8ffa641fbb139264d6af4762cc53839b80564da4a3f508640f44f56e35281 SHA512 86fe377418490737f0e47ec1c5d447a7dc9f172fb5d8d2a4cd4cf67ab034430b9ac02e4f5d8177d0b052560e2252555ae793d0a129e90fb9b2ab4f171e00de4f MISC metadata.xml 478 BLAKE2B 6b6edfb923803da21c7d6c7bb9732bc387e4f57d0682ad79a4bad3a973c8f4746ecfe3ccd376f4ae41784e019f29861b973c66cc35ba3535126de2fc6c827b98 SHA512 759912aaecef429c799aa70ec28428be7572f7eb5ddadcc3f6c0aec469d6fd9ddc3cb0d3f54585b60a2a5764bbc6b4bde5da596d9800f5989f638d60795b1533 diff --git a/x11-wm/metacity/metacity-3.40.0.ebuild b/x11-wm/metacity/metacity-3.42.0.ebuild index c20c6eb395e7..d9b7ef4b14f5 100644 --- a/x11-wm/metacity/metacity-3.40.0.ebuild +++ b/x11-wm/metacity/metacity-3.42.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~riscv" # TODO: libgtop could be optional, but no knob RDEPEND=" >=dev-libs/glib-2.67.3:2 - >=x11-libs/gtk+-3.22.0:3[X] + >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=gnome-base/gsettings-desktop-schemas-3.3.0 diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 416b2c03e040..98e21effd7e8 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,6 +1,5 @@ -AUX muffin-4.8.1-slibtool.patch 6242 BLAKE2B 487b87b47378cb827eaa85b0dbaa533bf6e79eaf712939aa694a8d42b54bb100b9e99b5b4d5fdce828a6e735af0a79fd99946a5c7a29ac5ab4ef1cea685efdee SHA512 8734ffc295042fc988a6668f12bc7f13a3de6783eff23418dd6dfd07f5f8a38697fa82e23b7e0703cbb4e20c78fa3e5b63e2943b272f5b50a487d6aba7252cdb -DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31 DIST muffin-5.0.2.tar.gz 5197188 BLAKE2B 88a7530359386ceb14b0b509e1769d8cc4d552d9afa45faf6dbd62a457c7ca19d59e553176cf3689c3d22962c761a8633f6880802ea3c5453ff07901e3ca5374 SHA512 4f31b5a4b81db5967a3bc21b7f2bdbb30f47f5dcde12be467cd27f340164483ab43b423cd043dce50201c9b900ccab4a0fc84f4f6e22c66e901cd0c6d986761d -EBUILD muffin-4.8.1.ebuild 2391 BLAKE2B c7bba34a7a838e54661e93df09dd5939632d911d3e95a11f8cee8b432e1d0dce7f370986cac7c89f0cf8e52005f1c839e556cb684ec848160382267bbec5811f SHA512 f6a8d5f7d4d1bed6d019f2f50ef026b989ecf9cc37feab790f7de04c8c173390df70f82c4f1202e6edf98fb20e161c4df40a753caae6faaa9d2629207c124f7a +DIST muffin-5.2.0.tar.gz 5197334 BLAKE2B e1c3ffc6f88ef4a6c5b2f3e03838448540baeeacce3029a039b2fae1804c79193f9ee0bb64d9187f4b2f7f902f47211dc5c5fb185e4f2fcf94513bfe2f0913bf SHA512 16d83d10e8ca4f0cc1cb679e8bf8bc0fd0788d656fa39470a921d848bcb0b158ef56bdd681a842e2ca41b40cb0121007d5e7f5f7f1570459b31fd21a78f96932 EBUILD muffin-5.0.2.ebuild 2346 BLAKE2B c2b8ee69a05dbf4d8f3c9e9e20a5f1a5fc718d831f486cc3abe5396e2acfd5bb530224ee3b4faa36a07dca52323376c36564cb5c35284f478673fb0c106bf139 SHA512 933886bf4590cd3c5909fce63b5f5e7da939ec59e0bede656bbf13626b2650c701c3ffd7f422d74eec6ec7ee255baa53f1d205c5e2aa63b85da1592a7b7f58a8 +EBUILD muffin-5.2.0.ebuild 2353 BLAKE2B 4efc9d7f6ead92f50a03a21503c4b3a58d0b5c223d052a124dc4228b168f90b6682df533d267175774a9bb3e99df1c528f52dbff9b0a19ef97efbace7fb24820 SHA512 43c850437a78e6368c058a5d543e87e5c910e323caf18c1b875bd992600b781178f2e555622cc91ff632fd337e503668e7ae6f5afde6b132c1cdd3b85f006541 MISC metadata.xml 486 BLAKE2B 26fc8398897e069e47a85126a78fe71fe0f6b0fad0a32078f2799fd4d15db18ebe4ff010f2a2b4889e2c27fe1bdc6244abb2c11ac02f1f1c050a5f2ba37c810d SHA512 ffb4b8c46f6fe2324d68c3041308342e550b3424c1909455cfad12d1a268eda4279ea28bd1836893f453fe9a45df568e81a6fb15d72b68fefdaad27fb8106315 diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch deleted file mode 100644 index 4d0d5827a62a..000000000000 --- a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch +++ /dev/null @@ -1,146 +0,0 @@ -https://github.com/linuxmint/muffin/pull/577 -https://bugs.gentoo.org/767139 - -From c10ab2d741cf4bbeff8f40f6859c9381606dbf26 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Mon, 25 Jan 2021 22:30:35 -0800 -Subject: [PATCH 1/2] build: Add missing libtool dependencies. - -This fixes the build with slibtool. ---- - clutter/clutter/Makefile.am | 18 +++++++++++++++--- - src/Makefile.am | 9 +++++++-- - 2 files changed, 22 insertions(+), 5 deletions(-) - -diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am -index a6366f4f2..ecfa568b7 100644 ---- a/clutter/clutter/Makefile.am -+++ b/clutter/clutter/Makefile.am -@@ -666,7 +666,11 @@ Clutter-@MUFFIN_PLUGIN_API_VERSION@.gir: libmuffin-clutter-@MUFFIN_PLUGIN_API_VE - - Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Clutter - Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@ --Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la -+Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \ -+ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la - Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = \ - $(clutter_include_HEADERS) \ - $(clutter_deprecated_HEADERS) \ -@@ -687,7 +691,11 @@ Cally-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_VERSI - - Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Cally - Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@ --Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la -+Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \ -+ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la - Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c) - Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS) - Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \ -@@ -702,7 +710,11 @@ ClutterX11-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_ - - ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = ClutterX11 - ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_INCLUDES = xlib-2.0 --ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la -+ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \ -+ libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la - ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(x11_introspection) - ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS) - ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 9cb3af14e..37274a4bd 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -277,7 +277,12 @@ Meta-$(api_version).gir: libmuffin.la - @META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Cogl-$(MUFFIN_PLUGIN_API_VERSION) Clutter-$(MUFFIN_PLUGIN_API_VERSION) xlib-2.0 xfixes-4.0 - @META_GIR@_PACKAGES = gtk+-3.0 - @META_GIR@_CFLAGS = $(AM_CPPFLAGS) --@META_GIR@_LIBS = libmuffin.la -+@META_GIR@_LIBS = \ -+ libmuffin.la \ -+ $(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \ -+ $(top_builddir)/cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la - @META_GIR@_FILES = \ - muffin-enum-types.h \ - $(libmuffininclude_base_headers) \ -@@ -383,4 +388,4 @@ install-exec-local: - { rm -f libmuffin-$$lib-0.so && ln -s muffin/libmuffin-$$lib-0.so libmuffin-$$lib-0.so; }; \ - } \ - ) ; \ -- done -\ No newline at end of file -+ done - -From 0762515b658b6331c076603340ce572c002f9458 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Mon, 25 Jan 2021 22:30:44 -0800 -Subject: [PATCH 2/2] build: Fix undefined references with slibtool. - ---- - Makefile.am | 2 +- - src/Makefile.am | 2 +- - src/compositor/plugins/Makefile.am | 9 ++++++--- - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index cf8382b67..c5d589ff7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,5 @@ - --SUBDIRS=cogl clutter src po doc data -+SUBDIRS=cogl clutter src src/compositor/plugins po doc data - - EXTRA_DIST = HACKING MAINTAINERS rationales.txt - -diff --git a/src/Makefile.am b/src/Makefile.am -index 37274a4bd..b75b1879f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -3,7 +3,7 @@ - - lib_LTLIBRARIES = libmuffin.la - --SUBDIRS=wm-tester tools compositor/plugins -+SUBDIRS=wm-tester tools - - NULL = - -diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am -index 09ab325a5..241b514c3 100644 ---- a/src/compositor/plugins/Makefile.am -+++ b/src/compositor/plugins/Makefile.am -@@ -2,9 +2,9 @@ - pkglibdir=@MUFFIN_PLUGIN_DIR@ - - AM_CPPFLAGS= \ -- $(WARN_CFLAGS) \ -+ $(WARN_CFLAGS) \ - $(MUFFIN_CFLAGS) \ -- -I$(top_builddir)/src \ -+ -I$(top_builddir)/src \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/cogl \ - -I$(top_builddir)/cogl \ -@@ -27,7 +27,10 @@ AM_CPPFLAGS= \ - default_la_CFLAGS = $(WARN_CFLAGS) -fPIC - default_la_SOURCES = default.c - default_la_LDFLAGS = $(WARN_LDFLAGS) -module -avoid-version -no-undefined --default_la_LIBADD = $(CLUTTER_LIBS) -+default_la_LIBADD = \ -+ $(CLUTTER_LIBS) \ -+ $(top_builddir)/src/libmuffin.la \ -+ $(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la - - pkglib_LTLIBRARIES = default.la - diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-5.2.0.ebuild index 3b692972bcb0..e68e869ca9bc 100644 --- a/x11-wm/muffin/muffin-4.8.1.ebuild +++ b/x11-wm/muffin/muffin-5.2.0.ebuild @@ -12,15 +12,15 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2+" SLOT="0" IUSE="+introspection test xinerama" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" RDEPEND=" >=dev-libs/glib-2.37.3:2[dbus] >=dev-libs/json-glib-1.0 - >=gnome-extra/cinnamon-desktop-4.8:0= + >=gnome-extra/cinnamon-desktop-5.2:0= gnome-extra/zenity >=media-libs/libcanberra-0.26[gtk3] - virtual/opengl + media-libs/libglvnd >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] @@ -34,7 +34,7 @@ RDEPEND=" x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.6.0 - >=x11-libs/libxkbcommon-0.4.3 + >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender @@ -61,10 +61,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-4.8.1-slibtool.patch -) - src_prepare() { default eautoreconf diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 66551b3fef84..31bcd949e2c5 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,11 +1,7 @@ AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8 -DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805 DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856eae679acf17be8fa5be6c4bf764924d89950c8fcd264859049fcf326ed94e2b4d74433bbee16acf06bb0e180674a9d3a2c2 SHA512 8da4f92b2268a6966d468cd15063fb361a71299aff671203141225e74d5655ee1cb4f4e2f1922e06355c3f3b756638f3a2243ecafeb30273e3ff04897b6a23d8 DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837 -DIST mutter-41.2.tar.xz 2713924 BLAKE2B 271b5cd3eebf3b3c040876dc634d5316788ee566fece2ded6987e048d03ea8b4b4c76b482ca91e1eaf5cdcdf36294948b2ab902013874f100247dfb5b04a4cbb SHA512 9fd030e2c3e5956e4e7412ac36069ab0e81798688b0a4f2372d935f81190ae8fb383919b2c29b8af37e5eeea47d250647ce8466d7f2e9047edf60e1ca93a9e3c DIST mutter-41.3.tar.xz 2717692 BLAKE2B c31fa8c5e110b243dc9ce0a96d4ea28670adec27d519788de6d826bcb858eda9df209eb02c08a07e2fa3a16fb8a2a2e8bce1025721c43a1f96b062980b924dbe SHA512 daa0cc8d91f8f3a35d2e2218c1e8d1f9e7f57df95a209f4b87ba8f3f81284ad45aa5000d08a148ae6d408f60d7ff120565e9132e1a84c3b6f55f9e59d6585338 -EBUILD mutter-40.4-r3.ebuild 4910 BLAKE2B d509e7c6afc917844f1b917e8d065266fb1ffee6ee6edbb8b9c4998eb6b17e6fe4559f83b6d7fa9a0842f06ca060f25140523eb0eface392478ef2c794a0eb60 SHA512 13c5de3dd4cd4bb92a23dca2b8b52973f03c3001e8b86d390c6a61d313f88d8367fb4954f81ce525656eeb4382e8d01721d83ad3383824cc057fde66de3655a5 -EBUILD mutter-40.5-r6.ebuild 5011 BLAKE2B bfae9c5e5bb26f03f5ccf0bdf8a83662f8e38af61db302a394b4fe8c4f6e40527ad7708916d72b783794055ba6e7f86f9fb880990c541e43d9569a0c375bf290 SHA512 9b5c7540852636aa927279611ba256f40790adb2a41d558af3015758d02354fbd5ee7297b72d0bbae07ac5687c0b9d77905ab13df4752601d2ea1114dc31c5f4 -EBUILD mutter-41.2-r1.ebuild 4975 BLAKE2B 6426a03d413f77306d22d2702a2e9d30d9dba481d25a896566576bd6e0683dfc9f9a9d1f19bb5f0231fac4b265663d6592d1c55f9447ab98db8ab01ec1ad64b2 SHA512 63cbda626bfb9debebeed8c08eb958826c710ecacfb4d64703fe6b2e8013ebb273b43fec2d021fb8f9f3d91ce93318d5e4f30773848d4a4557729ee42b4fcfc7 +EBUILD mutter-40.5-r6.ebuild 5008 BLAKE2B 6e8a4f71d89f0394f584f84c28e6f2241928ff1140485bb8c7fba58a7e9f3f8cc7913c8807215f32810ccd362c611dd83ea9595be0fd8f8196ce37acbb3cf07f SHA512 43207ac1262909fd3c8f84b374efbefc5b9d5d0a784f6017679fc3cbfa149949a2b68df9379b944fb1f0d987afbdca52a01d368bc52daeac17fc62d2195c354f EBUILD mutter-41.3.ebuild 4975 BLAKE2B a8f837597e1ddaa78db2e07360b5ad4ca02cc7061f39cd4ba9eeedad07992985d1b48fe76795ffef848a9e1989d8dd14d24e5dbdfef5bb90a67c94bd7a6d7d59 SHA512 0c07d7730a58652e4d31807b40cbb066d40645e66aff76e2eb8e64f985c3ef0367d7210ab20c903b6edb17cc74cba2cdce9ae41239d72ac89b2986dda02077f2 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899 diff --git a/x11-wm/mutter/mutter-40.4-r3.ebuild b/x11-wm/mutter/mutter-40.4-r3.ebuild deleted file mode 100644 index 94dd02db647d..000000000000 --- a/x11-wm/mutter/mutter-40.4-r3.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org gnome2-utils meson udev virtualx xdg - -DESCRIPTION="GNOME compositing window manager based on Clutter" -HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" - -LICENSE="GPL-2+" -SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot - -IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" -# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider -REQUIRED_USE=" - wayland? ( ^^ ( elogind systemd ) udev ) - test? ( wayland )" -RESTRICT="!test? ( test )" - -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" - -# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema -# xorg-server is needed at build and runtime with USE=wayland for Xwayland -# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order -DEPEND=" - >=x11-libs/libX11-1.7.0 - >=media-libs/graphene-1.10.2[introspection?] - >=x11-libs/gtk+-3.19.8:3[X,introspection?] - x11-libs/gdk-pixbuf:2 - >=x11-libs/pango-1.46[introspection?] - >=dev-libs/fribidi-1.0.0 - >=x11-libs/cairo-1.14[X] - >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] - >=dev-libs/glib-2.67.3:2 - gnome-base/gnome-settings-daemon - >=dev-libs/json-glib-0.12.0[introspection?] - gnome-base/gnome-desktop:3= - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-3 - >=x11-libs/libXi-1.7.4 - x11-libs/libXtst - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=x11-libs/libxkbcommon-0.4.3[X] - x11-libs/libXrender - >=x11-libs/libXrandr-1.5.0 - x11-libs/libxcb - x11-libs/libXinerama - x11-libs/libXau - x11-libs/libICE - >=dev-libs/atk-2.5.3[introspection?] - >=media-libs/libcanberra-0.26 - sys-apps/dbus - media-libs/mesa[X(+),egl(+)] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - wayland? ( - >=dev-libs/wayland-protocols-1.19 - >=dev-libs/wayland-1.18.0 - x11-libs/libdrm:= - >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] - >=dev-libs/libinput-1.15.0 - systemd? ( sys-apps/systemd ) - elogind? ( sys-auth/elogind ) - x11-base/xwayland - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( >=dev-libs/libgudev-232:= - >=virtual/libudev-232-r1:= ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.21:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -RDEPEND="${DEPEND} - gnome-extra/zenity -" -DEPEND="${DEPEND} - x11-base/xorg-proto - sysprof? ( >=dev-util/sysprof-common-3.38.0 ) -" -# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary -BDEPEND=" - dev-libs/wayland - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( app-text/docbook-xml-dtd:4.5 ) - wayland? ( - >=sys-kernel/linux-headers-4.4 - x11-libs/libxcvt - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch -) - -src_configure() { - # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain - local emesonargs=( - -Dopengl=true - #opengl_libname - #gles2_libname - $(meson_use wayland gles2) - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - $(meson_use udev) - -Dudev_dir=$(get_udevdir) - $(meson_use input_devices_wacom libwacom) - -Dpango_ft2=true - -Dstartup_notification=true - -Dsm=true - $(meson_use introspection) - $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false - $(meson_use test clutter_tests) - $(meson_use test tests) - $(meson_use sysprof profiler) - -Dinstalled_tests=false - #verbose # Let upstream choose default for verbose mode - #xwayland_path - # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops) - #xwayland_grab_default_access_rules - ) - - if use wayland && use video_cards_nvidia; then - emesonargs+=( - -Degl_device=true - -Dwayland_eglstream=true - ) - else - emsonargs+=( - -Degl_device=false - -Dwayland_eglstream=false - ) - fi - - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/x11-wm/mutter/mutter-40.5-r6.ebuild b/x11-wm/mutter/mutter-40.5-r6.ebuild index 68ed88cbb8c5..c21be09d0bb7 100644 --- a/x11-wm/mutter/mutter-40.5-r6.ebuild +++ b/x11-wm/mutter/mutter-40.5-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ REQUIRED_USE=" test? ( wayland )" RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema # xorg-server is needed at build and runtime with USE=wayland for Xwayland diff --git a/x11-wm/mutter/mutter-41.2-r1.ebuild b/x11-wm/mutter/mutter-41.2-r1.ebuild deleted file mode 100644 index b05673366a97..000000000000 --- a/x11-wm/mutter/mutter-41.2-r1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org gnome2-utils meson udev xdg - -DESCRIPTION="GNOME compositing window manager based on Clutter" -HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" - -LICENSE="GPL-2+" -SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot - -IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" -# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider -REQUIRED_USE=" - wayland? ( ^^ ( elogind systemd ) udev ) - test? ( wayland )" -RESTRICT="!test? ( test )" - -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - -# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema -# xorg-server is needed at build and runtime with USE=wayland for Xwayland -# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order -DEPEND=" - >=x11-libs/libX11-1.7.0 - >=media-libs/graphene-1.10.2[introspection?] - >=x11-libs/gtk+-3.19.8:3[X,introspection?] - x11-libs/gdk-pixbuf:2 - >=x11-libs/pango-1.46[introspection?] - >=dev-libs/fribidi-1.0.0 - >=x11-libs/cairo-1.14[X] - >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] - >=dev-libs/glib-2.69.0:2 - gnome-base/gnome-settings-daemon - >=dev-libs/json-glib-0.12.0[introspection?] - gnome-base/gnome-desktop:3= - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-3 - >=x11-libs/libXi-1.7.4 - x11-libs/libXtst - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=x11-libs/libxkbcommon-0.4.3[X] - x11-libs/libXrender - >=x11-libs/libXrandr-1.5.0 - x11-libs/libxcb - x11-libs/libXinerama - x11-libs/libXau - x11-libs/libICE - >=dev-libs/atk-2.5.3[introspection?] - >=media-libs/libcanberra-0.26 - sys-apps/dbus - media-libs/mesa[X(+),egl(+)] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) - systemd? ( sys-apps/systemd ) - wayland? ( - >=dev-libs/wayland-protocols-1.21 - >=dev-libs/wayland-1.18.0 - x11-libs/libdrm:= - >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] - >=dev-libs/libinput-1.18.0 - elogind? ( sys-auth/elogind ) - x11-base/xwayland - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( >=dev-libs/libgudev-232:= - >=virtual/libudev-232-r1:= ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.21:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -RDEPEND="${DEPEND} - gnome-extra/zenity -" -DEPEND="${DEPEND} - x11-base/xorg-proto - sysprof? ( >=dev-util/sysprof-common-3.38.0 ) -" -# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary -BDEPEND=" - dev-libs/wayland - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( - app-text/docbook-xml-dtd:4.5 - x11-misc/xvfb-run - ) - wayland? ( - >=sys-kernel/linux-headers-4.4 - x11-libs/libxcvt - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch -) - -src_configure() { - # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain - local emesonargs=( - -Dopengl=true - #opengl_libname - #gles2_libname - $(meson_use wayland gles2) - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use systemd) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - $(meson_use udev) - -Dudev_dir=$(get_udevdir) - $(meson_use input_devices_wacom libwacom) - -Dpango_ft2=true - -Dstartup_notification=true - -Dsm=true - $(meson_use introspection) - $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false - $(meson_use test clutter_tests) - $(meson_use test tests) - $(meson_use sysprof profiler) - -Dinstalled_tests=false - #verbose # Let upstream choose default for verbose mode - #xwayland_path - # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops) - #xwayland_grab_default_access_rules - ) - - if use wayland && use video_cards_nvidia; then - emesonargs+=( - -Degl_device=true - -Dwayland_eglstream=true - ) - else - emsonargs+=( - -Degl_device=false - -Dwayland_eglstream=false - ) - fi - - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 7db0df52d7d5..46c0c362ec0c 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -1,14 +1,11 @@ AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48add1302ed2bc2d6f1d6a1df3c234a65562c42b19b7ad53b0d267d9763606d43ba3ce18cfb6d70565d2f684dbe7c SHA512 09684ac0ac9626d1a441fb17a61919b3b1685520affcc72aa59e64c24ad55ffc7712af57e2ec392710e7dc412039daa6c76456ee6d5464a3e4057fb61d9ad7b1 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8 AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d -AUX xpra-4.2.2-bad-tests.patch 1909 BLAKE2B 35388169dad048ec457a197e922cbe137ab9438d4c25b952999be0bb0ec579092e04e5637e1e61c3800b2a284365ecbac49490f13f1590147be5f0ae572d925b SHA512 1e19e959ba08b4e273428b7192b3a347ea0330e76063a094fafc81eb20eb5d648c309280cb012abd7358098b9e2ef814ce16bc2dcd0eb45a5291132fe7e7bae3 -AUX xpra-4.2.2-true-false-bin-path.patch 1555 BLAKE2B 90882a8071e3a9d7e4d3e1a31a66de70c7b26c069ac848dbbbf3396917797df96e1bb08aabe96007c079fce570e361cc50078ab66cba8445edebf86ce02508e1 SHA512 a1e9498942c7c8fad0740b4aeeed098bb6d2c28a15506c8044c0c7b21ebfe954ffcf2b6be1439357cdef229a047841caa5b1dfcac7fc96b083041fe5f2c997a4 -AUX xpra-4.2.3-dup-ip.patch 1486 BLAKE2B 2da134f53c9cf8fefd4df5e6a2edc0c7c6d8cbda4320df09cd3c3b56b3807e418b1efe22c187dc93830c15ea4fe1ddbe4e05bc5293bd4337960df086a37acd93 SHA512 8716f58fcfb423adcc6c34f712a51251717682e38c05724004ebcbcb7d0c1b2fc505d214c75c9a1eb18428205d2117cb2be9003a639b63d19ed95d131c0d86e4 -DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5 DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c DIST xpra-4.3.1.tar.gz 4174135 BLAKE2B ac007f812fa7d27c4a5edc231f5f0b79311916b4dcfd43f14bfce5cf9d55a5b5738ec484f9ec653e2901d0b1d9d316ac14202668e77b80a56da34b6f98b3cf32 SHA512 0423a2c3bf5df0b6fafffc788b9e648a5f4e41d68a5b8ea014349ea78062be91cfca38f68656d1399ad0e3ba21952e216f3acc3e5bc3387d992c29d4388b6a07 -EBUILD xpra-4.2.3.ebuild 5083 BLAKE2B 55ea7ae97a9071291189cc3930ecedc5ffe4c8c83c4de3035487fe4128f42f3ddc21781d93cdcc4b59d87a1907ebe17766caf9c9b4465bffe57dd0a5c644a2d6 SHA512 432959ac0e2ce1e430645a02c45cfd55951483cfe7e7139266e508531e9e4ab42fd48feb671b716b0bc7e57bcb722395dbd73dea97dce31b7a02b0fdf1a75d9c +DIST xpra-4.3.2.tar.gz 4175968 BLAKE2B 16d42f9509c1ac3cf3f345a6cdd3711496019064c890268d1c1612e37e34ffe93016488f8a6d1bf8509da1d32500571e80bb4143a2f870f07530386515107735 SHA512 b9bc89a0d042e4ef2a416b7787bd1588a9d151d482319c637073749383e2b3f3361eb0f95c0e39ba98c9ae87ef5acb68c4980645fb9a2feea37215f88f7a8a95 EBUILD xpra-4.2.ebuild 4151 BLAKE2B ed1a85aee717a2aca5d7c7b5f76ebba8a3514b3fd7f0261429836b363bd30d69a8312bc6e2526ce3f8bd92b8ebf3f7bb0a2047192b11527f8257595b72bb5e69 SHA512 73dc455a42f2ea0365c8344adeb39dc75976ad2e737d4e956e09bb2bcefcbeda9968bd8c203e307ce28eaa8ae6b176a3a4253e6e8a870b6922e70aa2e59ddcd4 -EBUILD xpra-4.3.1.ebuild 4899 BLAKE2B 294ce78296f2d07757710a703287bab93896c83c8c3031863b129ccc2e36d4d96fb9116ec27c553e3318514e1690260a7e68299084044edfb03e253310505ad4 SHA512 72711a7701027892d546797c07376bc277cab26704d81a597aaf7a55d531a45fa0739528cbdd394888c01611cde5630a70cb56372ddb05a0b15c906857089689 +EBUILD xpra-4.3.1-r1.ebuild 4917 BLAKE2B 8d7d38a5d578ba69617da85ee50788e5dd824bd3a8dbbe264016466abfc609afea09f3a1dd52434af8ab974d2b6d653ea0e457f149a78871ca2fe5a9e3bc438d SHA512 3bc06602a7ca7600dc97dbfb89a0675fb7c5e56a055bf90fdf418d86dc86cdfa76649e0c2f190175b7b43b7ed8566ba9cbc6f1d7215d383f16ad78f1bef37cdd +EBUILD xpra-4.3.2.ebuild 4917 BLAKE2B 8d7d38a5d578ba69617da85ee50788e5dd824bd3a8dbbe264016466abfc609afea09f3a1dd52434af8ab974d2b6d653ea0e457f149a78871ca2fe5a9e3bc438d SHA512 3bc06602a7ca7600dc97dbfb89a0675fb7c5e56a055bf90fdf418d86dc86cdfa76649e0c2f190175b7b43b7ed8566ba9cbc6f1d7215d383f16ad78f1bef37cdd MISC metadata.xml 1362 BLAKE2B aedd143fbf55007c51f421515caa31daa954f6430ae0412ee33796471ac5beb1cec88b0e70f6598ab69640362804d67c75f9e04b2f43bddae5363644bcd0f547 SHA512 1a80da8c0e353a3ef671b3756b12cafa546def2935dca133bf349b8207b64a3f60d4de38b677b7c1ef2de69febe37d75e6950ee4b5873f8b466a75325e3b89d6 diff --git a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch deleted file mode 100644 index 0d34ab0ef2fa..000000000000 --- a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/tests/unittests/unit/net/compression_test.py b/tests/unittests/unit/net/compression_test.py -index 29ac7f2d2..89b68fdbf 100755 ---- a/tests/unittests/unit/net/compression_test.py -+++ b/tests/unittests/unit/net/compression_test.py -@@ -11,7 +11,6 @@ from xpra.net import compression - class TestCompression(unittest.TestCase): - - def test_main(self): -- compression.sanity_checks() - compression.init_all() - assert compression.use("zlib") - assert compression.get_compression_caps() -diff --git a/tests/unittests/unit/net/packet_encoding_test.py b/tests/unittests/unit/net/packet_encoding_test.py -index 69ef95c65..eead158b0 100755 ---- a/tests/unittests/unit/net/packet_encoding_test.py -+++ b/tests/unittests/unit/net/packet_encoding_test.py -@@ -12,7 +12,6 @@ class TestPacketEncoding(unittest.TestCase): - - def test_env_log(self): - packet_encoding.init_all() -- packet_encoding.sanity_checks() - assert packet_encoding.get_packet_encoding_caps() - assert packet_encoding.get_enabled_encoders() - for x in packet_encoding.get_enabled_encoders(): -diff --git a/tests/unittests/unit/scripts/main_test.py b/tests/unittests/unit/scripts/main_test.py -index 6dd54069c..f9478c2ab 100755 ---- a/tests/unittests/unit/scripts/main_test.py -+++ b/tests/unittests/unit/scripts/main_test.py -@@ -121,7 +121,6 @@ class TestMain(unittest.TestCase): - t("tcp://fe80::c1:ac45:7351:ea69%eth1:14500", {"host" : "fe80::c1:ac45:7351:ea69%eth1", "port" : 14500}) - t("tcp://[fe80::c1:ac45:7351:ea69]:14500", {"host" : "fe80::c1:ac45:7351:ea69", "port" : 14500}) - t("tcp://host/100,key1=value1", {"key1" : "value1"}) -- t("tcp://host/key1=value1", {"key1" : "value1"}) - try: - from xpra.net.vsock import CID_ANY, PORT_ANY #@UnresolvedImport - t("vsock://any:any/", {"vsock" : (CID_ANY, PORT_ANY)}) diff --git a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch deleted file mode 100644 index 255e80738616..000000000000 --- a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6e9ef70facfcc280e4c98892d2af6636d122c762 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Tue, 24 Aug 2021 09:56:26 +0100 -Subject: [PATCH] Execute true and false from /bin, not /usr/bin - -Some distributions now have /bin symlinked to /usr/bin, but not all of -them. /bin should work everywhere. ---- - tests/unittests/unit/server/auth_test.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/unittests/unit/server/auth_test.py b/tests/unittests/unit/server/auth_test.py -index 373db96e5..8e6be8e20 100755 ---- a/tests/unittests/unit/server/auth_test.py -+++ b/tests/unittests/unit/server/auth_test.py -@@ -73,7 +73,7 @@ class TestAuth(unittest.TestCase): - kwargs["connection"] = "fake-connection-data" - #exec auth would fail during rpmbuild without a default command: - if "command" not in kwargs: -- kwargs["command"] = "/usr/bin/true" -+ kwargs["command"] = "/bin/true" - return c(username, **kwargs) - - def _test_module(self, module): -@@ -380,8 +380,8 @@ class TestAuth(unittest.TestCase): - a = self._init_auth("exec", **kwargs) - assert not a.requires_challenge(), "%s should not require a challenge" % a - assert self.capsauth(a)==success, "%s should have %s using cmd=%s" % (a, ["failed", "succeeded"][success], cmd) -- exec_cmd("/usr/bin/true", True) -- exec_cmd("/usr/bin/false", False) -+ exec_cmd("/bin/true", True) -+ exec_cmd("/bin/false", False) - - - def main(): --- -2.32.0 - diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch deleted file mode 100644 index 337527305ecc..000000000000 --- a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py -index 5c6e3096c..870801666 100755 ---- a/tests/unittests/unit/net/net_util_test.py -+++ b/tests/unittests/unit/net/net_util_test.py -@@ -27,11 +27,8 @@ class TestVersionUtilModule(unittest.TestCase): - ifaces = get_interfaces() - if not ifaces: - return -+ ip_ifaces = defaultdict(list) - for iface in ifaces: -- ipmasks = do_get_bind_ifacemask(iface) -- for ip, _ in ipmasks: -- assert get_iface(ip)==iface, "expected interface %s for ip %s but got %s" % ( -- iface, ip, get_iface(ip)) - if if_nametoindex: - try: - i = if_nametoindex(iface) -@@ -41,6 +38,12 @@ class TestVersionUtilModule(unittest.TestCase): - if if_indextoname: - assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % ( - iface, i, if_indextoname(i)) -+ ipmasks = do_get_bind_ifacemask(iface) -+ for ip, _ in ipmasks: -+ ip_ifaces[ip].append(iface) -+ for ip, ifaces in ip_ifaces.items(): -+ assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % ( -+ ip, ifaces, get_iface(ip)) - ia = get_interfaces_addresses() - assert ia - #for iface, address in ia.items(): diff --git a/x11-wm/xpra/xpra-4.3.1.ebuild b/x11-wm/xpra/xpra-4.3.1-r1.ebuild index dbc1bee840bb..b0bbdd1cfe13 100644 --- a/x11-wm/xpra/xpra-4.3.1.ebuild +++ b/x11-wm/xpra/xpra-4.3.1-r1.ebuild @@ -53,6 +53,7 @@ DEPEND=" x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr + x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) diff --git a/x11-wm/xpra/xpra-4.2.3.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild index 6280862e546a..b0bbdd1cfe13 100644 --- a/x11-wm/xpra/xpra-4.2.3.ebuild +++ b/x11-wm/xpra/xpra-4.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_SINGLE_IMPL=yes @@ -10,7 +10,8 @@ inherit xdg xdg-utils distutils-r1 tmpfiles udev DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" HOMEPAGE="https://xpra.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch" LICENSE="GPL-2 BSD" SLOT="0" @@ -52,6 +53,7 @@ DEPEND=" x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr + x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) @@ -108,9 +110,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch "${FILESDIR}"/${PN}-4.2-suid-warning.patch - "${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch - "${FILESDIR}"/${PN}-4.2.3-dup-ip.patch - "${FILESDIR}"/${PN}-4.2.2-bad-tests.patch + "${DISTDIR}"/${PN}-4.3.1-tests.patch ) python_prepare_all() { @@ -127,16 +127,13 @@ python_prepare_all() { sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \ -i setup.py || die fi - - # Upstream says these tests are currently broken. - rm tests/unittests/unit/net/subprocess_wrapper_test.py tests/unittests/unit/net/protocol_test.py || die } python_configure_all() { sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ -i setup.py || die - mydistutilsargs=( + DISTUTILS_ARGS=( --without-PIC --without-Xdummy $(use_with client) @@ -181,7 +178,7 @@ python_test() { PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \ XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ - "${PYTHON}" tests/unittests/unit/run.py || die + "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die } python_install_all() { |