Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / rofi
Commits:
131f80cd by Robin Candau at 2024-12-27T12:04:10+01:00
Use a patch file instead of 'sed' to fix the xfce4-terminal binary name
sed can fail silently and is intransparent
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix_xfce4-terminal_binary_name.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -15,6 +15,8 @@ pkgbase = rofi
depends = xcb-util-cursor
optdepends = i3-wm: use as a window switcher
source =
https://github.com/DaveDavenport/rofi/releases/download/1.7.5/rofi-1.7.5.tar.xz
+ source = fix_xfce4-terminal_binary_name.patch
sha256sums =
caffcf66d165cb32b748c1db7f229d6d75da58c1685eb17455f65c60e8220c8d
+ sha256sums =
aa6c7bc39e4eb936e47a600beeadf0e11ff62bc5ce6e6d954b56439ec9a44543
pkgname = rofi
=====================================
PKGBUILD
=====================================
@@ -15,15 +15,20 @@ pkgdesc="A window switcher, application launcher and dmenu
replacement"
url="https://github.com/DaveDavenport/rofi";
arch=('x86_64')
license=('MIT')
-depends=('libxdg-basedir' 'startup-notification' 'libxkbcommon-x11'
'xcb-util-wm' 'xcb-util-xrm' 'librsvg' 'xcb-util-cursor')
+depends=('libxdg-basedir' 'startup-notification' 'libxkbcommon-x11'
+ 'xcb-util-wm' 'xcb-util-xrm' 'librsvg' 'xcb-util-cursor')
makedepends=('check')
optdepends=('i3-wm: use as a window switcher')
-source=("${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('caffcf66d165cb32b748c1db7f229d6d75da58c1685eb17455f65c60e8220c8d')
+source=("${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ 'fix_xfce4-terminal_binary_name.patch')
+sha256sums=('caffcf66d165cb32b748c1db7f229d6d75da58c1685eb17455f65c60e8220c8d'
+ 'aa6c7bc39e4eb936e47a600beeadf0e11ff62bc5ce6e6d954b56439ec9a44543')
prepare() {
cd "${pkgname}-${pkgver}"
- sed -i "s/xfce4-terminal.wrapper/xfce4-terminal/g"
script/rofi-sensible-terminal
+ # xfce4-terminal.wrapper is a Debian specific script
+ # that Arch does not provide
+ patch -Np1 < "${srcdir}/fix_xfce4-terminal_binary_name.patch"
}
build() {
=====================================
fix_xfce4-terminal_binary_name.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/script/rofi-sensible-terminal b/script/rofi-sensible-terminal
+index 4bec1c90..4c22ce4e 100755
+--- a/script/rofi-sensible-terminal
++++ b/script/rofi-sensible-terminal
+@@ -9,7 +9,7 @@
+ # We welcome patches that add distribution-specific mechanisms to find the
+ # preferred terminal emulator. On Debian, there is the x-terminal-emulator
+ # symlink for example.
+-for terminal in $TERMINAL x-terminal-emulator urxvt rxvt st terminology
qterminal Eterm aterm uxterm xterm roxterm xfce4-terminal.wrapper mate-terminal
lxterminal konsole alacritty kitty wezterm; do
++for terminal in $TERMINAL x-terminal-emulator urxvt rxvt st terminology
qterminal Eterm aterm uxterm xterm roxterm xfce4-terminal mate-terminal
lxterminal konsole alacritty kitty wezterm; do
+ if command -v $terminal >/dev/null 2>&1; then
+ exec $terminal "$@"
+ fi
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/rofi/-/commit/131f80cd0d9d9999e01a7335857c4aa704f462eb
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/rofi/-/commit/131f80cd0d9d9999e01a7335857c4aa704f462eb
You're receiving this email because of your account on gitlab.archlinux.org.
