Sync with upstream (again)
This commit is contained in:
Kevin Figueroa
parent
53c39cef30
commit
d05106ae6f
4 changed files with 108 additions and 54 deletions
Manual.md
common
37
Manual.md
37
Manual.md
|
|
@ -316,7 +316,7 @@ The following functions are defined by `xbps-src` and can be used on any templat
|
|||
`${FILESDIR}/$service`, containing `exec vlogger -t $service -p $facility`.
|
||||
if a second argument is not specified, the `daemon` facility is used.
|
||||
For more information about `vlogger` and available values for the facility,
|
||||
see [vlogger(1)](https://man.voidlinux.org/vlogger.1).
|
||||
see [vlogger(8)](https://man.voidlinux.org/vlogger.8).
|
||||
|
||||
- *vsed()* `vsed -i <file> -e <regex>`
|
||||
|
||||
|
|
@ -335,6 +335,29 @@ The following functions are defined by `xbps-src` and can be used on any templat
|
|||
it will default to `pkgname`. The `shell` argument can be one of `bash`,
|
||||
`fish` or `zsh`.
|
||||
|
||||
- *vextract()* `[-C <target directory>] [--no-strip-components|--strip-components=<n>] <file>`
|
||||
|
||||
Extracts `file` to `target directory` with `n` directory components stripped. If
|
||||
`target directory` not specified, defaults to the working directory. If
|
||||
`--strip-components` or `--no-strip-components` is not specified, defaults to
|
||||
`--strip-components=1`.
|
||||
|
||||
- *vsrcextract()* `[-C <target directory>] [--no-strip-components|--strip-components=<n>] <file>`
|
||||
|
||||
Extracts `$XBPS_SRCDISTDIR/$pkgname-$version/<file>` to `target directory`
|
||||
with `n` directory components stripped. If `target directory` not specified,
|
||||
defaults to the working directory. If `--strip-components` or `--no-strip-components`
|
||||
is not specified, defaults to `--strip-components=1`.
|
||||
|
||||
This is useful when used in conjunction with `skip_extraction` and for submodule distfiles.
|
||||
|
||||
- *vsrccopy()* `<file>... <target>`
|
||||
|
||||
Copies `file`s from `$XBPS_SRCDISTDIR/$pkgname-$version/` into the `target` directory,
|
||||
creating `target` if it does not exist.
|
||||
|
||||
This is useful when used in conjunction with `skip_extraction`.
|
||||
|
||||
> Shell wildcards must be properly quoted, Example: `vmove "usr/lib/*.a"`.
|
||||
|
||||
<a id="global_vars"></a>
|
||||
|
|
@ -736,9 +759,9 @@ built for, available architectures can be found under `common/cross-profiles`.
|
|||
In general, `archs` should only be set if the upstream software explicitly targets
|
||||
certain architectures or there is a compelling reason why the software should not be
|
||||
available on some supported architectures.
|
||||
Prepending pattern with tilde means disallowing build on indicated archs.
|
||||
First matching pattern is taken to allow/deny build. When no pattern matches,
|
||||
package is build if last pattern includes tilde.
|
||||
Prepending a pattern with a tilde means disallowing build on the indicated archs.
|
||||
The first matching pattern is taken to allow/deny build. When no pattern matches,
|
||||
the package is built if the last pattern includes a tilde.
|
||||
Examples:
|
||||
|
||||
```
|
||||
|
|
@ -1227,7 +1250,7 @@ package accordingly. Additionally, the following functions are available:
|
|||
- *vopt_feature()* `vopt_feature <option> <property>`
|
||||
|
||||
Same as `vopt_bool`, but uses `-D<property=enabled` and
|
||||
`-D<property>=disabled` respectively.
|
||||
`-D<property>=disabled` respectively.
|
||||
|
||||
The following example shows how to change a source package that uses GNU
|
||||
configure to enable a new build option to support PNG images:
|
||||
|
|
@ -1607,6 +1630,8 @@ In most cases version is inferred from shebang, install path or build style.
|
|||
Only required for some multi-language
|
||||
applications (e.g., the application is written in C while the command is
|
||||
written in Python) or just single Python file ones that live in `/usr/bin`.
|
||||
If `python_version` is set to `ignore`, python-containing shebangs will not be rewritten.
|
||||
Use this only if a package should not be using a system version of python.
|
||||
|
||||
Also, a set of useful variables are defined to use in the templates:
|
||||
|
||||
|
|
@ -2159,7 +2184,7 @@ otherwise the `debug` packages won't have debugging symbols.
|
|||
<a id="contributing"></a>
|
||||
### Contributing via git
|
||||
|
||||
To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
|
||||
To get started, [fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
|
||||
|
||||
$ git clone git@github.com:<user>/void-packages.git
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,15 @@ unalias -a
|
|||
|
||||
# disable wildcards helper
|
||||
_noglob_helper() {
|
||||
set +f
|
||||
"$@"
|
||||
set +f
|
||||
IFS= "$@"
|
||||
}
|
||||
|
||||
# Apply _noglob to v* commands
|
||||
for cmd in vinstall vcopy vcompletion vmove vmkdir vbin vman vdoc vconf vsconf vlicense vsv; do
|
||||
alias ${cmd}="set -f; _noglob_helper _${cmd}"
|
||||
# intentionally expanded when defined
|
||||
# shellcheck disable=SC2139
|
||||
alias ${cmd}="set -f; _noglob_helper _${cmd}"
|
||||
done
|
||||
|
||||
_vsv() {
|
||||
|
|
@ -24,6 +26,8 @@ _vsv() {
|
|||
local svdir="${PKGDESTDIR}/etc/sv/${service}"
|
||||
|
||||
if [ $# -lt 1 ] || [ $# -gt 2 ]; then
|
||||
# pkgver is defined in common/xbps-src/shutils/commmon.sh
|
||||
# shellcheck disable=SC2154
|
||||
msg_red "$pkgver: vsv: up to 2 arguments expected: <service> [<log facility>]\n"
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -34,26 +38,26 @@ _vsv() {
|
|||
|
||||
vmkdir etc/sv
|
||||
vcopy "${FILESDIR}/$service" etc/sv
|
||||
if [ ! -L $svdir/run ]; then
|
||||
grep -Fq 'exec 2>&1' $svdir/run || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n"
|
||||
chmod 755 $svdir/run
|
||||
if [ ! -L "$svdir/run" ]; then
|
||||
grep -Fq 'exec 2>&1' "$svdir/run" || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n"
|
||||
chmod 755 "$svdir/run"
|
||||
fi
|
||||
if [ -e $svdir/finish ] && [ ! -L $svdir/finish ]; then
|
||||
chmod 755 $svdir/finish
|
||||
if [ -e "$svdir/finish" ] && [ ! -L "$svdir/finish" ]; then
|
||||
chmod 755 "$svdir/finish"
|
||||
fi
|
||||
ln ${LN_OPTS} /run/runit/supervise.${service} $svdir/supervise
|
||||
if [ -d $svdir/log ] || [ -L $svdir/log ]; then
|
||||
ln ${LN_OPTS} "/run/runit/supervise.${service}" "$svdir/supervise"
|
||||
if [ -d "$svdir/log" ] || [ -L "$svdir/log" ]; then
|
||||
msg_warn "$pkgver: vsv: overriding default log service\n"
|
||||
else
|
||||
mkdir $svdir/log
|
||||
cat <<-EOF > $svdir/log/run
|
||||
mkdir "$svdir/log"
|
||||
cat <<-EOF > "$svdir/log/run"
|
||||
#!/bin/sh
|
||||
exec vlogger -t $service -p $facility
|
||||
EOF
|
||||
fi
|
||||
ln ${LN_OPTS} /run/runit/supervise.${service}-log $svdir/log/supervise
|
||||
if [ -e $svdir/log/run ] && [ ! -L $svdir/log/run ]; then
|
||||
chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
|
||||
ln ${LN_OPTS} "/run/runit/supervise.${service}-log" "$svdir/log/supervise"
|
||||
if [ -e "$svdir/log/run" ] && [ ! -L "$svdir/log/run" ]; then
|
||||
chmod 755 "${PKGDESTDIR}/etc/sv/${service}/log/run"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -120,6 +124,8 @@ _vdoc() {
|
|||
return 1
|
||||
fi
|
||||
|
||||
# pkgname is defined in the package
|
||||
# shellcheck disable=SC2154
|
||||
vinstall "$file" 644 "usr/share/doc/${pkgname}" "$targetfile"
|
||||
}
|
||||
|
||||
|
|
@ -175,9 +181,9 @@ _vinstall() {
|
|||
fi
|
||||
|
||||
if [ -z "$targetfile" ]; then
|
||||
install -Dm${mode} "${file}" "${PKGDESTDIR}/${targetdir}/${file##*/}"
|
||||
install -Dm"${mode}" "${file}" "${PKGDESTDIR}/${targetdir}/${file##*/}"
|
||||
else
|
||||
install -Dm${mode} "${file}" "${PKGDESTDIR}/${targetdir}/${targetfile##*/}"
|
||||
install -Dm"${mode}" "${file}" "${PKGDESTDIR}/${targetdir}/${targetfile##*/}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -193,7 +199,9 @@ _vcopy() {
|
|||
return 1
|
||||
fi
|
||||
|
||||
cp -a $files ${PKGDESTDIR}/${targetdir}
|
||||
# intentionally unquoted for globbing
|
||||
# shellcheck disable=SC2086
|
||||
cp -a $files "${PKGDESTDIR}/${targetdir}"
|
||||
}
|
||||
|
||||
_vmove() {
|
||||
|
|
@ -219,13 +227,17 @@ _vmove() {
|
|||
done
|
||||
|
||||
if [ -z "${_targetdir}" ]; then
|
||||
[ ! -d ${PKGDESTDIR} ] && install -d ${PKGDESTDIR}
|
||||
mv ${DESTDIR}/$files ${PKGDESTDIR}
|
||||
[ ! -d "${PKGDESTDIR}" ] && install -d "${PKGDESTDIR}"
|
||||
# intentionally unquoted for globbing
|
||||
# shellcheck disable=SC2086
|
||||
mv "${DESTDIR}"/$files "${PKGDESTDIR}"
|
||||
else
|
||||
if [ ! -d ${PKGDESTDIR}/${_targetdir} ]; then
|
||||
install -d ${PKGDESTDIR}/${_targetdir}
|
||||
if [ ! -d "${PKGDESTDIR}/${_targetdir}" ]; then
|
||||
install -d "${PKGDESTDIR}/${_targetdir}"
|
||||
fi
|
||||
mv ${DESTDIR}/$files ${PKGDESTDIR}/${_targetdir}
|
||||
# intentionally unquoted for globbing
|
||||
# shellcheck disable=SC2086
|
||||
mv "${DESTDIR}"/$files "${PKGDESTDIR}/${_targetdir}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -243,9 +255,9 @@ _vmkdir() {
|
|||
fi
|
||||
|
||||
if [ -z "$mode" ]; then
|
||||
install -d ${PKGDESTDIR}/${dir}
|
||||
install -d "${PKGDESTDIR}/${dir}"
|
||||
else
|
||||
install -dm${mode} ${PKGDESTDIR}/${dir}
|
||||
install -dm"${mode}" "${PKGDESTDIR}/${dir}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -119,10 +119,16 @@ _EOF
|
|||
#
|
||||
# Handle binfmts trigger
|
||||
#
|
||||
if [ -n "${binfmts}" ]; then
|
||||
if [ -n "${binfmts}" ] || [ -d "${PKGDESTDIR}/usr/share/binfmts" ]; then
|
||||
_add_trigger binfmts
|
||||
fi
|
||||
if [ -n "${binfmts}" ]; then
|
||||
echo "export binfmts=\"${binfmts}\"" >> $tmpf
|
||||
fi
|
||||
if [ -d "${PKGDESTDIR}/usr/share/binfmts" ]; then
|
||||
_import_binfmts="$(find "${PKGDESTDIR}/usr/share/binfmts" -type f -printf '%f\n')"
|
||||
echo "export import_binfmts=\"${_import_binfmts}\"" >> $tmpf
|
||||
fi
|
||||
#
|
||||
# Handle GNU Info files.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
|
|||
libMAC.so.6 libMAC-5.28_1
|
||||
libmad.so.0 libmad-0.15.1b_1
|
||||
libmatroska.so.7 libmatroska-1.6.0_1
|
||||
libmatrix_client.so.0.9.2 mtxclient-0.9.2_1
|
||||
libmatrix_client.so.0.10.0 mtxclient-0.10.0_1
|
||||
libebml.so.5 libebml-1.4.0_1
|
||||
libdvdread.so.8 libdvdread-6.1.1_1
|
||||
libdvdnav.so.4 libdvdnav-4.1.3_1
|
||||
|
|
@ -1023,6 +1023,7 @@ libparserutils.so.0 libparserutils-0.1.1_1
|
|||
libwapcaplet.so.0 libwapcaplet-0.1.0_1
|
||||
libcss.so.0 libcss-0.1.1_1
|
||||
libhubbub.so.0 libhubbub-0.1.1_1
|
||||
libhs.so.5 vectorscan-5.4.11_1
|
||||
liblutok.so.3 lutok-0.4_1
|
||||
libmtdev.so.1 mtdev-1.1.2_1
|
||||
libcryptsetup.so.12 libcryptsetup-2.3.4_2
|
||||
|
|
@ -1111,9 +1112,9 @@ libmowgli-2.so.0 libmowgli-2.1.3_8
|
|||
libgts-0.7.so.5 gts-0.7.6_1
|
||||
libguess.so.1 libguess-1.1_1
|
||||
libaudcore.so.5 audacious-base-4.3.1_1
|
||||
libaudgui.so.5 audacious-base-4.3.1_1
|
||||
libaudgui.so.6 audacious-base-4.3.1_1
|
||||
libaudtag.so.3 audacious-base-4.3.1_1
|
||||
libaudqt.so.2 audacious-base-4.3.1_1
|
||||
libaudqt.so.3 audacious-base-4.3.1_1
|
||||
libgstreamer-1.0.so.0 gstreamer1-1.0.0_1
|
||||
libgstbase-1.0.so.0 gstreamer1-1.0.0_1
|
||||
libgstcontroller-1.0.so.0 gstreamer1-1.0.0_1
|
||||
|
|
@ -1311,7 +1312,7 @@ librumpdev_audio.so.0 netbsd-rumpkernel-20140526_3
|
|||
librumpclient.so.0 netbsd-rumpkernel-20140526_3
|
||||
libdotconf.so.0 dotconf-1.3_1
|
||||
libspeechd.so.2 speech-dispatcher-0.8_1
|
||||
libre2.so.10 re2-2023.03.01_1
|
||||
libre2.so.11 re2-2024.06.01_1
|
||||
libminizip.so.1 minizip-1.2.7_1
|
||||
libsrtp2.so.1 libsrtp-2.1.0_1
|
||||
libjsoncpp.so.25 jsoncpp-1.9.5_1
|
||||
|
|
@ -1586,6 +1587,14 @@ libuwac0.so.0 libfreerdp-2.2.0_3
|
|||
libfreerdp-server2.so.2 libfreerdp-server-2.4.0_1
|
||||
libfreerdp-shadow-subsystem2.so.2 libfreerdp-server-2.4.0_1
|
||||
libfreerdp-shadow2.so.2 libfreerdp-server-2.4.0_1
|
||||
libfreerdp-client3.so.3 libfreerdp3-3.5.1_1
|
||||
libfreerdp-server-proxy3.so.3 libfreerdp3-server-3.5.1_1
|
||||
libfreerdp-server3.so.3 libfreerdp3-server-3.5.1_1
|
||||
libfreerdp-shadow-subsystem3.so.3 libfreerdp3-server-3.5.1_1
|
||||
libfreerdp-shadow3.so.3 libfreerdp3-server-3.5.1_1
|
||||
libfreerdp3.so.3 libfreerdp3-3.5.1_1
|
||||
libwinpr-tools3.so.3 libfreerdp3-3.5.1_1
|
||||
libwinpr3.so.3 libfreerdp3-3.5.1_1
|
||||
libcppunit-1.15.so.1 libcppunit-1.15.1_1
|
||||
libcalc.so.2.14.3.5 libcalc-2.14.3.5_1
|
||||
libcustcalc.so.2.14.3.5 libcalc-2.14.3.5_1
|
||||
|
|
@ -1940,6 +1949,7 @@ libQt6Xdg.so.4 libqtxdg-4.0.0_1
|
|||
libQt6XdgIconLoader.so.4 libqtxdg-4.0.0_1
|
||||
libqwt-qt5.so.6.2 qwt-6.2.0_2
|
||||
libqwt-qt6.so.6.2 qwt-qt6-6.2.0_2
|
||||
libKF6BreezeIcons.so.6 breeze-icons-6.3.0_1
|
||||
libKF6Archive.so.6 kf6-karchive-6.0.0_1
|
||||
libKF6Attica.so.6 kf6-attica-6.0.0_1
|
||||
libKF6AuthCore.so.6 kf6-kauth-6.0.0_1
|
||||
|
|
@ -2723,22 +2733,22 @@ libxdo.so.3 xdotool-3.20150503.1_1
|
|||
libabigail.so.4 libabigail-2.5_1
|
||||
libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
|
||||
libgnome-games-support-2.so.4 libgnome-games-support2-2.0.0_1
|
||||
libKDevCMakeCommon.so.512 kdevelop-23.08.2_1
|
||||
libKDevClangPrivate.so.512 kdevelop-23.08.2_1
|
||||
libKDevCompileAnalyzerCommon.so.512 kdevelop-23.08.2_1
|
||||
libKDevelopSessionsWatch.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformDebugger.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformDocumentation.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformInterfaces.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformLanguage.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformOutputView.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformProject.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformSerialization.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformShell.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformSublime.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformTests.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformUtil.so.512 kdevelop-23.08.2_1
|
||||
libKDevPlatformVcs.so.512 kdevelop-23.08.2_1
|
||||
libKDevCMakeCommon.so.514 kdevelop-24.05.1_1
|
||||
libKDevClangPrivate.so.514 kdevelop-24.05.1_1
|
||||
libKDevCompileAnalyzerCommon.so.514 kdevelop-24.05.1_1
|
||||
libKDevelopSessionsWatch.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformDebugger.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformDocumentation.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformInterfaces.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformLanguage.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformOutputView.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformProject.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformSerialization.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformShell.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformSublime.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformTests.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformUtil.so.514 kdevelop-24.05.1_1
|
||||
libKDevPlatformVcs.so.514 kdevelop-24.05.1_1
|
||||
libts.so.0 tslib-1.6_1
|
||||
libobs.so.0 obs-0.14.1_2
|
||||
libobsglad.so.1 obs-28.0.1_1
|
||||
|
|
@ -3531,7 +3541,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
|
|||
libcss_parser_pp.so.0 htmlcxx-0.86_1
|
||||
libcss_parser.so.0 htmlcxx-0.86_1
|
||||
libaom.so.3 libaom-3.4.0_1
|
||||
libre.so.18 re-3.6.0_1
|
||||
libre.so.23 re-3.11.0_1
|
||||
libtpms.so.0 libtpms-0.9.0_1
|
||||
libswtpm_libtpms.so.0 libswtpm-0.6.1_1
|
||||
libspandsp.so.2 spandsp-0.0.6_1
|
||||
|
|
@ -3544,7 +3554,7 @@ libspa-jack.so libspa-jack-0.3.6_1
|
|||
libspa-v4l2.so libspa-v4l2-0.3.6_1
|
||||
libspa-videoconvert.so libspa-videoconvert-0.3.6_1
|
||||
libspa-vulkan.so libspa-vulkan-0.3.6_1
|
||||
libshp.so.1 shapelib-1.4.1_1
|
||||
libshp.so.4 shapelib-1.6.0_1
|
||||
libantlr3c.so libantlr3c-3.4_1
|
||||
libbzrtp.so.0 bzrtp-1.0.6_1
|
||||
libbellesip.so.1 belle-sip-4.4.0_1
|
||||
|
|
@ -4501,6 +4511,7 @@ libcamera-base.so.0.2 libcamera-0.2.0_1
|
|||
libKPim6MimeTreeParserCore.so.6 mimetreeparser-24.02.0_1
|
||||
libKPim6MimeTreeParserWidgets.so.6 mimetreeparser-24.02.0_1
|
||||
/usr/lib/lua/5.1/lpeg.so lua51-lpeg-1.1.0_2
|
||||
libopenrazer.so.0 libopenrazer-0.2.0_1
|
||||
|
||||
# Cereus Linux custom shlibs
|
||||
libcalamares.so.3.3 calamares-3.3.1_1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue