From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Kn prefix remove noarch
Date: Sun, 22 Nov 2020 03:58:46 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26594@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages kn-prefix-remove-noarch
https://github.com/void-linux/void-packages/pull/26594
Kn prefix remove noarch
A patch file from https://github.com/void-linux/void-packages/pull/26594.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kn-prefix-remove-noarch-26594.patch --]
[-- Type: text/x-diff, Size: 13084 bytes --]
From f7d93cecce422e00724525ab1bf2551226ddc0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 01/11] kadu: remove noarch
---
srcpkgs/kadu-data | 1 -
srcpkgs/kadu/template | 21 +++------------------
2 files changed, 3 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/kadu-data
diff --git a/srcpkgs/kadu-data b/srcpkgs/kadu-data
deleted file mode 120000
index c6b22664110..00000000000
--- a/srcpkgs/kadu-data
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
index da8c8c086ff..8587198ae71 100644
--- a/srcpkgs/kadu/template
+++ b/srcpkgs/kadu/template
@@ -1,7 +1,7 @@
# Template file for 'kadu'
pkgname=kadu
version=4.3
-revision=5
+revision=6
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
-DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -19,7 +19,7 @@ makedepends="libao-devel libsndfile-devel libarchive-devel
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl
+depends="hicolor-icon-theme qca-qt5-ossl
$(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
$(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
$(vopt_if tds qt5-plugin-tds)"
@@ -29,6 +29,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
homepage="https://sourceforge.net/projects/kadu/"
distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
+replaces="kadu-data>=0"
build_options="mysql odbc pgsql sqlite tds"
build_options_default="sqlite"
@@ -53,22 +54,6 @@ pre_configure() {
-e "s;word_fix$;;"
}
-kadu-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/icons
- vmove "usr/share/kadu/configuration/*.ui"
- vmove usr/share/kadu/themes
- vmove usr/share/kadu/scripts
- vmove usr/share/kadu/syntax
- vmove "usr/share/kadu/plugins/*.desc"
- vmove "usr/share/kadu/plugins/configuration/*.ui"
- vmove usr/share/kadu/translations
- vmove usr/share/kadu/plugins/data
- vmove usr/share/kadu/plugins/translations
- }
-}
kadu-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
From 5db4bb917500032ead27900a2f6e1cf82fc3053c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH 02/11] kobodeluxe: remove noarch
---
srcpkgs/kobodeluxe-data | 1 -
srcpkgs/kobodeluxe/template | 14 +++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/kobodeluxe-data
diff --git a/srcpkgs/kobodeluxe-data b/srcpkgs/kobodeluxe-data
deleted file mode 120000
index a6b8725b11b..00000000000
--- a/srcpkgs/kobodeluxe-data
+++ /dev/null
@@ -1 +0,0 @@
-kobodeluxe
\ No newline at end of file
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 60539b09390..3de0311b8e5 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -1,19 +1,19 @@
# Template file for 'kobodeluxe'
pkgname=kobodeluxe
version=0.5.1
-revision=2
+revision=3
wrksrc="KoboDeluxe-${version}"
build_style=gnu-configure
configure_args="--sharedstatedir=/var/games"
hostmakedepends="pkg-config"
makedepends="SDL_image-devel"
-depends="${pkgname}-data"
short_desc="Space shooter in 2D"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://olofson.net/kobodl"
distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
checksum=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
+replaces="kobodeluxe-data>=0"
post_extract() {
bsdtar xf icons.tar.gz
@@ -26,11 +26,3 @@ post_install() {
done
vinstall icons/KDE/icons/32x32/kobodl.png 644 usr/share/pixmaps
}
-
-kobodeluxe-data_package() {
- short_desc+=" - data files"
- archs=noarch
- pkg_install() {
- vmove usr/share/kobo-deluxe
- }
-}
From 71885973b48770c2f04540b6d1a161c78383492f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 03/11] kpcli: remove noarch
---
srcpkgs/kpcli/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/kpcli/template b/srcpkgs/kpcli/template
index 3201920ce88..193c227462e 100644
--- a/srcpkgs/kpcli/template
+++ b/srcpkgs/kpcli/template
@@ -1,8 +1,7 @@
# Template file for 'kpcli'
pkgname=kpcli
version=3.3
-revision=1
-archs=noarch
+revision=2
build_style=fetch
depends="perl perl-Crypt-Rijndael perl-Sort-Naturally perl-Term-ReadKey perl-Term-ShellUI perl-File-KeePass perl-Clone perl-Term-ReadLine-Gnu perl-XML-Parser"
short_desc="KeePass Command Line Interface"
From df10cd51f5a8741d5dfbf00e44c741e799b55132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:25:10 +0700
Subject: [PATCH 04/11] kupfer: remove noarch
---
srcpkgs/kupfer/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index 03e80e9fdc9..6cf2cfb515c 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,11 +1,9 @@
# Template file for 'kupfer'
pkgname=kupfer
version=319
-revision=2
-archs=noarch
-build_style=waf3
+revision=3
wrksrc="${pkgname}-v${version}"
-python_version=3
+build_style=waf3
pycompile_dirs="usr/share/kupfer/kupfer"
configure_args="--no-update-mime --no-update-icon-cache"
hostmakedepends="intltool python3-docutils"
@@ -17,3 +15,4 @@ license="GPL-3.0-or-later"
homepage="https://kupferlauncher.github.io/"
distfiles="https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"
checksum=22357233984a6588a9f9743002363af38ea63b5c2684af487693a13c42973d31
+python_version=3
From 1b6ba5f7567c2dd74e9d996667f7cc8082eac13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 05/11] neofetch: remove noarch
---
srcpkgs/neofetch/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/neofetch/template b/srcpkgs/neofetch/template
index 60862481a28..1529e9ceef6 100644
--- a/srcpkgs/neofetch/template
+++ b/srcpkgs/neofetch/template
@@ -1,8 +1,7 @@
# Template file for 'neofetch'
pkgname=neofetch
version=7.1.0
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
depends="bash"
short_desc="Simple system information script"
From 50d3599ad062e42b309fef8a2eafeb012de098e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 06/11] netbsd-wtf: remove noarch
---
srcpkgs/netbsd-wtf/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template
index 87708e08847..be1b0c28c5c 100644
--- a/srcpkgs/netbsd-wtf/template
+++ b/srcpkgs/netbsd-wtf/template
@@ -1,13 +1,12 @@
# Template file for 'netbsd-wtf'
pkgname=netbsd-wtf
version=20180621
-revision=2
+revision=3
_commit=b1e5be48e340146f63b174cc14fef892a783168b
-archs=noarch
build_style=gnu-makefile
-short_desc="The NetBSD's wtf(6) utility"
+short_desc="NetBSD's wtf(6) utility"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
homepage="https://www.netbsd.org"
distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz"
checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7
From 9de27439be8b88fb0a54ef0d589c576684c8b7d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 07/11] netdata: remove noarch
---
srcpkgs/netdata/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 205d7985614..f6386f3e519 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,7 +1,7 @@
# Template file for 'netdata'
pkgname=netdata
version=1.24.0
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=gnu-configure
configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
@@ -53,7 +53,6 @@ post_install() {
netdata-plugins-nodejs_package() {
short_desc+=" - NodeJS Plugins"
depends="${sourcepkg}>=${version}_${revision} virtual?nodejs-runtime"
- archs=noarch
pkg_install() {
vmove usr/libexec/netdata/plugins.d/node.d.plugin
vmove usr/libexec/netdata/node.d
@@ -63,7 +62,6 @@ netdata-plugins-nodejs_package() {
netdata-plugins-python_package() {
short_desc+=" - Python Plugins"
depends="${sourcepkg}>=${version}_${revision} python3"
- archs=noarch
pkg_install() {
vmove usr/libexec/netdata/plugins.d/python.d.plugin
vmove usr/libexec/netdata/python.d
From cd871df08fa958d51f95d30c056760ddecbe61e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:24 +0700
Subject: [PATCH 08/11] netsurf-buildsystem: remove noarch
---
srcpkgs/netsurf-buildsystem/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/netsurf-buildsystem/template b/srcpkgs/netsurf-buildsystem/template
index b65615497e2..9bb7863b9c6 100644
--- a/srcpkgs/netsurf-buildsystem/template
+++ b/srcpkgs/netsurf-buildsystem/template
@@ -1,8 +1,7 @@
# Template file for 'netsurf-buildsystem'
pkgname=netsurf-buildsystem
version=1.9
-revision=1
-archs=noarch
+revision=2
wrksrc="${pkgname#netsurf-}-${version}"
short_desc="Netsurf buildsystem"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8557d69aa76173434636618fd41279be879af8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 09/11] novaboot: remove noarch
---
srcpkgs/novaboot/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/novaboot/template b/srcpkgs/novaboot/template
index f93c1ebe23b..78372f9230f 100644
--- a/srcpkgs/novaboot/template
+++ b/srcpkgs/novaboot/template
@@ -1,8 +1,7 @@
# Template file for 'novaboot'
pkgname=novaboot
version=20191023
-revision=1
-archs=noarch
+revision=2
build_style=gnu-makefile
hostmakedepends="perl"
makedepends="perl"
From 1763de150c92690227592f5910f2c27f7324f3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 10/11] ntp: remove noarch
---
srcpkgs/ntp/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index c1cd814ea9d..a2cc0f62441 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
@@ -42,7 +42,6 @@ post_install() {
ntp-perl_package() {
depends="ntp>=$version perl"
- archs=noarch
short_desc+=" - perl scripts"
pkg_install() {
vmove usr/bin/ntp-wait
From 2eaa761d5e37ad097bacbf31363b5439e14c4825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 22 Nov 2020 09:26:25 +0700
Subject: [PATCH 11/11] num-utils: remove noarch
---
srcpkgs/num-utils/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/num-utils/template b/srcpkgs/num-utils/template
index d7b542fa7af..a0103d6e4a6 100644
--- a/srcpkgs/num-utils/template
+++ b/srcpkgs/num-utils/template
@@ -1,16 +1,15 @@
# Template file for 'num-utils'
pkgname=num-utils
version=0.5
-revision=1
+revision=2
hostmakedepends="perl"
depends="perl"
short_desc="Programs for dealing with numbers from the Unix command line"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://suso.suso.org/xulu/Num-utils"
distfiles="http://suso.suso.org/programs/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
checksum=03592760fc7844492163b14ddc9bb4e4d6526e17b468b5317b4a702ea7f6c64e
-archs=noarch
post_extract() {
sed -i 's/\$new_number\^\$1/$new_number**$1/g' numprocess
next reply other threads:[~2020-11-22 2:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-22 2:58 sgn [this message]
2020-11-22 6:25 ` [PR PATCH] [Updated] " sgn
2020-11-23 11:50 ` [PR PATCH] [Merged]: " sgn
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26594@inbox.vuxu.org \
--to=sgn@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).