From unknown Tue Jun 17 01:43:47 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53750] [PATCH] gnu: openbox: Build with Python 3. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Feb 2022 15:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53750 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53750@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164390147718760 (code B ref -1); Thu, 03 Feb 2022 15:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Feb 2022 15:17:57 +0000 Received: from localhost ([127.0.0.1]:57403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFdro-0004sN-5U for submit@debbugs.gnu.org; Thu, 03 Feb 2022 10:17:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:42686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFdrf-0004s8-In for submit@debbugs.gnu.org; Thu, 03 Feb 2022 10:17:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFdre-0005TG-Dq for guix-patches@gnu.org; Thu, 03 Feb 2022 10:17:39 -0500 Received: from mout01.posteo.de ([185.67.36.65]:39379) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFdra-000723-3R for guix-patches@gnu.org; Thu, 03 Feb 2022 10:17:38 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 00B72240027 for ; Thu, 3 Feb 2022 16:17:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1643901452; bh=WjqrVQ9gpI3BoC50TRDZQ/7j/+XDvZTA2TL+efRyY5A=; h=From:To:Cc:Subject:Date:From; b=Kdi3VJm70sMx96HdEqBNO35Wsmz1ENpGIKkNafq/P+eHWrPE7Qxn4PSTgvZ1Q4qma vDOeeDR2Fnhcv7wVS2PMgc+9rUXL0xQIALArHqHGlsauRrqdWOEnqB2MRho6mRrilT SmS25Sw51FclIQ6TtgmK27Zv5tEoHLEgiqdZNXwCx4a1SlOSkuRBCLX5Y5ZgEkq9bC jfeIEnv3xjJt2iu64bQNxSn//KcJ4FLPTYyfsx0ZLlresKvtegOTCRIRjIBushvL/I L1PWU3XLzRsspYw5atmF2NW2XIUdixEu376QTgTvXe+j/Ja1wMoYwbHfP3KPNMPhhc MK+7znP1ERi9Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JqMjR07jJz6tmV; Thu, 3 Feb 2022 16:17:30 +0100 (CET) From: Vinicius Monego Date: Thu, 3 Feb 2022 15:17:12 +0000 Message-Id: <20220203151712.465416-1-monego@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/openbox.scm (openbox): Build with Python 3. [source]: Make some cosmetic changes. Add patch. [inputs]: Replace python with python-wrapper. [propagated-inputs]: Replace python2-xdg with python-xdg. * gnu/packages/patches/openbox-build-with-python3.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 +- gnu/packages/openbox.scm | 23 +-- .../patches/openbox-build-with-python3.patch | 162 ++++++++++++++++++ 3 files changed, 177 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/openbox-build-with-python3.patch diff --git a/gnu/local.mk b/gnu/local.mk index dddda78efa..fd03d1b8cf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -38,7 +38,7 @@ # Copyright © 2020 Tanguy Le Carrour # Copyright © 2020 Martin Becze # Copyright © 2020 Malte Frank Gerdes -# Copyright © 2020 Vinicius Monego +# Copyright © 2020, 2022 Vinicius Monego # Copyright © 2021 Björn Höfling # Copyright © 2021 Greg Hogan # Copyright © 2021 Philip McGrath @@ -1571,6 +1571,7 @@ dist_patch_DATA = \ %D%/packages/patches/onnx-shared-libraries.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ + %D%/packages/patches/openbox-build-with-python3.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm index 873592c19e..40288aa72c 100644 --- a/gnu/packages/openbox.scm +++ b/gnu/packages/openbox.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Julien Lepiller ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nikita +;;; Copyright © 2022 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -39,17 +41,18 @@ (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")))) + (source + (origin + (method url-fetch) + (uri (string-append + "http://openbox.org/dist/openbox/" name "-" + version ".tar.xz")) + (patches (search-patches "openbox-build-with-python3.patch")) + (sha256 + (base32 "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) - (propagated-inputs (list python2-pyxdg)) + (propagated-inputs (list python-pyxdg)) (inputs (list imlib2 libxml2 (librsvg-for-system) @@ -60,7 +63,7 @@ libxrandr libxft pango - python-2)) + python-wrapper)) (synopsis "Box style window manager") (description "Openbox is a highly configurable, next generation window manager with diff --git a/gnu/packages/patches/openbox-build-with-python3.patch b/gnu/packages/patches/openbox-build-with-python3.patch new file mode 100644 index 0000000000..29682a18f1 --- /dev/null +++ b/gnu/packages/patches/openbox-build-with-python3.patch @@ -0,0 +1,162 @@ +From acfbbc4ea40932f183617bb7006700140fe5f61e Mon Sep 17 00:00:00 2001 +From: Troy Curtis Jr +Date: Wed, 13 Sep 2017 21:59:48 -0500 +Subject: [PATCH] Add python3 support to openbox-xdg-autostart. + +Updated syntax in openbox-xdg-autostart to support both python2 and +python3. + +Added a configure substitution to set the chosen python at build time. + +https://bugzilla.icculus.org/show_bug.cgi?id=6444 +--- +Patch imported from Debian: https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/ with the following change: don't rename data/autostart/openbox-xdg-autostart to data/autostart/openbox-xdg-autostart.in. + + .gitignore | 1 + + configure.ac | 3 + + ...xdg-autostart => openbox-xdg-autostart.in} | 70 +++++++++---------- + 3 files changed, 38 insertions(+), 36 deletions(-) + rename data/autostart/{openbox-xdg-autostart => openbox-xdg-autostart.in} (77%) + +diff --git a/configure.ac b/configure.ac +index ca1602670..9a31e9845 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,6 +103,8 @@ AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h) + AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h) + AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h) + ++AM_PATH_PYTHON([2],,) ++ + AC_PATH_PROG([SED], [sed], [no]) + if test "$SED" = "no"; then + AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) +@@ -259,6 +261,7 @@ AC_CONFIG_FILES([ + obrender/version.h + obt/version.h + version.h ++ data/autostart/openbox-xdg-autostart + ]) + AC_CONFIG_COMMANDS([doc], + [test -d doc || mkdir doc]) +diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart +index 04a17a199..3c365b112 100755 +--- a/data/autostart/openbox-xdg-autostart ++++ b/data/autostart/openbox-xdg-autostart +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!@PYTHON@ + + # openbox-xdg-autostart runs things based on the XDG autostart specification + # Copyright (C) 2008 Dana Jansens +@@ -28,9 +28,7 @@ try: + from xdg.DesktopEntry import DesktopEntry + from xdg.Exceptions import ParsingError + except ImportError: +- print +- print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed" +- print ++ sys.stderr.write("\nERROR: %s requires PyXDG to be installed\n" % ME) + sys.exit(1) + + def main(argv=sys.argv): +@@ -51,7 +49,7 @@ def main(argv=sys.argv): + try: + autofile = AutostartFile(path) + except ParsingError: +- print "Invalid .desktop file: " + path ++ print("Invalid .desktop file: " + path) + else: + if not autofile in files: + files.append(autofile) +@@ -99,9 +97,9 @@ class AutostartFile: + + def _alert(self, str, info=False): + if info: +- print "\t ", str ++ print("\t ", str) + else: +- print "\t*", str ++ print("\t*", str) + + def _showInEnvironment(self, envs, verbose=False): + default = not self.de.getOnlyShowIn() +@@ -146,14 +144,14 @@ class AutostartFile: + + def display(self, envs): + if self._shouldRun(envs): +- print "[*] " + self.de.getName() ++ print("[*] " + self.de.getName()) + else: +- print "[ ] " + self.de.getName() ++ print("[ ] " + self.de.getName()) + self._alert("File: " + self.path, info=True) + if self.de.getExec(): + self._alert("Executes: " + self.de.getExec(), info=True) + self._shouldRun(envs, True) +- print ++ print() + + def run(self, envs): + here = os.getcwd() +@@ -165,34 +163,34 @@ class AutostartFile: + os.chdir(here) + + def show_help(): +- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..." +- print +- print "This tool will run xdg autostart .desktop files" +- print +- print "OPTIONS" +- print " --list Show a list of the files which would be run" +- print " Files which would be run are marked with an asterix" +- print " symbol [*]. For files which would not be run," +- print " information is given for why they are excluded" +- print " --help Show this help and exit" +- print " --version Show version and copyright information" +- print +- print "ENVIRONMENT specifies a list of environments for which to run autostart" +- print "applications. If none are specified, only applications which do not " +- print "limit themselves to certain environments will be run." +- print +- print "ENVIRONMENT can be one or more of:" +- print " GNOME Gnome Desktop" +- print " KDE KDE Desktop" +- print " ROX ROX Desktop" +- print " XFCE XFCE Desktop" +- print " Old Legacy systems" +- print ++ print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...") ++ print() ++ print("This tool will run xdg autostart .desktop files") ++ print() ++ print("OPTIONS") ++ print(" --list Show a list of the files which would be run") ++ print(" Files which would be run are marked with an asterix") ++ print(" symbol [*]. For files which would not be run,") ++ print(" information is given for why they are excluded") ++ print(" --help Show this help and exit") ++ print(" --version Show version and copyright information") ++ print() ++ print("ENVIRONMENT specifies a list of environments for which to run autostart") ++ print("applications. If none are specified, only applications which do not ") ++ print("limit themselves to certain environments will be run.") ++ print() ++ print("ENVIRONMENT can be one or more of:") ++ print(" GNOME Gnome Desktop") ++ print(" KDE KDE Desktop") ++ print(" ROX ROX Desktop") ++ print(" XFCE XFCE Desktop") ++ print(" Old Legacy systems") ++ print() + + def show_version(): +- print ME, VERSION +- print "Copyright (c) 2008 Dana Jansens" +- print ++ print(ME, VERSION) ++ print("Copyright (c) 2008 Dana Jansens") ++ print() + + if __name__ == "__main__": + sys.exit(main()) -- 2.30.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 03 11:14:08 2022 Received: (at control) by debbugs.gnu.org; 3 Feb 2022 16:14:08 +0000 Received: from localhost ([127.0.0.1]:57543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFekJ-0006Rp-QX for submit@debbugs.gnu.org; Thu, 03 Feb 2022 11:14:07 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFekH-0006RD-Jk for control@debbugs.gnu.org; Thu, 03 Feb 2022 11:14:05 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8D87A5C018A; Thu, 3 Feb 2022 11:14:00 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 03 Feb 2022 11:14:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:date:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:to:to; s=mesmtp; bh=72ITa0 ZrgZL5j0yewv6JtMWAnDy3javIh0aSO++ttzc=; b=YlPuMbVK6xyG1Z6F0aMp1I 3etDqm2z9qL5dJLb8kqnuj8OSqn4kjtFhemTT6OwUPNa1kIUCK9i1qlnfBHiKBf+ lvC75IixoStBRBQ891aIGbbAj/B4z1t2AMqiWNCo9xhr2g/IEOMLVeMhO34RXS9D nuHQ5n/v9YcmsTnHIIGNU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=72ITa0ZrgZL5j0yewv6JtMWAnDy3javIh0aSO++ttzc=; b=Vopj2Z7x /ZlNVoFfCY3C1T4xWxr4ubirgbnc1Ww35pFVxqsk38CaO2HdwduFytuGLZGb/Qp7 HhkyHJbTIr5qCqxDmyMHJ2mbpU3+NZtlcELkZ9/Q0j8X3ggsEZdyM49aMhx5TL+J UaVgf+jgJ39gUKDH+bwKb5KQFWc/SwmsUT9MOSCAwHnjfNeQJtnOPzNQINRGTdwM BWrRxTgsnue58Z/W4PZUk34BoeAI1wEatR/Gmq0/0/taDKz7l/TpU2B8MN17Z6qL 5hippEvBqoDxCT7HnScY7gTE8TGCB5PQHXluKEkFBgDL7YwWD5SPvMDP/yvyqeFG PuOOeD4RpUSbbQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrgeejgdekgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecugfhmphhthicushhusghjvggtthculddutddmnecujf gurhepfffhvffkgggtugesthdtredttddtvdenucfhrhhomhepnfgvohcuhfgrmhhulhgr rhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephf ejiefgfeevvdefteehgeeltdekvedutdegtdduieetheetgedvfeffudfffeffnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmh hulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 3 Feb 2022 11:14:00 -0500 (EST) Date: Thu, 3 Feb 2022 11:13:58 -0500 From: Leo Famulari To: control@debbugs.gnu.org Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: merge 53394 53750 Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [66.111.4.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [66.111.4.25 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject -0.0 T_SCC_BODY_TEXT_LINE No description available. 1.7 BODY_EMPTY No body text in message X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: merge 53394 53750 Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [66.111.4.25 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [66.111.4.25 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject -0.0 T_SCC_BODY_TEXT_LINE No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 1.7 BODY_EMPTY No body text in message merge 53394 53750 From unknown Tue Jun 17 01:43:47 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53750] [PATCH] gnu: openbox: Build with Python 3. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Feb 2022 18:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53750 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vinicius Monego Cc: 53750@debbugs.gnu.org Received: via spool by 53750-submit@debbugs.gnu.org id=B53750.164399955428569 (code B ref 53750); Fri, 04 Feb 2022 18:33:01 +0000 Received: (at 53750) by debbugs.gnu.org; 4 Feb 2022 18:32:34 +0000 Received: from localhost ([127.0.0.1]:32798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG3Nk-0007Qa-FA for submit@debbugs.gnu.org; Fri, 04 Feb 2022 13:32:34 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:49959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nG3Nh-0007QM-Vr for 53750@debbugs.gnu.org; Fri, 04 Feb 2022 13:32:27 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id CD17532007BE; Fri, 4 Feb 2022 13:32:19 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 04 Feb 2022 13:32:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=mesmtp; bh=EeSmVViV0vxi/wKYp7CpwxOkB/X l+WKEPNFICOmeWEU=; b=amTCxV5xXpR439QaMsfuqXKFGpNSJNMaj2Cv42Z07hU jbz7G1ZgN5aMOUokj9wiGjfhN2OwaYHdElu8TMSU7JrIS7H+lbEwKBYI5TUedOFG wA8kYIzaex3utITg5j+Q4Wyn45HYOZVXyzWj6e4k5si2StSpu/z2G9386noTZQVc = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=EeSmVViV0vxi/wKYp 7CpwxOkB/Xl+WKEPNFICOmeWEU=; b=APGK+8Y3km7u+20LEz0TlfCd4qkYPlFeK LkO9L67JjTMGtCtfYKeYoIYSbeJU+ByDE+Qdg7qHmy3R75kRvKqx/spK67MUIMxi Tge9uk28AOksEc0dm15xpcQVD3vC5JrwyColsYzNxuuA+6zwt6o62YmDwQwlgrAl Z4YV1Zfpi5lkh5x+MzQe8b8ilsexWi7BzDzxmk/GXLZka1+nRiZUqC+kYa9iTfYR yvdd1hPLbKnrqEvp52dRqGGgwDAOQatfzctDwYxi4CH5ufY5TBQWtW+fxfPRN4PO Kqj9axTTeyXT9CqTjjAsc/uQtOyjtB+RFkD22C6MhmtuQnhmaI2tg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrgeelgdduudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeekudefffekgfeivdefhfehkeejtdehuddtvedujefhvdevhedujeevheehuddt vdenucffohhmrghinhepghhnuhdrohhrghdpihgttghulhhushdrohhrghdpuggvsghirg hnrdhorhhgpdhophgvnhgsohigrdhorhhgpdgvgigrmhhplhgvrdgtohhmnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulh grrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 4 Feb 2022 13:32:18 -0500 (EST) Date: Fri, 4 Feb 2022 13:32:17 -0500 From: Leo Famulari Message-ID: References: <20220203151712.465416-1-monego@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220203151712.465416-1-monego@posteo.net> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Thu, Feb 03, 2022 at 03:17:12PM +0000, Vinicius Monego wrote: > * gnu/packages/openbox.scm (openbox): Build with Python 3. > [source]: Make some cosmetic changes. Add patch. > [inputs]: Replace python with python-wrapper. > [propagated-inputs]: Replace python2-xdg with python-xdg. > * gnu/packages/patches/openbox-build-with-python3.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. Thanks! You might have noticed that I merged this patch ticket with my own similar contribution at . I missed the python2-xdg change in my patch, and I also did not replace python with python-wrapper. Is the latter change necessary? > +From acfbbc4ea40932f183617bb7006700140fe5f61e Mon Sep 17 00:00:00 2001 > +From: Troy Curtis Jr > +Date: Wed, 13 Sep 2017 21:59:48 -0500 > +Subject: [PATCH] Add python3 support to openbox-xdg-autostart. > + > +Updated syntax in openbox-xdg-autostart to support both python2 and > +python3. > + > +Added a configure substitution to set the chosen python at build time. > + > +https://bugzilla.icculus.org/show_bug.cgi?id=6444 > +--- > +Patch imported from Debian: https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/ with the following change: don't rename data/autostart/openbox-xdg-autostart to data/autostart/openbox-xdg-autostart.in. Is this note about "Patch imported from Debian" written by you? We always try to give links to the source of patches, as well as a note that explains the context of the patch and a link to any discussions within Guix. So, the patch file should start with something like this: ------ Make Openbox compatible with Python 2: https://issues.guix.gnu.org/53750 Openbox seems to be abandoned upstream, with no activity in their Git repo since 2015: http://openbox.org/develop-git.php Patch copied from XXX: https://example.com/ ------ From unknown Tue Jun 17 01:43:47 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#53750] [PATCH] gnu: openbox: Build with Python 3. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Feb 2022 17:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53750 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 53750@debbugs.gnu.org Received: via spool by 53750-submit@debbugs.gnu.org id=B53750.164417007025869 (code B ref 53750); Sun, 06 Feb 2022 17:55:02 +0000 Received: (at 53750) by debbugs.gnu.org; 6 Feb 2022 17:54:30 +0000 Received: from localhost ([127.0.0.1]:39785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGlk1-0006j5-63 for submit@debbugs.gnu.org; Sun, 06 Feb 2022 12:54:30 -0500 Received: from mout02.posteo.de ([185.67.36.66]:52285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGljx-0006io-QJ for 53750@debbugs.gnu.org; Sun, 06 Feb 2022 12:54:24 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7B691240103 for <53750@debbugs.gnu.org>; Sun, 6 Feb 2022 18:54:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1644170055; bh=zOLBZ1YdG94k4AE0zYJAdsGw7pF/MNZRmjfAYqftScE=; h=Subject:From:To:Cc:Date:From; b=pmjQKpRvAKhTIeMkoIJ6lDvLH0BRoKInp1k34UcwU3H6nCN32Gveux1sAW9ktenfn deI6yZTOPozODIyFHopLtNIMksDekcKpimIf1uua/TxCUdEOQk8j66hU6VGr7PFWfs hrc7WVWOrWXd9yMitqLXmusOR2fgYSLwvV9keyhzdlpVvK13odZFNFSWnpEhuOORYH pEg4T2OzaDa6GrGPaQbUC7OmV+0WQZYaalLKjJo8zV9nBETZPhrml85wtCBoEHcZP0 jbgTOIbxAN/9ha/xjt7sRPSnYPsnZSK4QT87fiQ3PMBFgtBgAlISMpjUC7/tBbf82K A8J7gl8IR6Vgg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JsH2s39KZz9rxF; Sun, 6 Feb 2022 18:54:12 +0100 (CET) Message-ID: <4b640be44edce7b55d800976ff18f641a729f3b7.camel@posteo.net> From: Vinicius Monego Date: Sun, 06 Feb 2022 17:53:57 +0000 In-Reply-To: References: <20220203151712.465416-1-monego@posteo.net> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Em sex, 2022-02-04 às 13:32 -0500, Leo Famulari escreveu: > On Thu, Feb 03, 2022 at 03:17:12PM +0000, Vinicius Monego wrote: > > * gnu/packages/openbox.scm (openbox): Build with Python 3. > > [source]: Make some cosmetic changes. Add patch. > > [inputs]: Replace python with python-wrapper. > > [propagated-inputs]: Replace python2-xdg with python-xdg. > > * gnu/packages/patches/openbox-build-with-python3.patch: New file. > > * gnu/local.mk (dist_patch_DATA): Add it. > > Thanks! You might have noticed that I merged this patch ticket with > my > own similar contribution at . > Oh I didn't see that one! > I missed the python2-xdg change in my patch, and I also did not > replace > python with python-wrapper. Is the latter change necessary? > I use the wrapper because it is more failproof with calling the correct interpreter. The autostart header begins with: #!@PYTHON@ Not a direct call the path in the store, don't know if it would work with only python. > > +From acfbbc4ea40932f183617bb7006700140fe5f61e Mon Sep 17 00:00:00 > > 2001 > > +From: Troy Curtis Jr > > +Date: Wed, 13 Sep 2017 21:59:48 -0500 > > +Subject: [PATCH] Add python3 support to openbox-xdg-autostart. > > + > > +Updated syntax in openbox-xdg-autostart to support both python2 > > and > > +python3. > > + > > +Added a configure substitution to set the chosen python at build > > time. > > + > > +https://bugzilla.icculus.org/show_bug.cgi?id=6444 > > +--- > > +Patch imported from Debian: > > https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/ > >  with the following change: don't rename data/autostart/openbox- > > xdg-autostart to data/autostart/openbox-xdg-autostart.in. > > Is this note about "Patch imported from Debian" written by you? > Yes, that is my own comment. > We always try to give links to the source of patches, as well as a > note > that explains the context of the patch and a link to any discussions > within Guix. > > So, the patch file should start with something like this: > > ------ > Make Openbox compatible with Python 2: > > https://issues.guix.gnu.org/53750 > > Openbox seems to be abandoned upstream, with no activity in their Git > repo since > 2015: > > http://openbox.org/develop-git.php > > Patch copied from XXX: > > https://example.com/ > ------ Thanks for the suggestion. I'll check the other issue. From unknown Tue Jun 17 01:43:47 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Vinicius Monego Subject: bug#53750: closed ([PATCH] gnu: openbox: Build with Python 3.) Message-ID: References: <5f886d24ce518b799c3f2b2a8e598b81c44275ff.camel@posteo.net> <20220203151712.465416-1-monego@posteo.net> X-Gnu-PR-Message: they-closed 53750 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 53750@debbugs.gnu.org Date: Sun, 21 Aug 2022 22:12:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1661119922-24822-1" This is a multi-part message in MIME format... ------------=_1661119922-24822-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #53750: [PATCH] gnu: openbox: Build with Python 3. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 53750@debbugs.gnu.org. --=20 53750: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D53750 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1661119922-24822-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 53750-done) by debbugs.gnu.org; 21 Aug 2022 22:11:39 +0000 Received: from localhost ([127.0.0.1]:37001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPtAQ-0006Rl-Ui for submit@debbugs.gnu.org; Sun, 21 Aug 2022 18:11:39 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPtAN-0006RW-Su for 53750-done@debbugs.gnu.org; Sun, 21 Aug 2022 18:11:37 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 91EDC240101 for <53750-done@debbugs.gnu.org>; Mon, 22 Aug 2022 00:11:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1661119889; bh=wU9KdoXL7xEySl8NuMO3wcLbPryFDXvDm5y2rJbeh3g=; h=Subject:From:To:Date:From; b=axyfaksLypXDHd0zL12NJcRiOl2XpWfloQcgHeJPvHuvKTUnywPpp5PFtsaXbUk12 oGL8s68jU491mBOlid4KNXRAWdlg/uBOocQ32mDNjhxavqgKRw7F5aV4uE6s2yjozF x+jYCgu16R1RxEjxasm/pc26kgcTw+HXxofMBOpBYerv08XBnuviZS7eEuLIhGH8O7 knjhxj5j+2C6x5ZlZ/yU2NENdT4iQMTqrvxqYf5NCUliQQqbethVjfHQW0U5wuDs8q 0n7j9FP7uSts7FL8eHU7w7jIgxs1cMzNbZufZ/cseKerDw8+FBLtI8IeKSpgdiinOR D/nDJ/uo2Zocw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4M9qTD0663z6tnX for <53750-done@debbugs.gnu.org>; Mon, 22 Aug 2022 00:11:27 +0200 (CEST) Message-ID: <5f886d24ce518b799c3f2b2a8e598b81c44275ff.camel@posteo.net> Subject: [PATCH] gnu: openbox: Build with Python 3. From: Vinicius Monego To: 53750-done@debbugs.gnu.org Date: Sun, 21 Aug 2022 22:11:19 +0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53750-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) A similar patch was pushed in f451a8e80cf8d2da08bb65c4c07e3d41d7a17e58. Closing. ------------=_1661119922-24822-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 Feb 2022 15:17:57 +0000 Received: from localhost ([127.0.0.1]:57403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFdro-0004sN-5U for submit@debbugs.gnu.org; Thu, 03 Feb 2022 10:17:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:42686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFdrf-0004s8-In for submit@debbugs.gnu.org; Thu, 03 Feb 2022 10:17:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFdre-0005TG-Dq for guix-patches@gnu.org; Thu, 03 Feb 2022 10:17:39 -0500 Received: from mout01.posteo.de ([185.67.36.65]:39379) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFdra-000723-3R for guix-patches@gnu.org; Thu, 03 Feb 2022 10:17:38 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 00B72240027 for ; Thu, 3 Feb 2022 16:17:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1643901452; bh=WjqrVQ9gpI3BoC50TRDZQ/7j/+XDvZTA2TL+efRyY5A=; h=From:To:Cc:Subject:Date:From; b=Kdi3VJm70sMx96HdEqBNO35Wsmz1ENpGIKkNafq/P+eHWrPE7Qxn4PSTgvZ1Q4qma vDOeeDR2Fnhcv7wVS2PMgc+9rUXL0xQIALArHqHGlsauRrqdWOEnqB2MRho6mRrilT SmS25Sw51FclIQ6TtgmK27Zv5tEoHLEgiqdZNXwCx4a1SlOSkuRBCLX5Y5ZgEkq9bC jfeIEnv3xjJt2iu64bQNxSn//KcJ4FLPTYyfsx0ZLlresKvtegOTCRIRjIBushvL/I L1PWU3XLzRsspYw5atmF2NW2XIUdixEu376QTgTvXe+j/Ja1wMoYwbHfP3KPNMPhhc MK+7znP1ERi9Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JqMjR07jJz6tmV; Thu, 3 Feb 2022 16:17:30 +0100 (CET) From: Vinicius Monego To: guix-patches@gnu.org Subject: [PATCH] gnu: openbox: Build with Python 3. Date: Thu, 3 Feb 2022 15:17:12 +0000 Message-Id: <20220203151712.465416-1-monego@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Vinicius Monego X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/openbox.scm (openbox): Build with Python 3. [source]: Make some cosmetic changes. Add patch. [inputs]: Replace python with python-wrapper. [propagated-inputs]: Replace python2-xdg with python-xdg. * gnu/packages/patches/openbox-build-with-python3.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 3 +- gnu/packages/openbox.scm | 23 +-- .../patches/openbox-build-with-python3.patch | 162 ++++++++++++++++++ 3 files changed, 177 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/openbox-build-with-python3.patch diff --git a/gnu/local.mk b/gnu/local.mk index dddda78efa..fd03d1b8cf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -38,7 +38,7 @@ # Copyright © 2020 Tanguy Le Carrour # Copyright © 2020 Martin Becze # Copyright © 2020 Malte Frank Gerdes -# Copyright © 2020 Vinicius Monego +# Copyright © 2020, 2022 Vinicius Monego # Copyright © 2021 Björn Höfling # Copyright © 2021 Greg Hogan # Copyright © 2021 Philip McGrath @@ -1571,6 +1571,7 @@ dist_patch_DATA = \ %D%/packages/patches/onnx-shared-libraries.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ + %D%/packages/patches/openbox-build-with-python3.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm index 873592c19e..40288aa72c 100644 --- a/gnu/packages/openbox.scm +++ b/gnu/packages/openbox.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Julien Lepiller ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nikita +;;; Copyright © 2022 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -39,17 +41,18 @@ (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")))) + (source + (origin + (method url-fetch) + (uri (string-append + "http://openbox.org/dist/openbox/" name "-" + version ".tar.xz")) + (patches (search-patches "openbox-build-with-python3.patch")) + (sha256 + (base32 "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) - (propagated-inputs (list python2-pyxdg)) + (propagated-inputs (list python-pyxdg)) (inputs (list imlib2 libxml2 (librsvg-for-system) @@ -60,7 +63,7 @@ libxrandr libxft pango - python-2)) + python-wrapper)) (synopsis "Box style window manager") (description "Openbox is a highly configurable, next generation window manager with diff --git a/gnu/packages/patches/openbox-build-with-python3.patch b/gnu/packages/patches/openbox-build-with-python3.patch new file mode 100644 index 0000000000..29682a18f1 --- /dev/null +++ b/gnu/packages/patches/openbox-build-with-python3.patch @@ -0,0 +1,162 @@ +From acfbbc4ea40932f183617bb7006700140fe5f61e Mon Sep 17 00:00:00 2001 +From: Troy Curtis Jr +Date: Wed, 13 Sep 2017 21:59:48 -0500 +Subject: [PATCH] Add python3 support to openbox-xdg-autostart. + +Updated syntax in openbox-xdg-autostart to support both python2 and +python3. + +Added a configure substitution to set the chosen python at build time. + +https://bugzilla.icculus.org/show_bug.cgi?id=6444 +--- +Patch imported from Debian: https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/ with the following change: don't rename data/autostart/openbox-xdg-autostart to data/autostart/openbox-xdg-autostart.in. + + .gitignore | 1 + + configure.ac | 3 + + ...xdg-autostart => openbox-xdg-autostart.in} | 70 +++++++++---------- + 3 files changed, 38 insertions(+), 36 deletions(-) + rename data/autostart/{openbox-xdg-autostart => openbox-xdg-autostart.in} (77%) + +diff --git a/configure.ac b/configure.ac +index ca1602670..9a31e9845 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,6 +103,8 @@ AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h) + AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h) + AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h) + ++AM_PATH_PYTHON([2],,) ++ + AC_PATH_PROG([SED], [sed], [no]) + if test "$SED" = "no"; then + AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) +@@ -259,6 +261,7 @@ AC_CONFIG_FILES([ + obrender/version.h + obt/version.h + version.h ++ data/autostart/openbox-xdg-autostart + ]) + AC_CONFIG_COMMANDS([doc], + [test -d doc || mkdir doc]) +diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart +index 04a17a199..3c365b112 100755 +--- a/data/autostart/openbox-xdg-autostart ++++ b/data/autostart/openbox-xdg-autostart +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!@PYTHON@ + + # openbox-xdg-autostart runs things based on the XDG autostart specification + # Copyright (C) 2008 Dana Jansens +@@ -28,9 +28,7 @@ try: + from xdg.DesktopEntry import DesktopEntry + from xdg.Exceptions import ParsingError + except ImportError: +- print +- print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed" +- print ++ sys.stderr.write("\nERROR: %s requires PyXDG to be installed\n" % ME) + sys.exit(1) + + def main(argv=sys.argv): +@@ -51,7 +49,7 @@ def main(argv=sys.argv): + try: + autofile = AutostartFile(path) + except ParsingError: +- print "Invalid .desktop file: " + path ++ print("Invalid .desktop file: " + path) + else: + if not autofile in files: + files.append(autofile) +@@ -99,9 +97,9 @@ class AutostartFile: + + def _alert(self, str, info=False): + if info: +- print "\t ", str ++ print("\t ", str) + else: +- print "\t*", str ++ print("\t*", str) + + def _showInEnvironment(self, envs, verbose=False): + default = not self.de.getOnlyShowIn() +@@ -146,14 +144,14 @@ class AutostartFile: + + def display(self, envs): + if self._shouldRun(envs): +- print "[*] " + self.de.getName() ++ print("[*] " + self.de.getName()) + else: +- print "[ ] " + self.de.getName() ++ print("[ ] " + self.de.getName()) + self._alert("File: " + self.path, info=True) + if self.de.getExec(): + self._alert("Executes: " + self.de.getExec(), info=True) + self._shouldRun(envs, True) +- print ++ print() + + def run(self, envs): + here = os.getcwd() +@@ -165,34 +163,34 @@ class AutostartFile: + os.chdir(here) + + def show_help(): +- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..." +- print +- print "This tool will run xdg autostart .desktop files" +- print +- print "OPTIONS" +- print " --list Show a list of the files which would be run" +- print " Files which would be run are marked with an asterix" +- print " symbol [*]. For files which would not be run," +- print " information is given for why they are excluded" +- print " --help Show this help and exit" +- print " --version Show version and copyright information" +- print +- print "ENVIRONMENT specifies a list of environments for which to run autostart" +- print "applications. If none are specified, only applications which do not " +- print "limit themselves to certain environments will be run." +- print +- print "ENVIRONMENT can be one or more of:" +- print " GNOME Gnome Desktop" +- print " KDE KDE Desktop" +- print " ROX ROX Desktop" +- print " XFCE XFCE Desktop" +- print " Old Legacy systems" +- print ++ print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...") ++ print() ++ print("This tool will run xdg autostart .desktop files") ++ print() ++ print("OPTIONS") ++ print(" --list Show a list of the files which would be run") ++ print(" Files which would be run are marked with an asterix") ++ print(" symbol [*]. For files which would not be run,") ++ print(" information is given for why they are excluded") ++ print(" --help Show this help and exit") ++ print(" --version Show version and copyright information") ++ print() ++ print("ENVIRONMENT specifies a list of environments for which to run autostart") ++ print("applications. If none are specified, only applications which do not ") ++ print("limit themselves to certain environments will be run.") ++ print() ++ print("ENVIRONMENT can be one or more of:") ++ print(" GNOME Gnome Desktop") ++ print(" KDE KDE Desktop") ++ print(" ROX ROX Desktop") ++ print(" XFCE XFCE Desktop") ++ print(" Old Legacy systems") ++ print() + + def show_version(): +- print ME, VERSION +- print "Copyright (c) 2008 Dana Jansens" +- print ++ print(ME, VERSION) ++ print("Copyright (c) 2008 Dana Jansens") ++ print() + + if __name__ == "__main__": + sys.exit(main()) -- 2.30.2 ------------=_1661119922-24822-1-- From unknown Tue Jun 17 01:43:47 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Famulari Subject: bug#53394: closed ([PATCH] gnu: openbox: Build with Python 3.) Message-ID: References: <5f886d24ce518b799c3f2b2a8e598b81c44275ff.camel@posteo.net> <002d396c0ecfe47e1457a71842d53c95875f99cf.1642702165.git.leo@famulari.name> X-Gnu-PR-Message: they-closed 53394 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 53394@debbugs.gnu.org Date: Sun, 21 Aug 2022 22:12:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1661119923-24822-3" This is a multi-part message in MIME format... ------------=_1661119923-24822-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #53750: [PATCH] gnu: Openbox: Make compatible with Python 3. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 53394@debbugs.gnu.org. --=20 53750: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D53750 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1661119923-24822-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 53750-done) by debbugs.gnu.org; 21 Aug 2022 22:11:39 +0000 Received: from localhost ([127.0.0.1]:37001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPtAQ-0006Rl-Ui for submit@debbugs.gnu.org; Sun, 21 Aug 2022 18:11:39 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPtAN-0006RW-Su for 53750-done@debbugs.gnu.org; Sun, 21 Aug 2022 18:11:37 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 91EDC240101 for <53750-done@debbugs.gnu.org>; Mon, 22 Aug 2022 00:11:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1661119889; bh=wU9KdoXL7xEySl8NuMO3wcLbPryFDXvDm5y2rJbeh3g=; h=Subject:From:To:Date:From; b=axyfaksLypXDHd0zL12NJcRiOl2XpWfloQcgHeJPvHuvKTUnywPpp5PFtsaXbUk12 oGL8s68jU491mBOlid4KNXRAWdlg/uBOocQ32mDNjhxavqgKRw7F5aV4uE6s2yjozF x+jYCgu16R1RxEjxasm/pc26kgcTw+HXxofMBOpBYerv08XBnuviZS7eEuLIhGH8O7 knjhxj5j+2C6x5ZlZ/yU2NENdT4iQMTqrvxqYf5NCUliQQqbethVjfHQW0U5wuDs8q 0n7j9FP7uSts7FL8eHU7w7jIgxs1cMzNbZufZ/cseKerDw8+FBLtI8IeKSpgdiinOR D/nDJ/uo2Zocw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4M9qTD0663z6tnX for <53750-done@debbugs.gnu.org>; Mon, 22 Aug 2022 00:11:27 +0200 (CEST) Message-ID: <5f886d24ce518b799c3f2b2a8e598b81c44275ff.camel@posteo.net> Subject: [PATCH] gnu: openbox: Build with Python 3. From: Vinicius Monego To: 53750-done@debbugs.gnu.org Date: Sun, 21 Aug 2022 22:11:19 +0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53750-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) A similar patch was pushed in f451a8e80cf8d2da08bb65c4c07e3d41d7a17e58. Closing. ------------=_1661119923-24822-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Jan 2022 18:11:22 +0000 Received: from localhost ([127.0.0.1]:59136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAbu5-0001vQ-6w for submit@debbugs.gnu.org; Thu, 20 Jan 2022 13:11:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:51892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAbu2-0001vI-Lb for submit@debbugs.gnu.org; Thu, 20 Jan 2022 13:11:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAbu2-0004V3-Bs for guix-patches@gnu.org; Thu, 20 Jan 2022 13:11:18 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:42023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAbtx-0006Yv-HP for guix-patches@gnu.org; Thu, 20 Jan 2022 13:11:15 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 929633200645; Thu, 20 Jan 2022 13:11:11 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 20 Jan 2022 13:11:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=mesmtp; bh=aMLx8Ra3kMt5DF+LJwotuUW8tOPcFERotYs rn23WsNM=; b=stktof6anvFZgBq+d1y+pkFw9fsicnW0m10q3Eh7jgo/qzDJ/3+ O0ARnG+k3tU775f5ibbC4UOFnHKEOGDcUNU9+kyNOTfQ9oiq5kEaTGvMwnAOoLmw kL5JlJ5gqkZml09N8j2J7cwoMQwgoozMtf2cXcBjruH6mEfOziqp89Bs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:from:from:in-reply-to:message-id:mime-version :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=aMLx8Ra3kMt5DF+LJ wotuUW8tOPcFERotYsrn23WsNM=; b=NNahbnRMw0eu58tVU6PRkOGd3L9VTwpqo QlT715CLYG5zG+yHRsciRHJXNNPIbhw4rbIOaMh2Ro8uQKDlfTWdi/cweXwFgEL5 AZgTQlrEiLnYPKsQjjEgUUf/kEikCAIBf/fr3SDXBrEugJePUqVdYpTyXkCIbHuJ wMX/rtt+93gfbL6C1NZXIXWZRn7iPnkjH6m7X05DhmrnYDaTsL/J6ur42UG0Z+ZT uulnjoLnLCv0y1gb1esqteBX7VtX6eurMr/1yim6FEme0auB34tnEHT/LzM0ef8Q UvuVFWfNb4R7gJYNFz6hlLBAaHYys6lbdAGvS8BbkM9DJM4lUx5Ew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudekgddutdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeeuffdtjeeiheejueegteegkeettddute ejhefhieeghfegkeefhffgffekueekieenucffohhmrghinhepohhpvghnsghogidrohhr ghdpghgvnhhtohhordhorhhgpdhgihhthhhusgdrtghomhenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgr mhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 20 Jan 2022 13:11:10 -0500 (EST) From: Leo Famulari To: guix-patches@gnu.org Subject: [PATCH] gnu: Openbox: Make compatible with Python 3. Date: Thu, 20 Jan 2022 13:11:07 -0500 Message-Id: <002d396c0ecfe47e1457a71842d53c95875f99cf.1642702165.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.21; envelope-from=leo@famulari.name; helo=wout5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) As the patch file says, Openbox seems abandoned upstream. So, as Python 2 is phased out, we can either use a patch like this, or remove Openbox. I rebuilt all affected packages on x86_64-linux, and there were no new build failures, only the same failures as before this patch: kdepim-runtime-20.04.1 kmail-20.04.1 akregator-20.04.1 scorep-openmpi-3.1 smb4k-3.0.6 * gnu/packages/patches/openbox-python-3-compatibility.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/openbox.scm (openbox)[source]: Use it. --- gnu/packages/openbox.scm | 4 +- .../openbox-python-3-compatibility.patch | 273 ++++++++++++++++++ 2 files changed, 276 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openbox-python-3-compatibility.patch diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm index 873592c19e..698c939a96 100644 --- a/gnu/packages/openbox.scm +++ b/gnu/packages/openbox.scm @@ -24,6 +24,7 @@ (define-module (gnu packages openbox) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) @@ -44,6 +45,7 @@ (define-public openbox (uri (string-append "http://openbox.org/dist/openbox/" name "-" version ".tar.xz")) + (patches (search-patches "openbox-python-3-compatibility.patch")) (sha256 (base32 "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")))) @@ -60,7 +62,7 @@ (define-public openbox libxrandr libxft pango - python-2)) + python)) (synopsis "Box style window manager") (description "Openbox is a highly configurable, next generation window manager with diff --git a/gnu/packages/patches/openbox-python-3-compatibility.patch b/gnu/packages/patches/openbox-python-3-compatibility.patch new file mode 100644 index 0000000000..8e19bc86d6 --- /dev/null +++ b/gnu/packages/patches/openbox-python-3-compatibility.patch @@ -0,0 +1,273 @@ +Make Openbox compatible with Python 3. + +Patch adapted from Gentoo: + +https://gitweb.gentoo.org/repo/gentoo.git/patch/?id=31bad4f781f788ccf848500f8c17905ad32a2de9 + +Openbox seems to be abandoned upstream, with no activity in their Git repo since +2015: + +http://openbox.org/develop-git.php + +From 31bad4f781f788ccf848500f8c17905ad32a2de9 Mon Sep 17 00:00:00 2001 +From: Hanno Böck +Date: Mon, 13 Jan 2020 17:22:27 +0100 +Subject: x11-wm/openbox: Python 3 support. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use EAPI 7. +Remove Python 2, change to python single package. + +Closes: https://bugs.gentoo.org/696042 +Signed-off-by: Hanno Böck +Package-Manager: Portage-2.3.84, Repoman-2.3.20 +--- + x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch | 126 +++++++++++++++++++++++ + x11-wm/openbox/openbox-3.6.1-r2.ebuild | 100 ++++++++++++++++++ + 2 files changed, 226 insertions(+) + create mode 100644 x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch + create mode 100644 x11-wm/openbox/openbox-3.6.1-r2.ebuild + +diff --git a/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch b/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch +new file mode 100644 +index 00000000000..d28b536d64a +--- /dev/null ++++ b/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch +@@ -0,0 +1,126 @@ ++diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart ++index 04a17a199..f2c75bbdd 100755 ++--- a/data/autostart/openbox-xdg-autostart +++++ b/data/autostart/openbox-xdg-autostart ++@@ -19,6 +19,8 @@ ++ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ # GNU General Public License for more details. ++ +++from __future__ import print_function +++ ++ ME="openbox-xdg-autostart" ++ VERSION="1.1" ++ ++@@ -28,9 +30,9 @@ try: ++ from xdg.DesktopEntry import DesktopEntry ++ from xdg.Exceptions import ParsingError ++ except ImportError: ++- print ++- print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed" ++- print +++ print() +++ print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr) +++ print() ++ sys.exit(1) ++ ++ def main(argv=sys.argv): ++@@ -51,7 +53,7 @@ def main(argv=sys.argv): ++ try: ++ autofile = AutostartFile(path) ++ except ParsingError: ++- print "Invalid .desktop file: " + path +++ print("Invalid .desktop file: " + path) ++ else: ++ if not autofile in files: ++ files.append(autofile) ++@@ -99,9 +101,9 @@ class AutostartFile: ++ ++ def _alert(self, str, info=False): ++ if info: ++- print "\t ", str +++ print("\t ", str) ++ else: ++- print "\t*", str +++ print("\t*", str) ++ ++ def _showInEnvironment(self, envs, verbose=False): ++ default = not self.de.getOnlyShowIn() ++@@ -146,14 +148,14 @@ class AutostartFile: ++ ++ def display(self, envs): ++ if self._shouldRun(envs): ++- print "[*] " + self.de.getName() +++ print("[*] " + self.de.getName()) ++ else: ++- print "[ ] " + self.de.getName() +++ print("[ ] " + self.de.getName()) ++ self._alert("File: " + self.path, info=True) ++ if self.de.getExec(): ++ self._alert("Executes: " + self.de.getExec(), info=True) ++ self._shouldRun(envs, True) ++- print +++ print() ++ ++ def run(self, envs): ++ here = os.getcwd() ++@@ -165,34 +167,34 @@ class AutostartFile: ++ os.chdir(here) ++ ++ def show_help(): ++- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..." ++- print ++- print "This tool will run xdg autostart .desktop files" ++- print ++- print "OPTIONS" ++- print " --list Show a list of the files which would be run" ++- print " Files which would be run are marked with an asterix" ++- print " symbol [*]. For files which would not be run," ++- print " information is given for why they are excluded" ++- print " --help Show this help and exit" ++- print " --version Show version and copyright information" ++- print ++- print "ENVIRONMENT specifies a list of environments for which to run autostart" ++- print "applications. If none are specified, only applications which do not " ++- print "limit themselves to certain environments will be run." ++- print ++- print "ENVIRONMENT can be one or more of:" ++- print " GNOME Gnome Desktop" ++- print " KDE KDE Desktop" ++- print " ROX ROX Desktop" ++- print " XFCE XFCE Desktop" ++- print " Old Legacy systems" ++- print +++ print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...") +++ print() +++ print("This tool will run xdg autostart .desktop files") +++ print() +++ print("OPTIONS") +++ print(" --list Show a list of the files which would be run") +++ print(" Files which would be run are marked with an asterix") +++ print(" symbol [*]. For files which would not be run,") +++ print(" information is given for why they are excluded") +++ print(" --help Show this help and exit") +++ print(" --version Show version and copyright information") +++ print() +++ print("ENVIRONMENT specifies a list of environments for which to run autostart") +++ print("applications. If none are specified, only applications which do not ") +++ print("limit themselves to certain environments will be run.") +++ print() +++ print("ENVIRONMENT can be one or more of:") +++ print(" GNOME Gnome Desktop") +++ print(" KDE KDE Desktop") +++ print(" ROX ROX Desktop") +++ print(" XFCE XFCE Desktop") +++ print(" Old Legacy systems") +++ print() ++ ++ def show_version(): ++- print ME, VERSION ++- print "Copyright (c) 2008 Dana Jansens" ++- print +++ print(ME, VERSION) +++ print("Copyright (c) 2008 Dana Jansens") +++ print() ++ ++ if __name__ == "__main__": ++ sys.exit(main()) +#diff --git a/x11-wm/openbox/openbox-3.6.1-r2.ebuild b/x11-wm/openbox/openbox-3.6.1-r2.ebuild +#new file mode 100644 +#index 00000000000..80c67975b17 +#--- /dev/null +#+++ b/x11-wm/openbox/openbox-3.6.1-r2.ebuild +#@@ -0,0 +1,100 @@ +#+# Copyright 1999-2020 Gentoo Authors +#+# Distributed under the terms of the GNU General Public License v2 +#+ +#+EAPI=7 +#+ +#+PYTHON_COMPAT=( python3_{6,7,8} ) +#+inherit multilib autotools python-single-r1 eutils +#+ +#+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager" +#+HOMEPAGE="http://openbox.org/" +#+if [[ ${PV} == *9999* ]]; then +#+ inherit git-r3 +#+ EGIT_REPO_URI="git://git.openbox.org/dana/openbox" +#+ SRC_URI="branding? ( +#+ https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" +#+else +#+ SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz +#+ branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" +#+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" +#+fi +#+ +#+LICENSE="GPL-2" +#+SLOT="3" +#+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg" +#+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )" +#+ +#+RDEPEND="dev-libs/glib:2 +#+ >=dev-libs/libxml2-2.0 +#+ >=media-libs/fontconfig-2 +#+ x11-libs/cairo +#+ x11-libs/libXau +#+ x11-libs/libXcursor +#+ x11-libs/libXext +#+ x11-libs/libXft +#+ x11-libs/libXinerama +#+ x11-libs/libXrandr +#+ x11-libs/libXt +#+ >=x11-libs/pango-1.8[X] +#+ imlib? ( media-libs/imlib2 ) +#+ startup-notification? ( >=x11-libs/startup-notification-0.8 ) +#+ svg? ( gnome-base/librsvg:2 ) +#+ xdg? ( +#+ ${PYTHON_DEPS} +#+ dev-python/pyxdg[${PYTHON_USEDEP}] +#+ ) +#+ " +#+DEPEND="${RDEPEND} +#+ sys-devel/gettext +#+ virtual/pkgconfig +#+ x11-base/xorg-proto" +#+ +#+PATCHES=( +#+ "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" +#+ # see https://github.com/danakj/openbox/pull/35 +#+ "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch" +#+) +#+ +#+src_prepare() { +#+ default +#+ sed -i \ +#+ -e "s:-O0 -ggdb ::" \ +#+ -e 's/-fno-strict-aliasing//' \ +#+ "${S}"/m4/openbox.m4 || die +#+ eautoreconf +#+} +#+ +#+src_configure() { +#+ econf \ +#+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ +#+ $(use_enable debug) \ +#+ $(use_enable static-libs static) \ +#+ $(use_enable nls) \ +#+ $(use_enable imlib imlib2) \ +#+ $(use_enable svg librsvg) \ +#+ $(use_enable startup-notification) \ +#+ $(use_enable session session-management) \ +#+ --with-x +#+} +#+ +#+src_install() { +#+ dodir /etc/X11/Sessions +#+ echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}" +#+ fperms a+x /etc/X11/Sessions/${PN} +#+ emake DESTDIR="${D}" install +#+ if use branding; then +#+ insinto /usr/share/themes +#+ doins -r "${WORKDIR}"/Surreal_Gentoo +#+ # make it the default theme +#+ sed -i \ +#+ -e "//{n; s@.*@Surreal_Gentoo@}" \ +#+ "${D}"/etc/xdg/openbox/rc.xml \ +#+ || die "failed to set Surreal Gentoo as the default theme" +#+ fi +#+ use static-libs || find "${D}" -name '*.la' -delete +#+ if use xdg ; then +#+ python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart +#+ else +#+ rm "${ED}"/usr/libexec/openbox-xdg-autostart || die +#+ fi +#+} +#-- +#cgit v1.2.3-18-g5258 +# -- 2.34.0 ------------=_1661119923-24822-3--