From 02e2208f46f4e2c00fb9743cbc47350bdd233bfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Jan 2018 17:34:21 +0000 Subject: gentoo resync : 16.01.2018 --- dev-libs/sway/Manifest | 9 +- dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch | 370 --------------------- dev-libs/sway/sway-0.14.0.ebuild | 84 ----- dev-libs/sway/sway-0.15.0.ebuild | 86 ----- dev-libs/sway/sway-0.15.1.ebuild | 84 +++++ dev-libs/sway/sway-9999.ebuild | 19 +- 6 files changed, 96 insertions(+), 556 deletions(-) delete mode 100644 dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch delete mode 100644 dev-libs/sway/sway-0.14.0.ebuild delete mode 100644 dev-libs/sway/sway-0.15.0.ebuild create mode 100644 dev-libs/sway/sway-0.15.1.ebuild (limited to 'dev-libs/sway') diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest index 34e4770ce060..520d4e8e58c9 100644 --- a/dev-libs/sway/Manifest +++ b/dev-libs/sway/Manifest @@ -1,7 +1,4 @@ -AUX sway-0.15.0-json-c-fixes.patch 11281 BLAKE2B 85da7be6f1179c6177f982048da54eec994a0266f1f351ea17c63aebca18d43aa7d9693dbe2d4e10270d1d33a895caf6ed111a0737a677783d090feae33b6944 SHA512 29ffd1a613f43d0dc706c2cdc3196691dffb7cf1f855a42cb638492d1e563068db9f0d6cd65a722677f0657c8d110e84373c22e603fb819fb64d1767813dd11d -DIST sway-0.14.0.tar.gz 5376243 BLAKE2B 9990db2d0a17831ac55669236533737a3422a8cb8faa338acae3e897586e410bb95f83f395462332889886be148d0151cad5465bce7786bc8e1a1aa3ceba721c SHA512 2c2e45ddc935504bd240288386662d05f284eb0d540e05b6e56ca577e9b1f2303929b9659eaa3cb99b8cdadb60bd1bfa4104624bf2574e41365e1b3df5361410 -DIST sway-0.15.0.tar.gz 5394917 BLAKE2B 40b12e4c276bda3f6364f1a8d9f55604535632ce0186c0706ff6020bc6ff1b8f5b4b560ae52d281f5cc549547c7f1455bcf30e9b854db26b231e68e648819905 SHA512 2ac448f16cae83563b4ed7039b355c238cdf45bf16af58002c56781fbbac640a5b61b2fd05eb8bcfea5cc06a65707a48e093a68e80be44c14cf1d5d0a9410331 -EBUILD sway-0.14.0.ebuild 1906 BLAKE2B aba3a6e43bf908e01ef087b407fe6396bb2fe8212ce6d72398aa0828ce64de2a5f75b0b204a0ad2fe2a254a174577158857c5816754102e4eff58305d5546ff9 SHA512 1f9d9f4706d2334f04d088330b977269cbf917c0a9e5e2c99b311ec29127c8daa88d69b27a3e4002729d42a5ee172deada44c5e307a9e4496d7dcbc84355545d -EBUILD sway-0.15.0.ebuild 1988 BLAKE2B 6e3899699af109735744ad82c3378de89538d0c64facc80b8e019d7ef15c876384a5d52e1a3dfd26b55a2425b30af9f9c3b38447b4faec249871b85088a5d826 SHA512 cf97d366c9de0de7edc7f162c39b41dad039b5105c61e2577915d9e80578a050f9d83053bcdf1826e2e80e1600c1bd9e74b28ec2f19d06a0637b421698727ad8 -EBUILD sway-9999.ebuild 1936 BLAKE2B eb363ec691e8b51714a497a27decdb685de670c23215e9070a753a37a39c170213d70604248c2881e773d95f514b696512dd03533bee98fd700071829023328e SHA512 6712f338c32dc43f67d28f7cb560c2190544922a092cfe91e9d1dfdc7b2f0d0b66c106d765931e44008094d548fd380e8a7ec45fcd30df683958525519ea23fd +DIST sway-0.15.1.tar.gz 5395223 BLAKE2B b5803f6858f2fa9e70fef75f888970c05cf0ccb4f69ea520ec5121b683780d9ad7bd182ae9d1d4f53612e71a70c594e063a5adf94246318cefce67576e202253 SHA512 5a972fb58ab7f352f206694299832f7bcbeb053419ac47504041dccbbb55433a8de8ec06e3fa38aab259694f1a2042d2a2f920db16cb32dfcc1ac5344017de09 +EBUILD sway-0.15.1.ebuild 1922 BLAKE2B 569906ec2fab72a4d908de4dbd56817a01818bed1b8e086dd0c1fa72fc34545ad970e0ebad05f2eb54a8e3c5e53f5ae4bf379ad6d07b9475c5b0981ee95a75bc SHA512 0635bfa7e9a0e86d2a7e968f2f8d43a2e98ea76942e19990a4d94a2cd54c333d1cca8994a933701cf527a7bb19fd0b93f1ec061e9180e383fe0dcc77557f8485 +EBUILD sway-9999.ebuild 1889 BLAKE2B e324f60205740a5dcf1440bad7baf4a18d21bcf08eb3ecba84d608bc63873bb3245b5f5f2833fff29fc67d0f6def64d3d4c372bebb18a32621ddd202b8da45cf SHA512 36de11a38d5efc324d6bb77f34d26dcb2d05bfe0b1e1b4ef489ffe4e6d99a153368595d4db5d4a36d3205ce42f822781273bd331b0c65301982bd800a4a9d5c2 MISC metadata.xml 1756 BLAKE2B 98c5ea811df7218a945de7d8ae3891692ae7fa137f320ab316f985c99ac288ac62fe006879cdd539f48ea9207a953434f3a5dbaf815f32a40a5c7ff73376c594 SHA512 c66066c76ea1c1cbbdf79664fdd123d22a681e82bfa5c3ffe92ae12fd6fd4adaf51d12767b3ca4e2f88405df59a386e7dfe8f9f5a8fd382918b7566f6461d27a diff --git a/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch b/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch deleted file mode 100644 index 1e43eda62e81..000000000000 --- a/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch +++ /dev/null @@ -1,370 +0,0 @@ -From c6e12368a531dd4bbb0778c9a1dd5d3fb935c197 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 14 Dec 2017 01:30:54 +0100 -Subject: [PATCH 1/3] Lift restriction on json-c <= 0.12.1 - ---- - CMakeLists.txt | 2 +- - README.de.md | 2 +- - README.el.md | 2 +- - README.fr.md | 2 +- - README.it.md | 2 +- - README.ja.md | 2 +- - README.md | 2 +- - README.pt.md | 2 +- - README.ru.md | 2 +- - README.uk.md | 2 +- - 10 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc521570..bd12b191 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,7 +59,7 @@ if (LD_LIBRARY_PATH) - add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}") - endif() - --find_package(JsonC 0.12.1 REQUIRED) -+find_package(JsonC REQUIRED) - find_package(PCRE REQUIRED) - find_package(WLC REQUIRED) - find_package(Wayland REQUIRED) -diff --git a/README.de.md b/README.de.md -index 701cc34f..293ffe70 100644 ---- a/README.de.md -+++ b/README.de.md -@@ -60,7 +60,7 @@ Abhängigkeiten: - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.el.md b/README.el.md -index df39364f..eba97b9c 100644 ---- a/README.el.md -+++ b/README.el.md -@@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.fr.md b/README.fr.md -index 47b6c410..a4ff7cb9 100644 ---- a/README.fr.md -+++ b/README.fr.md -@@ -55,7 +55,7 @@ Installez les dépendances : - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.it.md b/README.it.md -index f5e0d8e2..ded441c3 100644 ---- a/README.it.md -+++ b/README.it.md -@@ -56,7 +56,7 @@ Installa queste dipendenze: - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.ja.md b/README.ja.md -index 2e8f9bfb..94b4ce9d 100644 ---- a/README.ja.md -+++ b/README.ja.md -@@ -46,7 +46,7 @@ Swayは沢山のディストリビューションで提供されています。" - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.md b/README.md -index 29e8a674..eeca9f88 100644 ---- a/README.md -+++ b/README.md -@@ -61,7 +61,7 @@ Install dependencies: - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.pt.md b/README.pt.md -index b5ca132f..e35849ec 100644 ---- a/README.pt.md -+++ b/README.pt.md -@@ -62,7 +62,7 @@ Antes de iniciar a compilação, instale as dependências: - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.ru.md b/README.ru.md -index 4035b0fc..1551caa0 100644 ---- a/README.ru.md -+++ b/README.ru.md -@@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * -diff --git a/README.uk.md b/README.uk.md -index 2e107afc..c8520e4b 100644 ---- a/README.uk.md -+++ b/README.uk.md -@@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а - * libcap - * asciidoc - * pcre --* json-c <= 0.12.1 -+* json-c - * pango - * cairo - * gdk-pixbuf2 * - -From 8272a9bae0d288b479c517dde3e831ea3889dc7f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 14 Dec 2017 16:44:18 +0100 -Subject: [PATCH 2/3] ipc-server: Acquire ownership of referenced json_object - properly - -When adding a referenced json_object with an unknown lifetime to -another json_object, it must be done with a wrapped call to -json_object_get() to acquire the ownership of that json_object. ---- - sway/ipc-server.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sway/ipc-server.c b/sway/ipc-server.c -index b560b930..80f4e5d0 100644 ---- a/sway/ipc-server.c -+++ b/sway/ipc-server.c -@@ -1126,7 +1126,8 @@ static void ipc_event_binding(json_object *sb_obj) { - sway_log(L_DEBUG, "Sending binding::run event"); - json_object *obj = json_object_new_object(); - json_object_object_add(obj, "change", json_object_new_string("run")); -- json_object_object_add(obj, "binding", sb_obj); -+ // sb_obj gets owned by the temporary json_object, too. -+ json_object_object_add(obj, "binding", json_object_get(sb_obj)); - - const char *json_string = json_object_to_json_string(obj); - ipc_send_event(json_string, IPC_EVENT_BINDING); - -From 02da9c4e7cafb36083566e511cc7913d8922aaa6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 14 Dec 2017 17:14:47 +0100 -Subject: [PATCH 3/3] Adaptions for API change in json-c v0.13 - ---- - include/sway_json_helper.h | 16 ++++++++++++++++ - include/swaygrab/json.h | 2 +- - sway/ipc-server.c | 4 ++-- - swaybar/status_line.c | 5 ++--- - swaygrab/json.c | 9 ++++----- - swaylock/main.c | 4 ++-- - swaymsg/main.c | 4 ++-- - 7 files changed, 29 insertions(+), 15 deletions(-) - create mode 100644 include/sway_json_helper.h - -diff --git a/include/sway_json_helper.h b/include/sway_json_helper.h -new file mode 100644 -index 00000000..66f9cff1 ---- /dev/null -+++ b/include/sway_json_helper.h -@@ -0,0 +1,16 @@ -+#ifndef _SWAY_JSON_HELPER_H -+#define _SWAY_JSON_HELPER_H -+ -+#include -+ -+// Macros for checking a specific version. -+#define JSON_C_VERSION_013 (13 << 8) -+ -+// json-c v0.13 uses size_t for array_list_length(). -+#if defined(JSON_C_VERSION_NUM) && JSON_C_VERSION_NUM >= JSON_C_VERSION_013 -+typedef size_t json_ar_len_t; -+#else -+typedef int json_ar_len_t; -+#endif -+ -+#endif // _SWAY_JSON_HELPER_H -diff --git a/include/swaygrab/json.h b/include/swaygrab/json.h -index c1093ef1..c0bd8587 100644 ---- a/include/swaygrab/json.h -+++ b/include/swaygrab/json.h -@@ -1,4 +1,4 @@ --#include -+#include "sway_json_helper.h" - #include "wlc/wlc.h" - - void init_json_tree(int socketfd); -diff --git a/sway/ipc-server.c b/sway/ipc-server.c -index 80f4e5d0..e10445cf 100644 ---- a/sway/ipc-server.c -+++ b/sway/ipc-server.c -@@ -15,7 +15,6 @@ - #include - #include - #include --#include - #include - #include - #ifdef __linux__ -@@ -25,6 +24,7 @@ struct ucred { - gid_t gid; - }; - #endif -+#include "sway_json_helper.h" - #include "sway/ipc-json.h" - #include "sway/ipc-server.h" - #include "sway/security.h" -@@ -724,7 +724,7 @@ void ipc_client_handle_command(struct ipc_client *client) { - } - - // parse requested event types -- for (int i = 0; i < json_object_array_length(request); i++) { -+ for (json_ar_len_t i = 0; i < json_object_array_length(request); i++) { - const char *event_type = json_object_get_string(json_object_array_get_idx(request, i)); - if (strcmp(event_type, "workspace") == 0) { - client->subscribed_events |= event_mask(IPC_EVENT_WORKSPACE); -diff --git a/swaybar/status_line.c b/swaybar/status_line.c -index 87e90caf..e3cc0bf4 100644 ---- a/swaybar/status_line.c -+++ b/swaybar/status_line.c -@@ -2,8 +2,8 @@ - #include - #include - #include --#include - -+#include "sway_json_helper.h" - #include "swaybar/config.h" - #include "swaybar/status_line.h" - #include "log.h" -@@ -70,8 +70,7 @@ static void parse_json(struct bar *bar, const char *text) { - - bar->status->block_line = create_list(); - -- int i; -- for (i = 0; i < json_object_array_length(results); ++i) { -+ for (json_ar_len_t i = 0; i < json_object_array_length(results); ++i) { - json_object *full_text, *short_text, *color, *min_width, *align, *urgent; - json_object *name, *instance, *separator, *separator_block_width; - json_object *background, *border, *border_top, *border_bottom; -diff --git a/swaygrab/json.c b/swaygrab/json.c -index 286085c3..f0e8fa90 100644 ---- a/swaygrab/json.c -+++ b/swaygrab/json.c -@@ -50,8 +50,7 @@ static json_object *get_focused_container_r(json_object *c) { - } else { - json_object *nodes, *node, *child; - json_object_object_get_ex(c, "nodes", &nodes); -- int i; -- for (i = 0; i < json_object_array_length(nodes); i++) { -+ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { - node = json_object_array_get_idx(nodes, i); - - if ((child = get_focused_container_r(node))) { -@@ -60,7 +59,7 @@ static json_object *get_focused_container_r(json_object *c) { - } - - json_object_object_get_ex(c, "floating_nodes", &nodes); -- for (i = 0; i < json_object_array_length(nodes); i++) { -+ for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { - node = json_object_array_get_idx(nodes, i); - - if ((child = get_focused_container_r(node))) { -@@ -83,7 +82,7 @@ char *get_focused_output() { - if (!outputs) { - sway_abort("Unabled to get focused output. No nodes in tree."); - } -- for (int i = 0; i < json_object_array_length(outputs); i++) { -+ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { - output = json_object_array_get_idx(outputs, i); - - if (get_focused_container_r(output)) { -@@ -131,7 +130,7 @@ json_object *get_output_container(const char *output) { - json_object *outputs, *json_output, *name; - json_object_object_get_ex(tree, "nodes", &outputs); - -- for (int i = 0; i < json_object_array_length(outputs); i++) { -+ for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { - json_output = json_object_array_get_idx(outputs, i); - json_object_object_get_ex(json_output, "name", &name); - -diff --git a/swaylock/main.c b/swaylock/main.c -index c2615951..7b7dd601 100644 ---- a/swaylock/main.c -+++ b/swaylock/main.c -@@ -3,7 +3,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -13,6 +12,7 @@ - #include - #include - #include -+#include "sway_json_helper.h" - #include "client/window.h" - #include "client/registry.h" - #include "client/cairo.h" -@@ -584,7 +584,7 @@ int main(int argc, char **argv) { - - for (i = 0; i < registry->outputs->length; ++i) { - if (displays_paths[i * 2] != NULL) { -- for (int j = 0;; ++j) { -+ for (json_ar_len_t j = 0;; ++j) { - if (j >= json_object_array_length(json_outputs)) { - sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]); - exit(EXIT_FAILURE); -diff --git a/swaymsg/main.c b/swaymsg/main.c -index 2f9cfb14..0ee7c76f 100644 ---- a/swaymsg/main.c -+++ b/swaymsg/main.c -@@ -9,7 +9,7 @@ - #include - #include - #include --#include -+#include "sway_json_helper.h" - #include "stringop.h" - #include "ipc-client.h" - #include "readline.h" -@@ -149,7 +149,7 @@ static void pretty_print_version(json_object *v) { - static void pretty_print_clipboard(json_object *v) { - if (success(v, true)) { - if (json_object_is_type(v, json_type_array)) { -- for (int i = 0; i < json_object_array_length(v); ++i) { -+ for (json_ar_len_t i = 0; i < json_object_array_length(v); ++i) { - json_object *o = json_object_array_get_idx(v, i); - printf("%s\n", json_object_get_string(o)); - } diff --git a/dev-libs/sway/sway-0.14.0.ebuild b/dev-libs/sway/sway-0.14.0.ebuild deleted file mode 100644 index 4f0d30aa0e11..000000000000 --- a/dev-libs/sway/sway-0.14.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils cmake-utils - -DESCRIPTION="i3-compatible Wayland window manager" -HOMEPAGE="http://swaywm.org/" - -SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray" - -REQUIRED_USE="tray? ( swaybar )" - -RDEPEND=">=dev-libs/wlc-0.0.8[systemd=] - dev-libs/json-c:= - dev-libs/libpcre - dev-libs/libinput - x11-libs/libxkbcommon - dev-libs/wayland - sys-libs/libcap - x11-libs/pango - x11-libs/cairo - swaylock? ( virtual/pam ) - tray? ( sys-apps/dbus ) - gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - app-text/asciidoc" - -src_prepare() { - cmake-utils_src_prepare - - # remove bad CFLAGS that upstream is trying to add - sed -i -e '/FLAGS.*-Werror/d' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -Denable-swaybar=$(usex swaybar) - -Denable-swaybg=$(usex swaybg) - -Denable-swaygrab=$(usex swaygrab) - -Denable-swaylock=$(usex swaylock) - -Denable-swaymsg=$(usex swaymsg) - -Denable-tray=$(usex tray) - - -Ddefault-wallpaper=$(usex wallpapers) - - -Denable-gdk-pixbuf=$(usex gdk-pixbuf) - -Dzsh-completions=$(usex zsh-completion) - - -DCMAKE_INSTALL_SYSCONFDIR="/etc" - -DVERSION="${PV}" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - use !systemd && fperms u+s /usr/bin/sway -} - -pkg_postinst() { - if use swaygrab - then - optfeature "swaygrab screenshot support" media-gfx/imagemagick[png] - optfeature "swaygrab video capture support" virtual/ffmpeg - fi - if use tray - then - optfeature "experimental xembed tray icons support" \ - x11-misc/xembedsniproxy - fi - - optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland] -} diff --git a/dev-libs/sway/sway-0.15.0.ebuild b/dev-libs/sway/sway-0.15.0.ebuild deleted file mode 100644 index 4763bcbcc74a..000000000000 --- a/dev-libs/sway/sway-0.15.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils cmake-utils - -DESCRIPTION="i3-compatible Wayland window manager" -HOMEPAGE="http://swaywm.org/" - -SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray" - -REQUIRED_USE="tray? ( swaybar )" - -RDEPEND=">=dev-libs/wlc-0.0.8[systemd=] - >=dev-libs/json-c-0.12.1:= - dev-libs/libpcre - dev-libs/libinput - x11-libs/libxkbcommon - dev-libs/wayland - sys-libs/libcap - x11-libs/pango - x11-libs/cairo - swaylock? ( virtual/pam ) - tray? ( sys-apps/dbus ) - gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - app-text/asciidoc" - -PATCHES=( "${FILESDIR}/sway-0.15.0-json-c-fixes.patch" ) - -src_prepare() { - cmake-utils_src_prepare - - # remove bad CFLAGS that upstream is trying to add - sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -Denable-swaybar=$(usex swaybar) - -Denable-swaybg=$(usex swaybg) - -Denable-swaygrab=$(usex swaygrab) - -Denable-swaylock=$(usex swaylock) - -Denable-swaymsg=$(usex swaymsg) - -Denable-tray=$(usex tray) - - -Ddefault-wallpaper=$(usex wallpapers) - - -Denable-gdk-pixbuf=$(usex gdk-pixbuf) - -Dzsh-completions=$(usex zsh-completion) - - -DCMAKE_INSTALL_SYSCONFDIR="/etc" - -DVERSION="${PV}" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - use !systemd && fperms u+s /usr/bin/sway -} - -pkg_postinst() { - if use swaygrab - then - optfeature "swaygrab screenshot support" media-gfx/imagemagick[png] - optfeature "swaygrab video capture support" virtual/ffmpeg - fi - if use tray - then - optfeature "experimental xembed tray icons support" \ - x11-misc/xembedsniproxy - fi - - optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland] -} diff --git a/dev-libs/sway/sway-0.15.1.ebuild b/dev-libs/sway/sway-0.15.1.ebuild new file mode 100644 index 000000000000..53a06086e793 --- /dev/null +++ b/dev-libs/sway/sway-0.15.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils cmake-utils + +DESCRIPTION="i3-compatible Wayland window manager" +HOMEPAGE="http://swaywm.org/" + +SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion" + +REQUIRED_USE="tray? ( swaybar )" + +RDEPEND=">=dev-libs/wlc-0.0.8[systemd=] + dev-libs/json-c:0= + dev-libs/libpcre + dev-libs/libinput + dev-libs/wayland + sys-libs/libcap + x11-libs/libxkbcommon + x11-libs/cairo + x11-libs/pango + gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) + swaylock? ( virtual/pam ) + tray? ( sys-apps/dbus )" + +DEPEND="${RDEPEND} + app-text/asciidoc + virtual/pkgconfig" + +src_prepare() { + cmake-utils_src_prepare + + # remove bad CFLAGS that upstream is trying to add + sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -Denable-swaybar=$(usex swaybar) + -Denable-swaybg=$(usex swaybg) + -Denable-swaygrab=$(usex swaygrab) + -Denable-swaylock=$(usex swaylock) + -Denable-swaymsg=$(usex swaymsg) + -Denable-tray=$(usex tray) + + -Ddefault-wallpaper=$(usex wallpapers) + + -Denable-gdk-pixbuf=$(usex gdk-pixbuf) + -Dzsh-completions=$(usex zsh-completion) + + -DCMAKE_INSTALL_SYSCONFDIR="/etc" + -DVERSION="${PV}" + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + use !systemd && fperms u+s /usr/bin/sway +} + +pkg_postinst() { + if use swaygrab + then + optfeature "swaygrab screenshot support" media-gfx/imagemagick[png] + optfeature "swaygrab video capture support" virtual/ffmpeg + fi + if use tray + then + optfeature "experimental xembed tray icons support" \ + x11-misc/xembedsniproxy + fi + + optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland] +} diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild index f7250762bfe6..da318f9247b2 100644 --- a/dev-libs/sway/sway-9999.ebuild +++ b/dev-libs/sway/sway-9999.ebuild @@ -9,32 +9,31 @@ DESCRIPTION="i3-compatible Wayland window manager" HOMEPAGE="http://swaywm.org/" EGIT_REPO_URI="https://github.com/swaywm/sway.git" +EGIT_BRANCH="0.15" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray" +IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion" REQUIRED_USE="tray? ( swaybar )" RDEPEND="=dev-libs/wlc-9999[systemd=] - >=dev-libs/json-c-0.12.1:= + dev-libs/json-c:0= dev-libs/libpcre dev-libs/libinput - x11-libs/libxkbcommon dev-libs/wayland sys-libs/libcap - x11-libs/pango + x11-libs/libxkbcommon x11-libs/cairo + x11-libs/pango + gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) swaylock? ( virtual/pam ) - tray? ( sys-apps/dbus ) - gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )" + tray? ( sys-apps/dbus )" DEPEND="${RDEPEND} - virtual/pkgconfig - app-text/asciidoc" - -PATCHES=( "${FILESDIR}/sway-0.15.0-json-c-fixes.patch" ) + app-text/asciidoc + virtual/pkgconfig" src_prepare() { cmake-utils_src_prepare -- cgit v1.2.3