diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/kde-frameworks.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/lxde.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/lxqt.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/openbox.scm | 120 | ||||
| -rw-r--r-- | gnu/packages/wm.scm | 82 | ||||
| -rw-r--r-- | gnu/tests/install.scm | 1 | ||||
| -rw-r--r-- | po/packages/POTFILES.in | 1 |
8 files changed, 83 insertions, 127 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 43de2994f4..f185f1d7ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -512,7 +512,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/openkinect.scm \ %D%/packages/onc-rpc.scm \ %D%/packages/opencl.scm \ - %D%/packages/openbox.scm \ %D%/packages/opencog.scm \ %D%/packages/openldap.scm \ %D%/packages/openpgp.scm \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 4d70a9b276..e1ccfdcb81 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -77,7 +77,6 @@ #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) - #:use-module (gnu packages openbox) #:use-module (gnu packages pdf) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -96,6 +95,7 @@ #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) + #:use-module (gnu packages wm) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index ba1c1374ef..3aeb2a5321 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -47,7 +47,6 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lsof) - #:use-module (gnu packages openbox) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 634a2f5849..03ec37101a 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -57,7 +57,6 @@ #:use-module (gnu packages perl) #:use-module (gnu packages lxde) #:use-module (gnu packages maths) - #:use-module (gnu packages openbox) #:use-module (gnu packages pcre) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) @@ -65,6 +64,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages qt) #:use-module (gnu packages textutils) + #:use-module (gnu packages wm) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm deleted file mode 100644 index 08ce89b547..0000000000 --- a/gnu/packages/openbox.scm +++ /dev/null @@ -1,120 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu> -;;; Copyright © 2016, 2023 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017 Nikita <nikita@n0.is> -;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop> -;;; -;;; 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 utils) - #:use-module (guix build-system gnu) - #:use-module (guix gexp) - #:use-module (gnu packages) - #:use-module (gnu packages autotools) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gettext) - #: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 python) - #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) - -(define-public openbox - (package - (name "openbox") - (version "3.6.1") - (source (origin - (method url-fetch) - (uri (string-append - "http://openbox.org/dist/openbox/" name "-" - version ".tar.xz")) - (sha256 - (base32 - "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")) - (patches (search-patches "openbox-add-fix-for-glib2-exposed-segfault.patch" "openbox-python3.patch")))) - (build-system gnu-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'force-reconfigure - ;; This is made necessary by the openbox-python3 patch. - (lambda _ - (delete-file "configure")))))) - (native-inputs (list autoconf automake gettext-minimal libtool pkg-config)) - (propagated-inputs (list python-pyxdg)) - (inputs (list imlib2 - libxml2 - (librsvg-for-system) - libsm - libxcursor - libxinerama - libxml2 - libxrandr - libxft - pango - python-wrapper)) - (synopsis "Box style window manager") - (description - "Openbox is a highly configurable, next generation window manager with -extensive standards 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+))) - -(define-public obconf - (package - (name "obconf") - (version "2.0.4") - (source - (origin - (method url-fetch) - (uri (string-append "http://openbox.org/dist/" name - "/" name "-" version ".tar.gz")) - (sha256 - (base32 - "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi")))) - (inputs (list gtk+-2 - imlib2 - libglade - libsm - librsvg - libxft - openbox - startup-notification)) - (native-inputs (list gettext-minimal pkg-config)) - (build-system gnu-build-system) - (arguments - (list - #:configure-flags - #~(list "--enable-nls" - "CFLAGS=-g -O2 -Wno-error=implicit-function-declaration"))) - (home-page "https://openbox.org/obconf") - (synopsis "Openbox configuration tool") - (description - "Obconf is a tool for configuring the Openbox window manager. -You can configure its appearance, themes, and much more.") - (license gpl2+))) - -;;; openbox.scm ends here diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7b91e2b33a..ffc4ea3aaa 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1,11 +1,12 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> ;;; Copyright © 2015, 2016, 2022 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2015 xd1le <elisp.vim@gmail.com> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> -;;; Copyright © 2016, 2019, 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2019-2020, 2023-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2016 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org> @@ -707,6 +708,85 @@ the i3 window manager through its i3bar component, as an alternative to i3status.") (license license:gpl3+))) +(define-public obconf + (package + (name "obconf") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://openbox.org/dist/" name + "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi")))) + (inputs (list gtk+-2 + imlib2 + libglade + libsm + librsvg + libxft + openbox + startup-notification)) + (native-inputs (list gettext-minimal pkg-config)) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "--enable-nls" + "CFLAGS=-g -O2 -Wno-error=implicit-function-declaration"))) + (home-page "https://openbox.org/obconf") + (synopsis "Openbox configuration tool") + (description + "Obconf is a tool for configuring the Openbox window manager. +You can configure its appearance, themes, and much more.") + (license license:gpl2+))) + +(define-public openbox + (package + (name "openbox") + (version "3.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "http://openbox.org/dist/openbox/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")) + (patches (search-patches "openbox-add-fix-for-glib2-exposed-segfault.patch" "openbox-python3.patch")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'force-reconfigure + ;; This is made necessary by the openbox-python3 patch. + (lambda _ + (delete-file "configure")))))) + (native-inputs (list autoconf automake gettext-minimal libtool pkg-config)) + (propagated-inputs (list python-pyxdg)) + (inputs (list imlib2 + libxml2 + (librsvg-for-system) + libsm + libxcursor + libxinerama + libxml2 + libxrandr + libxft + pango + python-wrapper)) + (synopsis "Box style window manager") + (description + "Openbox is a highly configurable, next generation window manager with +extensive standards 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 license:gpl2+))) + (define-public papersway (package (name "papersway") diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index be3de699a4..b26dc890a4 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -43,7 +43,6 @@ #:use-module (gnu packages firmware) #:use-module (gnu packages linux) #:use-module (gnu packages ocr) - #:use-module (gnu packages openbox) #:use-module (gnu packages package-management) #:use-module (gnu packages ratpoison) #:use-module (gnu packages suckless) diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 0dfbbd6e61..9522bdc5c7 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -461,7 +461,6 @@ gnu/packages/nushell.scm gnu/packages/ocaml.scm gnu/packages/ocr.scm gnu/packages/onc-rpc.scm -gnu/packages/openbox.scm gnu/packages/opencog.scm gnu/packages/openldap.scm gnu/packages/openstack.scm |