From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [WIP] Sway-wm, stuck on it for too long Date: Sat, 3 Jun 2017 13:48:01 +0000 Message-ID: <20170603134801.h7xjd322adp6vn6t@abyayala> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="dvx54p4ulabomtja" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dH9QR-0007xJ-UJ for guix-devel@gnu.org; Sat, 03 Jun 2017 09:49:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dH9QO-0003BB-KP for guix-devel@gnu.org; Sat, 03 Jun 2017 09:49:07 -0400 Received: from aibo.runbox.com ([91.220.196.211]:55950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dH9QO-00037k-7g for guix-devel@gnu.org; Sat, 03 Jun 2017 09:49:04 -0400 Received: from [10.9.9.212] (helo=mailfront12.runbox.com) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1dH9QL-0002SW-M0 for guix-devel@gnu.org; Sat, 03 Jun 2017 15:49:01 +0200 Received: from politkovskaja.torservers.net ([77.247.181.165] helo=localhost) by mailfront12.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1dH9Pe-0004Cm-Nj for guix-devel@gnu.org; Sat, 03 Jun 2017 15:48:19 +0200 Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --dvx54p4ulabomtja Content-Type: multipart/mixed; boundary="vxjt27e2blwjnbgl" Content-Disposition: inline --vxjt27e2blwjnbgl Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable These 3 patches have been around in my checkout for a long time. I run into https://github.com/SirCmpwn/sway/issues/1230 and the developer seems to have no idea what is going on. --=20 ng0 OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 --vxjt27e2blwjnbgl Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-Add-chck.patch" Content-Transfer-Encoding: quoted-printable =46rom 580567dd81fcaa109791c06d202866c6ca713b6d Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Sun, 11 Sep 2016 09:40:32 +0000 Subject: [PATCH 1/3] gnu: Add chck. * gnu/packages/wm.scm (chck): New variable. --- gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index cd53091ce..7d0b29aea 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -40,6 +40,7 @@ #:use-module (guix build-system haskell) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (gnu packages compression) #:use-module (gnu packages haskell) #:use-module (gnu packages base) #:use-module (gnu packages pkg-config) @@ -58,6 +59,7 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages fribidi) #:use-module (gnu packages maths) + #:use-module (gnu packages valgrind) #:use-module (gnu packages web) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) @@ -752,3 +754,34 @@ It is inspired by Xmonad and dwm. Its major features = include: @end itemize\n") (home-page "https://github.com/conformal/spectrwm") (license license:isc))) + +(define-public chck + (let* ((commit "0400fb5e9cf8fd84f7ad5f59822fa2c9d48e1267") + (revision "1")) + (package + (name "chck") + (version (string-append "0.0." revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Cloudef/chck") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1lqy7djj28hhn4x656lglx4whndl8q4m85k8lzs36v95msmm2am6"))= )) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list + "-DCMAKE_BUILD_TYPE=3DUpstream"))) + (inputs + `(("doxygen" ,doxygen) + ("zlib" ,zlib) + ("valgrind" ,valgrind))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/Cloudef/chck") + (synopsis "Collection of C utilities") + (description + "Collection of C utilities") + (license license:zlib)))) --=20 2.13.0 --vxjt27e2blwjnbgl Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Add-wlc.patch" Content-Transfer-Encoding: quoted-printable =46rom c923bd7f78a9b8850b09430a4dd375e2a8f0feaf Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Sun, 11 Sep 2016 10:50:49 +0000 Subject: [PATCH 2/3] gnu: Add wlc. * gnu/packages/wm.scm (wlc): New variable. --- gnu/packages/wm.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7d0b29aea..e126d6f03 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -42,9 +42,11 @@ #:use-module (guix build-system python) #:use-module (gnu packages compression) #:use-module (gnu packages haskell) + #:use-module (gnu packages gl) #:use-module (gnu packages base) #:use-module (gnu packages pkg-config) #:use-module (gnu packages perl) + #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -785,3 +787,54 @@ It is inspired by Xmonad and dwm. Its major features = include: (description "Collection of C utilities") (license license:zlib)))) + +(define-public wlc + (package + (name "wlc") + (version "0.0.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/Cloudef/wlc/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d9albrwb17mqrqfcc6gag40f5yvc7qrs3p71l3ip80fwn8j6zyh")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DCMAKE_BUILD_TYPE=3DUpstream" + "-DWLC_BUILD_EXAMPLES=3DOFF" + "-DWLC_BUILD_TESTS=3DOFF"))) + (inputs + `(("pixman" ,pixman) + ("wayland" ,wayland) + ("libxkbcommon" ,libxkbcommon) + ("eudev" ,eudev) + ("libdrm" ,libdrm) + ("libinput" ,libinput) + ("libx11" ,libx11) ; x11-xcb, xfixes + ("libxcb" ,libxcb) + ("libxkbcommon" ,libxkbcommon) + ("xkeyboard-config" ,xkeyboard-config) + ("libxfixes" ,libxfixes) + ("pth" ,pth) + ("libxcomposite" ,libxcomposite) + ("mesa" ,mesa) ; libgbm, libegl, libglesv2 + ("dbus" ,dbus) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-wm" ,xcb-util-wm) + ("xproxo" ,xproto) + ("xorg-server-xwayland" ,xorg-server-xwayland) + ("zlib" ,zlib) + ("elogind" ,elogind) + ("chck" ,chck))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://github.com/Cloudef/wlc") + (synopsis "Helper library for Wayland compositors") + (description + "Wlc is a Wayland compositor library.") + (license (list license:expat + license:zlib)))) --=20 2.13.0 --vxjt27e2blwjnbgl Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-gnu-Add-sway.patch" Content-Transfer-Encoding: quoted-printable =46rom 252c9fb43c1b987d86ef12885455461b850a6ff8 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Thu, 19 Jan 2017 13:58:36 +0000 Subject: [PATCH 3/3] gnu: Add sway. * gnu/packages/wm.scm (sway): New variable. --- gnu/packages/wm.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index e126d6f03..0425e0af3 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages fribidi) #:use-module (gnu packages maths) #:use-module (gnu packages valgrind) + #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) @@ -838,3 +839,58 @@ It is inspired by Xmonad and dwm. Its major features = include: "Wlc is a Wayland compositor library.") (license (list license:expat license:zlib)))) + +(define-public sway + (package + (name "sway") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/SirCmpwn/sway/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zbzlxb48l8djm164n5cp0wvywlg0w4xs7iqk6zpf9yr52fhr8jn")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DCMAKE_BUILD_TYPE=3DRelease" + (string-append "-DCMAKE_INSTALL_SYSCONFDIR= =3D" + (assoc-ref %outputs "out") + "/etc") + (string-append "-DSWAY_VERSION=3D0.13.0")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-clags + (lambda _ + (substitute* "CMakeLists.txt" + (("Werror") "")) + #t))))) + (inputs + `(("pixman" ,pixman) + ("wayland" ,wayland) + ("xorg-server-xwayland" ,xorg-server-xwayland) + ("wlc" ,wlc) + ("libcap" ,libcap) + ("pcre" ,pcre) + ("json-c" ,json-c) + ("pango" ,pango) + ("cairo" ,cairo) + ("gdk-pixbuf" ,gdk-pixbuf) + ("linux-pam" ,linux-pam) + ("imagemagick" ,imagemagick) + ("ffmpeg" ,ffmpeg) + ("libinput" ,libinput) + ("libxkbcommon" ,libxkbcommon) + ("elogind" ,elogind))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("asciidoc" ,asciidoc))) + (home-page "http://swaywm.org") + (synopsis "i3 compatible Wayland window manager") + (description + "Sway is a drop-in replacement for the i3 window manager, but for +Wayland instead of X11. It works with your existing i3 configuration and +supports most of i3's features, and a few extras.") + (license license:expat))) --=20 2.13.0 --vxjt27e2blwjnbgl-- --dvx54p4ulabomtja Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlkyvhEACgkQ4i+bv+40 hYjYyRAAkET+budtsRLfyQol3Ol3+PXluSvON7syW2OZi1nylb4bUGGDg2RvJ4RA XM6kTejeNntnbMzyvvc1/bFegf115hLhyFBZ38sVwdQZTMpOyWQYJOp07QLu2ugu k+8/u/hEL6gSxC9l8iHwMMYPYTDKmoziAQEwG6ny9cLJqsN07AGrBFPScIYRaKoW W0rKQSa2d4WdqkFbxsLSemWghZFWPkT8GmWzqp1BcEvD/DFcC6tnm1iu3T0J+6fL sBgCf4AO7ztxb550cbPLJUgbah04trT7sISsJSkjSOJ46pwPxxEBiwUYuSZadsC2 3TI/aoARli0BaLp9phl3vpWN+3VndW+sbK+b2QCNZejOfZiQxc982gXDOnj47u4j hvppCvOpX3aMzqJB3EnDdneJ22DiRQYHy0xbHsmJ/VOIYjYG41QzSCYAcoWMArJu /5jewbnNceJ1jLw8j8NoAWCH6mtIh4IBMf3C/43aPrDzG6BEdpO7nhqlQTGUzVcf 9YbShysxz0/nZhS3a4Vc0efoRXR7kB15m/L6n29mE5gwIuUjCN3+aUpiSEhuKd8s aOdkqxhKQpvR9wZd38hf4og752PQCZfGnq2Iu0kg0Ole6SgK9QIOHmlO9tX2GgP6 bWpqPeTW1H+D4WeIOknGCsBy4Ugcl+wsw27E1JhWB48+QqTJlts= =tq1f -----END PGP SIGNATURE----- --dvx54p4ulabomtja--