From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- gui-wm/sway/Manifest | 2 + gui-wm/sway/files/sway-1.4-gcc-10.patch | 42 ++++++++++++ gui-wm/sway/sway-1.4-r1.ebuild | 118 ++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 gui-wm/sway/files/sway-1.4-gcc-10.patch create mode 100644 gui-wm/sway/sway-1.4-r1.ebuild (limited to 'gui-wm/sway') diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest index 0b43106cc40c..3692cf935274 100644 --- a/gui-wm/sway/Manifest +++ b/gui-wm/sway/Manifest @@ -1,4 +1,6 @@ +AUX sway-1.4-gcc-10.patch 1147 BLAKE2B 5ccd4d4b5320389f0b0f521bf40c1d68016098951b2196f5045b6323eb622ea865390d82c01b4a12ce3e77779fbde60a5ff452a58a3121bf83284af961bdf7b4 SHA512 1aaa87327c4f2b83325de3eb33d5976a62e60fab0d95e78bee7697f1293e326b039bbb135d2b0dce17328fe95705b87b4e206b4605cd212d914cb5714f03bb69 DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71 +EBUILD sway-1.4-r1.ebuild 3088 BLAKE2B afe1e931c1049b48d5f6d5d74bd9badf726d2987671a2de2575e383a888939a14f7e10f4227dec7dfff6379e0441d87280f79f21e7e5b49b99fce75937c9185d SHA512 725d7429319ceffca7187bfa55563f4c0e6e745c196a3cf7f7d862ed8ebb3fb7e21f58c00ae3bc1d9deb0e75859228d6393103c4547fc8649a4a4793f341d0e5 EBUILD sway-1.4.ebuild 3042 BLAKE2B ed83ac7e11b7d9261a8f1ab419c625dfe79b5df0d4aaae40b7b8f19f0efc3c4566f1efe5e31388a90c7448ebad5afa2817d45453380a03d7793b0f28ccf463ba SHA512 bb74a92ffe6ebf4e6f167ceba1f2ab49c08d17ab7a3837d7245b9b917d3a83e788fc860d9612146456d21c4ed9039cc419b74ef940bac88a1f3d6eeb597a03a5 EBUILD sway-9999.ebuild 3045 BLAKE2B 7a6ebdaf0a6a923b915af7e1363f63555780fa37f0d4c5ba81f608de0f3481163dc1aa91e0dec51d7a2a0eb6677d5ec9d0c4f6de22d101c94d89d3924015e63f SHA512 86f1ce470af97a3a14cf9b9bc81bda806e5ce6f43eb806de2752f96dc4a372735ac8c6a7a9bd8f81063ad7d0f9bb519155a1c435958b307a745f9506a8386033 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d diff --git a/gui-wm/sway/files/sway-1.4-gcc-10.patch b/gui-wm/sway/files/sway-1.4-gcc-10.patch new file mode 100644 index 000000000000..d54b18c8fe01 --- /dev/null +++ b/gui-wm/sway/files/sway-1.4-gcc-10.patch @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/708704 + +From 29a5ce5f65d04b046271fbe53850836c77bbee80 Mon Sep 17 00:00:00 2001 +From: thermitegod +Date: Thu, 23 Jan 2020 18:12:00 -0700 +Subject: [PATCH] Fix compiling with -fno-common + +--- + include/sway/server.h | 4 ++-- + sway/main.c | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/include/sway/server.h ++++ b/include/sway/server.h +@@ -78,7 +78,7 @@ struct sway_server { + list_t *dirty_nodes; + }; + +-struct sway_server server; ++extern struct sway_server server; + + struct sway_debug { + bool noatomic; // Ignore atomic layout updates +@@ -92,7 +92,7 @@ struct sway_debug { + } damage; + }; + +-struct sway_debug debug; ++extern struct sway_debug debug; + + /* Prepares an unprivileged server_init by performing all privileged operations in advance */ + bool server_privileged_prepare(struct sway_server *server); +--- a/sway/main.c ++++ b/sway/main.c +@@ -27,6 +27,7 @@ + static bool terminate_request = false; + static int exit_value = 0; + struct sway_server server = {0}; ++struct sway_debug debug = {0}; + + void sway_terminate(int exit_code) { + if (!server.wl_display) { diff --git a/gui-wm/sway/sway-1.4-r1.ebuild b/gui-wm/sway/sway-1.4-r1.ebuild new file mode 100644 index 000000000000..7329df134bb2 --- /dev/null +++ b/gui-wm/sway/sway-1.4-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils meson + +DESCRIPTION="i3-compatible Wayland window manager" +HOMEPAGE="https://swaywm.org" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/swaywm/${PN}.git" +else + MY_PV=${PV/_rc/-rc} + SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion" +REQUIRED_USE="?? ( elogind systemd ) + tray? ( || ( elogind systemd ) )" + +DEPEND=" + >=dev-libs/json-c-0.13:0= + >=dev-libs/libinput-1.6.0:0= + dev-libs/libpcre + dev-libs/wayland + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + media-libs/mesa[gles2] + elogind? ( >=sys-auth/elogind-239 ) + swaybar? ( x11-libs/gdk-pixbuf:2 ) + swaybg? ( gui-apps/swaybg ) + swayidle? ( gui-apps/swayidle ) + swaylock? ( gui-apps/swaylock ) + systemd? ( >=sys-apps/systemd-239 ) + X? ( x11-libs/libxcb:0= ) +" +if [[ ${PV} == 9999 ]]; then + DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]" +else + DEPEND+=" + >=gui-libs/wlroots-0.10.0:=[elogind=,systemd=,X=] +