New package: rgbds-1.0.0

CONTRIBUTING.md

@@ -163,7 +163,7 @@ When you make changes to your pull request, please *do not close and reopen your
 #### Continuous Integration
 
 Pull requests are automatically submitted for Continuous Integration (CI) testing to ensure packages build and pass their tests (on native builds) on various combinations of C library and architecture.
-Packages that take longer than 120 minutes or need more than 14G of storage to complete their build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the PR title or body (the comment field when the PR is being opened) to avoid wasting CI builder time.
+Packages expected to take longer than several hours or need more than 14G of storage to complete their build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the PR title or body (the comment field when the PR is being opened) to avoid spurious failures and wasted CI builder time.
 Use your best judgment on build times based on your local building experience. If you skip CI when submitting a PR, please build and cross-build for a variety of architectures locally, with both glibc and musl, and note your local results in PR comments.
 Make sure to cover 64-bit and 32-bit architectures.
 

Manual.md

@@ -100,7 +100,7 @@ pkgname=foo
 version=1.0
 revision=1
 build_style=gnu-configure
-short_desc="A short description max 72 chars"
+short_desc="Package description, no more than 72 characters"
 maintainer="name <email>"
 license="GPL-3.0-or-later"
 homepage="http://www.foo.org"

common/build-style/void-cross.sh

@@ -98,9 +98,17 @@ _void_cross_build_bootstrap_gcc() {
 		_void_cross_apply_patch "$f"
 	done
 	if [ -f ${wrksrc}/.musl_version ]; then
+		local musl_version
 		for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
 			_void_cross_apply_patch "$f"
 		done
+		musl_version=$(cat "${wrksrc}/.musl_version")
+		case "$musl_version" in
+		1.1.*)
+			sed -i '/define LIBDRUNTIME_MUSL_PRE_TIME64/s/0/1/' \
+				gcc/config/linux-d.cc
+			;;
+		esac
 	fi
 	cd ..
 
@@ -337,7 +345,6 @@ _void_cross_build_musl() {
 }
 
 _void_cross_build_libucontext() {
-	[ -n "$cross_gcc_skip_go" ] && return 0
 	[ -f ${wrksrc}/.libucontext_build_done ] && return 0
 
 	local tgt=$1
@@ -390,7 +397,7 @@ _void_cross_build_gcc() {
 	mkdir -p ${wrksrc}/gcc_build
 	cd ${wrksrc}/gcc_build
 
-	local langs="c,c++,fortran,objc,obj-c++,ada,lto"
+	local langs="c,c++,fortran,objc,obj-c++,ada,lto,d"
 	if [ -z "$cross_gcc_skip_go" ]; then
 		langs+=",go"
 	fi
@@ -477,7 +484,9 @@ _void_cross_test_gcc_ver() {
 	ver=$(cat .gcc_version)
 	if [ -d "gcc-${ver}" ] && [ -f "gcc-${ver}/gcc/BASE-VER" ] && [ -f "gcc-${ver}/gcc/DATESTAMP" ]; then
 		basever="$(cat "gcc-${ver}/gcc/BASE-VER")_$(cat "gcc-${ver}/gcc/DATESTAMP")"
-		mv "gcc-${ver}" "gcc-${basever}"
+		if [ "$ver" != "$basever" ]; then
+			mv "gcc-${ver}" "gcc-${basever}"
+		fi
 		echo ${basever} > ${wrksrc}/.gcc_version
 		return
 	fi
@@ -511,12 +520,12 @@ do_build() {
 	if [ ! -f .musl_version ]; then
 		_void_cross_test_ver glibc
 		libc_ver=$(cat .glibc_version)
+		export GDCFLAGS_FOR_TARGET="$cross_glibc_cflags"
 	else
 		libc_ver=$(cat .musl_version)
-		if [ -z "$cross_gcc_skip_go" ]; then
-			_void_cross_test_ver libucontext
-			libucontext_ver=$(cat .libucontext_version)
-		fi
+		_void_cross_test_ver libucontext
+		libucontext_ver=$(cat .libucontext_version)
+		export GDCFLAGS_FOR_TARGET="$cross_musl_cflags"
 	fi
 
 	local sysroot="/usr/${tgt}"

common/environment/setup/python.sh

@@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}"
 py2_sitelib="${py2_lib}/site-packages"
 py2_inc="usr/include/python${py2_ver}"
 
-py3_ver="3.13"
+py3_ver="3.14"
 py3_abiver=""
 py3_lib="usr/lib/python${py3_ver}"
 py3_sitelib="${py3_lib}/site-packages"

common/hooks/post-install/15-qt-private-api.sh

@@ -37,6 +37,10 @@ hook() {
         return 0
     fi
 
+    case " qt6-base " in
+    *" ${sourcepkg} "*) return 0 ;;
+    esac
+
     _list=$(get_qt_private)
     for _shlib in $_list; do
         msg_normal "${pkgver}: requires PRIVATE_API from $_shlib\n"

common/hooks/pre-configure/02-script-wrapper.sh

@@ -251,7 +251,7 @@ hook() {
 	generic_wrapper3 libetpan-config
 	generic_wrapper3 giblib-config
 	python_wrapper python-config 2.7
-	python_wrapper python3-config 3.13
+	python_wrapper python3-config 3.14
 	apr_apu_wrapper apu-1-config
 	qemu_wrapper llvm-config
 }

common/hooks/pre-pkg/03-restrict-py3-version.sh

@@ -0,0 +1,31 @@
+# vim: set ts=4 sw=4 et:
+#
+# This hook performs the following task:
+# - Identifies any python3 runtime dependencies
+# - If any are found, ensures that the base python3 package is included
+# - Restricts the python3 version to the same minor specified in $py3_ver
+
+hook() {
+    [ -d "${PKGDESTDIR}/${py3_lib}" ] || return 0
+    [ "${pkgname}" = python3 ] && return 0
+
+    local dep rdeps
+    for dep in ${run_depends}; do
+        case "${dep}" in
+            python3 | "python3>"* | "python3<"* | "python3-${py3_ver}"* ) ;;
+            *) rdeps+=( "${dep}" ) ;;
+        esac
+    done
+
+    local minor next_minor
+
+    minor="${py3_ver#3.}"
+    next_minor="$(( "${minor}" + 1 ))" >/dev/null 2>&1 || next_minor=
+
+    if ! [ "${next_minor}" -gt "${minor}" ]; then
+        msg_error 'unable to determine python3 minor bounds from $py3_ver\n'
+    fi
+
+    rdeps+=( "python3>=3.${minor}.0_1<3.${next_minor}.0_1" )
+    run_depends="${rdeps[*]}"
+}

common/hooks/pre-pkg/04-generate-runtime-deps.sh

@@ -45,9 +45,31 @@ store_pkgdestdir_rundeps() {
         fi
 }
 
+parse_shlib_needed() {
+    while read -r f; do
+        lf=${f#${PKGDESTDIR}}
+	    if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+		    msg_normal "Skipping dependency scan for ${lf}\n" >&3
+		    continue
+	    fi
+        read -n4 elfmagic < "$f"
+        if [ "$elfmagic" = $'\177ELF' ]; then
+            $OBJDUMP -p "$f" |
+            awk '
+                /NEEDED/{print $2;}
+                /Qt_5_PRIVATE_API/{next;}
+                /Qt_[0-9]*_PRIVATE_API/{print $NF;}
+            '
+        fi
+    done
+}
+
 hook() {
     local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
     local _shlib_dir="${XBPS_STATEDIR}/shlib-provides"
+    local _shlibtmp
+
+    local Qt_6_PRIVATE_API=6.10.0
 
     # Disable trap on ERR, xbps-uhelper cmd might return error... but not something
     # to be worried about because if there are broken shlibs this hook returns
@@ -68,28 +90,11 @@ hook() {
         verify_deps+=" ${f}"
     done
 
-    exec 3<&0 # save stdin
-    exec < $depsftmp
-    while read -r f; do
-        lf=${f#${PKGDESTDIR}}
-	    if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
-		    msg_normal "Skipping dependency scan for ${lf}\n"
-		    continue
-	    fi
-        read -n4 elfmagic < "$f"
-        if [ "$elfmagic" = $'\177ELF' ]; then
-            for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
-                [ -z "$verify_deps" ] && verify_deps="$nlib" && continue
-                found=0
-                for j in ${verify_deps}; do
-                    [[ $j == $nlib ]] && found=1 && break
-                done
-                [[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
-            done
-        fi
-    done
-    exec 0<&3 # restore stdin
-    rm -f $depsftmp
+    _shlibtmp=$(mktemp) || exit 1
+    parse_shlib_needed 3>&1 >"$_shlibtmp" <"$depsftmp"
+    rm -f "$depsftmp"
+    verify_deps=$(sort <"$_shlibtmp" | uniq)
+    rm -f "$_shlibtmp"
 
     #
     # Add required run time packages by using required shlibs resolved
@@ -98,11 +103,23 @@ hook() {
     for f in ${verify_deps}; do
         unset _rdep _pkgname _rdepver
 
+        case "$f" in
+        Qt_*_PRIVATE_API)
+            eval "f=lib${f}.\${$f}"
+            ;;
+        esac
+
         local _findargs="-name"
         # if SONAME is a path, find should use -wholename
         if [[ "$f" = */* ]]; then
             _findargs="-wholename"
         fi
+        case " $shlib_provides " in
+        *" $f "*)
+            echo "   SONAME: $f <-> $pkgname (ignored)"
+            continue
+            ;;
+        esac
         if [ "$(find "${PKGDESTDIR}" $_findargs "$f")" ]; then
             # Ignore libs by current pkg
             echo "   SONAME: $f <-> $pkgname (ignored)"
@@ -111,11 +128,11 @@ hook() {
         elif _pkgname="$(cd "$_shlib_dir" && grep -F -l -x "$f" *.soname 2>/dev/null)"; then
             # If that library has SONAME, add it to shlibs-requires, too.
             _pkgname=${_pkgname%.soname}
-            _sdep="${_pkgname}-${version}_${revision}"
+            _sdep="${_pkgname}>=${version}_${revision}"
             sorequires+="${f} "
         elif _pkgname="$(cd "$_shlib_dir" && grep -F -l -x "$f" *.nosoname 2>/dev/null)"; then
             _pkgname=${_pkgname%.nosoname}
-            _sdep="${_pkgname}-${version}_${revision}"
+            _sdep="${_pkgname}>=${version}_${revision}"
         else
             _rdep="$(awk -v sl="$f" -v arch="$XBPS_TARGET_MACHINE" '$1 == sl && ($3 == "" || $3 == "ignore" || $3 == arch) { print $2; exit; }' "$mapshlibs")"