add openbox

add openbox

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

Hello,

This time, I send you a real patch. It adds openbox, a window manager,
to the distribution. Openbox requires that pango is compiled with
libxft, so I added the dependency in gtk.scm.

Julien Lepiller.

[-- Attachment #2: 0001-gnu-Add-openbox.patch --]
[-- Type: application/octet-stream, Size: 4124 bytes --]

From feabd656c24dbc9b3d41d0a9bcdf22f88fecedcb Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sun, 16 Nov 2014 17:57:06 +0100
Subject: [PATCH] gnu: Add openbox.

* gnu/packages/openbox.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am            |  1 +
 gnu/packages/gtk.scm     |  3 ++-
 gnu/packages/openbox.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/openbox.scm

diff --git a/gnu-system.am b/gnu-system.am
index 1af1aa5..4530a04 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -192,6 +192,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/ocaml.scm			\
   gnu/packages/ocrad.scm			\
   gnu/packages/onc-rpc.scm			\
+  gnu/packages/openbox.scm			\
   gnu/packages/openldap.scm			\
   gnu/packages/openssl.scm			\
   gnu/packages/orpheus.scm			\
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d8c8a29..703f2c6 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -161,7 +161,8 @@ affine transformation (scale, rotation, shear, etc.)")
     `(("cairo" ,cairo)
       ("harfbuzz" ,harfbuzz)))
    (inputs
-    `(("zlib" ,zlib)))
+    `(("zlib" ,zlib)
+      ("libxft" ,libxft)))
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("glib" ,glib "bin")                               ; glib-mkenums, etc.
diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm
new file mode 100644
index 0000000..7bbd50b
--- /dev/null
+++ b/gnu/packages/openbox.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Lepiller Julien <julien@lepiller.eu>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages openbox)
+  #:use-module ((guix licenses) #:select (gpl2+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))
+
+(define-public openbox
+  (package
+    (name "openbox")
+    (version "3.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.icculus.org/openbox/releases/" name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("imlib2" ,imlib2)
+              ("libxml2" ,libxml2)
+              ("librsvg" ,librsvg)
+              ("libsm" ,libsm)
+              ("libxcursor" ,libxcursor)
+              ("libxinerama" ,libxinerama)
+              ("libxml2" ,libxml2)
+              ("libxrandr" ,libxrandr)
+              ("libxft" ,libxft)
+              ("pango" ,pango)))
+    (synopsis "Box style window manager")
+    (description
+     "Openbox is a highly configurable, next generation window manager with
+extensive standars support.  The *box visual style is well known for its
+minimalistic appearance.  Openbox uses the *box visual style, while providing
+a greater number of options for theme developers than previous *box
+implementations.")
+    (home-page "http://openbox.org/wiki/Main_Page")
+    (license gpl2+)))
+
+;;; openbox.scm ends here
-- 
2.1.2

Re: add openbox

[Ludovic Courtès]

Hello,

Julien Lepiller <julien@lepiller.eu> skribis:

> This time, I send you a real patch. It adds openbox, a window manager,
> to the distribution. Openbox requires that pango is compiled with
> libxft, so I added the dependency in gtk.scm.

The patch looks good to me.  However, because the next release is to be
out soon and I would like to avoid any disruption, I’ve pushed it to the
‘next’ branch, which we’ll merge soon after the release.

> From feabd656c24dbc9b3d41d0a9bcdf22f88fecedcb Mon Sep 17 00:00:00 2001
> From: Julien Lepiller <julien@lepiller.eu>
> Date: Sun, 16 Nov 2014 17:57:06 +0100
> Subject: [PATCH] gnu: Add openbox.
>
> * gnu/packages/openbox.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

Pushed with minor changes:

> +;;; Copyright © 2014 Lepiller Julien <julien@lepiller.eu>

I’ve swapped first name/last name.

> +              (method url-fetch)
> +              (uri (string-append
> +                    "http://www.icculus.org/openbox/releases/" name "-" version ".tar.gz"))
> +              (sha256
> +               (base32 "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj"))))

Did some reformatting to keep lines below 80 characters.

Thank you, and welcome!  :-)

Ludo’.

Re: add openbox

[Andreas Enge]

On Sun, Nov 16, 2014 at 06:18:06PM +0100, Julien Lepiller wrote:
> This time, I send you a real patch. It adds openbox, a window manager,
> to the distribution. Openbox requires that pango is compiled with
> libxft, so I added the dependency in gtk.scm.

Personally, I would split this into two commits: The first one for pango,
the second one for openbox.

Andreas

Re: add openbox

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> On Sun, Nov 16, 2014 at 06:18:06PM +0100, Julien Lepiller wrote:
>> This time, I send you a real patch. It adds openbox, a window manager,
>> to the distribution. Openbox requires that pango is compiled with
>> libxft, so I added the dependency in gtk.scm.
>
> Personally, I would split this into two commits: The first one for pango,
> the second one for openbox.

Yeah, right.  I think I just didn’t want to overwhelm Julien (yet ;-))
and thought this was acceptable.

Ludo’.

Re: add openbox

[Andreas Enge]

On Mon, Nov 17, 2014 at 09:39:13PM +0100, Ludovic Courtès wrote:
> Yeah, right.  I think I just didn’t want to overwhelm Julien (yet ;-))
> and thought this was acceptable.

Definitely acceptable!

Andreas

Re: add openbox

[Ludovic Courtès]

I’ve just pushed it to master, and as two separate commits–I couldn’t
resist Andreas’ call.  ;-)

Thanks!

Ludo’.