From 7014a5a3ea0feffab9701fdd6b64cc7667a985af Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Jun 2019 17:36:28 +0100 Subject: gentoo resync : 30.06.2019 --- x11-wm/Manifest.gz | Bin 9638 -> 9626 bytes x11-wm/i3-gaps/Manifest | 1 + x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild | 87 +++++++++++++++++++ x11-wm/jwm/Manifest | 2 +- x11-wm/jwm/metadata.xml | 5 +- x11-wm/mutter/Manifest | 2 + x11-wm/mutter/mutter-3.30.2-r2.ebuild | 147 ++++++++++++++++++++++++++++++++ 7 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild create mode 100644 x11-wm/mutter/mutter-3.30.2-r2.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index 0ba2a4d0ee8f..9a173f24c824 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest index 4cbdee3fc85b..54d7b3e1863b 100644 --- a/x11-wm/i3-gaps/Manifest +++ b/x11-wm/i3-gaps/Manifest @@ -1,4 +1,5 @@ AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9 +EBUILD i3-gaps-4.16.1-r1.ebuild 1726 BLAKE2B ed6032ccaae1089c2c6a3874aaaaffc090d9480634a995166c7d214c628b562a4a96625d1a586126f1fa2a649fd5851ac3d75610bf185d9b84d2ef5653b8c3ee SHA512 024abbc3412fbba63864a16a0fcead29e855eebb72fc8a88b0d20e69bff8bf623058ac5d982d72af2438550bd8552393e71a1e617a450ee39071c8f350450df1 EBUILD i3-gaps-4.16.1.ebuild 1727 BLAKE2B baceb7766ffb3113638ac33ba2bc24135dc067649dff1be81911f56d697247f6f1c95edfed41c5b3f2ff70ccf189997676a53d0a3ba7b8b0c78077da979c447d SHA512 d17165aaeef4e73552052d6cb2c8e3877ae7978836eee3d349a20966ff70544fccbd3155778cf0e400ffe17be358b053f7a50b58f2166850f9ce04a477050516 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6 diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild new file mode 100644 index 000000000000..0f5113ed0c6a --- /dev/null +++ b/x11-wm/i3-gaps/i3-gaps-4.16.1-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools out-of-source + +DESCRIPTION="i3 fork with gaps and some more features" +HOMEPAGE="https://github.com/Airblader/i3" +SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +DEPEND=" + dev-libs/glib:2 + dev-libs/libev + dev-libs/libpcre + dev-libs/yajl + x11-libs/cairo[X,xcb] + x11-libs/libxcb[xkb] + x11-libs/libxkbcommon[X] + x11-libs/pango[X] + x11-libs/startup-notification + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm +" +BDEPEND=" + app-text/asciidoc + app-text/xmlto + dev-lang/perl + virtual/pkgconfig +" +RDEPEND="${DEPEND} + dev-lang/perl + dev-perl/AnyEvent-I3 + dev-perl/JSON-XS + !x11-wm/i3 +" + +S=${WORKDIR}/i3-${PV} + +DOCS=( RELEASE-NOTES-$(ver_cut 1-3) ) + +PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" ) + +src_prepare() { + default + eautoreconf + cat <<- EOF > "${T}"/i3wm + #!/bin/sh + exec /usr/bin/i3 + EOF +} + +my_src_configure() { + # disable sanitizer: otherwise injects -O0 -g + local myeconfargs=( + $(use_enable doc docs) + --enable-debug=no + --enable-mans + --disable-sanitizers + ) + econf "${myeconfargs[@]}" +} + +my_src_install_all() { + doman "${BUILD_DIR}"/man/*.1 + einstalldocs + + exeinto /etc/X11/Sessions + doexe "${T}"/i3wm +} + +pkg_postinst() { + einfo "There are several packages that you may find useful with ${PN} and" + einfo "their usage is suggested by the upstream maintainers, namely:" + einfo " x11-misc/dmenu" + einfo " x11-misc/i3lock" + einfo " x11-misc/i3status" + einfo "Please refer to their description for additional info." +} diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest index c582300b6119..9d52e93d01d3 100644 --- a/x11-wm/jwm/Manifest +++ b/x11-wm/jwm/Manifest @@ -9,4 +9,4 @@ EBUILD jwm-2.3.4-r1.ebuild 1493 BLAKE2B ade32fbe5954271c26943490d0c1970084b7f53d EBUILD jwm-2.3.5.ebuild 1773 BLAKE2B 38544c2219983545a7c3d12d2656858e0e790cbec3344f1f6b5cff82bde53fce18e681038155ba65e98075e504f0d595ba145dce1bfbfba4c0b1203cde827203 SHA512 1608c2e237a6acb2f608ba6b7e36b4feb172f75de94ae8b170985b7c78d501ffd5264ea5b6a1191f71778aace4163af0cf8839f03684219d89eeef3f872e5412 EBUILD jwm-2.3.6.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae EBUILD jwm-2.3.7.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae -MISC metadata.xml 973 BLAKE2B 396dc5d70f98f46e0a2698b893b127cad189762b28a1be2272b560ea4bd174a637cb4a9a01783a69c14797605d74442d221a55d3b5ca4128f343d7e602333096 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0 +MISC metadata.xml 898 BLAKE2B 0b366993a3e1c91c6f4abfba9f97144d00c2a002f81b898f9403c4a4ed79c9ad491edd6ad36a675287bbf4543e0faca6da127bbb8cf1eb9b0baa0e54beef3dc1 SHA512 87e56bee3a559b4056846016673eba8784f287b69162027ab0da9e2e9cd17d71fb8fb693dcd3fa1aa70017d567ca93160958a76eddb97ea97f2acf0a0ff2a019 diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml index 1f5b8e82302b..194d92bfe46f 100644 --- a/x11-wm/jwm/metadata.xml +++ b/x11-wm/jwm/metadata.xml @@ -1,10 +1,7 @@ - - wraeth@gentoo.org - Sam Jorna - + joewing/jwm http://joewing.net/projects/jwm/snapshots/ChangeLog diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index ad367219cbc3..39e92a1040f0 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -5,7 +5,9 @@ AUX 3.28.3-no-gles2-fix.patch 1442 BLAKE2B f5cdaa84bf635d3f729f77ab0d5150a35c19f DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a84a2a39d291dc1f6191e5805633327d21fb0796b8b0172a35602bec9c7e879819ebdb189f324cba3f4a4aee232d5e439ba0a SHA512 f842920d6855803b8712e1736399805ecd3266a61dd7baba1f80383978d00533e34fd742103b578f9f2969ab2059f9e0c7b3812d2ea2283b6ffa91810bf6094f +DIST mutter-3.30.2-r2-patchset.tar.xz 38544 BLAKE2B f4282b9220f49b38ce495939db222f1585e48b8e446d168135e643248b06c26c57c75032f130615dc6d758c44e4628c0431d88bdd2ee23eee1fb64f2929bd51f SHA512 6ceefbc4bdca9b1eb82ce1f3c0847d85922ebc86643fcde4a3bb37201ff50c1d9343ea605572d5942c984d1e87e44597a4febd058fba9fb57224dccb25a10152 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373 EBUILD mutter-3.30.2-r1.ebuild 4817 BLAKE2B e2128d9fe651f03bff0153be4102245a8da5270614b9cec07528d523e0bde4d5cd86b7f3f5c79437cec0425f8414ff5c57d816f06ba0b830520aa1fee4e50daa SHA512 bd965f23aea6eee86f4e647f3a4b38fdcc54b5fd9abf2c9c6971858940ffbcc73e0244b437635a1d831bdb126e78a360c3c57da12049145b799f7f469e747268 +EBUILD mutter-3.30.2-r2.ebuild 4819 BLAKE2B 0331ce71d812745f6c67112cb52dbf81537540fbef1c4b60b98818020b6083bbe33822e6f3d50a74204bf67d6ebca516daadc998d461460427f54b84eeacc23b SHA512 21c5d1ad6d85a1676ee838562c2c989fdbc5cf5c1b957fe2d5e2e71ffd98f2c11fc1f54de6d9f0f93abffb1a2a3a759b7c8398f43c050d1ffa6f6d5df1bf57dc MISC metadata.xml 431 BLAKE2B 224bce7cb810d88b198f757a6df09da0ba641a08ec75aba918d0fe4e914a3e572e73a863d88bbbd05ab1be52f10d2b30dc20e3420a79fdaa5893b51e72aea476 SHA512 e66679d251265d2666ef26d927110d647d09dbdf4b6fd1f4f1fbac14a35074bfd77182c78e798cba7e2a4649b2a54c16431620a211f9558f922281c522944b85 diff --git a/x11-wm/mutter/mutter-3.30.2-r2.ebuild b/x11-wm/mutter/mutter-3.30.2-r2.ebuild new file mode 100644 index 000000000000..67f779d74521 --- /dev/null +++ b/x11-wm/mutter/mutter-3.30.2-r2.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" +inherit gnome2 virtualx + +DESCRIPTION="GNOME 3 compositing window manager based on Clutter" +HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot + +IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland" +# native backend requires gles3 for hybrid graphics blitting support and a logind provider +REQUIRED_USE=" + wayland? ( ^^ ( elogind systemd ) )" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# libXi-1.7.4 or newer needed per: +# https://bugzilla.gnome.org/show_bug.cgi?id=738944 +# gl.pc package is required, which is only installed by mesa if glx is enabled; pre-emptively requiring USE=X on mesa, as hopefully eventually it'll support disabling glx for wayland-only systems +RDEPEND=" + >=dev-libs/atk-2.5.3 + >=x11-libs/gdk-pixbuf-2:2 + >=dev-libs/json-glib-0.12.0 + >=x11-libs/pango-1.30[introspection?] + >=x11-libs/cairo-1.14[X] + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + >=dev-libs/glib-2.53.2:2 + >=media-libs/libcanberra-0.26[gtk3] + >=x11-libs/startup-notification-0.7 + >=x11-libs/libXcomposite-0.2 + >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] + gnome-base/gnome-desktop:3= + + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=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/libXinerama + >=x11-libs/libXrandr-1.5 + x11-libs/libXrender + x11-libs/libxcb + x11-libs/libxkbfile + >=x11-libs/libxkbcommon-0.4.3[X] + x11-misc/xkeyboard-config + + gnome-extra/zenity + media-libs/mesa[X(+),egl,gles2?] + + input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) + introspection? ( >=dev-libs/gobject-introspection-1.42:= ) + udev? ( >=virtual/libgudev-232:= ) + wayland? ( + >=dev-libs/libinput-1.4 + >=dev-libs/wayland-1.13.0 + >=dev-libs/wayland-protocols-1.16 + >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] + systemd? ( sys-apps/systemd ) + elogind? ( sys-auth/elogind ) + >=virtual/libgudev-232:= + >=virtual/libudev-136:= + x11-base/xorg-server[wayland] + x11-libs/libdrm:= + ) +" +DEPEND="${RDEPEND} + dev-util/glib-utils + >=sys-devel/gettext-0.19.6 + virtual/pkgconfig + x11-base/xorg-proto + test? ( app-text/docbook-xml-dtd:4.5 ) + wayland? ( >=sys-kernel/linux-headers-4.4 ) +" + +PATCHES=( + # Some patches from gnome-3-30 branch on top of 3.30.2 + "${WORKDIR}"/patches/ + # Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2] + "${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf +) + +src_prepare() { + # Disable building of noinst_PROGRAM for tests + if ! use test; then + sed -e '/^noinst_PROGRAMS/d' \ + -i cogl/tests/conform/Makefile.{am,in} || die + sed -e '/noinst_PROGRAMS += testboxes/d' \ + -i src/Makefile-tests.am || die + sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \ + -i src/Makefile.in || die + fi + + gnome2_src_prepare + + # Leave the damn CFLAGS alone + sed -e 's/$CFLAGS -g/$CFLAGS /' \ + -i clutter/configure || die + sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \ + -i cogl/configure || die + sed -e 's/$CFLAGS -g -O/$CFLAGS /' \ + -i configure || die +} + +src_configure() { + # TODO: pipewire remote desktop support; --disable-remote-desktop actually enables it due to upstream autotools bug in 3.26.2 (omitted means disabled) + # TODO: nvidia EGLDevice support + # TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package + # TODO: lack of --with-xwayland-grab-default-access-rules 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) + # Prefer gl driver by default + # GLX is forced by mutter but optional in clutter + # xlib-egl-platform required by mutter x11 backend + # native backend without wayland is useless + gnome2_src_configure \ + --disable-static \ + --enable-compile-warnings=minimum \ + --enable-gl \ + --enable-glx \ + --enable-sm \ + --enable-startup-notification \ + --enable-verbose-mode \ + --enable-xlib-egl-platform \ + --with-default-driver=gl \ + --with-libcanberra \ + $(usex debug --enable-debug=yes "") \ + $(use_enable gles2) \ + $(use_enable gles2 cogl-gles2) \ + $(use_enable introspection) \ + $(use_enable wayland) \ + $(use_enable wayland kms-egl-platform) \ + $(use_enable wayland native-backend) \ + $(use_enable wayland wayland-egl-server) \ + $(use_with input_devices_wacom libwacom) \ + $(use_with udev gudev) +} + +src_test() { + virtx emake check +} -- cgit v1.2.3