From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3991815800A for ; Sat, 5 Aug 2023 22:29:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76CFD2BC01A; Sat, 5 Aug 2023 22:29:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62D0C2BC01A for ; Sat, 5 Aug 2023 22:29:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 835A7340DFC for ; Sat, 5 Aug 2023 22:29:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98BA4F10 for ; Sat, 5 Aug 2023 22:29:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691274511.7f9198feb0dc9af82c863c7839d339c6a54bd76c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/openbox/openbox-3.6.1-r6.ebuild x11-wm/openbox/openbox-9999.ebuild X-VCS-Directories: x11-wm/openbox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7f9198feb0dc9af82c863c7839d339c6a54bd76c X-VCS-Branch: master Date: Sat, 5 Aug 2023 22:29:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1595179-0952-4f1e-ac5b-7ddeab525228 X-Archives-Hash: bc9da611076ebde05a2c0b908f992f53 commit: 7f9198feb0dc9af82c863c7839d339c6a54bd76c Author: Sam James gentoo org> AuthorDate: Sat Aug 5 22:28:02 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 5 22:28:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9198fe x11-wm/openbox: fix shebang in /etc/X11/Sessions file A file in /etc/X11/Sessions with just the path that's *not* executable is fine, but if it's executable, it's reasonably treated as a script. Oops. Closes: https://bugs.gentoo.org/911787 Signed-off-by: Sam James gentoo.org> .../{openbox-9999.ebuild => openbox-3.6.1-r6.ebuild} | 13 +++++++++---- x11-wm/openbox/openbox-9999.ebuild | 11 ++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-3.6.1-r6.ebuild similarity index 91% copy from x11-wm/openbox/openbox-9999.ebuild copy to x11-wm/openbox/openbox-3.6.1-r6.ebuild index d753cdef761b..0233009d6d34 100644 --- a/x11-wm/openbox/openbox-9999.ebuild +++ b/x11-wm/openbox/openbox-3.6.1-r6.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/Mikachu/openbox.git" else SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux" fi SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" @@ -61,6 +61,8 @@ PATCHES=( "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch" # https://bugs.gentoo.org/827227 "${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch" + # https://bugs.gentoo.org/901777 + "${FILESDIR}/${PN}-3.6.1-glib-2.76.patch" ) pkg_setup() { @@ -99,9 +101,12 @@ src_configure() { } src_install() { - dodir /etc/X11/Sessions - echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}" - fperms a+x /etc/X11/Sessions/${PN} + exeinto /etc/X11/Sessions + newexe - ${PN} <<-EOF + #!/bin/sh + ${PN} + EOF + emake DESTDIR="${D}" install if use branding; then insinto /usr/share/themes diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild index d753cdef761b..3a35c296e216 100644 --- a/x11-wm/openbox/openbox-9999.ebuild +++ b/x11-wm/openbox/openbox-9999.ebuild @@ -61,6 +61,8 @@ PATCHES=( "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch" # https://bugs.gentoo.org/827227 "${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch" + # https://bugs.gentoo.org/901777 + "${FILESDIR}/${PN}-3.6.1-glib-2.76.patch" ) pkg_setup() { @@ -99,9 +101,12 @@ src_configure() { } src_install() { - dodir /etc/X11/Sessions - echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}" - fperms a+x /etc/X11/Sessions/${PN} + exeinto /etc/X11/Sessions + newexe - ${PN} <<-EOF + #!/bin/sh + ${PN} + EOF + emake DESTDIR="${D}" install if use branding; then insinto /usr/share/themes