creton32 4 weeks ago
parent
commit
34c2a430b1
  1. 15
      .github/workflows/lockthreads.yml
  2. 11
      CONTRIBUTING.md
  3. 34
      Manual.md
  4. 26
      common/build-helper/qmake.sh
  5. 2
      common/build-style/cmake.sh
  6. 2
      common/build-style/void-cross.sh
  7. 5
      common/environment/build-style/cmake.sh
  8. 2
      common/environment/setup/misc.sh
  9. 92
      common/shlibs
  10. 6
      common/xbps-src/shutils/update_check.sh
  11. 4
      srcpkgs/3mux/template
  12. 4
      srcpkgs/66-tools/template
  13. 6
      srcpkgs/Amass/template
  14. 15
      srcpkgs/AusweisApp2/template
  15. 4
      srcpkgs/CellWriter/template
  16. 4
      srcpkgs/Clight/template
  17. 6
      srcpkgs/Clightd/template
  18. 2
      srcpkgs/CoinMP/template
  19. 14
      srcpkgs/Converseen/template
  20. 17
      srcpkgs/EternalTerminal/patches/fix-cflags.patch
  21. 1
      srcpkgs/EternalTerminal/template
  22. 2
      srcpkgs/FeedReader/template
  23. 4
      srcpkgs/GCP-base/template
  24. 6
      srcpkgs/GConf/template
  25. 40
      srcpkgs/Haru/patches/Add-license.patch
  26. 20
      srcpkgs/Haru/template
  27. 2
      srcpkgs/JAI/template
  28. 4
      srcpkgs/Komikku/template
  29. 6
      srcpkgs/Lucene++/template
  30. 2
      srcpkgs/Maelstrom/template
  31. 4
      srcpkgs/MoarVM/template
  32. 2
      srcpkgs/MonkeysAudio/template
  33. 37
      srcpkgs/MultiMC/patches/be.patch
  34. 10
      srcpkgs/MultiMC/template
  35. 3
      srcpkgs/MultiMarkdown/template
  36. 4
      srcpkgs/NetAuth-ldap/template
  37. 4
      srcpkgs/NetAuth-localizer/template
  38. 4
      srcpkgs/NetAuth-nsscache/template
  39. 12
      srcpkgs/NetAuth-pam-helper/template
  40. 8
      srcpkgs/NetAuth/template
  41. 4
      srcpkgs/NetKeys/template
  42. 4
      srcpkgs/NetworkManager-openconnect/template
  43. 6
      srcpkgs/NetworkManager-openvpn/template
  44. 69
      srcpkgs/NetworkManager/patches/fix-cross-gir.patch
  45. 15
      srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff
  46. 16
      srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch
  47. 29
      srcpkgs/NetworkManager/patches/musl-basic.patch
  48. 54
      srcpkgs/NetworkManager/patches/musl-fix-includes.patch
  49. 42
      srcpkgs/NetworkManager/patches/musl-network-support.patch
  50. 40
      srcpkgs/NetworkManager/patches/musl-process-util.patch
  51. 40
      srcpkgs/NetworkManager/patches/musl-use-srand48.patch
  52. 30
      srcpkgs/NetworkManager/patches/no-gtk-doc.patch
  53. 39
      srcpkgs/NetworkManager/template
  54. 17
      srcpkgs/OTPClient/patches/fix-cflags.patch
  55. 1
      srcpkgs/OTPClient/template
  56. 4
      srcpkgs/OpenCPN/template
  57. 5
      srcpkgs/OpenRCT2/INSTALL.msg
  58. 19
      srcpkgs/OpenRCT2/template
  59. 12
      srcpkgs/Quaternion/template
  60. 36
      srcpkgs/RyzenAdj/patches/heap-corruption.patch
  61. 3
      srcpkgs/RyzenAdj/template
  62. 7
      srcpkgs/SDL2_gfx/template
  63. 2
      srcpkgs/SDL2_net/template
  64. 7
      srcpkgs/SDL_gfx/template
  65. 4
      srcpkgs/SDL_image/template
  66. 4
      srcpkgs/SDL_mixer/template
  67. 4
      srcpkgs/SDL_net/template
  68. 4
      srcpkgs/SDL_sound/template
  69. 2
      srcpkgs/SMC/template
  70. 2
      srcpkgs/TSC/template
  71. 4
      srcpkgs/Thunar/template
  72. 2
      srcpkgs/WiringPi/template
  73. 2
      srcpkgs/Z80Explorer/template
  74. 28
      srcpkgs/ZMusic/patches/0001-fix-cross.patch
  75. 4
      srcpkgs/ZMusic/template
  76. 4
      srcpkgs/aalib/template
  77. 6
      srcpkgs/abGate/template
  78. 6
      srcpkgs/abook/template
  79. 6
      srcpkgs/abootimg/template
  80. 4
      srcpkgs/acl/template
  81. 4
      srcpkgs/acpica-utils/template
  82. 2
      srcpkgs/actiona/template
  83. 4
      srcpkgs/adriconf/template
  84. 6
      srcpkgs/advancecomp/template
  85. 4
      srcpkgs/adwaita-icon-theme/template
  86. 4
      srcpkgs/adwaita-plus/template
  87. 4
      srcpkgs/adwaita-qt/template
  88. 4
      srcpkgs/airspy/template
  89. 2
      srcpkgs/aisleriot/template
  90. 4
      srcpkgs/aldo/template
  91. 8
      srcpkgs/alsa-tools/template
  92. 7
      srcpkgs/alttab/template
  93. 12
      srcpkgs/alure/patches/include-close.patch
  94. 13
      srcpkgs/alure/template
  95. 60
      srcpkgs/amdvlk/patches/cmake-build-type-none.patch
  96. 4
      srcpkgs/an/template
  97. 17
      srcpkgs/android-studio/template
  98. 4
      srcpkgs/android-tools/template
  99. 35
      srcpkgs/anthy/template
  100. 4
      srcpkgs/aoeui/template

15
.github/workflows/lockthreads.yml

@ -0,0 +1,15 @@
name: 'Lock threads'
on:
schedule:
- cron: '0 18 * * *'
jobs:
lock:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v2
with:
github-token: ${{ github.token }}
pr-lock-inactive-days: '90'
process-only: 'prs'

11
CONTRIBUTING.md

@ -41,7 +41,7 @@ If `xlint` reports any issues, resolve them before committing.
### Committing your changes
Once you have built your template file or files, the commit message should have one of the following forms:
Once you have made and verified your changes to the package template and/or other files, make one commit per package (including all changes to its sub-packages). Each commit message should have one of the following formats:
* for new packages, use ```New package: <pkgname>-<version>``` ([example](https://github.com/void-linux/void-packages/commit/176d9655429188aac10cd229827f99b72982ab10)).
@ -74,7 +74,7 @@ New packages will not be accepted unless they have been runtime tested.
### Starting a pull request
Once you have successfully built the package, you can [create a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
Once you have successfully built the package, you can [create a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request). Pull requests are also known as PRs.
Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
@ -99,11 +99,10 @@ comply with the our guidelines. At the moment not all packages comply with the r
#### Review
Most of the time your pull request will contain mistakes. It's nothing bad, it just happens.
It's possible (and common) that a pull request will contain mistakes or reviewers will ask for additional tweaks.
Reviewers will comment on your pull request and point out which changes are needed before the pull request can be merged.
Reviewers will comment on your pull request and point out which changes are needed before the template can be included.
We recommend having only a single commit for pull request, so if you need to make changes in commits but already have a pull request, use the following commands:
Most PRs will have a single commit, as seen [above](#committing-your-changes), so if you need to make changes to the commit and already have a pull request open, you can use the following commands:
$ git add <file>
$ git commit --amend

34
Manual.md

@ -76,17 +76,19 @@ packages for XBPS, the `Void Linux` native packaging system.
<a id="Introduction"></a>
## Introduction
The `void-packages` repository contains all `source` packages that are the
recipes to download, compile and build binary packages for `Void`.
Those `source` package files are called `templates`.
The `void-packages` repository contains all the
recipes to download, compile and build binary packages for Void Linux.
These `source` package files are called `templates`.
The `template files` are `GNU bash` shell scripts that must define some required/optional
`variables` and `functions` that are processed by `xbps-src` (the package builder)
to generate the resulting binary packages.
The `template` files are shell scripts that define `variables` and `functions`
to be processed by `xbps-src`, the package builder, to generate binary packages.
The shell used by `xbps-src` is GNU bash; `xbps-src` doesn't aim to be
compatible with POSIX `sh`.
By convention, all templates start with a comment briefly explaining what they
are. In addition, pkgname and version can't have any characters in them that
would require them to be quoted, so they are not quoted.
By convention, all templates start with a comment saying that it is a
`template file` for a certain package. Most of the lines should be kept under 80
columns; variables that list many values can be split into new lines, with the
continuation in the next line indented by one space.
A simple `template` example is as follows:
@ -447,10 +449,9 @@ Multiple licenses should be separated by commas, Example: `GPL-3.0-or-later, cus
Note: `MIT`, `BSD`, `ISC` and custom licenses
require the license file to be supplied with the binary package.
- `maintainer` A string in the form of `name <user@domain>`. The
email for this field must be a valid email that you can be reached
at. Packages using `users.noreply.github.com` emails will not be
accepted.
- `maintainer` A string in the form of `name <user@domain>`. The email for this field
must be a valid email that you can be reached at. Packages using
`users.noreply.github.com` emails will not be accepted.
- `pkgname` A string with the package name, matching `srcpkgs/<pkgname>`.
@ -461,7 +462,12 @@ the generated `binary packages` have been modified.
- `short_desc` A string with a brief description for this package. Max 72 chars.
- `version` A string with the package version. Must not contain dashes or underscore
and at least one digit is required. Shell's variable substition usage is not allowed.
and at least one digit is required. Using bash's pattern substitution and prefix and
suffix matching isn't supported, since this field needs to be parsed by
`xbps-checkvers(1)`. Using variables in this field should be avoided.
Neither `pkgname` or `version` should contain special characters which make it
necessary to quote them, so they shouldn't be quoted in the template.
<a id="optional_vars"></a>
#### Optional variables

26
common/build-helper/qmake.sh

@ -65,14 +65,36 @@ _EOF
# create the qmake-wrapper here because it only
# makes sense together with the qmake build-helper
# and not to interfere with e.g. the qmake build-style
#
# XXX: Intentionally quote {C,CXX,LD}FLAGS here but not in native.
# - Cross Build:
# + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
# + hardening flags will be picked up from environment variables
# - Native Build:
# + hardening flags will be picked up first (Makefile, qt.conf?)
# + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
# Maybe there're better workaround, I don't know.
cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
#!/bin/sh
exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf"
exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
QMAKE_CFLAGS+="\${CFLAGS}" \\
QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
QMAKE_LFLAGS+="\${LDFLAGS}"
_EOF
else
cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
#!/bin/sh
exec /usr/lib/qt5/bin/qmake "\$@" CONFIG+=no_qt_rpath
exec /usr/lib/qt5/bin/qmake \
"\$@" \
PREFIX=/usr \
QT_INSTALL_PREFIX=/usr \
LIB=/usr/lib \
QMAKE_CC=$CC QMAKE_CXX=$CXX \
QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
QMAKE_CFLAGS+="${CFLAGS}" \
QMAKE_CXXFLAGS+="${CXXFLAGS}" \
QMAKE_LFLAGS+="${LDFLAGS}" \
CONFIG+=no_qt_rpath
_EOF
fi
chmod 755 ${XBPS_WRAPPERDIR}/qmake

2
common/build-style/cmake.sh

@ -52,7 +52,7 @@ _EOF
cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
fi
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
cmake_args+=" -DCMAKE_BUILD_TYPE=Release"
cmake_args+=" -DCMAKE_BUILD_TYPE=None"
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
if [[ $build_helper = *"qemu"* ]]; then

2
common/build-style/void-cross.sh

@ -607,7 +607,7 @@ do_install() {
${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch}
# Symlinks for gnarl and gnat shared libraries
local adalib=usr/lib/gcc/${_triplet}/${gcc_patch}/adalib
local adalib=usr/lib/gcc/${tgt}/${gcc_patch}/adalib
mv ${DESTDIR}/${adalib}/libgnarl-${gcc_major}.so \
${DESTDIR}/${sysroot}/usr/lib
mv ${DESTDIR}/${adalib}/libgnat-${gcc_major}.so \

5
common/environment/build-style/cmake.sh

@ -1,5 +1,8 @@
if [ "$CHROOT_READY" ]; then
if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
hostmakedepends+=" cmake ninja"
hostmakedepends+=" cmake"
fi
if [ "${make_cmd:-ninja}" = ninja ]; then
hostmakedepends+=" ninja"
fi
fi

2
common/environment/setup/misc.sh

@ -9,7 +9,7 @@ NONGNU_SITE="https://download.savannah.nongnu.org/releases"
UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
XORG_SITE="https://www.x.org/releases/individual"
DEBIAN_SITE="http://ftp.debian.org/debian/pool"
GNOME_SITE="https://ftp.gnome.org/pub/GNOME/sources"
GNOME_SITE="https://download.gnome.org/sources"
KERNEL_SITE="https://www.kernel.org/pub/linux"
CPAN_SITE="https://www.cpan.org/modules/by-module"
PYPI_SITE="https://files.pythonhosted.org/packages/source"

92
common/shlibs

@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
libbluetooth.so.3 libbluetooth-4.58_1
libwmf-0.2.so.7 libwmf-0.2.8.4_1
libwmflite-0.2.so.7 libwmf-0.2.8.4_1
libgthread-2.0.so.0 glib-2.18.0_1
libglib-2.0.so.0 glib-2.18.0_1
libgmodule-2.0.so.0 glib-2.18.0_1
libgio-2.0.so.0 glib-2.18.0_1
libgobject-2.0.so.0 glib-2.18.0_1
libgthread-2.0.so.0 glib-2.68.0_1
libglib-2.0.so.0 glib-2.68.0_1
libgmodule-2.0.so.0 glib-2.68.0_1
libgio-2.0.so.0 glib-2.68.0_1
libgobject-2.0.so.0 glib-2.68.0_1
libatk-1.0.so.0 atk-1.26.0_1
libpangocairo-1.0.so.0 pango-1.24.0_1
libpangoft2-1.0.so.0 pango-1.24.0_1
@ -176,11 +176,10 @@ libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
libgettextlib-0.21.so gettext-libs-0.21_1
libgettextsrc-0.21.so gettext-libs-0.21_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libgettextlib-0.21.so gettext-0.21_3
libgettextsrc-0.21.so gettext-0.21_3
libtextstyle.so.0 gettext-0.21_3
libgettextpo.so.0 gettext-0.21_3
libattr.so.1 attr-2.4.43_1
libacl.so.1 acl-2.2.47_1
libpython2.7.so.1.0 python-2.7.18_3
@ -557,7 +556,7 @@ libecpg_compat.so.3 postgresql-libs-13.2_2
libecpg.so.6 postgresql-libs-13.2_2
libpgtypes.so.3 postgresql-libs-13.2_2
libpq.so.5 postgresql-libs-13.2_2
libmypaint-1.5.so.1 libmypaint-1.5.1_1
libmypaint.so.0 libmypaint-1.6.1_1
libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
libmysqlclient.so.18 libmariadbclient-10.1.48_2
libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
@ -606,9 +605,9 @@ libicalss_cxx.so.3 libical-3.0.4_1
libicalvcal.so.3 libical-3.0.4_1
libical-glib.so.3 libical-3.0.4_1
libcamel-1.2.so.62 evolution-data-server-3.30.0_1
libedataserver-1.2.so.25 evolution-data-server-3.37.90_1
libedataserver-1.2.so.26 evolution-data-server-3.40.0_1
libebackend-1.2.so.10 evolution-data-server-3.17.90_1
libedataserverui-1.2.so.2 evolution-data-server-3.28.0_1
libedataserverui-1.2.so.3 evolution-data-server-3.40.0_1
libebook-contacts-1.2.so.3 evolution-data-server-3.34.0_1
libedata-book-1.2.so.26 evolution-data-server-3.34.0_1
libebook-1.2.so.20 evolution-data-server-3.34.0_1
@ -617,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
libevolution-util.so evolution-3.28.0_1
libemail-engine.so evolution-3.28.0_1
libevolution-mail.so evolution-3.28.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.1 evolution-data-server-3.34.0_1
libgdata.so.22 libgdata-0.17.9_1
@ -1005,7 +1005,7 @@ libgsm.so.1 libgsm-1.0.13_13
libcgroup.so.1 libcgroup-0.37.1_1
libxdg-basedir.so.1 libxdg-basedir-1.1.1_1
libev.so.4 libev-4.04_1
libell.so.0 ell-0.20_1
libell.so.0 ell-0.39_1
libgvnc-1.0.so.0 gtk-vnc-0.4.4_1
libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1
libyaml-0.so.2 libyaml-0.1.4_1
@ -1013,7 +1013,6 @@ libuchardet.so.0 uchardet-0.0.6_1
libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
libyajl.so.2 yajl-2.0.1_1
libconfuse.so.2 confuse-3.2.1_1
libLLVM-10.so libllvm10-10.0.0_1
liblldb.so.11 lldb-11.0.0_1
libclang.so.11 libclang-11.0.0_1
libclang-cpp.so.11 libclang-cpp-11.0.0_1
@ -1564,7 +1563,7 @@ libcheck.so.0 check-0.9.12_1
liblxc.so.1 liblxc-4.0.6_2
libtcmalloc.so.4 gperftools-2.1_1
libaio.so.1 libaio-0.3.109_1
libofx.so.7 libofx-0.9.11_1
libofx.so.7 libofx-0.10.1_1
libsigsegv.so.2 libsigsegv-2.10_2
libfprint.so.0 libfprint0-1.0_1
libfprint-2.so.2 libfprint-1.90.7_1
@ -2326,9 +2325,9 @@ libIL.so.1 devil-1.7.8_1
libILU.so.1 devil-1.7.8_1
libILUT.so.1 devil-1.7.8_1
liboath.so.0 oath-toolkit-2.6.0_2
libanthy.so.0 anthy-9100h_1
libanthydic.so.0 anthy-9100h_1
libanthyinput.so.0 anthy-9100h_1
libanthy.so.1 libanthy-0.4_1
libanthydic.so.1 libanthy-0.4_1
libanthyinput.so.0 libanthy-0.4_1
libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
libtbbmalloc_proxy.so.2 tbb-4.3_1
@ -2405,6 +2404,7 @@ libpinktrace_0.9.so.9 pinktrace-0.9.1_1
libsyd_1.0.so.0 sydbox-1.0.2_1
libcsync.so.0 csync-0.50.0_1
libcalligrasheetsodf.so.17 calligra-sheets-3.2.0_1
libkokross.so.17 calligra-libs-3.2.1_3
libkotext.so.17 calligra-libs-3.2.0_1
libkoodf.so.17 calligra-libs-3.2.0_1
libkarbonui.so.17 calligra-karbon-3.2.0_1
@ -2757,7 +2757,7 @@ libmono-btls-shared.so mono-5.2.0.215_1
libxcb-xrm.so.0 xcb-util-xrm-1.0_1
libinchi.so.0 openbabel-2.3.2_1
libopenbabel.so.5 openbabel-2.4.1_1
libcourier-unicode.so.4 courier-unicode-2.0_1
libcourier-unicode.so.7 courier-unicode-2.2.2_1
libzstd.so.1 libzstd-1.0.0_1
libudis86.so.0 udis86-1.7.2_4
libsass.so.1 libsass-3.5.0_1
@ -2920,20 +2920,15 @@ liblxpanel.so.0 lxpanel-0.9.3_1
libuim.so.8 uim-1.8.6_1
libuim-scm.so.0 uim-1.8.6_1
libuim-custom.so.2 uim-1.8.6_1
libgcroots.so.0 uim-1.8.6_1
libgcroots.so.0 libgcroots-0.3.2_1
libdecoration.so.0 compiz-core-0.8.14_1
libcompizconfig.so.0 libcompizconfig-0.8.14_1
libemeraldengine.so.0 emerald-0.8.14_1
libhangul.so.1 libhangul-0.1.0_1
libmutter-7.so.0 mutter-3.37.90_1
libmutter-clutter-7.so mutter-3.37.90_1
libmutter-clutter-7.so.0 mutter-3.37.90_1
libmutter-cogl-path-7.so mutter-3.37.90_1
libmutter-cogl-path-7.so.0 mutter-3.37.90_1
libmutter-cogl-7.so mutter-3.37.90_1
libmutter-cogl-7.so.0 mutter-3.37.90_1
libmutter-cogl-pango-7.so mutter-3.37.90_1
libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
libmutter-8.so.0 mutter-40.0_1
libmutter-clutter-8.so.0 mutter-40.0_1
libmutter-cogl-8.so.0 mutter-40.0_1
libmutter-cogl-pango-8.so.0 mutter-40.0_1
libgeoclue-2.so.0 geoclue2-2.4.4_1
libgepub.so.0 libgepub-0.4_1
libslopy.so.7.5 slop-7.5_1
@ -3158,12 +3153,12 @@ libGammu.so.8 gammu-1.39.0_1
libz3.so z3-4.6.0_2
libngspice.so.0 ngspice-27_2
libvulkan.so.1 vulkan-loader-1.0.57.0_1
libembb_mtapi_cpp.so embb-devel-1.0.0_1
libembb_mtapi_c.so embb-devel-1.0.0_1
libembb_mtapi_network_c.so embb-devel-1.0.0_1
libembb_base_cpp.so embb-devel-1.0.0_1
libembb_base_c.so embb-devel-1.0.0_1
libhpdf.so Haru-devel-2.3.0_1
libembb_mtapi_cpp.so embb-1.0.0_3
libembb_mtapi_c.so embb-1.0.0_3
libembb_mtapi_network_c.so embb-1.0.0_3
libembb_base_cpp.so embb-1.0.0_3
libembb_base_c.so embb-1.0.0_3
libhpdf-2.3.0.so Haru-2.3.0_3
libKF5Contacts.so.5 kcontacts-5.63.0_1
libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
libKF5AkonadiCore.so.5 akonadi5-17.12.0_1
@ -3222,7 +3217,6 @@ libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
libvtkDomainsChemistryOpenGL2-9.0.so.1 vtk-9.0.1_1
libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
@ -3254,7 +3248,6 @@ libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
libvtkIOExport-9.0.so.1 vtk-9.0.1_1
libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
libvtkIOExportOpenGL2-9.0.so.1 vtk-9.0.1_1
libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
libvtkIOImage-9.0.so.1 vtk-9.0.1_1
@ -3264,7 +3257,6 @@ libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
libvtkIOMPIParallel-9.0.so.1 vtk-9.0.1_1
libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
@ -3294,10 +3286,8 @@ libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
libvtkParallelMPI-9.0.so.1 vtk-9.0.1_1
libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
libvtkRenderingContextOpenGL2-9.0.so.1 vtk-9.0.1_1
libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
@ -3315,10 +3305,8 @@ libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
libvtkexodusII-9.0.so.1 vtk-9.0.1_1
libvtkgl2ps-9.0.so.1 vtk-9.0.1_1
libvtklibharu-9.0.so.1 vtk-9.0.1_1
libvtkmetaio-9.0.so.1 vtk-9.0.1_1
libvtkpugixml-9.0.so.1 vtk-9.0.1_1
libvtksys-9.0.so.1 vtk-9.0.1_1
libvtkverdict-9.0.so.1 vtk-9.0.1_1
libvolume_key.so.1 volume_key-0.3.9_1
@ -3465,7 +3453,7 @@ libwx_gtk3u_media-3.0.so.0 wxWidgets-gtk3-3.0.4_1
libwx_gtk3u_ribbon-3.0.so.0 wxWidgets-gtk3-3.0.4_1
libwx_gtk3u_gl-3.0.so.0 wxWidgets-gtk3-3.0.4_1
libwx_gtk3u_stc-3.0.so.0 wxWidgets-gtk3-3.0.4_1
libtepl-5.so.0 tepl-4.2.0_1
libtepl-6.so.0 tepl-6.00.0_1
libnomacsCore.so.3 nomacs-3.10.2_4
libaudit.so.1 libaudit-2.8.4_1
libauparse.so.0 libauparse-2.8.4_1
@ -3533,9 +3521,9 @@ libupstart.so.1 libupstart-1.13.3_1
librtas.so.2 librtas-2.0.2_1
librtasevent.so.2 librtas-2.0.2_1
libbroker.so.2 zeek-3.2.4_2
libcaf_core.so.0.17.6 zeek-3.2.4_2
libcaf_io.so.0.17.6 zeek-3.2.4_2
libcaf_openssl.so.0.17.6 zeek-3.2.4_2
libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1
libpinyin.so.13 libpinyin-2.2.1_1
@ -3550,7 +3538,7 @@ libgaminggearfx.so.0 libgaminggear-0.15.1_1
libgaminggearwidget.so.0 libgaminggear-0.15.1_1
libopkg.so.1 libopkg-0.4.4_2
libkodiplatform.so.19.0 kodi-platform-20180302_1
libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
libQuotient.so.0.6 libQuotient-0.6.6_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
libliquid.so.1 liquid-dsp-1.3.1_1
@ -3584,7 +3572,7 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
libqmdnsengine.so.0 qmdnsengine-0.1.0_1
libyang.so.1 libyang-1.0r5_1
libhtp.so.2 libhtp-0.5.30_1
libgedit-3.38.so gedit-3.37.3_1
libgedit-40.0.so gedit-40.0_1
libchewing.so.3 libchewing-0.5.1_1
libdwarves.so.1 pahole-1.12_1
libdwarves_emit.so.1 pahole-1.12_1
@ -3895,7 +3883,7 @@ libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
liburing.so.1 liburing-0.7_1
liburing.so.2 liburing-2.0_1
libbson-1.0.so.0 libbson-1.17.4_2
libsonic.so.0 libsonic-0.2.0_1
libtickit.so.3 libtickit-0.4.1_1
@ -3972,3 +3960,7 @@ libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
libspdlog.so.1 libspdlog-1.8.2_2
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
libgumbo.so.1 gumbo-parser-0.10.1_2

6
common/xbps-src/shutils/update_check.sh

@ -121,7 +121,7 @@ update_check() {
*github.com*)
pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
url="https://github.com/$pkgurlname/tags"
rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
*//gitlab.*)
pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
url="$pkgurlname/tags"
@ -130,9 +130,9 @@ update_check() {
pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"
url="https://bitbucket.org/$pkgurlname/downloads"
rx='/(get|downloads)/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar)';;
*ftp.gnome.org*)
*ftp.gnome.org*|*download.gnome.org*)
: ${pattern="\Q$pkgname\E-\K(0|[13]\.[0-9]*[02468]|[4-9][0-9]+)\.[0-9.]*[0-9](?=)"}
url="http://ftp.gnome.org/pub/GNOME/sources/$pkgname/cache.json";;
url="https://download.gnome.org/sources/$pkgname/cache.json";;
*kernel.org/pub/linux/kernel/*)
rx=linux-'\K'${version%.*}'[\d.]+(?=\.tar\.xz)';;
*cran.r-project.org/src/contrib*)

4
srcpkgs/3mux/template

@ -1,6 +1,6 @@
# Template file for '3mux'
pkgname=3mux
version=1.0.1
version=1.1.0
revision=1
build_style=go
go_import_path=github.com/aaronjanse/3mux
@ -9,7 +9,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
homepage="https://github.com/aaronjanse/3mux"
distfiles="https://github.com/aaronjanse/3mux/archive/v${version}.tar.gz"
checksum=925e23850ad69ce12069bb4c48af6e70c820bbd4bfe5a83ebf72eaefb9d8ab83
checksum=0f4dae181914c73eaa91bdb21ee0875f21b5da64c7c9d478f6d52a2d0aa2c0ea
post_install() {
vlicense LICENSE

4
srcpkgs/66-tools/template

@ -1,6 +1,6 @@
# Template file for '66-tools'
pkgname=66-tools
version=0.0.7.1
version=0.0.7.2
revision=1
wrksrc=${pkgname}-v${version}
build_style=configure
@ -16,7 +16,7 @@ license="ISC"
homepage="http://web.obarun.org/software/index.html"
changelog="https://framagit.org/Obarun/66-tools/-/raw/master/NEWS.md"
distfiles="https://framagit.org/Obarun/66-tools/-/archive/v${version}/66-tools-v${version}.tar.gz"
checksum=370fda8d10254bfece86cbeabf7b4d48d8b47e91bd57fe5bae12e18b5a032547
checksum=2732c67211d0ea1f0bda5ae55dc3be41f07a7e75d6006867cc5b8c87d1c29984
post_install() {
vlicense LICENSE

6
srcpkgs/Amass/template

@ -1,12 +1,12 @@
# Template file for 'Amass'
pkgname=Amass
version=3.11.9
version=3.11.13
revision=1
build_style=go
go_import_path="github.com/OWASP/Amass/..."
go_import_path="github.com/OWASP/Amass/v3/..."
short_desc="In-depth Attack Surface Mapping and Asset Discovery"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
checksum=82e69f400ed16210c9aaa49351b6f44ae986caf0d1c1080d532a1dd170c018ed
checksum=012b5c01209c56b4698c605c74c39001341a5319b90e65d484329fd4a3e2b7cf

15
srcpkgs/AusweisApp2/template

@ -0,0 +1,15 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.22.2
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-websockets-devel
qt5-declarative-devel qt5-quickcontrols2-devel openssl-devel pcsclite-devel"
depends="qt5-declarative qt5-quickcontrols2 qt5-graphicaleffects"
short_desc="Official authentication app for German ID cards and residence permits"
maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="EUPL-1.2"
homepage="https://www.ausweisapp.bund.de/ausweisapp2/"
distfiles="https://github.com/Governikus/AusweisApp2/archive/refs/tags/${version}.tar.gz"
checksum=79d637a976dc1dc5445757a43324f4fe609d844bf90f11c0f62a46c39dc4fea6

4
srcpkgs/CellWriter/template

@ -1,14 +1,14 @@
# Template file for 'CellWriter'
pkgname=CellWriter
version=1.3.6
revision=1
revision=2
wrksrc=cellwriter-${version}
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtk+-devel libXtst-devel"
short_desc="Grid-entry natural handwriting input panel"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="GPL-2"
license="GPL-2.0-or-later"
homepage="https://github.com/risujin/cellwriter"
distfiles="https://github.com/risujin/cellwriter/archive/${version}.tar.gz"
checksum=17bb07226d4680b565b18a60494cb19cdf9067b427c8df7454c16d809de9963b

4
srcpkgs/Clight/template

@ -1,6 +1,6 @@
# Template file for 'Clight'
pkgname=Clight
version=4.4
version=4.5
revision=1
build_style=cmake
hostmakedepends="pkg-config"
@ -12,7 +12,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/FedeDP/Clight"
distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz"
checksum=1371ac6f537cec4fc61581dbb6ceb143df08f20e24f884fa148068008864b054
checksum=2ce204edd58284c178b99e2ffec0105fc8e78d8a076350f64424b66c9878e91e
post_install() {
vcompletion Extra/completions/_clight zsh

6
srcpkgs/Clightd/template

@ -1,7 +1,7 @@
# Template file for 'Clightd'
pkgname=Clightd
version=5.2
revision=2
version=5.3
revision=1
build_style=cmake
cmake_builddir=build
configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
@ -15,7 +15,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/FedeDP/Clightd"
distfiles="https://github.com/FedeDP/Clightd/archive/${version}.tar.gz"
checksum=6636d58eae7aff4780534258940d1f680637fc1b983320e15aa2fd5be8648853
checksum=05e109618cf2d4b31bc37780bbc60c58bc7064fe1d27e8d504d3fef318099a31
post_install() {
vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

2
srcpkgs/CoinMP/template

@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="doxygen graphviz pkg-config"
short_desc="Library that supports most of Coin CLP, CBC and CGL"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
maintainer="Orphaned <orphan@voidlinux.org>"
license="CPL-1.0"
homepage="https://projects.coin-or.org/CoinMP"
distfiles="http://www.coin-or.org/download/source/${pkgname}/${pkgname}-${version}.tgz"

14
srcpkgs/Converseen/template

@ -0,0 +1,14 @@
# Template file for 'Converseen'
pkgname=Converseen
version=0.9.9.0
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
makedepends="qt5-devel qt5-tools-devel libmagick-devel ImageMagick"
depends="ghostscript openexr hicolor-icon-theme"
short_desc="Free batch image processor"
maintainer="Justin Jagieniak <justin@jagieniak.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/Faster3ck/Converseen"
distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz"
checksum=627f2578dd0ec6629118bb781d7a876b41e9319641f711bd18cb9c2221b3ac38

17
srcpkgs/EternalTerminal/patches/fix-cflags.patch

@ -0,0 +1,17 @@
Index: EternalTerminal-et-v6.0.13/CMakeLists.txt
===================================================================
--- EternalTerminal-et-v6.0.13.orig/CMakeLists.txt
+++ EternalTerminal-et-v6.0.13/CMakeLists.txt
@@ -26,12 +26,6 @@ if(DISABLE_CRASH_LOG)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DELPP_DISABLE_DEFAULT_CRASH_HANDLING")
ENDIF(DISABLE_CRASH_LOG)
-if(UNIX)
- # Enable debug info
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -ggdb3")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -ggdb3")
-endif()
-
# Enable C++-11
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

1
srcpkgs/EternalTerminal/template

@ -13,6 +13,7 @@ homepage="https://eternalterminal.dev/"
distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
checksum=728c3a444d666897c710e33fe473d8d289263a59574451b13aa53ec3c6ac88b3
system_accounts="_eternal"
patch_args=-Np1
LDFLAGS="-lgflags"

2
srcpkgs/FeedReader/template

@ -1,7 +1,7 @@
# Template file for 'FeedReader'
pkgname=FeedReader
version=2.11.0
revision=1
revision=2
build_style=meson
hostmakedepends="glib-devel intltool itstool pkg-config vala"
makedepends="gnome-online-accounts-devel gst-plugins-base1-devel json-glib-devel

4
srcpkgs/GCP-base/template

@ -1,7 +1,7 @@
# Template file for 'GCP-base'
pkgname=GCP-base
version=1
revision=2
revision=3
archs="x86_64*"
build_style=meta
depends="grub GCP-Guest-Environment"
@ -11,5 +11,5 @@ short_desc="Base components for the Google Cloud Platform images"
# when I have free time. I use my work email for this only because it
# makes a little more sense to me than my VoidLinux email.
maintainer="Michael Aldridge <themaldridge@google.com>"
license="GPL-3"
license="GPL-3.0-only"
homepage="http://cloud.google.com/"

6
srcpkgs/GConf/template

@ -1,7 +1,7 @@
# Template file for 'GConf'
pkgname=GConf
version=3.2.6
revision=10
revision=11
build_style=gnu-configure
build_helper="gir"
configure_args="--without-openldap --enable-gtk --enable-defaults-service
@ -13,11 +13,11 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
depends="dconf"
short_desc="Process-transparent configuration system"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2"
license="GPL-2.0-or-later"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
python_version=2 #unverified
python_version=2
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root

40
srcpkgs/Haru/patches/Add-license.patch

@ -1,40 +0,0 @@
From 24443b76f4daf74c21307044e81b4942bd4e586a Mon Sep 17 00:00:00 2001
From: Maciej Klemarczyk <m.klemarczyk+git@live.com>
Date: Sun, 28 Jun 2015 12:05:05 +0200
Subject: [PATCH 4/4] Missing LICENSE file was created
File was created based on license provided by README file.
---
LICENCE | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 LICENSE
diff --git LICENSE LICENSE
new file mode 100644
index 0000000..bdf271e
--- /dev/null
+++ LICENSE
@@ -0,0 +1,20 @@
+
+Copyright (C) 1999-2006 Takeshi Kanno
+Copyright (C) 2007-2009 Antony Dovgal
+
+This software is provided 'as-is', without any express or implied warranty.
+
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+
+Permission is granted to anyone to use this software for any purpose,including
+commercial applications, and to alter it and redistribute it freely, subject
+to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a
+ product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
--
2.24.0

20
srcpkgs/Haru/template

@ -1,19 +1,25 @@
# Template file for 'Haru'
pkgname=Haru
version=2.3.0
revision=2
revision=3
wrksrc="libharu-RELEASE_${version//./_}"
build_style=cmake
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel libpng-devel"
short_desc="Free, cross platform, open source library for generating PDF files"
maintainer="Florian Eich <flrn@nrmncr.net>"
license="ZLIB/LIBPNG"
license="Zlib"
homepage="http://libharu.org/"
distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
post_install() {
vlicense LICENSE
if [ "$CROSS_BUILD" ]; then
configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr"
configure_args+=" --with-png=${XBPS_CROSS_BASE}/usr"
fi
pre_configure() {
make -f build.mk
}
Haru-devel_package() {
@ -21,7 +27,7 @@ Haru-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/*.a
vmove usr/lib/*.so
vmove "usr/lib/*.a"
vmove usr/lib/libhpdf.so
}
}

2
srcpkgs/JAI/template

@ -4,7 +4,7 @@ version=1.1.3
revision=4
archs="i686 x86_64"
short_desc="Java Advanced Imaging Library - binary version"
maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:Oracle Binary Code License"
homepage="https://java.net/projects/jai-core"
repository=nonfree

4
srcpkgs/Komikku/template

@ -1,6 +1,6 @@
# Template file for 'Komikku'
pkgname=Komikku
version=0.26.1
version=0.27.0
revision=1
wrksrc=Komikku-v${version}
build_style=meson
@ -15,4 +15,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="${homepage}/-/archive/v${version}/Komikku-v${version}.tar.gz"
checksum=3f21d17414d33e9a33d831e4eeb297d62c27920b7e63de0abe755cb0983b3652
checksum=d4ecd12d7fc3a6a3e5fde3ed03608ff48045c2e7425b66ef0fadf04941643da2

6
srcpkgs/Lucene++/template

@ -1,14 +1,14 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
revision=10
revision=11
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
makedepends="boost-devel gtest-devel"
short_desc="A C++ port of the popular text search engine"
short_desc="C++ port of the popular text search engine"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3"
license="LGPL-3.0-or-later, Apache-2.0"
homepage="https://github.com/luceneplusplus/LucenePlusPlus"
distfiles="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${version}.tar.gz"
checksum=6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c

2
srcpkgs/Maelstrom/template

@ -7,7 +7,7 @@ build_style=gnu-configure
hostmakedepends="automake libtool SDL2_net-devel"
makedepends="SDL2_net-devel"
short_desc="Guide your ship through the Maelstrom asteroid belt"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.libsdl.org/projects/Maelstrom/"
distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"

4
srcpkgs/MoarVM/template

@ -1,6 +1,6 @@
# Template file for 'MoarVM'
pkgname=MoarVM
version=2020.11
version=2021.03
revision=1
build_style=configure
configure_script="perl Configure.pl"
@ -15,6 +15,6 @@ license="Artistic-2.0"
homepage="https://moarvm.org"
changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
checksum=6d028273b6ed5ba7b972e7b3f2681ce1deff1897ebdf7bcd5cfcd1e7c2fec384
checksum=8a0cf32273e473af884f409a02ad13c4aed5646628facf86544f6b3757e5cacf
nocross=yes
shlib_provides="libmoar.so"

2
srcpkgs/MonkeysAudio/template

@ -6,7 +6,7 @@ create_wrksrc=yes
build_style="gnu-makefile"
depends="libMAC>=${version}_${revision}"
short_desc="Fast and powerful lossless audio (de)compressor"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:MIT-like"
homepage="https://monkeysaudio.com/"
distfiles="https://monkeysaudio.com/files/MAC_SDK_${version//./}.zip

37
srcpkgs/MultiMC/patches/be.patch

@ -1,37 +0,0 @@
Fixes build on big endian.
--- libraries/classparser/src/javaendian.h
+++ libraries/classparser/src/javaendian.h
@@ -11,32 +11,26 @@ inline uint64_t bigswap(uint64_t x)
{
return x;
}
-;
inline uint32_t bigswap(uint32_t x)
{
return x;
}
-;
inline uint16_t bigswap(uint16_t x)
{
return x;
}
-;
inline int64_t bigswap(int64_t x)
{
return x;
}
-;
inline int32_t bigswap(int32_t x)
{
return x;
}
-;
inline int16_t bigswap(int16_t x)
{
return x;
}
-;
#else
inline uint64_t bigswap(uint64_t x)
{

10
srcpkgs/MultiMC/template

@ -1,7 +1,7 @@
# Template file for 'MultiMC'
pkgname=MultiMC
version=0.6.11
revision=1
version=0.6.12
revision=2
wrksrc="${pkgname}5-${version}"
_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
_nbtversion="multimc-0.6.1"
@ -10,15 +10,15 @@ build_style=cmake
configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
depends="virtual?java-environment"
depends="virtual?java-environment qt5-svg"
short_desc="Instanced Minecraft client"
maintainer="Spencer H <spencernh77@gmail.com>"
maintainer="Henry Naguski <henry@nilsu.org>"
license="Apache-2.0"
homepage="http://multimc.org"
distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz
https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
checksum="7cad736f1fe3f2887aeaa7a7f3927930e16ed815c98e4cf3a7378a99c426a775
checksum="c251744b77d93db4ead56940b7b81d30dc5390fb86a1676d3f0364cc4e570185
36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"

3
srcpkgs/MultiMarkdown/template

@ -1,7 +1,7 @@
# Template file for 'MultiMarkdown'
pkgname=MultiMarkdown
version=6.6.0
revision=1
revision=2
wrksrc="$pkgname-6-$version"
build_style=cmake
hostmakedepends="perl"
@ -18,5 +18,6 @@ post_install() {
mv ${DESTDIR}/usr/bin/markdown ${DESTDIR}/usr/bin/multimarkdown-markdown
# Avoid conflict with mtools
mv ${DESTDIR}/usr/bin/mmd ${DESTDIR}/usr/bin/multimarkdown-mmd
rm ${DESTDIR}/usr/{LICENSE,README}.txt
vlicense LICENSE
}

4
srcpkgs/NetAuth-ldap/template

@ -1,6 +1,6 @@
# Template file for 'NetAuth-ldap'
pkgname=NetAuth-ldap
version=0.2.0
version=0.2.3
revision=1
wrksrc=ldap-$version
build_style=go
@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://www.netauth.org/ecosystem/ldap"
distfiles="https://github.com/netauth/ldap/archive/v$version.tar.gz"
checksum=581b60475e940efff673edd3a0fb5ab34fef28f4872fc51a0720013f2004c2f0
checksum=1d75f23197ea869207e8895cfaadde2c536f279eb26ddb8256642f5babece7e7
system_accounts="_netauth_ldap"
post_install() {

4
srcpkgs/NetAuth-localizer/template

@ -1,6 +1,6 @@
# Template file for 'NetAuth-localizer'
pkgname=NetAuth-localizer
version=0.1.1
version=0.1.3
revision=1
wrksrc=localizer-$version
build_style=go
@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://netauth.org/ecosystem/localizer"
distfiles="https://github.com/netauth/localizer/archive/v$version.tar.gz"
checksum=8a7f7b57f7bdb751f9a6b482603b0207577ae54c1e79cb0f7dd8e96730fbdb84
checksum=63c4d462f90e03b8f4e225afe8cd064fdb54cf1d646c8ec4ff2452dbe2ad55f5
do_check() {
go test -v ./...

4
srcpkgs/NetAuth-nsscache/template

@ -1,6 +1,6 @@
# Template file for 'NetAuth-nsscache'
pkgname=NetAuth-nsscache
version=0.6.3
version=0.6.5
revision=1
wrksrc="nsscache-$version"
build_style=go
@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://netauth.org"
distfiles="https://github.com/NetAuth/nsscache/archive/v$version.tar.gz"
checksum=9e29b188166318e1d3aa4a2ddc00501c4419699ed812f34ea1fb73303f4fedfd
checksum=d5e558d552009d59e5b433a9b96dac7db378412ccebb9dee95216a7a58eab2aa
post_install() {
vlicense LICENSE

12
srcpkgs/NetAuth-pam-helper/template

@ -1,14 +1,18 @@
# Template file for 'NetAuth-pam-helper'
pkgname=NetAuth-pam-helper
version=0.1.3
version=0.1.5
revision=1
wrksrc=pam-helper-$version
build_style=go
go_import_path="github.com/netauth/pam-helper"
hostmakedepends="git"
short_desc="A helper executable to use with pam_exec"
maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
short_desc="Helper executable to use with pam_exec"
maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://www.github.com/netauth/pam-helper"
distfiles="$homepage/archive/v$version.tar.gz"
checksum=d9b14782a52604a0fc19ffe5164aad5e1580e3bdb015fda0c4b58acdb38049ae
checksum=1f4fd5e914e6a423ba51911c89b105736b595a2328946e298a31e9dc144d1998
post_install() {
vlicense LICENSE
}

8
srcpkgs/NetAuth/template

@ -1,7 +1,7 @@
# Template file for 'NetAuth'
pkgname=NetAuth
version=0.3.4
revision=5
version=0.4.2
revision=1
wrksrc=netauth-$version
build_style="go"
go_import_path="github.com/netauth/netauth"
@ -9,11 +9,11 @@ go_package="${go_import_path}/cmd/netauth
${go_import_path}/cmd/netauthd"
hostmakedepends="git"
short_desc="Network authentication and identity system"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://netauth.org"
distfiles="https://github.com/NetAuth/NetAuth/archive/v$version.tar.gz"
checksum=76811411d4ebd00876e553b4eb9c912c16ee5ebc5c6aaeab922e233275f56a94
checksum=09246b3a9579f56a9c55bc4beefad9c39e9afad434ac13c344e390ee89d707bb
do_check() {
go test -v ./...

4
srcpkgs/NetKeys/template

@ -1,6 +1,6 @@
# Template file for 'NetKeys'
pkgname=NetKeys
version=0.5.3
version=0.5.5
revision=1
wrksrc=netkeys-$version
build_style=go
@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@netauth.org>"
license="MIT"
homepage="https://netauth.org"
distfiles="https://github.com/NetAuth/NetKeys/archive/v$version.tar.gz"
checksum=c7cdcc54a41501c3a40f114aa873668bb78c6ff2bd73c7a1c8c2295a968fc453
checksum=1a82b2d415b77a63bd1cf7b2f79db454aea11811f268166dc004b75f38b9a791
post_install() {
vlicense LICENSE

4
srcpkgs/NetworkManager-openconnect/template

@ -1,7 +1,7 @@
# Template file for 'NetworkManager-openconnect'
pkgname=NetworkManager-openconnect
version=1.2.6
revision=3
revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
@ -10,7 +10,7 @@ makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
depends="openconnect"
short_desc="NetworkManager VPN plugin for OpenConnect"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-or-later"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a

6
srcpkgs/NetworkManager-openvpn/template

@ -1,7 +1,7 @@
# Template file for 'NetworkManager-openvpn'
pkgname=NetworkManager-openvpn
version=1.8.12
revision=2
version=1.8.14
revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/NetworkManager"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
checksum=e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb
system_accounts="_nm_openvpn"
lib32disabled=yes
_nm_openvpn_homedir="/var/empty"

69
srcpkgs/NetworkManager/patches/fix-cross-gir.patch

@ -1,52 +1,31 @@
Reason: Fix crossbuilding GIR
Upstream: No, not upstreamable since this is very specific to the Void setup
diff --git clients/common/meson.build clients/common/meson.build
index afa257b..50b53e7 100644
--- clients/common/meson.build
+++ clients/common/meson.build
@@ -35,7 +35,7 @@ if enable_introspection
settings_docs,
input: nm_property_docs,
output: settings_docs,
- command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'],
+ command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), join_paths(meson.current_source_dir(), '..', '..', '@INPUT@')],
)
Index: b/libnm/meson.build
===================================================================
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -274,13 +274,23 @@ if enable_introspection
'LD_LIBRARY_PATH=' + ld_library_path,
]
test(
diff --git libnm/meson.build libnm/meson.build
index 51ca46d..f14d861 100644
--- libnm/meson.build
+++ libnm/meson.build
@@ -236,7 +236,13 @@ if enable_introspection
)
endif
- generate_setting_docs = join_paths(meson.current_source_dir(), 'generate-setting-docs.py')
+ if meson.is_cross_build()
+ qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
+ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/usr/bin/python3'
+ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
+ qemu_python3_cmd = [
+ '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
+ '-L', '@XBPS_CROSS_BASE@',
+ '@XBPS_CROSS_BASE@/usr/bin/python3'
+ ]
+ else
+ generate_setting_docs = [python.path(), join_paths(meson.current_source_dir(), 'generate-setting-docs.py')]
+ qemu_python3_cmd = python.path()
+ endif
gi_typelib_path = run_command('printenv', 'GI_TYPELIB_PATH').stdout()
if gi_typelib_path != ''
@@ -261,7 +267,7 @@ if enable_introspection
name,
+
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
input: libnm_gir[0],
output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'],
depends: libnm_gir,
)
@@ -270,7 +276,7 @@ if enable_introspection
name,
input: [libnm_gir[0], nm_settings_docs_overrides],
output: name,
- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'],
depends: libnm_gir,
)
endif
output: 'nm-settings-docs-gir.xml',
command: [
generate_setting_docs_env,
- python.path(),
+ qemu_python3_cmd,
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
'--lib-path', meson.current_build_dir(),
'--gir', '@INPUT@',

15
srcpkgs/NetworkManager/patches/fix-musl-linux-header.diff

@ -1,15 +0,0 @@
diff --git src/systemd/src/libsystemd-network/sd-dhcp6-client.c src/systemd/src/libsystemd-network/sd-dhcp6-client.c
index f67a45bd2..ec11fa605 100644
--- src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ src/systemd/src/libsystemd-network/sd-dhcp6-client.c
@@ -8,8 +8,10 @@
#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
+#ifdef __GLIBC__
#include <linux/if_arp.h>
#include <linux/if_infiniband.h>
+#endif
#include "sd-dhcp6-client.h"

16
srcpkgs/NetworkManager/patches/fix-musl-qsort_r.patch

@ -1,16 +0,0 @@
diff --git shared/systemd/src/basic/sort-util.h shared/systemd/src/basic/sort-util.h
index e029f8646..168735087 100644
--- shared/systemd/src/basic/sort-util.h
+++ shared/systemd/src/basic/sort-util.h
@@ -60,7 +60,11 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_
return;
assert(base);
+#ifdef __GLIBC__
qsort_r(base, nmemb, size, compar, userdata);
+#else
+ g_qsort_with_data(base, nmemb, size, compar, userdata);
+#endif
}
#define typesafe_qsort_r(p, n, func, userdata) \

29
srcpkgs/NetworkManager/patches/musl-basic.patch

@ -1,29 +0,0 @@
Usual fix for musl libc
--- shared/systemd/src/basic/stdio-util.h.orig
+++ shared/systemd/src/basic/stdio-util.h
@@ -19,7 +19,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#if defined(__GLIBC__)
#include <printf.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
--- shared/systemd/src/basic/sort-util.h 2019-06-09 17:02:48.895695896 +0200
+++ shared/systemd/src/basic/sort-util.h 2019-06-09 17:03:27.564199937 +0200
@@ -5,6 +5,12 @@
#include "macro.h"
+#if !defined(__GLIBC__)
+typedef int (*__compar_fn_t) (const void*, const void*);
+typedef __compar_fn_t comparison_fn_t;
+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
+#endif
+
void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
__compar_d_fn_t compar, void *arg);

54
srcpkgs/NetworkManager/patches/musl-fix-includes.patch

@ -1,54 +0,0 @@
--- src/devices/nm-device.c.orig 2019-12-17 08:59:49.000000000 +0100
+++ src/devices/nm-device.c 2020-01-06 17:29:08.678242168 +0100
@@ -17,7 +17,11 @@
#include <arpa/inet.h>
#include <fcntl.h>
#include <linux/if_addr.h>
+#if defined(__GLIBC__)
#include <linux/if_arp.h>
+#else
+#include <linux/if.h>
+#endif
#include <linux/rtnetlink.h>
#include <linux/pkt_sched.h>
--- src/nm-manager.c.orig 2020-01-06 17:29:08.682242177 +0100
+++ src/nm-manager.c 2020-01-06 17:30:50.378482034 +0100
@@ -15,6 +15,7 @@
#include <sys/stat.h>
#include <sys/sendfile.h>
#include <limits.h>
+#include <asm/types.h>
#include "nm-glib-aux/nm-c-list.h"
--- src/platform/nm-linux-platform.c.orig 2019-12-17 08:59:49.000000000 +0100
+++ src/platform/nm-linux-platform.c 2020-01-06 17:29:08.686242186 +0100
@@ -6,6 +6,7 @@
#include "nm-default.h"
#include "nm-linux-platform.h"
+#include "wpan/nm-wpan-utils.h"
#include <arpa/inet.h>
#include <dlfcn.h>
@@ -14,7 +15,11 @@
#include <libudev.h>
#include <linux/fib_rules.h>
#include <linux/ip.h>
+#if defined(__GLIBC__)
#include <linux/if_arp.h>
+#else
+#include <linux/if.h>
+#endif
#include <linux/if_bridge.h>
#include <linux/if_link.h>
#include <linux/if_tun.h>
@@ -44,7 +49,6 @@
#include "nm-platform-private.h"
#include "wifi/nm-wifi-utils.h"
#include "wifi/nm-wifi-utils-wext.h"
-#include "wpan/nm-wpan-utils.h"
#include "nm-glib-aux/nm-io-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"

42
srcpkgs/NetworkManager/patches/musl-network-support.patch

@ -1,42 +0,0 @@
--- libnm-core/nm-utils.h.orig
+++ libnm-core/nm-utils.h
@@ -30,7 +30,11 @@
#include <netinet/in.h>
/* For ETH_ALEN and INFINIBAND_ALEN */
+#if defined(__GLIBC__)
#include <linux/if_ether.h>
+#else
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
+#endif
#include <linux/if_infiniband.h>
#include "nm-core-enum-types.h"
--- src/platform/wifi/nm-wifi-utils.h.orig
+++ src/platform/wifi/nm-wifi-utils.h
@@ -22,7 +22,11 @@
#ifndef __WIFI_UTILS_H__
#define __WIFI_UTILS_H__
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#else /* musl libc */
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
+#endif
#include "nm-dbus-interface.h"
--- shared/systemd/src/basic/socket-util.h 2019-03-16 15:41:33.287235649 +0100
+++ shared/systemd/src/basic/socket-util.h 2019-03-16 15:42:24.273912106 +0100
@@ -12,6 +12,11 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
+#if !defined(__GLIBC__)
+/* SIOCGSTAMPNS from linux/asm-generic.h
+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
+#include <linux/sockios.h>
+#endif
#include "macro.h"
#include "missing_socket.h"

40
srcpkgs/NetworkManager/patches/musl-process-util.patch

@ -1,40 +0,0 @@
--- shared/systemd/src/basic/process-util.c
+++ shared/systemd/src/basic/process-util.c
@@ -21,6 +21,9 @@
#include <sys/wait.h>
#include <syslog.h>
#include <unistd.h>
+#ifndef __GLIBC__
+#include <pthread.h>
+#endif
#if 0 /* NM_IGNORED */
#if HAVE_VALGRIND_VALGRIND_H
#include <valgrind/valgrind.h>
@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
cached_pid = CACHED_PID_UNSET;
}
+#ifdef __GLIBC__
/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
* headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
* libpthread, as it is part of glibc anyway. */
extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
extern void* __dso_handle _weak_;
+#endif
pid_t getpid_cached(void) {
static bool installed = false;
@@ -1201,7 +1206,12 @@ pid_t getpid_cached(void) {
* only half-documented (glibc doesn't document it but LSB does — though only superficially)
* we'll check for errors only in the most generic fashion possible. */
- if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
+ #ifdef __GLIBC__
+ if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
+ #else
+ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
+ #endif
+
/* OOM? Let's try again later */
cached_pid = CACHED_PID_UNSET;
return new_pid;

40
srcpkgs/NetworkManager/patches/musl-use-srand48.patch

@ -1,40 +0,0 @@
--- shared/n-dhcp4/src/n-dhcp4-c-probe.c.orig 2020-01-06 15:35:10.128600647 +0100
+++ shared/n-dhcp4/src/n-dhcp4-c-probe.c 2020-01-06 15:39:41.446240531 +0100
@@ -362,7 +362,12 @@ static void n_dhcp4_client_probe_config_
seed16v[1] = (u64 >> 16) ^ (u64 >> 0);
seed16v[2] = (u64 >> 32) ^ (u64 >> 16);
+#ifdef __GLIBC__
r = seed48_r(seed16v, &config->entropy);
+#else
+ r = 0;
+ seed48(seed16v);
+#endif
c_assert(!r);
}
@@ -379,7 +384,12 @@ uint32_t n_dhcp4_client_probe_config_get
long int result;
int r;
+#ifdef __GLIBC__
r = mrand48_r(&config->entropy, &result);
+#else
+ r = 0;
+ result = mrand48();
+#endif
c_assert(!r);
return result;
--- shared/n-dhcp4/src/n-dhcp4-private.h.orig 2020-01-06 15:41:31.941501136 +0100
+++ shared/n-dhcp4/src/n-dhcp4-private.h 2020-01-06 15:41:55.341556325 +0100
@@ -267,7 +267,9 @@ struct NDhcp4ClientProbeConfig {
bool inform_only;
bool init_reboot;
struct in_addr requested_ip;
+#ifdef __GLIBC__
struct drand48_data entropy; /* entropy pool */
+#endif
uint64_t ms_start_delay; /* max ms to wait before starting probe */
NDhcp4ClientProbeOption *options[UINT8_MAX + 1];
int8_t request_parameters[UINT8_MAX + 1];

30
srcpkgs/NetworkManager/patches/no-gtk-doc.patch

@ -0,0 +1,30 @@
Reason: We only want to build man pages, not development docs
Upstream: An issue has been filed - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/689
Index: b/meson.build
===================================================================
--- a/meson.build
+++ b/meson.build
@@ -943,10 +943,8 @@ if enable_qt
endif
if enable_docs
- assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
subdir('man')
- subdir('docs')
endif
configure_file(
Index: b/clients/common/meson.build
===================================================================
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@@ -28,7 +28,7 @@ libnmc_base_dep = declare_dependency(
link_with: libnmc_base,
)
-if enable_docs
+if enable_docs and enable_introspection
settings_docs_source = custom_target(
'settings-docs.h',
input: nm_settings_docs_xml_gir,

39
srcpkgs/NetworkManager/template

@ -1,41 +1,39 @@
# Template file for 'NetworkManager'
# when updating to 1.24 or newer, drop the compat
# patch in gnome-control-center and rebuild it