guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] wip'ish things rebased a bit on master: awesome-3.5.9 and lua-lg


From: ng0
Subject: [PATCH] wip'ish things rebased a bit on master: awesome-3.5.9 and lua-lgi.
Date: Sat, 20 Aug 2016 20:53:09 +0000

As written in
https://lists.gnu.org/archive/html/help-guix/2016-08/msg00068.html,
here are two patches from my wip crypt (you should apply them in
reverse, lgi is a dependency of awesome).

awesome has not been tested again, lgi has been half tested (it fails in
the make check phase).

Here are additional notes:
awesome:
(run)inputs: lua-5.1 glib2 libxdg-basedir-1
lua/lgi-0.7 cairo[xcb] gdk-pixbuf2 libxcb-1.6
pango-1.19.3[introspection] startup-notification
xcb-util xcb-util-cursor libXcursor libx11

(build/make)native-inputs: asciidoc xmlto gperf
pkg-config imagemagick[png] xcb-proto-1.15 xproto
(if docs: doxygen, graphviz)

The part where I cut down the awesome description: This was my original
description months ago, did a 12 lines description not trigger lint
failures? I'll send in a separate patch now which will fix this. For
every twm etc we don't need to explain what twm's are.

>From 4d2907a46c4f02fba09c9843637189eacb847750 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Sat, 20 Aug 2016 20:09:58 +0000
Subject: [PATCH 1/2] gnu: awesome: Update to 3.5.9.

* gnu/packages/wm.scm (awesome): Update to 3.5.9.
---
 gnu/packages/wm.scm | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2cc9f44..e1ae7d0 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2016 Al McElrath <address@hidden>
 ;;; Copyright © 2016 Carlo Zancanaro <address@hidden>
 ;;; Copyright © 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016 ng0 <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -382,15 +383,15 @@ experience.")
 (define-public awesome
   (package
     (name "awesome")
-    (version "3.4.15")
+    (version "3.5.9")
     (source
      (origin (method url-fetch)
              (uri (string-append
                    "https://awesome.naquadah.org/download/awesome-";
-                   version ".tar.xz"))
+                   version ".tar.bz2"))
              (sha256
               (base32
-               "1m910lr7wkw2dgzmirfvz7dasfswhhccdf65l21iiciv24c3w1bb"))
+               "103c1015nk8iyjh9qsrs23gggp3x3x2cklipslx3vccvi36zgxlr"))
              (modules '((guix build utils)
                         (srfi srfi-19)))
              (snippet
@@ -423,6 +424,7 @@ experience.")
               ("libxcursor" ,libxcursor)
               ("libxdg-basedir" ,libxdg-basedir)
               ("lua" ,lua-5.1)
+              ("lgi" ,lgi)
               ("pango" ,pango)
               ("startup-notification" ,startup-notification)
               ("xcb-util" ,xcb-util)
@@ -452,16 +454,7 @@ experience.")
                       (zero? (system* "../build/awesome" "-v")))))))
     (synopsis "Highly configurable window manager")
     (description
-     "awesome is a window manager for X.  It manages windows in different
-layouts, like floating or tiled.  Any layout can be applied dynamically,
-optimizing the environment for the application in use and the task currently
-being performed.
-
-In a tiled layout, windows are managed in a master and stacking area.  In a
-floating layout windows can be resized and moved freely.  Dialog windows are
-always managed as floating, regardless of the layout currently applied.
-
-Windows are grouped by tags in awesome.  Each window can be tagged with one or
-more tags.  Selecting certain tags displays all windows with these tags.")
+     "Awesome has been designed as a framework window manager. It is extremely 
fast,
+small, dynamic and heavily extensible using the Lua programming language.")
     (license license:gpl2+)
     (home-page "https://awesome.naquadah.org/";)))
-- 
2.9.3

>From b1bc2bf6c66247614aff06062fc70c7f57ec0cb0 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Sat, 20 Aug 2016 20:44:04 +0000
Subject: [PATCH 2/2] gnu: Add lua-lgi.

* gnu/packages/lua.scm (lua-lgi): New variable.
---
 gnu/packages/lua.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index b4b5dee..e32ed80 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014 Mark H Weaver <address@hidden>
 ;;; Copyright © 2014 Andreas Enge <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2016 ng0 <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,9 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages readline))
 
 (define-public lua
@@ -107,3 +111,36 @@ programming language.  Lua is a powerful, dynamic and 
light-weight programming
 language.  It may be embedded or used as a general-purpose, stand-alone
 language.")
     (license x11)))
+
+(define-public lua-lgi
+  (package
+    (name "lua-lgi")
+    (version "0.9.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/pavouk/";
+                                  "lgi" "/archive/" version
+                                  ".tar.gz"))
+              (file-name (string-append name "-" version))
+              (sha256
+               (base32
+                "1fmgdl5y4ph3yc6ycg865s3vai1rjkyda61cgqxk6zd13hmznw0c"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (alist-delete 'configure %standard-phases)
+       #:make-flags (list (string-append "PREFIX="
+                                         (assoc-ref %outputs "out"))
+                          "CC=gcc")))
+    (inputs
+     `(("glib" ,glib)
+       ("gobject-introspection" ,gobject-introspection)
+       ("lua" ,lua)
+       ("cairo" ,cairo)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    ;;make , make install [PREFIX=<prefix>] [DESTDIR=<destdir>]
+    (home-page "https://github.com/pavouk/lgi/";)
+    (synopsis "Dynamic Lua binding to GObject libraries using 
GObject-introspection")
+    (description "Dynamic Lua binding to GObject libraries using 
GObject-introspection.
+Yeah, look, new stuff.")
+    (license x11)))
-- 
2.9.3

-- 
ng0
For non-prism friendly talk find me on http://www.psyced.org

reply via email to

[Prev in Thread] Current Thread [Next in Thread]