Browse Source

Merge remote-tracking branch 'upstream/master'

master
creton32 2 months ago
parent
commit
5dd1ef4fa7
  1. 8
      .github/workflows/build.yaml
  2. 31
      .github/workflows/notify-issue.yaml
  3. 31
      .github/workflows/notify-pr.yaml
  4. 29
      .github/workflows/notify-push.yaml
  5. 7
      common/build-style/cmake.sh
  6. 2
      common/build-style/meson.sh
  7. 3
      common/build-style/waf.sh
  8. 11
      common/build-style/waf3.sh
  9. 9
      common/environment/configure/gnu-configure-args.sh
  10. 8
      common/hooks/post-install/00-lib32.sh
  11. 7
      common/hooks/post-install/00-libdir.sh
  12. 9
      common/hooks/pre-install/00-lib32.sh
  13. 8
      common/hooks/pre-install/00-libdir.sh
  14. 81
      common/shlibs
  15. 28
      common/travis/check-install.sh
  16. 4
      common/wrappers/cross-cc
  17. 26
      srcpkgs/66/patches/ed738d6cbdc78e3b8ce869949b601505caa4b6cb.diff
  18. 7
      srcpkgs/66/template
  19. 4
      srcpkgs/ImageMagick/template
  20. 4
      srcpkgs/ImageMagick6/template
  21. 6
      srcpkgs/MangoHud/template
  22. 4
      srcpkgs/QMPlay2/template
  23. 9
      srcpkgs/Terminal/patches/x86_64-musl-termios_h.patch
  24. 16
      srcpkgs/Terminal/template
  25. 11
      srcpkgs/abGate/template
  26. 6
      srcpkgs/acl/template
  27. 12
      srcpkgs/adobe-flash-plugin/template
  28. 2
      srcpkgs/aisleriot/template
  29. 37
      srcpkgs/amdvlk/template
  30. 7
      srcpkgs/amfora/template
  31. 11
      srcpkgs/apvlv/patches/fix-build-with-poppler-0.73.0.patch
  32. 11
      srcpkgs/apvlv/patches/fix-gcc6-getline.patch
  33. 23
      srcpkgs/apvlv/patches/fix-gcc7-ftbfs.patch
  34. 10
      srcpkgs/apvlv/template
  35. 12
      srcpkgs/arcan/patches/cmake-espeak-ng.patch
  36. 2
      srcpkgs/arcan/template
  37. 7
      srcpkgs/attr/template
  38. 2
      srcpkgs/autogen/template
  39. 2
      srcpkgs/avahi-discover/template
  40. 4
      srcpkgs/bctoolbox/template
  41. 8
      srcpkgs/binutils/template
  42. 6
      srcpkgs/boinc/template
  43. 2
      srcpkgs/bomi/template
  44. 4
      srcpkgs/bpytop/template
  45. 4
      srcpkgs/bzrtp/template
  46. 4
      srcpkgs/calibre/template
  47. 4
      srcpkgs/cargo-about/template
  48. 5
      srcpkgs/cegui/template
  49. 4
      srcpkgs/chezmoi/template
  50. 2
      srcpkgs/cifs-utils/template
  51. 343
      srcpkgs/clazy/files/clazy-001-llvm11-stringref.patch
  52. 28
      srcpkgs/clazy/files/clazy-002-llvm11-stringref.patch
  53. 16
      srcpkgs/clazy/template
  54. 4
      srcpkgs/cmake-bootstrap/template
  55. 1
      srcpkgs/cmake-bootstrap/update
  56. 4
      srcpkgs/cni-plugins/template
  57. 20
      srcpkgs/collectd/template
  58. 4
      srcpkgs/comrak/template
  59. 4
      srcpkgs/conmon/template
  60. 1
      srcpkgs/cross-aarch64-linux-gnu/files/fix-cxxflags-passing.patch
  61. 1
      srcpkgs/cross-aarch64-linux-gnu/files/use-pure-64bit-configs.patch
  62. 15
      srcpkgs/cross-aarch64-linux-gnu/template
  63. 1
      srcpkgs/cross-aarch64-linux-musl/files/fix-cxxflags-passing.patch
  64. 1
      srcpkgs/cross-aarch64-linux-musl/files/gccgo-musl.patch
  65. 1
      srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch
  66. 1
      srcpkgs/cross-aarch64-linux-musl/files/libgnarl-musl.patch
  67. 1
      srcpkgs/cross-aarch64-linux-musl/files/libssp-musl.patch
  68. 1
      srcpkgs/cross-aarch64-linux-musl/files/musl-ada.patch
  69. 1
      srcpkgs/cross-aarch64-linux-musl/files/use-pure-64bit-configs.patch
  70. 19
      srcpkgs/cross-aarch64-linux-musl/template
  71. 1
      srcpkgs/cross-arm-linux-gnueabi/files/fix-cxxflags-passing.patch
  72. 21
      srcpkgs/cross-arm-linux-gnueabi/template
  73. 1
      srcpkgs/cross-arm-linux-gnueabihf/files/fix-cxxflags-passing.patch
  74. 21
      srcpkgs/cross-arm-linux-gnueabihf/template
  75. 1
      srcpkgs/cross-arm-linux-musleabi/files/fix-cxxflags-passing.patch
  76. 1
      srcpkgs/cross-arm-linux-musleabi/files/gccgo-musl.patch
  77. 1
      srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch
  78. 1
      srcpkgs/cross-arm-linux-musleabi/files/libgnarl-musl.patch
  79. 1
      srcpkgs/cross-arm-linux-musleabi/files/libssp-musl.patch
  80. 1
      srcpkgs/cross-arm-linux-musleabi/files/musl-ada.patch
  81. 16
      srcpkgs/cross-arm-linux-musleabi/template
  82. 1
      srcpkgs/cross-arm-linux-musleabihf/files/fix-cxxflags-passing.patch
  83. 1
      srcpkgs/cross-arm-linux-musleabihf/files/gccgo-musl.patch
  84. 1
      srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch
  85. 1
      srcpkgs/cross-arm-linux-musleabihf/files/libgnarl-musl.patch
  86. 1
      srcpkgs/cross-arm-linux-musleabihf/files/libssp-musl.patch
  87. 1
      srcpkgs/cross-arm-linux-musleabihf/files/musl-ada.patch
  88. 16
      srcpkgs/cross-arm-linux-musleabihf/template
  89. 1
      srcpkgs/cross-armv7l-linux-gnueabihf/files/fix-cxxflags-passing.patch
  90. 21
      srcpkgs/cross-armv7l-linux-gnueabihf/template
  91. 1
      srcpkgs/cross-armv7l-linux-musleabihf/files/fix-cxxflags-passing.patch
  92. 1
      srcpkgs/cross-armv7l-linux-musleabihf/files/gccgo-musl.patch
  93. 1
      srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch
  94. 1
      srcpkgs/cross-armv7l-linux-musleabihf/files/libgnarl-musl.patch
  95. 1
      srcpkgs/cross-armv7l-linux-musleabihf/files/libssp-musl.patch
  96. 1
      srcpkgs/cross-armv7l-linux-musleabihf/files/musl-ada.patch
  97. 16
      srcpkgs/cross-armv7l-linux-musleabihf/template
  98. 1
      srcpkgs/cross-i686-linux-musl/files/fix-cxxflags-passing.patch
  99. 1
      srcpkgs/cross-i686-linux-musl/files/gccgo-musl.patch
  100. 1
      srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch

8
.github/workflows/build.yaml

@ -87,3 +87,11 @@ jobs:
cd /
"$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
)
- name: Verify repository state
run: |
(
here="$(pwd)"
cd /
"$here/common/travis/check-install.sh" "$BOOTSTRAP" "$ARCH"
)

31
.github/workflows/notify-issue.yaml

@ -1,31 +0,0 @@
name: "Issue Notification"
on:
issues:
types: [opened, closed]
jobs:
ircnotify:
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- name: Shorten URL
id: shortener
if: github.repository == 'void-linux/void-packages'
uses: Gottox/url-shortener-action@master
with:
url: "${{ github.event.issue.html_url }}"
- name: "Issue Notification"
uses: Gottox/irc-message-action@main
continue-on-error: true
if: github.repository == 'void-linux/void-packages'
with:
channel: "#xbps"
nickname: void-packages
sasl_password: ${{ secrets.freenode_password_void_packages }}
tls: true
message: >-
${{ github.actor }}
${{ github.event.action }} issue
#${{ github.event.issue.number }}
“${{ github.event.issue.title }}”
${{ steps.shortener.outputs.short_url }}

31
.github/workflows/notify-pr.yaml

@ -1,31 +0,0 @@
name: "Pull Request Notification"
on:
pull_request:
types: [opened, closed]
jobs:
ircnotify:
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- name: Shorten URL
id: shortener
if: github.repository == 'void-linux/void-packages'
uses: Gottox/url-shortener-action@master
with:
url: "${{ github.event.pull_request.html_url }}"
- name: "Pull Request Notification"
uses: Gottox/irc-message-action@main
continue-on-error: true
if: github.repository == 'void-linux/void-packages'
with:
channel: "#xbps"
nickname: void-packages
sasl_password: ${{ secrets.freenode_password_void_packages }}
tls: true
message: >-
${{ github.actor }}
${{ github.event.action }} pull request
#${{ github.event.pull_request.number }}
“${{ github.event.pull_request.title }}”
${{ steps.shortener.outputs.short_url }}

29
.github/workflows/notify-push.yaml

@ -1,29 +0,0 @@
name: "Push Notification"
on:
push:
branches: [master]
jobs:
ircnotify:
runs-on: ubuntu-latest
timeout-minutes: 3
steps:
- name: Shorten URL
id: shortener
if: github.repository == 'void-linux/void-packages'
uses: Gottox/url-shortener-action@master
with:
url: "${{ github.event.compare }}"
- name: "Push Notification"
uses: Gottox/irc-message-action@main
continue-on-error: true
if: github.repository == 'void-linux/void-packages'
with:
channel: "#xbps"
nickname: void-packages
sasl_password: ${{ secrets.freenode_password_void_packages }}
tls: true
message: >-
${{ github.actor }}
pushed
${{ steps.shortener.outputs.short_url }}

7
common/build-style/cmake.sh

@ -58,12 +58,7 @@ _EOF
fi
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
cmake_args+=" -DCMAKE_BUILD_TYPE=Release"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib32"
else
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib"
fi
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
if [[ $build_helper = *"qemu"* ]]; then
echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \

2
common/build-style/meson.sh

@ -94,7 +94,7 @@ do_configure() {
${meson_cmd} \
--prefix=/usr \
--libdir=/usr/lib \
--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
--libexecdir=/usr/libexec \
--bindir=/usr/bin \
--sbindir=/usr/bin \

3
common/build-style/waf.sh

@ -4,7 +4,8 @@
do_configure() {
: ${configure_script:=waf}
PYTHON=/usr/bin/python2 python2 ${configure_script} configure --prefix=/usr --libdir=/usr/lib ${configure_args}
PYTHON=/usr/bin/python2 python2 ${configure_script} configure \
--prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} ${configure_args}
}
do_build() {

11
common/build-style/waf3.sh

@ -3,8 +3,17 @@
#
do_configure() {
: ${configure_script:=waf}
local cross_args
PYTHON=/usr/bin/python3 python3 ${configure_script} configure --prefix=/usr --libdir=/usr/lib ${configure_args}
if [[ $build_helper = *"qemu"* ]] && [ "$CROSS_BUILD" ]; then
# If the qemu build helper is specified, use it for cross builds
cross_args="--cross-compile --hostcc=${CC_FOR_BUILD}
--cross-execute=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
fi
PYTHON=/usr/bin/python3 python3 ${configure_script} configure \
--prefix=/usr --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
${configure_args} ${cross_args}
}
do_build() {

9
common/environment/configure/gnu-configure-args.sh

@ -10,11 +10,10 @@ export configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bind
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# on x86 use /usr/lib32 as libdir, but just as fake directory,
# because /usr/lib32 is a symlink to /usr/lib in void.
export configure_args+=" --libdir=/usr/lib32"
fi
# Always use wordsize-specific libdir even though the real path is lib
# This is to make sure 32-bit and 64-bit libs can coexist when looking
# up things (the opposite-libdir is always symlinked as libNN)
export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
_AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache

8
common/hooks/post-install/00-lib32.sh

@ -1,8 +0,0 @@
# This hook removes the /usr/lib32 symlink on 32-bit systems.
hook() {
if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \
[ "${pkgname}" != "base-files" ]; then
rm -f ${PKGDESTDIR}/usr/lib32
fi
}

7
common/hooks/post-install/00-libdir.sh

@ -0,0 +1,7 @@
# This hook removes the wordsize specific libdir symlink.
hook() {
if [ "${pkgname}" != "base-files" ]; then
rm -f ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
fi
}

9
common/hooks/pre-install/00-lib32.sh

@ -1,9 +0,0 @@
# This hook creates the /usr/lib32 symlink for 32-bit systems.
hook() {
if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \
[ "${pkgname}" != "base-files" ]; then
vmkdir usr/lib
ln -sf lib ${PKGDESTDIR}/usr/lib32
fi
}

8
common/hooks/pre-install/00-libdir.sh

@ -0,0 +1,8 @@
# This hook creates the wordsize specific libdir symlink.
hook() {
if [ "${pkgname}" != "base-files" ]; then
vmkdir usr/lib
ln -sf lib ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
fi
}

81
common/shlibs

@ -735,6 +735,7 @@ libasm.so.1 libelf-0.155_1
libdebuginfod.so.1 libdebuginfod-0.182_1
libgtksourceview-3.0.so.1 gtksourceview-3.8.0_1
libtalloc.so.2 talloc-2.0.1_1
libpytalloc-util.so.2 libpytalloc-util-2.3.1_2
libmount.so.1 libmount-2.18_1
libdconf.so.1 dconf-0.13.90_1
libassuan.so.0 libassuan-2.0.1_1
@ -759,8 +760,8 @@ libasyncns.so.0 libasyncns-0.8_1
libpulse.so.0 libpulseaudio-1.0_1
libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
libpulse-simple.so.0 libpulseaudio-1.0_1
libpulsecommon-13.0.so libpulseaudio-13.0_1
libpulsecore-13.0.so libpulseaudio-13.0_1
libpulsecommon-14.0.so libpulseaudio-14.0_1
libpulsecore-14.0.so libpulseaudio-14.0_1
libprojectM.so.3 projectM-3.1.7_2
liborc-0.4.so.0 orc-0.4.11_1
liborc-test-0.4.so.0 orc-0.4.11_1
@ -773,10 +774,8 @@ libgssdp-1.2.so.0 gssdp-1.2.0_1
libgupnp-1.2.so.0 gupnp-1.2.0_1
libsamplerate.so.0 libsamplerate-0.1.7_1
libmms.so.0 libmms-0.6_1
libsmbclient.so.0 libsmbclient-3.5.6_1
libsmbios.so.2 libsmbios-2.2.28_1
libsmbios_c.so.2 libsmbios-2.2.28_1
libwbclient.so.0 libsmbclient-3.5.6_1
libjasper.so.4 libjasper-1.900.27_1
librecode.so.0 librecode-3.6_1
libenca.so.0 libenca-1.13_1
@ -1436,7 +1435,7 @@ libgda-xslt-5.0.so.4 libgda-5.1.2_1
libamtk-5.so.0 amtk-5.0.0_1
libdevhelp-3.so.6 devhelp-libs-3.30.0_1
libunistring.so.2 libunistring-0.9.4_1
libguile-2.0.so.22 libguile-2.0.9_3
libguile-2.2.so.1 libguile-2.2.7_1
libopts.so.25 libopts-5.18.4_6
libanjuta-3.so.0 anjuta-3.8.4_1
libgmlib.so.1 gmtk-1.0.8_1
@ -1617,8 +1616,6 @@ libdovecot-compression.so.0 dovecot-2.2.11_2
libdovecot-sql.so.0 dovecot-2.2.11_2
libdovecot-storage.so.0 dovecot-2.2.11_2
libdovecot-lda.so.0 dovecot-2.2.11_2
libnetapi.so.0 samba-3.6.23_1
libsmbsharemodes.so.0 samba-3.6.23_1
libmysqld.so.18 libmariadbclient-5.5.36_1
libwiretap.so.11 libwireshark-3.4.0_1
libwireshark.so.14 libwireshark-3.4.0_1
@ -2121,7 +2118,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
libespeak.so.1 libespeak-1.48.04_1
libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
@ -2258,7 +2255,7 @@ libtesseract.so.4 tesseract-ocr-4.0.0_1
libffmpegthumbnailer.so.4 ffmpegthumbnailer-2.0.10_1
libopenraw.so.7 libopenraw-0.1.0_1
libopenrawgnome.so.7 libopenraw-0.1.0_1
libgeda.so.46 geda-1.10.0_1
libgeda.so.47 geda-1.10.1_1
libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
libgsound.so.0 gsound-1.0.1_1
libgegl-0.3.so.0 gegl3-0.3.0_1
@ -2777,7 +2774,8 @@ libply-boot-client.so.4 plymouth-0.9.2_1
libmilter.so.1.0.2 libmilter-1.0.2_1
libopendkim.so.10 opendkim-2.10.3_1
libtevent.so.0 tevent-0.9.28_1
libldb.so.1 ldb-1.1.26_1
libldb.so.2 ldb-2.2.0_1
libpyldb-util.so.2 libpyldb-util-2.2.0_1
libpath_utils.so.1 ding-libs-0.5.0_1
libdhash.so.1 ding-libs-0.5.0_1
libcollection.so.4 ding-libs-0.5.0_1
@ -2944,25 +2942,25 @@ libkj-async-0.8.0.so capnproto-0.8.0_1
libkj-test-0.8.0.so capnproto-0.8.0_1
libkj-0.8.0.so capnproto-0.8.0_1
libkea-asiodns.so.1 libkea-1.7.0_1
libkea-asiolink.so.19 libkea-1.9.0_1
libkea-asiolink.so.21 libkea-1.9.3_1
libkea-cc.so.20 libkea-1.9.2_1
libkea-cfgclient.so.10 libkea-1.8.0_1
libkea-cfgclient.so.21 libkea-1.9.3_1
libkea-cryptolink.so.16 libkea-1.9.2_1
libkea-database.so.18 libkea-1.9.2_1
libkea-database.so.19 libkea-1.9.3_1
libkea-dhcp++.so.31 libkea-1.9.2_1
libkea-dhcp_ddns.so.14 libkea-1.9.1_1
libkea-dhcpsrv.so.40 libkea-1.9.2_1
libkea-dhcpsrv.so.41 libkea-1.9.3_1
libkea-dns++.so.5 libkea-1.8.0_1
libkea-eval.so.23 libkea-1.9.2_1
libkea-exceptions.so.0 libkea-1.1.0_1
libkea-hooks.so.28 libkea-1.9.2_1
libkea-http.so.21 libkea-1.9.2_1
libkea-hooks.so.29 libkea-1.9.3_1
libkea-http.so.22 libkea-1.9.3_1
libkea-log.so.17 libkea-1.9.2_1
libkea-pgsql.so.16 libkea-1.9.2_1
libkea-process.so.23 libkea-1.9.2_1
libkea-pgsql.so.17 libkea-1.9.3_1
libkea-process.so.24 libkea-1.9.3_1
libkea-stats.so.16 libkea-1.9.0_1
libkea-util-io.so.0 libkea-1.1.0_1
libkea-util.so.29 libkea-1.9.2_1
libkea-util.so.30 libkea-1.9.3_1
libytnef.so.0 ytnef-1.8_1
libpisock.so.9 pilot-link-0.12.5_1
libpisync.so.1 pilot-link-0.12.5_1
@ -3725,7 +3723,7 @@ libflite.so.1 flite-2.1_1
libflite_cmu_us_kal.so.1 flite-2.1_1
libflite_usenglish.so.1 flite-2.1_1
libflite_cmulex.so.1 flite-2.1_1
libgtk-4.so.0 gtk4-3.99.1_1
libgtk-4.so.1 gtk4-4.0.0_1
libmodule.so.5 libmodule-5.0.0_1
libgnustep-gui.so.0.28 gnustep-gui-0.28.0_1
libmhash.so.2 mhash-0.9.9.9_1
@ -4000,3 +3998,46 @@ libevemu.so.3 evemu-2.7.0_1
libantilib.so.1 libantimicrox-3.1.2_1
libinih.so.0 inih-52_1
libpcaudio.so.0 pcaudiolib-1.1_1
libdcerpc-samr.so.0 samba-4.13.2_1
libdcerpc-server-core.so.0 samba-4.13.2_1
libnetapi.so.0 samba-4.13.2_1
libnss_winbind.so.2 samba-4.13.2_1
libnss_wins.so.2 samba-4.13.2_1
libsamba-policy.so.0 samba-4.13.2_1
libauth-unix-token-samba4.so samba-4.13.2_1
libdcerpc-samba4.so samba-4.13.2_1
libdsdb-module-samba4.so samba-4.13.2_1
libgpext-samba4.so samba-4.13.2_1
libposix-eadb-samba4.so samba-4.13.2_1
libprinting-migrate-samba4.so samba-4.13.2_1
libsamba-net-samba4.so samba-4.13.2_1
libshares-samba4.so samba-4.13.2_1
libsmbd-base-samba4.so samba-4.13.2_1
libsmbd-conn-samba4.so samba-4.13.2_1
libxattr-tdb-samba4.so samba-4.13.2_1
libdcerpc.so.0 samba-libs-4.13.2_1
libdcerpc-binding.so.0 samba-libs-4.13.2_1
libndr-krb5pac.so.0 samba-libs-4.13.2_1
libndr-nbt.so.0 samba-libs-4.13.2_1
libndr-standard.so.0 samba-libs-4.13.2_1
libndr.so.1 samba-libs-4.13.2_1
libsamba-credentials.so.0 samba-libs-4.13.2_1
libsamba-errors.so.1 samba-libs-4.13.2_1
libsamba-hostconfig.so.0 samba-libs-4.13.2_1
libsamba-passdb.so.0 samba-libs-4.13.2_1
libsamba-util.so.0 samba-libs-4.13.2_1
libsamdb.so.0 samba-libs-4.13.2_1
libsmbclient.so.0 samba-libs-4.13.2_1
libsmbconf.so.0 samba-libs-4.13.2_1
libsmbldap.so.2 samba-libs-4.13.2_1
libwbclient.so.0 samba-libs-4.13.2_1
libcli-ldap-samba4.so samba-libs-4.13.2_1
libcliauth-samba4.so samba-libs-4.13.2_1
libcommon-auth-samba4.so samba-libs-4.13.2_1
libdcerpc-samba-samba4.so samba-libs-4.13.2_1
libgpo-samba4.so samba-libs-4.13.2_1
libndr-samba-samba4.so samba-libs-4.13.2_1
libndr-samba4.so samba-libs-4.13.2_1
libsmb-transport-samba4.so samba-libs-4.13.2_1
libutil-cmdline-samba4.so samba-libs-4.13.2_1
libwinbind-client-samba4.so samba-libs-4.13.2_1

28
common/travis/check-install.sh

@ -0,0 +1,28 @@
#!/bin/sh
#
# check-install.sh
export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
triplet="$(/hostrepo/xbps-src -a "$XBPS_TARGET_ARCH" show-var XBPS_CROSS_TRIPLET)"
ROOTDIR="-r /usr/$triplet"
fi
ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
/bin/echo -e "\x1b[32mTrying to install dependants of $subpkg:\x1b[0m"
for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
xbps-install \
$ROOTDIR $ADDREPO \
-Sny \
"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
if [ $? -eq 8 ]; then
/bin/echo -e "\x1b[31mFailed to install '$subpkg' and '$dep'\x1b[0m"
exit 1
fi
done
done
done < /tmp/templates

4
common/wrappers/cross-cc

@ -16,7 +16,7 @@ while [ $i -lt ${#ARGS[@]} ]; do
fi
unset incpath
elif [ "$libpath" ]; then
if [ "$arg" = "/usr/lib" ]; then
if [ "$arg" = "/usr/lib" -o "$arg" = "/lib" ]; then
echo "[cc-wrapper] ignoring -L $arg"
else
MYARGS+=("-L${arg}")
@ -26,7 +26,7 @@ while [ $i -lt ${#ARGS[@]} ]; do
incpath=1
elif [ "$arg" = "-L" ]; then
libpath=1
elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" ]; then
elif [ "$arg" = "-I/usr/include" -o "$arg" = "-L/usr/lib" -o "$arg" = "-L/lib" ]; then
echo "[cc-wrapper] ignoring $arg"
else
MYARGS+=("${arg}")

26
srcpkgs/66/patches/ed738d6cbdc78e3b8ce869949b601505caa4b6cb.diff

@ -1,26 +0,0 @@
diff --git a/src/lib66/ss_environ.c b/src/lib66/ss_environ.c
index 05f2697c45d3958147d9243c24a5389897c2bd41..12c2b8fcbc99fcb83adf576c1541984a4b23e8e5 100644
--- a/src/lib66/ss_environ.c
+++ b/src/lib66/ss_environ.c
@@ -185,7 +185,7 @@ int env_make_symlink(stralloc *dst,stralloc *old_dst,sv_alltype *sv,uint8_t conf
* a directory. File means old format, in this case we enforce to pass
* to the new one. */
r = lstat(sym_version,&st) ;
- if (S_ISLNK(st.st_mode))
+ if (S_ISLNK(st.st_mode) && !r)
{
if (sarealpath(&saversion,sym_version) == -1)
log_warn_return(LOG_EXIT_ZERO,"sarealpath of: ",sym_version) ;
diff --git a/src/lib66/ssexec_disable.c b/src/lib66/ssexec_disable.c
index ed884021cea729be8d22af9323fa5ec67c7a7b56..5e056509171fcaaa48ae52ea2390400edc1a3312 100644
--- a/src/lib66/ssexec_disable.c
+++ b/src/lib66/ssexec_disable.c
@@ -213,7 +213,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
/** The force options can be only used if the service is not marked initialized.
* This option should only be used when we have a inconsistent state between
- * the /var/lib/66/system/<tree>/servicedirs/* and /var/lib/66/system/<tree>/.resolve
+ * the /var/lib/66/system/<tree>/servicedirs/ and /var/lib/66/system/<tree>/.resolve
* directory meaning a service which is not present in the compiled db but its resolve file
* exist.*/
if (FORCE && ss_state_check(state,name))

7
srcpkgs/66/template

@ -1,7 +1,7 @@
# Template file for '66'
pkgname=66
version=0.5.1.0
revision=2
version=0.5.1.1
revision=1
wrksrc="66-v${version}"
build_style=configure
configure_args="--prefix=/usr
@ -17,8 +17,7 @@ license="ISC"
homepage="http://web.obarun.org/software/"
changelog="https://framagit.org/Obarun/66/raw/master/NEWS.md"
distfiles="https://framagit.org/Obarun/66/-/archive/v${version}/66-v${version}.tar.bz2"
checksum=16a720f493d40a6d43e78b66ddd218335926ed988b7ea2aed82d17c6f7b5a8a6
patch_args="-Np1"
checksum=7a0db00186f1c2111d07cbcc082f769c806820607d7ba5f49e505abf06687e0c
conf_files="/etc/66/init /etc/66/init.conf"

4
srcpkgs/ImageMagick/template

@ -1,7 +1,7 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
_majorver=7.0.10
_patchver=48
_patchver=51
version="${_majorver}.${_patchver}"
revision=1
wrksrc="${pkgname}-${_majorver}-${_patchver}"
@ -21,7 +21,7 @@ license="ImageMagick"
homepage="https://www.imagemagick.org/"
changelog="https://imagemagick.org/script/changelog.php"
distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
checksum=8f587b3d0b5ce5cc1ba00c193c28b3224d7e9588f47f722975ae45d3f37861d6
checksum=fa993169a06052267eaf81cf85bbf5a30c0bf243511017d986f47abbe65ff262
subpackages="libmagick libmagick-devel"

4
srcpkgs/ImageMagick6/template

@ -1,7 +1,7 @@
# Template file for 'ImageMagick6'
pkgname=ImageMagick6
_majorver=6.9.11
_patchver=48
_patchver=51
version="${_majorver}.${_patchver}"
revision=1
wrksrc="${pkgname}-${_majorver}-${_patchver}"
@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="ImageMagick"
homepage="https://www.imagemagick.org/"
distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
checksum=ce19fb4eeddb64d63e5f16f5643b8d5f8772319207d1fc1a0f610ec9506cfcdf
checksum=06c4363486e1053e69bb3fa211374bdaed4baa678ca8ccd1f38731f0da2d3497
keep_libtool_archives=yes
conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"

6
srcpkgs/MangoHud/template

@ -1,7 +1,7 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.6.1
revision=1
revision=2
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled"
hostmakedepends="Vulkan-Headers python3-Mako glslang pkg-config"
@ -14,10 +14,6 @@ distfiles="https://github.com/flightlessmango/MangoHud/archive/v${version}.tar.g
checksum=a1cb0bef85fd46a6e5e7426b86e0d16714e5ec68f96c724f6f53a357f516f78b
lib32files="/usr/bin/mangohud.x86 /usr/share/vulkan/implicit_layer.d/MangoHud.x86.json"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
configure_args+=" --libdir=/usr/lib32"
fi
post_install() {
vlicense LICENSE
}

4
srcpkgs/QMPlay2/template

@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=20.12.07
version=20.12.16
revision=1
wrksrc="${pkgname}-src-${version}"
build_style=cmake
@ -15,7 +15,7 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
checksum=b118fdeba5d9d72e613e793617efccaa2d6ad325b05b373a9644cac987ae825e
checksum=d6a5425f552e33a70b254ed27631878f20ea92850ccf221c2f2322200783d278
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"

9
srcpkgs/Terminal/patches/x86_64-musl-termios_h.patch

@ -0,0 +1,9 @@
Building on x86_64-musl fails with:
TerminalView.m:49:12: fatal error: termio.h: No such file or directory
--- TerminalView.m 2017-08-02 13:17:43.000000000 -0400
+++ TerminalView.m 2020-12-17 01:38:16.124286870 -0500
@@ -49 +49 @@ activated */
-# include <termio.h>
+# include <termios.h>

16
srcpkgs/Terminal/template

@ -0,0 +1,16 @@
# Template file for 'Terminal'
pkgname=Terminal
version=0.9.9
revision=1
build_style=gnu-makefile
make_use_env=yes
hostmakedepends="gnustep-make gcc-objc"
makedepends="gnustep-base-devel gnustep-gui-devel"
depends="gnustep-base gnustep-gui gnustep-back"
short_desc="Terminal emulator for GNUstep"
maintainer="Phosu Parsons <founderofjp@gmail.com>"
license="GPL-2.0-only"
homepage="http://gap.nongnu.org/terminal/"
distfiles="${NONGNU_SITE}/gap/${pkgname}-${version}.tar.gz"
checksum=27f81bbecdbd10cde8c080012cde4973bec20e551c58c29f353733cf03c220e9
nocross="objc doesn't get cross build at present within gcc (see gnustep-base)"

11
srcpkgs/abGate/template

@ -1,6 +1,6 @@
# Template file for 'abGate'
pkgname=abGate
version=1.1.9
version=1.2.0
revision=1
build_style=gnu-makefile
build_helper=qmake
@ -11,13 +11,10 @@ short_desc="LV2 Noise Gate plugin"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later"
homepage="http://abgate.sourceforge.net/"
distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz"
checksum=898b50cce44dffedd82ec0e6d6d043a9d26534fbf07898d099575ea4c1057721
distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz>${pkgname}-${versiont}.tar.gz"
checksum=ebee1cc545b088bf6e5989c114e7e34fa9f21ac7fdb1eee3fd067bcf98703b86
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
fi
pre_build() {
vsed -i -e 's/g++/$(CXX)/' Makefile
}
CXXFLAGS="-fPIC"

6
srcpkgs/acl/template

@ -4,7 +4,8 @@ version=2.2.53
revision=1
bootstrap=yes
build_style=gnu-configure
configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
--libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
makedepends="attr-devel"
short_desc="Access Control List filesystem support"
maintainer="Orphaned <orphan@voidlinux.org>"
@ -17,9 +18,6 @@ if [ -z "$CHROOT_READY" ]; then
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
fi
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
configure_args="--libdir=/usr/lib32 --libexecdir=/usr/lib32"
fi
acl-devel_package() {
depends="attr-devel acl>=${version}_${revision}"

12
srcpkgs/adobe-flash-plugin/template

@ -1,10 +1,10 @@
# Template file for 'adobe-flash-plugin'
pkgname=adobe-flash-plugin
version=32.0.0.453
version=32.0.0.465
revision=1
depends="curl hicolor-icon-theme desktop-file-utils"
short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="mkf <makefile@riseup.net>"
license="custom:Adobe License (non free)"
homepage="https://www.adobe.com"
repository="nonfree"
@ -23,15 +23,15 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
${_url}/flash_player_npapi_linux.x86_64.tar.gz
${_url}/flash_player_ppapi_linux.x86_64.tar.gz"
checksum="
587fe7027ef410e6833a9428b61ea28d4047bce6e8ed4bff3127cb9e08723e37
cab3d2b3a02b1348d991259a7602ffb1d12ec1912984a68bcab0f7ccdf27a9f7"
a90f2edb98231896331c61a81017f390e180015f90193865e3295319cf636c35
99fcc780897be55bac7d11c0204ba7a3d5e7dc1f1aed75d5e7b5ad28c0b2ff5d"
else
distfiles="
${_url}/flash_player_npapi_linux.i386.tar.gz
${_url}/flash_player_ppapi_linux.i386.tar.gz"
checksum="
4151cdbba10488978aa2baae19ec147012e17d79c59a6bb40453e35435571df8
88f71944d5c08d1b36446c9c865fc82bcb89d55cd148f62afee8dd928943caf6"
27b7210d09514d661c34752d29cbc0b6c09968b8d197d21fedc14fd3c49a0bd6
d32ad3eb24f22cd11cb83910a72880c98f69ea1ec0f3ce6beb31812e166f0f62"
fi
distfiles+=" ${_eula}"
checksum+=" ${_eulacksum}"

2
srcpkgs/aisleriot/template

@ -1,7 +1,7 @@
# Template file for 'aisleriot'
pkgname=aisleriot
version=3.22.13
revision=1
revision=2
build_style=meson
# build requires assertions to be turned on -> n_debug=false
configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true

37
srcpkgs/amdvlk/template

@ -1,11 +1,11 @@
# Template file for 'amdvlk'
pkgname=amdvlk
version=2020.Q4.3
version=2020.Q4.6
revision=1
_llpc_commit=3b3506161572475b0c163a5d44444fd98922b7d8
_xgl_commit=87430a6fa88da11473eed49603def2fa47b51fa0
_pal_commit=4ae736bdbc5d5dee59851ac564c5e21d807b44b0
_llvm_project_commit=11778b213e0e979cbe185901b365f0b2e9a66522
_llpc_commit=e2d38b0c8042efbc435e51696aba5c1abd256c88
_xgl_commit=86f61a31988a626371131a1633547b0d0ebfcfcb
_pal_commit=f92844ecbba39be3d2663717ad69c3dffc282211
_llvm_project_commit=a0777f49050191c9e215a4880c855395ba805508
_spvgen_commit=fb798cb760a436e9496dbaab8827e4d183b74744
_MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
_CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
checksum="83d963cdffbd3b816379abd26105c75bf55788e68a2836be0a086c9604750b94
2fa3a50a61ae39a9b08c92bb2b035f03d21d6d137dffdd5318e56fc48dccd91f
da14aa4de81be1bfe366f94d9cd7d4f025b45a67215cefa08a47cc1e3bf357eb
f871c688dbf124772e00d965ca7f3ba3a69f5e9a0fda2a3454ce0087e6b69e2e
3947879b78906177e5028fc08c62a13c9517ddeb87790be03fb7b0799063339a
checksum="7408961e8b8d5725ba5887ef55cf79c7117da6e77f4f4d5d24bb531b775f5fb6
346307070fe5283a6fc261465cd8ecdff749381f7ab2e48fe45fa46ef112e907
2f4a186c8a8ce23d4cb57623eb8380ff1ed70c0172311a73c084f94706a09c01
92bb3e00dd10556f4f4f2bc702f6e51b7709ccbfef6c4d94b07a15140993ed4f
32bbc615d89abfbef188c3a613d3a4effcf0ea95eabe2d113dd9b80d3ce74fe9
371b137edf4d5ec4f4483ec10ac1419fffa73b6abb1931dd637a59c1b6247e65
cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
@ -64,17 +64,10 @@ pre_configure() {
}
do_install() {
case $XBPS_TARGET_MACHINE in
i686*|mips*|arm*|ppc|ppc-musl)
vinstall build/icd/amdvlk32.so 644 usr/lib/
vinstall ${wrksrc}/AMDVLK/json/Redhat/amd_icd32.json 644 usr/share/vulkan/icd.d/
vsed -i ${DESTDIR}/usr/share/vulkan/icd.d/amd_icd32.json -e 's#/usr/lib/#/usr/lib32/#g'
;;
*)
vinstall build/icd/amdvlk64.so 644 usr/lib/
vinstall ${wrksrc}/AMDVLK/json/Redhat/amd_icd64.json 644 usr/share/vulkan/icd.d/
vsed -i ${DESTDIR}/usr/share/vulkan/icd.d/amd_icd64.json -e 's#/usr/lib64/#/usr/lib/#g'
;;
esac
vinstall build/icd/amdvlk${XBPS_TARGET_WORDSIZE}.so 644 usr/lib/
vinstall ${wrksrc}/AMDVLK/json/Redhat/amd_icd${XBPS_TARGET_WORDSIZE}.json \
644 usr/share/vulkan/icd.d/
vsed -i ${DESTDIR}/usr/share/vulkan/icd.d/amd_icd${XBPS_TARGET_WORDSIZE}.json \
-e "s#/usr/lib/#/usr/lib${XBPS_TARGET_WORDSIZE}/#g"
vlicense ${wrksrc}/AMDVLK/LICENSE.txt
}

7
srcpkgs/amfora/template

@ -1,7 +1,7 @@
# Template file for 'amfora'
pkgname=amfora
version=1.6.0
revision=2
version=1.7.1
revision=1
build_style=go
go_import_path="github.com/makeworld-the-better-one/${pkgname}"
short_desc="Fancy terminal browser for the Gemini protocol"
@ -10,9 +10,10 @@ license="GPL-3.0-only"
homepage="https://github.com/makeworld-the-better-one/amfora"
changelog="https://raw.githubusercontent.com/makeworld-the-better-one/amfora/master/CHANGELOG.md"
distfiles="https://github.com/makeworld-the-better-one/${pkgname}/archive/v${version}.tar.gz"
checksum=a02b070679718953a4184ef2b7fbeccfcdf9bf227ca1efab34ee0d7fa21e9bd9
checksum=55a2d98e438ed3d41ad6bae6b4e04348a04e28a279fdc09866a1fdd5ee91d3ec
post_install() {
vinstall amfora.desktop 644 usr/share/applications/
vsconf default-config.toml
vcopy contrib/themes usr/share/examples/${pkgname}/themes
}

11
srcpkgs/apvlv/patches/fix-build-with-poppler-0.73.0.patch

@ -1,11 +0,0 @@
--- src/ApvlvPdf.cc
+++ src/ApvlvPdf.cc
@@ -29,7 +29,7 @@
#include "ApvlvPdf.h"
#ifndef POPPLER_WITH_GDK
-#include <goo/gtypes.h>
+#include <goo/gfile.h>
static void
copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,

11
srcpkgs/apvlv/patches/fix-gcc6-getline.patch

@ -1,11 +0,0 @@
--- src/ApvlvParams.cc 2015-01-10 15:04:24.000000000 +0100
+++ src/ApvlvParams.cc 2016-10-04 00:06:58.187468048 +0200
@@ -90,7 +90,7 @@
return false;
}
- while ((getline (os, str)) != NULL)
+ while (getline (os, str))
{
string argu, data, crap;
stringstream is (str);

23
srcpkgs/apvlv/patches/fix-gcc7-ftbfs.patch

@ -1,23 +0,0 @@
--- src/ApvlvCmds.cc
+++ src/ApvlvCmds.cc
@@ -200,7 +200,7 @@ namespace apvlv
if (len >= 4
&& *s == '<'
- && (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
+ && (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
{
e++;
StringKeyMap::iterator it;
--- src/ApvlvCore.cc
+++ src/ApvlvCore.cc
@@ -90,7 +90,7 @@ namespace apvlv
{
mInuse = use;
- if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
+ if (mInuse == false && !gView->hasloaded (filename (), type ()))
{
debug ("core :%p is not needed, delete it\n", this);
delete this;

10
srcpkgs/apvlv/template

@ -1,16 +1,16 @@
# Template file for 'apvlv'
pkgname=apvlv
version=0.1.5
revision=8
version=0.2.0
revision=1
build_style=cmake
configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
hostmakedepends="pkg-config"
makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel"
makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel webkit2gtk-devel ebook-tools-devel"
depends="desktop-file-utils"
short_desc="Vim-like PDF/DJVU/TXT viewer"
maintainer="Logen K <logen@sudotask.com>"
license="GPL-2"
license="GPL-2.0-only"
homepage="http://naihe2010.github.io/apvlv/"
distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
checksum=dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a
checksum=a4a2f42a7e42715a21d2356def3ed93c180c6ae41128580addee42835e5374c2
replaces="apvlv-git>=0"

12
srcpkgs/arcan/patches/cmake-espeak-ng.patch

@ -0,0 +1,12 @@
diff --git a/src/platform/cmake/modules/FindEspeak.cmake b/src/platform/cmake/modules/FindEspeak.cmake
index 6815e874..a548a232 100644
--- a/src/platform/cmake/modules/FindEspeak.cmake
+++ b/src/platform/cmake/modules/FindEspeak.cmake
@@ -1,5 +1,5 @@
-FIND_PATH( ESPEAK_INCLUDE_DIR espeak/speak_lib.h )
-FIND_LIBRARY(ESPEAK_LIBRARIES NAMES espeak )
+FIND_PATH( ESPEAK_INCLUDE_DIR espeak/speak_lib.h)
+FIND_LIBRARY(ESPEAK_LIBRARIES NAMES espeak espeak-ng)
IF( ESPEAK_LIBRARIES )
SET( ESPEAK_FOUND TRUE )

2
srcpkgs/arcan/template

@ -11,7 +11,7 @@ hostmakedepends="pkg-config
makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel
libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel
vlc-devel
$(vopt_if tts 'libespeak-devel')
$(vopt_if tts 'libespeak-ng-devel')
$(vopt_if luajit 'LuaJIT-devel' 'lua51-devel')
$(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel')
$(vopt_if wayland 'wayland-devel wayland-protocols libxcb-devel xcb-util-wm-devel')

7
srcpkgs/attr/template

@ -5,7 +5,8 @@ revision=1
bootstrap=yes
build_style=gnu-configure
checkdepends="perl"
configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
--libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
short_desc="Extended attribute support library for ACL support"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
@ -18,10 +19,6 @@ conf_files="/etc/xattr.conf"
# The included libtool is rotten and only works with bash; easiest fix.
export CONFIG_SHELL=/bin/bash
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
configure_args="--libdir=/usr/lib32 --libexecdir=/usr/lib32"
fi
pre_check() {
# Either the test wasn't updated or the package misconfigures/miscompiles
# the error message in musl based systems

2
srcpkgs/autogen/template

@ -1,7 +1,7 @@
# Template file for 'autogen'
pkgname=autogen
version=5.18.16
revision=1
revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-dependency-tracking --without-libregex"
hostmakedepends="guile pkg-config perl tar which"

2
srcpkgs/avahi-discover/template

@ -55,7 +55,7 @@ pre_configure() {
do_install() {
mkdir -p ${wrksrc}/tmpinstall/usr/lib
ln -s lib ${wrksrc}/tmpinstall/usr/lib32
ln -s lib ${wrksrc}/tmpinstall/usr/lib${XBPS_TARGET_WORDSIZE}
make DESTDIR=${wrksrc}/tmpinstall install

4
srcpkgs/bctoolbox/template

@ -1,6 +1,6 @@
# Template file for 'bctoolbox'
pkgname=bctoolbox
version=4.4.9
version=4.4.17
revision=1
build_style=cmake
configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=OFF
@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://gitlab.linphone.org/BC/public/bctoolbox"
distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz"
checksum=d96586b30999fd41d720150b52d334bbb5bbb419b8d5900a8a037f2617bf1d6b
checksum=1364d5f42b5514546b9c6654c227804ff92cf9cf13fdc7cb6ca666e3bb5a7987
bctoolbox-devel_package() {
depends="bctoolbox-${version}_${revision}"

8
srcpkgs/binutils/template

@ -81,12 +81,6 @@ do_check() {
do_install() {
local _triplet=$(_get_triplet)
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
mkdir -p ${DESTDIR}/usr/lib
cd ${DESTDIR}/usr
ln -s lib lib64
cd ${wrksrc}
fi
make DESTDIR=${DESTDIR} tooldir=/usr install
# Remove ld (hardlink) and make a symlink to ld.bfd.
@ -110,8 +104,6 @@ do_install() {
echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \
>${DESTDIR}/usr/lib/libopcodes.so
rm -f ${DESTDIR}/usr/lib64
# Remove useless manpages.
for f in dlltool nlmconv windres windmc; do
rm -f ${DESTDIR}/usr/share/man/man1/${f}.1

6
srcpkgs/boinc/template

@ -1,7 +1,7 @@
# Template file for 'boinc'
pkgname=boinc
version=7.16.7
revision=2
version=7.16.14
revision=1
_majorver=${version%.*}
wrksrc=boinc-client_release-${_majorver}-${version}
build_style=gnu-configure
@ -16,7 +16,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="LGPL-3.0-or-later"
homepage="https://boinc.berkeley.edu/"
distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
checksum=38130d532031e75701eee910da64b9eb837e5bfeff9979dbb200c37146be3fed
checksum=c328399cc27109f94ee77aaf80406ed304c6be6c198391ff8e83f8400431fc78
system_accounts="boinc"
boinc_homedir="/var/lib/boinc"
boinc_shell="/bin/bash"

2
srcpkgs/bomi/template

@ -1,7 +1,7 @@
# Template file for 'bomi'
pkgname=bomi
version=0.9.11
revision=16
revision=17
build_style=configure
configure_args="--disable-systemd --release --prefix=/usr"
# does not build using py3.8 because of waf issues

4
srcpkgs/bpytop/template

@ -1,6 +1,6 @@
# Template file for 'bpytop'
pkgname=bpytop
version=1.0.50
version=1.0.52
revision=1
build_style=gnu-makefile
depends="python3-psutil"
@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/aristocratos/bpytop"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=ba4647c5db37ef87dbe730762306ae1c00e57e4249d18d65fa4ac0d3a9559123
checksum=15ef1bd094d945b9145343566c2596bb34922870e6be56c3cc028b33aff056fa
pre_configure() {
vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

4
srcpkgs/bzrtp/template

@ -1,6 +1,6 @@
# Template file for 'bzrtp'
pkgname=bzrtp
version=4.4.0
version=4.4.17
revision=1
build_style=cmake
configure_args="-DENABLE_TESTS=0 -DENABLE_STATIC=FALSE"
@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://www.linphone.org"
distfiles="https://gitlab.linphone.org/BC/public/bzrtp/-/archive/${version}/bzrtp-${version}.tar.gz"
checksum=5fc501c742f38661b5ac8904e6a66f530b07be93d7493663daab33f3d4ffdb6c
checksum=8cfb6f8be7be64046982849aaa48020caf5c6f1ab9cd9422af6082dfd669267d
bzrtp-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

4
srcpkgs/calibre/template

@ -1,6 +1,6 @@
# Template file for 'calibre'
pkgname=calibre
version=5.7.2
version=5.8.1
revision=1
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
@ -27,7 +27,7 @@ license="GPL-3.0-only"
homepage="https://calibre-ebook.com"
changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
checksum=3cdbc526071e16b5d974b98c1e9a80b7716127764164285884e37e5e52a9ebae
checksum=23910db4cff74236f489a9720ad45a30afd1eb09dd05e944f383b1b3ac9d514e
lib32disabled=yes
nocross=yes

4
srcpkgs/cargo-about/template

@ -1,6 +1,6 @@
# Template file for 'cargo-about'
pkgname=cargo-about
version=0.2.2
version=0.2.3
revision=1
build_style=cargo
short_desc="Cargo plugin to generate list of all licenses for a crate"
@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
homepage="https://github.com/EmbarkStudios/cargo-about"
distfiles="https://github.com/EmbarkStudios/cargo-about/archive/${version}.tar.gz"
checksum=7ecff5b92aef2f25510258423fe81044e52a1d2e8ae5661debbaac0faa682dbb
checksum=e39528da6826ddb609165866858984578ebbf80819b136d66215e840c69621c7
post_install() {
vlicense LICENSE-APACHE

5
srcpkgs/cegui/template

@ -42,11 +42,6 @@ pre_configure() {
# Use a FindOpenGLES.cmake which works
cp -p ${FILESDIR}/FindOpenGLES.cmake cmake
# Use /usr/lib instead of /usr/lib64 or /usr/lib32
sed -i ${wrksrc}/CMakeLists.txt \
-e "s;lib64;lib;g" \
-e "s;lib32;lib;g"
# cmake sets standard to c++03 (which doesn’t know int16_t)
sed -i -e "s/-std=c++03//" CMakeLists.txt
}

4
srcpkgs/chezmoi/template

@ -1,6 +1,6 @@
# Template file for 'chezmoi'
pkgname=chezmoi
version=1.8.9
version=1.8.10
revision=1
build_style=go
go_import_path="github.com/twpayne/chezmoi"
@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
license="MIT"
homepage="https://chezmoi.io/"
distfiles="https://github.com/twpayne/${pkgname}/archive/v${version}.tar.gz"
checksum=6e9d341672bc375ad2e9594a689c0c8ae8ebad0c964d699dfbd408fc93058b93
checksum=46f94b65abd0dcb6e3c4d8f28d18f9435297065ffff12140fd60c61ed2ece90f
post_install() {
vlicense LICENSE

2
srcpkgs/cifs-utils/template

@ -1,7 +1,7 @@
# Template file for 'cifs-utils'
pkgname=cifs-utils
version=6.11
revision=2
revision=3
build_style=gnu-configure
configure_args="--disable-systemd"
make_install_args="ROOTSBINDIR=/usr/bin"

343
srcpkgs/clazy/files/clazy-001-llvm11-stringref.patch

@ -1,343 +0,0 @@
From 30d6a2b64f5a05722fdc5d8e3754dbf13425cd62 Mon Sep 17 00:00:00 2001
From: Egor Gabov <egor.gabov@waveaccess.ru>
Date: Thu, 4 Jun 2020 17:10:21 +0300
Subject: [PATCH] updated for compatibility with LLVM 10
In LLVM 10 llvm::StringRef operator std::string() is marked as explicit.
In this commit all implicit conversion from llvm::StringRef to
std::string are changed by explicit.
Also included header file clang/Basic/FileManager.h in src/MiniDumper
because without this header, class clang::FileEntry in incomplete class
---
src/FixItExporter.cpp | 5 +++--
src/MiniAstDumper.cpp | 1 +
src/Utils.cpp | 2 +-
src/checkbase.cpp | 2 +-
src/checks/detachingbase.cpp | 2 +-
src/checks/level0/qenums.cpp | 2 +-
src/checks/level0/qt-macros.cpp | 4 ++--
src/checks/level0/unused-non-trivial-variable.cpp | 2 +-
src/checks/level1/detaching-temporary.cpp | 2 +-
src/checks/level1/non-pod-global-static.cpp | 2 +-
src/checks/level1/qproperty-without-notify.cpp | 2 +-
src/checks/level2/missing-typeinfo.cpp | 2 +-
src/checks/level2/old-style-connect.cpp | 6 +++---
src/checks/level2/rule-of-three.cpp | 2 +-
src/checks/manuallevel/ifndef-define-typo.cpp | 6 +++---
src/checks/manuallevel/qproperty-type-mismatch.cpp | 2 +-
src/checks/manuallevel/qrequiredresult-candidates.cpp | 2 +-
src/checks/manuallevel/qt-keywords.cpp | 4 ++--
src/checks/manuallevel/reserve-candidates.cpp | 3 ++-
19 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/FixItExporter.cpp b/src/FixItExporter.cpp
index f3af2e54..44240cf5 100644
--- a/src/FixItExporter.cpp
+++ b/src/FixItExporter.cpp
@@ -68,7 +68,7 @@ void FixItExporter::BeginSourceFile(const LangOptions &LangOpts, const Preproces
const auto id = SourceMgr.getMainFileID();
const auto entry = SourceMgr.getFileEntryForID(id);
- getTuDiag().MainSourceFile = entry->getName();
+ getTuDiag().MainSourceFile = static_cast<std::string>(entry->getName());
}
bool FixItExporter::IncludeInDiagnosticCounts() const
@@ -89,7 +89,8 @@ tooling::Diagnostic FixItExporter::ConvertDiagnostic(const Diagnostic &Info)
// TODO: This returns an empty string: DiagEngine->getDiagnosticIDs()->getWarningOptionForDiag(Info.getID());
// HACK: capture it at the end of the message: Message text [check-name]
- std::string checkName = DiagEngine.getDiagnosticIDs()->getWarningOptionForDiag(Info.getID());
+ std::string checkName =
+ static_cast<std::string>(DiagEngine.getDiagnosticIDs()->getWarningOptionForDiag(Info.getID()));
std::string messageText;
if (checkName.empty()) {
diff --git a/src/MiniAstDumper.cpp b/src/MiniAstDumper.cpp
index 47661749..6124e6e8 100644
--- a/src/MiniAstDumper.cpp
+++ b/src/MiniAstDumper.cpp
@@ -24,6 +24,7 @@
#include <clang/Frontend/CompilerInstance.h>
#include <clang/Frontend/FrontendPluginRegistry.h>
+#include <clang/Basic/FileManager.h>
using namespace clang;
using namespace std;
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 001ced98..b0812fe3 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -878,7 +878,7 @@ string Utils::filenameForLoc(SourceLocation loc, const clang::SourceManager &sm)
if (loc.isMacroID())
loc = sm.getExpansionLoc(loc);
- const string filename = sm.getFilename(loc);
+ const string filename = static_cast<std::string>(sm.getFilename(loc));
auto splitted = clazy::splitString(filename, '/');
if (splitted.empty())
return {};
diff --git a/src/checkbase.cpp b/src/checkbase.cpp
index 8b40e19d..22a426cf 100644
--- a/src/checkbase.cpp
+++ b/src/checkbase.cpp
@@ -188,7 +188,7 @@ bool CheckBase::shouldIgnoreFile(SourceLocation loc) const
if (!loc.isValid())
return true;
- string filename = sm().getFilename(loc);
+ string filename = static_cast<std::string>(sm().getFilename(loc));
return clazy::any_of(m_filesToIgnore, [filename](const std::string &ignored) {
return clazy::contains(filename, ignored);
diff --git a/src/checks/detachingbase.cpp b/src/checks/detachingbase.cpp
index 70311f42..1b094ee7 100644
--- a/src/checks/detachingbase.cpp
+++ b/src/checks/detachingbase.cpp
@@ -57,7 +57,7 @@ bool DetachingBase::isDetachingMethod(CXXMethodDecl *method, DetachingMethodType
const std::unordered_map<string, std::vector<StringRef>> &methodsByType = detachingMethodType == DetachingMethod ? clazy::detachingMethods()
: clazy::detachingMethodsWithConstCounterParts();
- auto it = methodsByType.find(className);
+ auto it = methodsByType.find(static_cast<std::string>(className));
if (it != methodsByType.cend()) {
const auto &methods = it->second;
if (clazy::contains(methods, clazy::name(method)))
diff --git a/src/checks/level0/qenums.cpp b/src/checks/level0/qenums.cpp
index 00075b5c..db8910f2 100644
--- a/src/checks/level0/qenums.cpp
+++ b/src/checks/level0/qenums.cpp
@@ -59,7 +59,7 @@ void QEnums::VisitMacroExpands(const Token &MacroNameTok, const SourceRange &ran
// We simply check if :: is present because it's very cumbersome to to check for different classes when dealing with the pre-processor
CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
- string text = Lexer::getSourceText(crange, sm(), lo());
+ string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
if (clazy::contains(text, "::"))
return;
}
diff --git a/src/checks/level0/qt-macros.cpp b/src/checks/level0/qt-macros.cpp
index d3a587cb..ab8e9f52 100644
--- a/src/checks/level0/qt-macros.cpp
+++ b/src/checks/level0/qt-macros.cpp
@@ -44,7 +44,7 @@ void QtMacros::VisitMacroDefined(const Token &MacroNameTok)
return;
IdentifierInfo *ii = MacroNameTok.getIdentifierInfo();
- if (ii && clazy::startsWith(ii->getName(), "Q_OS_"))
+ if (ii && clazy::startsWith(static_cast<std::string>(ii->getName()), "Q_OS_"))
m_OSMacroExists = true;
}
@@ -58,7 +58,7 @@ void QtMacros::checkIfDef(const Token &macroNameTok, SourceLocation Loc)
if (preProcessorVisitor && preProcessorVisitor->qtVersion() < 51204 && ii->getName() == "Q_OS_WINDOWS") {
// Q_OS_WINDOWS was introduced in 5.12.4
emitWarning(Loc, "Q_OS_WINDOWS was only introduced in Qt 5.12.4, use Q_OS_WIN instead");
- } else if (!m_OSMacroExists && clazy::startsWith(ii->getName(), "Q_OS_")) {
+ } else if (!m_OSMacroExists && clazy::startsWith(static_cast<std::string>(ii->getName()), "Q_OS_")) {
emitWarning(Loc, "Include qglobal.h before testing Q_OS_ macros");
}
}
diff --git a/src/checks/level0/unused-non-trivial-variable.cpp b/src/checks/level0/unused-non-trivial-variable.cpp
index 4e4b8303..93815f27 100644
--- a/src/checks/level0/unused-non-trivial-variable.cpp
+++ b/src/checks/level0/unused-non-trivial-variable.cpp
@@ -91,7 +91,7 @@ bool UnusedNonTrivialVariable::isUninterestingType(const CXXRecordDecl *record)
static const vector<StringRef> blacklistedTemplates = { "QScopedPointer", "QSetValueOnDestroy", "QScopedValueRollback" };
StringRef className = clazy::name(record);
for (StringRef templateName : blacklistedTemplates) {
- if (clazy::startsWith(className, templateName))
+ if (clazy::startsWith(static_cast<std::string>(className), static_cast<std::string>(templateName)))
return true;
}
diff --git a/src/checks/level1/detaching-temporary.cpp b/src/checks/level1/detaching-temporary.cpp
index fedfc81c..60c75532 100644
--- a/src/checks/level1/detaching-temporary.cpp
+++ b/src/checks/level1/detaching-temporary.cpp
@@ -140,7 +140,7 @@ void DetachingTemporary::VisitStmt(clang::Stmt *stm)
StringRef className = clazy::name(classDecl);
const std::unordered_map<string, std::vector<StringRef>> &methodsByType = clazy::detachingMethods();
- auto it = methodsByType.find(className);
+ auto it = methodsByType.find(static_cast<std::string>(className));
auto it2 = m_writeMethodsByType.find(className);
std::vector<StringRef> allowedFunctions;
diff --git a/src/checks/level1/non-pod-global-static.cpp b/src/checks/level1/non-pod-global-static.cpp
index 5879bff8..433b5c5f 100644
--- a/src/checks/level1/non-pod-global-static.cpp
+++ b/src/checks/level1/non-pod-global-static.cpp
@@ -74,7 +74,7 @@ void NonPodGlobalStatic::VisitStmt(clang::Stmt *stm)
const SourceLocation declStart = clazy::getLocStart(varDecl);
if (declStart.isMacroID()) {
- auto macroName = Lexer::getImmediateMacroName(declStart, sm(), lo());
+ auto macroName = static_cast<std::string>(Lexer::getImmediateMacroName(declStart, sm(), lo()));
if (clazy::startsWithAny(macroName, { "Q_IMPORT_PLUGIN", "Q_CONSTRUCTOR_FUNCTION", "Q_DESTRUCTOR_FUNCTION"})) // Don't warn on these
return;
}
diff --git a/src/checks/level1/qproperty-without-notify.cpp b/src/checks/level1/qproperty-without-notify.cpp
index e1d6db4a..3af9fee2 100644
--- a/src/checks/level1/qproperty-without-notify.cpp
+++ b/src/checks/level1/qproperty-without-notify.cpp
@@ -69,7 +69,7 @@ void QPropertyWithoutNotify::VisitMacroExpands(const clang::Token &MacroNameTok,
return;
CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
- string text = Lexer::getSourceText(crange, sm(), lo());
+ string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
if (text.back() == ')')
text.pop_back();
diff --git a/src/checks/level2/missing-typeinfo.cpp b/src/checks/level2/missing-typeinfo.cpp
index 98df2cd4..03b44e06 100644
--- a/src/checks/level2/missing-typeinfo.cpp
+++ b/src/checks/level2/missing-typeinfo.cpp
@@ -74,7 +74,7 @@ void MissingTypeInfo::VisitDecl(clang::Decl *decl)
if (sm().isInSystemHeader(clazy::getLocStart(record)))
return;
- std::string typeName = clazy::name(record);
+ std::string typeName = static_cast<std::string>(clazy::name(record));
if (typeName == "QPair") // QPair doesn't use Q_DECLARE_TYPEINFO, but rather a explicit QTypeInfo.
return;
diff --git a/src/checks/level2/old-style-connect.cpp b/src/checks/level2/old-style-connect.cpp
index 0fe68c13..396cb703 100644
--- a/src/checks/level2/old-style-connect.cpp
+++ b/src/checks/level2/old-style-connect.cpp
@@ -274,7 +274,7 @@ void OldStyleConnect::VisitMacroExpands(const Token &macroNameTok, const SourceR
return;
auto charRange = Lexer::getAsCharRange(range, sm(), lo());
- const string text = Lexer::getSourceText(charRange, sm(), lo());
+ const string text = static_cast<std::string>(Lexer::getSourceText(charRange, sm(), lo()));
static regex rx(R"(Q_PRIVATE_SLOT\s*\((.*)\s*,\s*.*\s+(.*)\(.*)");
smatch match;
@@ -293,7 +293,7 @@ string OldStyleConnect::signalOrSlotNameFromMacro(SourceLocation macroLoc)
CharSourceRange expansionRange = clazy::getImmediateExpansionRange(macroLoc, sm());
SourceRange range = SourceRange(expansionRange.getBegin(), expansionRange.getEnd());
auto charRange = Lexer::getAsCharRange(range, sm(), lo());
- const string text = Lexer::getSourceText(charRange, sm(), lo());
+ const string text = static_cast<std::string>(Lexer::getSourceText(charRange, sm(), lo()));
static regex rx(R"(\s*(SIGNAL|SLOT)\s*\(\s*(.+)\s*\(.*)");
@@ -315,7 +315,7 @@ bool OldStyleConnect::isSignalOrSlot(SourceLocation loc, string &macroName) cons
if (!loc.isMacroID() || loc.isInvalid())
return false;
- macroName = Lexer::getImmediateMacroName(loc, sm(), lo());
+ macroName = static_cast<std::string>(Lexer::getImmediateMacroName(loc, sm(), lo()));
return macroName == "SIGNAL" || macroName == "SLOT";
}
diff --git a/src/checks/level2/rule-of-three.cpp b/src/checks/level2/rule-of-three.cpp
index 8db55d53..7583fcc5 100644
--- a/src/checks/level2/rule-of-three.cpp
+++ b/src/checks/level2/rule-of-three.cpp
@@ -140,7 +140,7 @@ void RuleOfThree::VisitDecl(clang::Decl *decl)
const string className = record->getNameAsString();
const string classQualifiedName = record->getQualifiedNameAsString();
- const string filename = sm().getFilename(recordStart);
+ const string filename = static_cast<std::string>(sm().getFilename(recordStart));
if (clazy::endsWith(className, "Private") && clazy::endsWithAny(filename, { ".cpp", ".cxx", "_p.h" }))
return; // Lots of RAII classes fall into this category. And even Private (d-pointer) classes, warning in that case would just be noise
diff --git a/src/checks/manuallevel/ifndef-define-typo.cpp b/src/checks/manuallevel/ifndef-define-typo.cpp
index edb6cdf4..e9c50a45 100644
--- a/src/checks/manuallevel/ifndef-define-typo.cpp
+++ b/src/checks/manuallevel/ifndef-define-typo.cpp
@@ -44,7 +44,7 @@ void IfndefDefineTypo::VisitMacroDefined(const Token &macroNameTok)
{
if (!m_lastIfndef.empty()) {
if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo()) {
- maybeWarn(ii->getName(), macroNameTok.getLocation());
+ maybeWarn(static_cast<std::string>(ii->getName()), macroNameTok.getLocation());
}
}
}
@@ -53,7 +53,7 @@ void IfndefDefineTypo::VisitDefined(const Token &macroNameTok, const SourceRange
{
if (!m_lastIfndef.empty()) {
if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo()) {
- maybeWarn(ii->getName(), macroNameTok.getLocation());
+ maybeWarn(static_cast<std::string>(ii->getName()), macroNameTok.getLocation());
}
}
}
@@ -66,7 +66,7 @@ void IfndefDefineTypo::VisitIfdef(SourceLocation, const Token &)
void IfndefDefineTypo::VisitIfndef(SourceLocation, const Token &macroNameTok)
{
if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo())
- m_lastIfndef = ii->getName();
+ m_lastIfndef = static_cast<std::string>(ii->getName());
}
void IfndefDefineTypo::VisitIf(SourceLocation, SourceRange, PPCallbacks::ConditionValueKind)
diff --git a/src/checks/manuallevel/qproperty-type-mismatch.cpp b/src/checks/manuallevel/qproperty-type-mismatch.cpp
index f91159cb..952d9f1d 100644
--- a/src/checks/manuallevel/qproperty-type-mismatch.cpp
+++ b/src/checks/manuallevel/qproperty-type-mismatch.cpp
@@ -237,7 +237,7 @@ void QPropertyTypeMismatch::VisitMacroExpands(const clang::Token &MacroNameTok,
CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
- string text = Lexer::getSourceText(crange, sm(), lo());
+ string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
if (!text.empty() && text.back() == ')')
text.pop_back();
diff --git a/src/checks/manuallevel/qrequiredresult-candidates.cpp b/src/checks/manuallevel/qrequiredresult-candidates.cpp
index 912dbaa0..6375bd7b 100644
--- a/src/checks/manuallevel/qrequiredresult-candidates.cpp
+++ b/src/checks/manuallevel/qrequiredresult-candidates.cpp
@@ -65,7 +65,7 @@ void QRequiredResultCandidates::VisitDecl(clang::Decl *decl)
if (returnClass == classDecl) {
- const std::string methodName = clazy::name(method);
+ const std::string methodName = static_cast<std::string>(clazy::name(method));
if (methodName.empty()) // fixes assert
return;
diff --git a/src/checks/manuallevel/qt-keywords.cpp b/src/checks/manuallevel/qt-keywords.cpp
index e792e95a..b60752c9 100644
--- a/src/checks/manuallevel/qt-keywords.cpp
+++ b/src/checks/manuallevel/qt-keywords.cpp
@@ -59,12 +59,12 @@ void QtKeywords::VisitMacroExpands(const Token &macroNameTok, const SourceRange
}
static const vector<StringRef> keywords = { "foreach", "signals", "slots", "emit" };
- std::string name = ii->getName();
+ std::string name = static_cast<std::string>(ii->getName());
if (!clazy::contains(keywords, name))
return;
// Make sure the macro is Qt's. It must be defined in Qt's headers, not 3rdparty
- std::string qtheader = sm().getFilename(sm().getSpellingLoc(minfo->getDefinitionLoc()));
+ std::string qtheader = static_cast<std::string>(sm().getFilename(sm().getSpellingLoc(minfo->getDefinitionLoc())));
if (!clazy::endsWith(qtheader, "qglobal.h") && !clazy::endsWith(qtheader, "qobjectdefs.h"))
return;
diff --git a/src/checks/manuallevel/reserve-candidates.cpp b/src/checks/manuallevel/reserve-candidates.cpp
index 389cac5a..92e4491c 100644
--- a/src/checks/manuallevel/reserve-candidates.cpp
+++ b/src/checks/manuallevel/reserve-candidates.cpp
@@ -78,7 +78,8 @@ static bool isCandidateMethod(CXXMethodDecl *methodDecl)
if (!classDecl)
return false;
- if (!clazy::equalsAny(clazy::name(methodDecl), { "append", "push_back", "push", "operator<<", "operator+=" }))
+ if (!clazy::equalsAny(static_cast<std::string>(clazy::name(methodDecl)),
+ { "append", "push_back", "push", "operator<<", "operator+=" }))
return false;
if (!clazy::isAReserveClass(classDecl))
--
GitLab

28
srcpkgs/clazy/files/clazy-002-llvm11-stringref.patch

@ -1,28 +0,0 @@
From 25aa102cc49def9573ffbed88155589cd60a2e8f Mon Sep 17 00:00:00 2001
From: Egor Gabov <egor.gabov@waveaccess.ru>
Date: Fri, 5 Jun 2020 16:52:53 +0300
Subject: [PATCH] updated for compatibility with LLVM 10 (clazy-standalone)
In LLVM 10 llvm::StringRef operator std::string() is marked as explicit.
In this commit all implicit conversion from llvm::StringRef to
std::string are changed by explicit.
---
src/checks/manuallevel/jnisignatures.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/checks/manuallevel/jnisignatures.cpp b/src/checks/manuallevel/jnisignatures.cpp
index 81e61d48..5d4fe203 100644
--- a/src/checks/manuallevel/jnisignatures.cpp
+++ b/src/checks/manuallevel/jnisignatures.cpp
@@ -103,7 +103,7 @@ void JniSignatures::checkFunctionCall(Stmt *stm)
return;
}
- const std::string name = clazy::name(funDecl);
+ const std::string name = static_cast<std::string>(clazy::name(funDecl));
if (name == "callObjectMethod" || name == "callMethod") {
checkArgAt(callExpr, 0, methodNameRegex, "Invalid method name");
--
GitLab

16
srcpkgs/clazy/template

@ -1,20 +1,14 @@
# Template file for 'clazy'
pkgname=clazy
version=1.7
revision=2
version=1.8
revision=1
create_wrksrc=yes
build_style=cmake
hostmakedepends="python"
makedepends="clang llvm"
short_desc="Qt oriented code checker based on clang framework"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://cgit.kde.org/clazy.git/about/"
homepage="https://apps.kde.org/en/clazy"
distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz"
checksum=754da5815f769dd6b72a040a2430525c93f294eb7769c78271603df9614f1b21
checksum=ff0a5b5e694149df5f60bb7a4dc253ee4752b803453c5d29fa79611b54ecffdc
nocross="Clang cannot be installed as makedep"
post_extract() {
for i in ${FILESDIR}/clazy-*.patch; do
patch -sNp1 -i ${i}
done
}

4
srcpkgs/cmake-bootstrap/template

@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
version=3.19.0
version=3.19.2
revision=1
wrksrc=cmake-$version
bootstrap=yes
@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"