From: maybe-one-day-ubermensch <maybe-one-day-ubermensch@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] common/environment/setup/install.sh: add vdesktop
Date: Thu, 19 Aug 2021 23:30:56 +0200 [thread overview]
Message-ID: <20210819213056.8ssr2NAYF2361tk5queimDpCTx1Diiw-CDbABnfmp1Y@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32575@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
There is an updated pull request by maybe-one-day-ubermensch against master on the void-packages repository
https://github.com/maybe-one-day-ubermensch/void-packages vdesktop
https://github.com/void-linux/void-packages/pull/32575
common/environment/setup/install.sh: add vdesktop
Install function for installing `*.desktop` files.
A patch file from https://github.com/void-linux/void-packages/pull/32575.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vdesktop-32575.patch --]
[-- Type: text/x-diff, Size: 9414 bytes --]
From 57d7fcadb72cd440c46964e9e4ef85c7249fe307 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Wed, 18 Aug 2021 22:58:41 -0700
Subject: [PATCH 1/8] common/environment/setup/install.sh: add vdesktop
Install function for installing `*.desktop` files.
---
Manual.md | 6 ++++++
common/environment/setup/install.sh | 13 ++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Manual.md b/Manual.md
index 4316363f66c4..67ff280cb66a 100644
--- a/Manual.md
+++ b/Manual.md
@@ -310,6 +310,12 @@ The following functions are defined by `xbps-src` and can be used on any templat
- `foo.1.gz` -> `${DESTDIR}/usr/share/man/man1/foo.1`
- `foo.1.bz2` -> `${DESTDIR}/usr/share/man/man1/foo.1`
+- *vdesktop()* `vdesktop <file> [<name>]`
+
+ Installs `file` into `usr/share/applications` in the pkg
+ `$DESTDIR`. The optional 2nd argument can be used to change the
+ `file name`.
+
- *vdoc()* `vdoc <file> [<name>]`
Installs `file` into `usr/share/doc/<pkgname>` in the pkg
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index a6b68435eb43..4e697301e68f 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -13,7 +13,7 @@ _noglob_helper() {
}
# Apply _noglob to v* commands
-for cmd in vinstall vcopy vcompletion vmove vmkdir vbin vman vdoc vconf vsconf vlicense vsv; do
+for cmd in vinstall vcopy vcompletion vmove vmkdir vbin vman vdesktop vdoc vconf vsconf vlicense vsv; do
alias ${cmd}="set -f; _noglob_helper _${cmd}"
done
@@ -98,6 +98,17 @@ _vman() {
return 1
}
+_vdesktop() {
+ local file="$1" targetfile="$2"
+
+ if [ $# -lt 1 ]; then
+ msg_red "$pkgver: vdesktop: 1 argument expected: <file>\n"
+ return 1
+ fi
+
+ vinstall "$file" 644 "usr/share/applications" "$targetfile"
+}
+
_vdoc() {
local file="$1" targetfile="$2"
From 2f7822bdae1339fe6f2e230fef47aa04fab4bb56 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 19 Aug 2021 13:44:45 -0700
Subject: [PATCH 2/8] gamehub: `vdesktop`ify
[ci-skip]
---
srcpkgs/gamehub/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index ccbf98b53483..06775b88cfb2 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -1,7 +1,7 @@
# Template file for 'gamehub'
pkgname=gamehub
version=0.16.0
-revision=1
+revision=2
wrksrc="GameHub-${version}-1-master"
build_style=meson
hostmakedepends="glib-devel pkg-config vala"
@@ -16,5 +16,5 @@ distfiles="https://github.com/tkashkin/GameHub/archive/${version}-1-master.tar.g
checksum=4244c914d7427933727ec0611886720b9325c4d4a852e0e8c283f6331ebd30e2
post_install() {
- vinstall data/com.github.tkashkin.gamehub.desktop.in 644 usr/share/applications com.github.tkashkin.gamehub.desktop
+ vdesktop data/com.github.tkashkin.gamehub.desktop.in com.github.tkashkin.gamehub.desktop
}
From 6e077827e339516bab5870896e1caaf503f4ec12 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 19 Aug 2021 13:50:59 -0700
Subject: [PATCH 3/8] vivaldi: `vdesktop`ify
[ci-skip]
---
srcpkgs/vivaldi/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 377b0f008dbb..431bcab96e9c 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,7 +1,7 @@
# Template file for 'vivaldi'
pkgname=vivaldi
version=4.0.2312.41
-revision=1
+revision=2
_release=1
archs="x86_64"
hostmakedepends="curl python3-html2text python3-setuptools"
@@ -26,8 +26,7 @@ do_extract() {
}
do_install() {
- vinstall usr/share/applications/vivaldi-stable.desktop 0644 \
- usr/share/applications
+ vdesktop usr/share/applications/vivaldi-stable.desktop
vmkdir opt
vcopy opt/vivaldi opt
From 49af9ddb77008ba7efd756f0da7f7813c9110a94 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 19 Aug 2021 13:55:43 -0700
Subject: [PATCH 4/8] adobe-flash-plugin: `vdesktop`ify
[ci-skip]
---
srcpkgs/adobe-flash-plugin/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index df9f3f997a59..0bbdf591fc09 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'adobe-flash-plugin'
pkgname=adobe-flash-plugin
version=32.0.0.465
-revision=1
+revision=2
depends="curl hicolor-icon-theme desktop-file-utils"
short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
maintainer="mkf <makefile@riseup.net>"
@@ -45,8 +45,7 @@ do_install() {
vinstall usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
644 usr/share/icons/hicolor/${i}/apps
done
- vinstall usr/share/applications/flash-player-properties.desktop 644 \
- usr/share/applications
+ vdesktop usr/share/applications/flash-player-properties.desktop
vinstall usr/share/kde4/services/kcm_adobe_flash_player.desktop 644 \
usr/share/kde4/services
vlicense "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_eula##*/}" LICENSE.pdf
From ce7057c07ca6a31628b61f77a6b5a1c9280484a6 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 19 Aug 2021 13:58:05 -0700
Subject: [PATCH 5/8] openlierox: `vdesktop`ify
[ci-skip]
---
srcpkgs/openlierox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template
index 7ae0e22f2d3d..323ecb590e5d 100644
--- a/srcpkgs/openlierox/template
+++ b/srcpkgs/openlierox/template
@@ -1,7 +1,7 @@
# Template file for 'openlierox'
pkgname=openlierox
version=0.58.rc5
-revision=2
+revision=3
wrksrc=OpenLieroX
build_style=cmake
configure_args="-DSYSTEM_DATA_DIR=/usr/share -DDEBUG=OFF -DBREAKPAD=OFF"
@@ -34,7 +34,7 @@ do_install() {
vbin build/bin/openlierox
vman doc/openlierox.6
vinstall share/OpenLieroX.svg 644 usr/share/pixmaps
- vinstall share/openlierox-openlierox.desktop 644 usr/share/applications openlierox.desktop
+ vdesktop share/openlierox-openlierox.desktop openlierox.desktop
vmkdir usr/share/OpenLieroX
vcopy share/gamedir/* usr/share/OpenLieroX
find ${DESTDIR}/usr/share/OpenLieroX -type d -exec chmod 755 "{}" \;
From dc10f2a063f80755d066eb7c2c95d7d12234d83e Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 19 Aug 2021 14:00:44 -0700
Subject: [PATCH 6/8] kobodeluxe: `vdesktop`ify
[ci-skip]
---
srcpkgs/kobodeluxe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 94e3e8329728..a83c38cbfa82 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -1,7 +1,7 @@
# Template file for 'kobodeluxe'
pkgname=kobodeluxe
version=0.5.1
-revision=3
+revision=4
wrksrc="KoboDeluxe-${version}"
build_style=gnu-configure
configure_args="--sharedstatedir=/var/games"
@@ -19,7 +19,7 @@ post_extract() {
bsdtar xf icons.tar.gz
}
post_install() {
- vinstall icons/KDE/kobo-deluxe.desktop 644 usr/share/applications kobodl.desktop
+ vdesktop icons/KDE/kobo-deluxe.desktop kobodl.desktop
for _size in 16 22 32 48 64 128; do
vinstall icons/KDE/icons/${_size}x${_size}/kobodl.png 644 \
usr/share/icons/hicolor/${_size}x${_size}/apps
From 521dd0210012517aa55753d490e3d43e750adce2 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 19 Aug 2021 14:14:50 -0700
Subject: [PATCH 7/8] lf: `vdesktop`ify
[ci-skip]
---
srcpkgs/lf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index ad60a7a2ec31..b4c6fdbe3c99 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
# Template file for 'lf'
pkgname=lf
version=r24
-revision=1
+revision=2
build_style=go
go_import_path="github.com/gokcehan/${pkgname}"
go_ldflags="-X main.gVersion=$version"
@@ -19,5 +19,5 @@ post_install() {
vcompletion etc/lf.fish fish
vcompletion etc/lf.zsh zsh
vcompletion etc/lf.bash bash
- vinstall lf.desktop 644 usr/share/applications
+ vdesktop lf.desktop
}
From 529640284ab6d19357d27023b12dbb1a4f728c20 Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Thu, 19 Aug 2021 14:17:12 -0700
Subject: [PATCH 8/8] mediainfo: `vdesktop`ify
[ci-skip]
---
srcpkgs/mediainfo/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
index c18d68247cc1..5e411044ee10 100644
--- a/srcpkgs/mediainfo/template
+++ b/srcpkgs/mediainfo/template
@@ -1,7 +1,7 @@
# Template file for 'mediainfo'
pkgname=mediainfo
version=21.03
-revision=1
+revision=2
wrksrc=MediaInfo
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="automake libtool pkg-config"
@@ -38,8 +38,7 @@ do_install() {
usr/share/icons/hicolor/scalable/apps mediainfo.svg
vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
usr/share/pixmaps mediainfo-gui.png
- vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
- usr/share/applications
+ vdesktop ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop
}
mediainfo-cli_package() {
next prev parent reply other threads:[~2021-08-19 21:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 6:18 [PR PATCH] " maybe-one-day-ubermensch
2021-08-19 20:01 ` [PR REVIEW] " ericonr
2021-08-19 20:34 ` maybe-one-day-ubermensch
2021-08-19 20:34 ` maybe-one-day-ubermensch
2021-08-19 20:35 ` maybe-one-day-ubermensch
2021-08-19 20:35 ` maybe-one-day-ubermensch
2021-08-19 21:30 ` maybe-one-day-ubermensch [this message]
2021-08-19 21:33 ` [PR PATCH] [Updated] " maybe-one-day-ubermensch
2021-08-19 23:26 ` ericonr
2021-08-20 0:19 ` [PR PATCH] [Updated] " maybe-one-day-ubermensch
2021-08-20 0:19 ` maybe-one-day-ubermensch
2022-06-02 2:14 ` github-actions
2022-06-17 2:13 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819213056.8ssr2NAYF2361tk5queimDpCTx1Diiw-CDbABnfmp1Y@z \
--to=maybe-one-day-ubermensch@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).