From 6853465ca086cfdeb349ab4f5908f3630c19dd64 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 20 Sep 2025 16:04:34 -0300 Subject: [PATCH] gnu: Merge (gnu packages openbox) with (gnu packages wm). This file contains two package definitions that should be on wm.scm. They are not overly complex, not tightly couple and small, so there is few to no reason keeping them in a dedicated file. * gnu/packages/openbox.scm (obconf, openbox): Move from here ... * gnu/packages/wm.scm: ... to here. * gnu/packages/openbox.scm: Delete file. * gnu/local.mk: Remove reference to openbox.scm. * gnu/packages/kde-frameworks.scm: Fixup reference to (gnu packages openbox) module. * gnu/packages/lxde.scm: Remove reference to (gnu packages openbox) module. * gnu/packages/lxqt.scm: Fixup reference to (gnu packages openbox) module. * gnu/tests/install.scm: Remove reference to (gnu packages openbox) module. * po/packages/POTFILES.in: Remove reference to openbox.scm. Change-Id: I0b887debb97e8fcc7880c9f05d29981226d06077 Signed-off-by: Sharlatan Hellseher --- gnu/local.mk | 1 - gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/lxde.scm | 1 - gnu/packages/lxqt.scm | 2 +- gnu/packages/openbox.scm | 120 -------------------------------- gnu/packages/wm.scm | 82 +++++++++++++++++++++- gnu/tests/install.scm | 1 - po/packages/POTFILES.in | 1 - 8 files changed, 83 insertions(+), 127 deletions(-) delete mode 100644 gnu/packages/openbox.scm diff --git a/gnu/local.mk b/gnu/local.mk index 43de2994f456e5a2c05c7e1a11a09c0f005f0bb6..f185f1d7ed9a40595d9e679d6883ac24ded543bb 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 4d70a9b276dde48aabff386f347c6970f4eb5ce2..e1ccfdcb8184cd12e5e18575989909b0cc10c139 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 ba1c1374ef0535885bf1db6308abbf6b6282fd6c..3aeb2a5321ad83f0162d5d34d62d6d5dfc432227 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 634a2f584920b4882ebf22e433273e159617cfd2..03ec37101a58f85d98ba9d58c7cb25748c40382b 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 08ce89b54768c5add1b3212cfbf892b922eea7a0..0000000000000000000000000000000000000000 --- a/gnu/packages/openbox.scm +++ /dev/null @@ -1,120 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Julien Lepiller -;;; Copyright © 2016, 2023 Efraim Flashner -;;; Copyright © 2017 Nikita -;;; Copyright © 2022 Maxim Cournoyer -;;; -;;; 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 . - -(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 7b91e2b33a0a22d030ed193fe058da09335a451d..ffc4ea3aaa36985146395eed0f61a4edc43816c7 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 ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015 Siniša Biđin ;;; Copyright © 2015, 2016, 2022 Eric Bavier ;;; Copyright © 2015 xd1le ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2019, 2020, 2023, 2024 Efraim Flashner +;;; Copyright © 2016, 2019-2020, 2023-2024 Efraim Flashner ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016 2019, 2021-2022 Ludovic Courtès @@ -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 be3de699a4081c7b668caadbb63bac8d80a1d313..b26dc890a44e1b5477356b87013d4c81e0eed1e4 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 0dfbbd6e61b1a0d4fab88e5b48a6e88acc5ca4b8..9522bdc5c702e8497afa9b5c0749dffc552aab78 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