Merge branch 'void-linux:master' into master

This commit is contained in:
ALPHA_B_91 2024-09-03 18:40:18 +01:00 committed by GitHub
commit 57cc2bcd1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 61 additions and 17 deletions

View file

@ -1,6 +1,6 @@
# Template file for 'acpica-utils'
pkgname=acpica-utils
version=20230628
version=20240827
revision=1
build_style="gnu-makefile"
make_use_env=yes
@ -10,8 +10,12 @@ short_desc="Intel ACPI CA Unix utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, BSD-3-Clause"
homepage="https://www.acpica.org/"
distfiles="https://downloadmirror.intel.com/783534/acpica-unix-${version}.tar.gz"
checksum=86876a745e3d224dcfd222ed3de465b47559e85811df2db9820ef09a9dff5cce
distfiles="https://github.com/user-attachments/files/16769900/acpica-unix-${version}.tar.gz"
checksum=373d4f08da7f1e838191311cb0fc2615ca9c76f47b1e103631e20292a38b4836
post_extract() {
mv source/include/ACPIXF.H source/include/acpixf.h
}
post_install() {
sed -n '/Copyright Notice/,/\*\/$/p' source/include/accommon.h | \

View file

@ -1,2 +1,2 @@
site="https://acpica.org/downloads"
site="https://github.com/acpica/acpica/releases"
pkgname="acpica-unix"

View file

@ -1,6 +1,6 @@
# Template file for 'cppcheck'
pkgname=cppcheck
version=2.14.2
version=2.15.0
revision=1
build_style=cmake
configure_args="
@ -18,8 +18,8 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://cppcheck.sourceforge.net"
changelog="https://sourceforge.net/p/cppcheck/news/"
distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
checksum=9c3acea5f489336bd83a8ea33917a9a04a80c56d874bf270287e7de27acf2d00
distfiles="https://github.com/danmar/cppcheck/archive/refs/tags/${version}.tar.gz"
checksum=98bcc40ac8062635b492fb096d7815376a176ae26749d6c708083f4637f7c0bb
export CXXFLAGS="-DNDEBUG"

1
srcpkgs/libreoffice-libgtk Symbolic link
View file

@ -0,0 +1 @@
libreoffice

View file

@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=24.8.0.3
revision=1
revision=2
build_style=meta
build_helper="gir"
make_build_target="build"
@ -178,7 +178,7 @@ _split() {
list=${wrksrc}/file-lists/${1}_list.txt
# skip non-existing file lists
[ -f ${list} ] || msg_error "There is no ${1}_list.txt file!\n"
grep -v '^%dir' "$list" | sort -u |
grep -v -e '^%dir' -e '^$' "$list" | sort -u |
while read file; do
dir="${file%/*}"
[ -d "${PKGDESTDIR}/${dir}" ] || vmkdir "${dir}"
@ -525,6 +525,12 @@ do_install() {
# Remove useless directory usr/lib32
rm -rf ${DESTDIR}/usr/lib32
grep libreoffice.program.libavmediagtk file-lists/common_list.txt \
>>file-lists/gnome_list.txt
vsed -i -e '/libavmediaqt6/d' \
-e '/libavmediagtk/d' \
-e '/liblibreofficekitgtk/d' \
file-lists/common_list.txt
}
libreoffice-common_package() {
@ -615,6 +621,7 @@ libreoffice-qt6_package() {
cat > ${wrksrc}/file-lists/qt6_list.txt <<-EOF
%dir /usr/lib/libreoffice/program
/usr/lib/libreoffice/program/libvclplug_qt6lo.so
/usr/lib/libreoffice/program/libavmediaqt6.so
EOF
_split qt6
}
@ -634,6 +641,27 @@ libreoffice-kde_package() {
}
}
libreoffice-libgtk_package() {
short_desc="GTK+3 widget wrapping LibreOffice functionality"
pkg_install() {
local _gir_wrkdir
cat > ${wrksrc}/file-lists/libgtk_list.txt <<-EOF
%dir /usr/lib/libreoffice/program
/usr/lib/libreoffice/program/liblibreofficekitgtk.so
EOF
_split libgtk
ln -sf libreoffice/program/liblibreofficekitgtk.so \
"${PKGDESTDIR}/usr/lib/liblibreofficekitgtk.so"
vmkdir usr/share/gir-1.0
vmkdir usr/lib/girepository-1.0
_gir_wrkdir=workdir/CustomTarget/sysui/share/libreoffice
vinstall "${_gir_wrkdir}/LOKDocView-0.1.typelib" 644 \
usr/lib/girepository-1.0
vinstall "${_gir_wrkdir}/LOKDocView-0.1.gir" 644 \
usr/share/gir-1.0
}
}
libreoffice-kit_package() {
short_desc+=" - development files"
pkg_install() {

View file

@ -0,0 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ CPPFLAGS += $(INCL)
all: ragel ndhc
ndhc: $(NDHC_OBJS)
- $(CC) $(CFLAGS) $(INCL) -o $@ $^
+ $(CC) $(CFLAGS) $(INCL) -o $@ $^ $(LDFLAGS)
-include $(NDHC_DEP)

View file

@ -1,6 +1,6 @@
# Template file for 'ndhc'
pkgname=ndhc
version=20220308
version=20240524
revision=1
_dashversion="${version:0:4}-${version:4:2}-${version:6:2}"
build_style=gnu-makefile
@ -12,8 +12,8 @@ short_desc="Privilege-seperated secure DHCPv4 client"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://github.com/niklata/ndhc"
distfiles="https://github.com/niklata/ndhc/archive/v${_dashversion}.tar.gz"
checksum=30f595b7c1cc2e60599b8c6aa82e0b1ee4ef2243a67fcebf812b60746db7de4d
distfiles="https://github.com/niklata/ndhc/archive/refs/tags/v${_dashversion}.tar.gz"
checksum=4612e1b01e65e3c64b39e39d8e67e46e571ed651b33e3087d6c0d257cd25644c
export CFLAGS="-std=gnu99 -D_GNU_SOURCE -DNK_USE_CAPABILITY"

View file

@ -3,7 +3,7 @@
_nsprver=4.35
pkgname=nss
version=3.103
version=3.104
revision=1
hostmakedepends="perl which"
makedepends="nspr-devel sqlite-devel zlib-devel"
@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0, MIT, BSD-3-Clause"
homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
checksum=7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962
checksum=e2763223622d1e76b98a43030873856f248af0a41b03b2fa2ca06a91bc50ac8e
export NS_USE_GCC=1
export LIBRUNPATH=

View file

@ -1,7 +1,7 @@
# Template file for 'syncthing'
pkgname=syncthing
version=1.27.10
revision=2
version=1.27.11
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
go_package="
@ -16,7 +16,7 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/syncthing/archive/v${version}.tar.gz"
checksum=e2cd7126a10fe317c2a0be52bb3bc359ad8f2974f746b6093a86e611390907da
checksum=b1d52d4b975595d6f5af694788d9025a62599b73dcf4b98c398129df7e731780
pre_build() {
GOARCH= go generate \