xlunch: update to 4.7.5
This commit is contained in:
parent
21372da14a
commit
3aede34728
|
@ -1,33 +0,0 @@
|
|||
# This file is originally called 'genconf' in the src, but it needs to
|
||||
# run on the machine that this actually gets installed on, so it will
|
||||
# be an install script here...
|
||||
|
||||
case "$ACTION" in
|
||||
post)
|
||||
mkdir -p etc/xlunch
|
||||
APPS=/usr/share/applications
|
||||
ICONS=/usr/share/icons/hicolor
|
||||
SIZE=48
|
||||
|
||||
echo "generating config file from $APPS ..." >&2
|
||||
|
||||
|
||||
find $APPS | fgrep .desktop | while read DESKTOPFILE; do
|
||||
NAME="$(cat $DESKTOPFILE | egrep -i "^Name=" | head -n 1 | cut -d "=" -f 2-)"
|
||||
EXEC="$(cat $DESKTOPFILE | egrep -i "^Exec=" | head -n 1 | cut -d "=" -f 2-)"
|
||||
ICON="$(cat $DESKTOPFILE | egrep -i "^Icon=" | head -n 1 | cut -d "=" -f 2-)"
|
||||
TERM="$(cat $DESKTOPFILE | egrep -i "^Terminal=" | head -n 1 | cut -d "=" -f 2-)"
|
||||
|
||||
if [ "$TERM" = "true" ]; then
|
||||
EXEC="xterm -e ""$EXEC"
|
||||
fi
|
||||
|
||||
if [ "$ICON" != "" ]; then
|
||||
ICON=$(find "$ICONS" | grep $SIZE"x"$SIZE | grep $ICON"[.]png" | head -n 1)
|
||||
if [ "$ICON" != "" -a "$EXEC" != "" -a "$NAME" != "" ]; then
|
||||
echo "$NAME;$ICON;$EXEC"
|
||||
fi
|
||||
fi
|
||||
done | sort | uniq > etc/xlunch/entries.dsv
|
||||
;;
|
||||
esac
|
|
@ -0,0 +1,39 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 8297904..88a1c51 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,9 +1,9 @@
|
||||
CC = gcc
|
||||
-LDFLAGS = -lImlib2 -lX11
|
||||
+override LDFLAGS += -lImlib2 -lX11
|
||||
CFLAGS ?= -O2 -s
|
||||
#CFLAGS ?= -ggdb -g3 # For debugging
|
||||
|
||||
-all: xlunch entries.dsv
|
||||
+all: xlunch # entries.dsv
|
||||
|
||||
install: xlunch
|
||||
mkdir -p $(DESTDIR)/etc/xlunch/
|
||||
@@ -20,7 +20,7 @@ install: xlunch
|
||||
cp extra/genentries.desktop.sh $(DESTDIR)/usr/bin
|
||||
cp extra/genentries.desktop $(DESTDIR)/usr/share/applications/
|
||||
cp default.conf $(DESTDIR)/etc/xlunch/default.conf
|
||||
- bash extra/genentries --path $(DESTDIR)/usr/share/xlunch/svgicons/ > $(DESTDIR)/etc/xlunch/entries.dsv
|
||||
+ # bash extra/genentries --path $(DESTDIR)/usr/share/xlunch/svgicons/ > $(DESTDIR)/etc/xlunch/entries.dsv
|
||||
cp -r svgicons/ $(DESTDIR)/usr/share/xlunch/ 2>/dev/null || :
|
||||
|
||||
remove:
|
||||
diff --git a/xlunch.c b/xlunch.c
|
||||
index e613d37..50eed83 100644
|
||||
--- a/xlunch.c
|
||||
+++ b/xlunch.c
|
||||
@@ -39,6 +39,9 @@ const int VERSION_PATCH = 5; // Patch version, changes when something is changed
|
||||
#include <sys/poll.h>
|
||||
#include <errno.h>
|
||||
|
||||
+/* file I/O stuff */
|
||||
+#include <fcntl.h>
|
||||
+
|
||||
/* some globals for our window & X display */
|
||||
Display *disp;
|
||||
Window win;
|
|
@ -1,9 +0,0 @@
|
|||
--- a/Makefile 2017-05-16 00:48:25.302317545 -0500
|
||||
+++ b/Makefile 2017-05-16 00:47:47.801022135 -0500
|
||||
@@ -1,5 +1,5 @@
|
||||
CC = gcc
|
||||
-LDFLAGS = -lImlib2 -lX11
|
||||
+override LDFLAGS += -lImlib2 -lX11
|
||||
CFLAGS ?= -O2 -s
|
||||
|
||||
all: xlunch icons.conf
|
|
@ -1,12 +0,0 @@
|
|||
--- a/xlunch.c 2017-05-17 21:38:59.048445309 -0500
|
||||
+++ b/xlunch.c 2017-05-17 21:39:41.334944291 -0500
|
||||
@@ -27,6 +27,9 @@
|
||||
#include <sys/file.h>
|
||||
#include <errno.h>
|
||||
|
||||
+/* file I/O stuff */
|
||||
+#include <fcntl.h>
|
||||
+
|
||||
/* some globals for our window & X display */
|
||||
Display *disp;
|
||||
Window win;
|
|
@ -1,25 +1,14 @@
|
|||
# Template file for 'xlunch'
|
||||
pkgname=xlunch
|
||||
version=4.7.3
|
||||
version=4.7.5
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
make_build_target=xlunch
|
||||
makedepends="imlib2-devel"
|
||||
depends="bash findutils grep awk sed desktop-file-utils hicolor-icon-theme"
|
||||
short_desc="Graphical app launcher for X with little dependencies"
|
||||
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="http://xlunch.org/"
|
||||
distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz"
|
||||
checksum=9bc03634e8889f47d5727a8f3f49462cebc2c3576337593ffd9832801ea63e6c
|
||||
|
||||
do_install() {
|
||||
vbin xlunch
|
||||
vbin extra/genentries
|
||||
|
||||
vmkdir usr/share/icons/hicolor/48x48/apps
|
||||
vinstall extra/ghost.png 0644 usr/share/icons/hicolor/48x48/apps
|
||||
vinstall docs/logo.png 0644 usr/share/icons/hicolor/48x48/apps
|
||||
|
||||
vmkdir usr/share/applications
|
||||
vinstall extra/genentries.desktop 0644 usr/share/applications
|
||||
}
|
||||
checksum=594b2f79e0c789b5206b45c41ffd5c16e3b5a96754725286956e39b10261b725
|
||||
|
|
Loading…
Reference in New Issue