* [PR PATCH] xlunch: update to 4.7.5
@ 2024-02-24 8:59 MIvanchev
2024-02-24 9:00 ` MIvanchev
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: MIvanchev @ 2024-02-24 8:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
There is a new pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages xlunch-update
https://github.com/void-linux/void-packages/pull/48909
xlunch: update to 4.7.5
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48909.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xlunch-update-48909.patch --]
[-- Type: text/x-diff, Size: 5844 bytes --]
From 1bf6d5534da42bfbb7aff472702615466aacbb1a Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sat, 24 Feb 2024 09:56:46 +0100
Subject: [PATCH] xlunch: update to 4.7.5
---
srcpkgs/xlunch/INSTALL | 33 -----------------------
srcpkgs/xlunch/patches/build.patch | 39 ++++++++++++++++++++++++++++
srcpkgs/xlunch/patches/ldflags.patch | 9 -------
srcpkgs/xlunch/patches/musl.patch | 12 ---------
srcpkgs/xlunch/template | 16 +++---------
5 files changed, 42 insertions(+), 67 deletions(-)
delete mode 100644 srcpkgs/xlunch/INSTALL
create mode 100644 srcpkgs/xlunch/patches/build.patch
delete mode 100644 srcpkgs/xlunch/patches/ldflags.patch
delete mode 100644 srcpkgs/xlunch/patches/musl.patch
diff --git a/srcpkgs/xlunch/INSTALL b/srcpkgs/xlunch/INSTALL
deleted file mode 100644
index 62025c9d583757..00000000000000
--- a/srcpkgs/xlunch/INSTALL
+++ /dev/null
@@ -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
diff --git a/srcpkgs/xlunch/patches/build.patch b/srcpkgs/xlunch/patches/build.patch
new file mode 100644
index 00000000000000..a75fb12ebb0f05
--- /dev/null
+++ b/srcpkgs/xlunch/patches/build.patch
@@ -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;
diff --git a/srcpkgs/xlunch/patches/ldflags.patch b/srcpkgs/xlunch/patches/ldflags.patch
deleted file mode 100644
index 2d547fae6d6e70..00000000000000
--- a/srcpkgs/xlunch/patches/ldflags.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/xlunch/patches/musl.patch b/srcpkgs/xlunch/patches/musl.patch
deleted file mode 100644
index cd76c29116e3d7..00000000000000
--- a/srcpkgs/xlunch/patches/musl.patch
+++ /dev/null
@@ -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;
diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index c3e9ed018c476a..9a7658e5a5e3c2 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -1,25 +1,15 @@
# 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
+checksum=594b2f79e0c789b5206b45c41ffd5c16e3b5a96754725286956e39b10261b725
-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
-}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: xlunch: update to 4.7.5
2024-02-24 8:59 [PR PATCH] xlunch: update to 4.7.5 MIvanchev
@ 2024-02-24 9:00 ` MIvanchev
2024-02-24 9:00 ` [PR PATCH] [Updated] " MIvanchev
2024-02-24 9:04 ` MIvanchev
2 siblings, 0 replies; 4+ messages in thread
From: MIvanchev @ 2024-02-24 9:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/48909#issuecomment-1962303913
Comment:
I suggest removing the INSTALL. The file that it creates is not really useful, it's never removed with the package and it prints messages which contradicts the guidelines. It's not that hard to run the genentries script right after installation.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] xlunch: update to 4.7.5
2024-02-24 8:59 [PR PATCH] xlunch: update to 4.7.5 MIvanchev
2024-02-24 9:00 ` MIvanchev
@ 2024-02-24 9:00 ` MIvanchev
2024-02-24 9:04 ` MIvanchev
2 siblings, 0 replies; 4+ messages in thread
From: MIvanchev @ 2024-02-24 9:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages xlunch-update
https://github.com/void-linux/void-packages/pull/48909
xlunch: update to 4.7.5
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (X86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/48909.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xlunch-update-48909.patch --]
[-- Type: text/x-diff, Size: 5844 bytes --]
From d0ca6dea601b88204eceed42ef5fba3a4ee94f89 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Sat, 24 Feb 2024 09:56:46 +0100
Subject: [PATCH] xlunch: update to 4.7.5
---
srcpkgs/xlunch/INSTALL | 33 -----------------------
srcpkgs/xlunch/patches/build.patch | 39 ++++++++++++++++++++++++++++
srcpkgs/xlunch/patches/ldflags.patch | 9 -------
srcpkgs/xlunch/patches/musl.patch | 12 ---------
srcpkgs/xlunch/template | 17 +++---------
5 files changed, 42 insertions(+), 68 deletions(-)
delete mode 100644 srcpkgs/xlunch/INSTALL
create mode 100644 srcpkgs/xlunch/patches/build.patch
delete mode 100644 srcpkgs/xlunch/patches/ldflags.patch
delete mode 100644 srcpkgs/xlunch/patches/musl.patch
diff --git a/srcpkgs/xlunch/INSTALL b/srcpkgs/xlunch/INSTALL
deleted file mode 100644
index 62025c9d583757..00000000000000
--- a/srcpkgs/xlunch/INSTALL
+++ /dev/null
@@ -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
diff --git a/srcpkgs/xlunch/patches/build.patch b/srcpkgs/xlunch/patches/build.patch
new file mode 100644
index 00000000000000..a75fb12ebb0f05
--- /dev/null
+++ b/srcpkgs/xlunch/patches/build.patch
@@ -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;
diff --git a/srcpkgs/xlunch/patches/ldflags.patch b/srcpkgs/xlunch/patches/ldflags.patch
deleted file mode 100644
index 2d547fae6d6e70..00000000000000
--- a/srcpkgs/xlunch/patches/ldflags.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/xlunch/patches/musl.patch b/srcpkgs/xlunch/patches/musl.patch
deleted file mode 100644
index cd76c29116e3d7..00000000000000
--- a/srcpkgs/xlunch/patches/musl.patch
+++ /dev/null
@@ -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;
diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index c3e9ed018c476a..084d0a2eeacffd 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: xlunch: update to 4.7.5
2024-02-24 8:59 [PR PATCH] xlunch: update to 4.7.5 MIvanchev
2024-02-24 9:00 ` MIvanchev
2024-02-24 9:00 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-02-24 9:04 ` MIvanchev
2 siblings, 0 replies; 4+ messages in thread
From: MIvanchev @ 2024-02-24 9:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/48909#issuecomment-1962303913
Comment:
I suggest removing the INSTALL. The file that it creates is not really useful, it's never removed with the package and it prints messages which contradicts the guidelines. It's not that hard to run the genentries script right after installation.
P.S.
I also patched the Makefile in order to use the default install target instead of writing our own.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-24 9:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-24 8:59 [PR PATCH] xlunch: update to 4.7.5 MIvanchev
2024-02-24 9:00 ` MIvanchev
2024-02-24 9:00 ` [PR PATCH] [Updated] " MIvanchev
2024-02-24 9:04 ` MIvanchev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).