diff options
Diffstat (limited to 'user')
730 files changed, 18410 insertions, 8589 deletions
diff --git a/user/abiword/APKBUILD b/user/abiword/APKBUILD index 6d732c535..7da87b633 100644 --- a/user/abiword/APKBUILD +++ b/user/abiword/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abiword pkgver=3.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="A fully-featured word processor" url="https://www.abisource.com" arch="all" @@ -25,6 +25,7 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ # https certificate is expired; integrity provided by checksum source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz fix-bad-cast.patch + libxml2-2.12.patch " build() { @@ -43,4 +44,5 @@ package() { } sha512sums="a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6 abiword-3.0.5.tar.gz -89edeed246f937e4f198068ed9861e155662d346fb1534d2ed676cbd782de22a691d2b045989942bd715cbfc3750cf9d7615065816b970695597361ae4a9d55e fix-bad-cast.patch" +89edeed246f937e4f198068ed9861e155662d346fb1534d2ed676cbd782de22a691d2b045989942bd715cbfc3750cf9d7615065816b970695597361ae4a9d55e fix-bad-cast.patch +0f98383e160782ccc2160e1bd9f5ba5ca02463dc14c2caeb987f225c06b4484a3618a068ff35806b6e3b6b2748e90a558c71ffb8d44c669f302fdcaebca836d4 libxml2-2.12.patch" diff --git a/user/abiword/libxml2-2.12.patch b/user/abiword/libxml2-2.12.patch new file mode 100644 index 000000000..2c3642248 --- /dev/null +++ b/user/abiword/libxml2-2.12.patch @@ -0,0 +1,29 @@ +From 2a06be6a10a0718f8a3d8e00c317f5042c99a467 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Mon, 11 Dec 2023 01:55:53 +0100 +Subject: [PATCH] Fix build with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libxml 2.12.0 restructured headers so that xmlFree is no longer in the scope. +Let’s add the correct include. +--- + src/af/util/xp/ut_stringbuf.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/af/util/xp/ut_stringbuf.cpp b/src/af/util/xp/ut_stringbuf.cpp +index f1e8d9078..88488ad67 100644 +--- a/src/af/util/xp/ut_stringbuf.cpp ++++ b/src/af/util/xp/ut_stringbuf.cpp +@@ -26,6 +26,7 @@ + #include <algorithm> + + #include <libxml/uri.h> ++#include <libxml/xmlmemory.h> + + #include <glib.h> + +-- +GitLab + diff --git a/user/akonadi-search/APKBUILD b/user/akonadi-search/APKBUILD index bf40009de..a514ca634 100644 --- a/user/akonadi-search/APKBUILD +++ b/user/akonadi-search/APKBUILD @@ -34,7 +34,7 @@ build() { check() { # sqlite backend requires D-Bus server. - QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'akonadi-sqlite*' + QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'akonadi-sqlite*|akonadi-pgsql*' } package() { diff --git a/user/apaste/APKBUILD b/user/apaste/APKBUILD index 9da6d259a..99851d559 100644 --- a/user/apaste/APKBUILD +++ b/user/apaste/APKBUILD @@ -1,15 +1,18 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=apaste -pkgver=0.0.2.0 -pkgrel=2 +pkgver=0.0.3.0 +pkgrel=0 pkgdesc="A command-line pastebin" url="https://skarnet.org/software/apaste/" arch="all" options="!check" # No test suite. license="ISC" +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6net_version=2.7.1 depends="s6-networking" -makedepends="skalibs-dev>=2.14.1.1 s6-networking-dev>=2.7.0.2" +makedepends="skalibs-dev>=$_skalibs_version s6-networking-dev>=$_s6net_version" subpackages="apaste-doc apasted:server apasted-openrc:apasted_openrc" source=" https://skarnet.org/software/apaste/apaste-$pkgver.tar.gz @@ -24,12 +27,11 @@ pkgusers="apastedlog apasted" build() { ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + --enable-shared \ + --disable-allstatic \ --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var + --with-pkgconfig \ + --enable-pkgconfig make } @@ -58,7 +60,7 @@ package() { } server() { - depends="execline s6 s6-networking>=2.7.0.2 apasted-openrc" + depends="execline>=$_execline_version s6>=$_s6_version s6-networking>=$_s6net_version apasted-openrc" pkgdesc="A server for the apaste command-line pastebin" install="apasted.pre-install" mkdir -p "$subpkgdir/usr/bin" "$subpkgdir/var/lib/apasted/services" @@ -74,9 +76,9 @@ apasted_openrc() { install -D -m 0755 "$srcdir/apasted.initd" "$subpkgdir/etc/init.d/apasted" } -sha512sums="b1550d738801ddee528d0ce62333aa9a8fc9824183a61be295e767fbcdb1ae4d15a5e34295754cc5e8c51c8b410a56972bac28c5812099652fb8bb5140fb4c15 apaste-0.0.2.0.tar.gz -27f6b3ac98f52a6ed11d225ea19e34160b1fef2dd980a32a43ff03499e121b6418612be4c94d1139388bee47b14a5ea24edc383fcfcfe55abe7daf12be2d514c apasted.run -8cd74ba6c6579912083f9605056b46ca2887faaf23a0d1981043a5ac4d6e724def51a7c087fb719f2b0189e6b0a0d9469a1e955fcbf04c8ea9f2d818649c122e apastesd.run +sha512sums="ac3031b5d43447cf33bb4300ce866716b650ed730d74e6d41fff83a7a3eff2233172d9962e13c6d624002537a7c13ac5d581715a9a49145f392139c21b921ea6 apaste-0.0.3.0.tar.gz +970a79b6da5a7c58539cd9d47cba36855eb4f37e1e0bbd841ade15022b5fb291a077f7ad118ff662a45f3b2b59162264a180c338f23f964ea3e48364c68ac606 apasted.run +817b276ae51e9bd769e39a8313a84449d181c65749640119ba1e4af3c21d2572152c7bdd5eec70cbcfaa3255fd6cba966dfc1dc7a818a60d329283c39ae058a8 apastesd.run 9341c1c69c1d45b35052b0042665fffb9cff6583fad558ed37a19af574b53a5e298727c43a6c718fd40936e8f16d1a10e9c229392595ba1e06ddb21d1d8b055b apasted-log.run 3b91225252d95d676097d337ca77ef2bdffb52baa657197efe079b82c663baeaed0882993eeed7f7ce260f051e439159c61368f8a1d4b84d1daa74fe358c39d7 apasted.confd f9e6dd5aa6d5efe678f370431e7b58a52f903eed9b698f60b1853d601a4d9c0a53ccb996034d401dfd7ddbe573fc2651cf5c87164de599c42f754ad015b8e302 apasted.initd" diff --git a/user/apaste/apasted.run b/user/apaste/apasted.run index 4b49c6320..8ad8aa487 100644 --- a/user/apaste/apasted.run +++ b/user/apaste/apasted.run @@ -6,13 +6,13 @@ fdmove 1 3 envfile /etc/conf.d/apasted multisubstitute { - importas -ui APASTED_IPv@V@ APASTED_IPv@V@ - importas -ui APASTED_PORT APASTED_PORT - importas -ui APASTED_ROOT APASTED_ROOT - importas -uD "" APASTED_PREFIX APASTED_PREFIX - importas -uD 10 APASTED_MAXFILES APASTED_MAXFILES - importas -uD 1048576 APASTED_MAXSIZE APASTED_MAXSIZE - importas -uD 10485760 APASTED_MAXTOTALSIZE APASTED_MAXTOTALSIZE + importas -uSi APASTED_IPv@V@ + importas -uSi APASTED_PORT + importas -uSi APASTED_ROOT + importas -uSD "" APASTED_PREFIX + importas -uSD10 APASTED_MAXFILES + importas -uSD1048576 APASTED_MAXSIZE + importas -uSD10485760 APASTED_MAXTOTALSIZE } s6-envuidgid apasted s6-tcpserver -1 -U -- ${APASTED_IPv@V@} ${APASTED_PORT} diff --git a/user/apaste/apastesd.run b/user/apaste/apastesd.run index b5d0813f6..a1205ed4c 100644 --- a/user/apaste/apastesd.run +++ b/user/apaste/apastesd.run @@ -6,15 +6,15 @@ fdmove 1 3 envfile /etc/conf.d/apasted multisubstitute { - importas -ui APASTED_IPv@V@ APASTED_IPv@V@ - importas -ui APASTED_TLS_PORT APASTED_TLS_PORT - importas -ui APASTED_ROOT APASTED_ROOT - importas -uD "" APASTED_PREFIX APASTED_PREFIX - importas -uD 10 APASTED_MAXFILES APASTED_MAXFILES - importas -uD 1048576 APASTED_MAXSIZE APASTED_MAXSIZE - importas -uD 10485760 APASTED_MAXTOTALSIZE APASTED_MAXTOTALSIZE - importas -ui KEYFILE KEYFILE - importas -ui CERTFILE CERTFILE + importas -uSi APASTED_IPv@V@ + importas -uSi APASTED_TLS_PORT + importas -uSi APASTED_ROOT + importas -uSD "" APASTED_PREFIX + importas -uSD10 APASTED_MAXFILES + importas -uSD1048576 APASTED_MAXSIZE + importas -uSD10485760 APASTED_MAXTOTALSIZE + importas -uSi KEYFILE + importas -uSi CERTFILE } s6-envuidgid apasted export TLS_UID 65534 diff --git a/user/appres/APKBUILD b/user/appres/APKBUILD index d66574bcc..0f8b4de41 100644 --- a/user/appres/APKBUILD +++ b/user/appres/APKBUILD @@ -1,34 +1,33 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=appres -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="list X application resource database" url="https://www.X.org/" arch="all" license="X11" depends="" -makedepends="libx11-dev libxt-dev xproto" +makedepends="libx11-dev libxt-dev xproto meson" subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + meson setup \ + -Dprefix=/usr \ + -Dsysconfdir=/etc \ + -Dmandir=/usr/share/man \ + -Dlocalstatedir=/var \ + build + meson compile -C build } check() { - make check + meson test -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="6d14f6a2ad5c83a4d42d4c51ec9a9f32652dfe7624881f1f41c0b1f4946904e7e5ca81a2fd9f4f4824488ce1bd2a4047f92320626bf33b0f1afc5e6b89d3e2b9 appres-1.0.6.tar.xz" +sha512sums="5948f869124dd7160ffe109b0fc7ccdca45c3b3f551a382a0bcf2c2af9e3832b0d4451e2868ca93a38de8e8e2caf1946ac72936b3256e99a32437d0ddd937a60 appres-1.0.7.tar.xz" diff --git a/user/arcticfox/APKBUILD b/user/arcticfox/APKBUILD new file mode 100644 index 000000000..78349f11a --- /dev/null +++ b/user/arcticfox/APKBUILD @@ -0,0 +1,136 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=arcticfox +pkgver=45.1 +pkgrel=0 +pkgdesc="Arctic Fox web browser (fork of Firefox with PPC support)" +url="https://github.com/rmottola/Arctic-Fox/wiki" +arch="pmmx ppc ppc64 x86" +options="!check" # Disable tests. +license="MPL-2.0" +depends="" +makedepends="alsa-lib-dev bzip2-dev dbus-glib-dev gconf-dev gtk+2.0-dev + gtk+3.0-dev hunspell-dev icu-dev libevent-dev libidl-dev + libjpeg-turbo-dev libnotify-dev libogg-dev libtheora-dev libvorbis-dev + libxt-dev libxcomposite-dev mesa-dev nspr-dev automake libtool + pulseaudio-dev sqlite-dev startup-notification-dev autoconf2.13 + bsd-compat-headers cmd:which openssl-dev sed yasm zip" +subpackages="$pkgname-dev" +source="arcticfox-$pkgver.tar.gz::https://github.com/rmottola/Arctic-Fox/archive/refs/tags/v$pkgver.tar.gz + mozconfig + https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz + arcticfox.desktop + + hunspell.patch + override-cxx-version.patch + stackwalk-x86-ppc.patch + " +builddir="$srcdir/Arctic-Fox-$pkgver" +provides="firefox-esr=$pkgver-r$pkgrel" +_mozappdir="/usr/lib/$pkgname-$pkgver" +# Vendors its own NSS for now until upstream is compatible with latest versions +somask="libfreeblpriv3.so liblgpllibs.so libmozgtk.so libmozsqlite3.so + libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so + libsoftokn3.so libssl3.so libxul.so" +ldpath="$_mozappdir" + +unpack() { + default_unpack + + [ -z $SKIP_PYTHON ] || return 0 + msg "Killing all remaining hope for humanity and building Python 2..." + cd "$srcdir" + [ -d python ] && rm -r python + mkdir python + # 19:39 <+solar> just make the firefox build process build its own py2 copy + # 20:03 <calvin> TheWilfox: there's always violence + cd Python-2.7.15 + ./configure --prefix="$srcdir/python" + make -j $JOBS + # 6 tests failed: + # test__locale test_os test_posix test_re test_strptime test_time + # make test + make -j $JOBS install +} + +prepare() { + default_prepare + + cp "$srcdir"/mozconfig "$builddir"/mozconfig + echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig + echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig + echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig + # Needed, see upstream https://github.com/rmottola/Arctic-Fox/issues/125 + # on ppc, fails in NSFrameState::operator& without these flags + export CFLAGS="$CFLAGS -O1 -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" + export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir" + + # arch-specific configuration + case "$CARCH" in + pmmx|x86*|arm*) + echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig + ;; + ppc) + export LDFLAGS="$LDFLAGS -latomic" + ;; + ppc64) + echo "ac_add_options --enable-altivec" >> "$builddir"/mozconfig + ;; + s390x) + echo "ac_add_options --disable-startupcache" >> "$builddir"/mozconfig + ;; + esac + + echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig +} + +build() { + export CFLAGS="$CFLAGS -Wno-dangling-pointer -Wno-array-bounds -Wno-comment -Wno-maybe-uninitialized -Wno-misleading-indentation -Wno-multistatement-macros -Wno-stringop-overflow -Wno-unused-function -Wno-unused-value -Wno-ignored-qualifiers -Wno-deprecated-declarations -Wno-implicit-fallthrough -Wno-unused-but-set-variable -Wno-int-in-bool-context -Wno-stringop-overread -Wno-address -Wno-use-after-free" + export CXXFLAGS="$CFLAGS -Wno-class-memaccess -Wno-changes-meaning -Wno-subobject-linkage -Wno-return-local-addr -Wno-unused-local-typedefs" + export SHELL=/bin/sh + export BUILD_OFFICIAL=1 + export MOZILLA_OFFICIAL=1 + export USE_SHORT_LIBNAME=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system + export PATH="$PATH:$srcdir/python/bin" + export CXX="/usr/bin/g++ -std=gnu++17" + + # set rpath so linker finds the libs + export UNIXCONFDIR="$srcdir" + + ./mach configure + # parallel make bug hit on gwyn (64 threads) + ./mach build -j1 export + ./mach build +} + +package() { + export PATH="$PATH:$srcdir/python/bin" + DESTDIR="$pkgdir" ./mach install + + for pngsize in 16 32 48; do + install -D -m644 \ + "browser/branding/$pkgname/default$pngsize.png" \ + "$pkgdir"/usr/share/icons/hicolor/${pngsize}x${pngsize}/apps/$pkgname.png + done + + install -D -m644 "browser/branding/$pkgname/mozicon128.png" \ + "$pkgdir"/usr/share/pixmaps/$pkgname.png + install -D -m644 $srcdir/$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop +} + +dev() { + mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share + mv "$pkgdir"/usr/lib/$pkgname-devel-$pkgver \ + "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/idl "$subpkgdir"/usr/share/ + default_dev +} + +sha512sums="0b24bc8cf201a78517c7934c119b1e21d511068e8ea06c8b7f5ce65e5867e9f091cc0c8c65b0f8c78e8637d27dd3d505126d355c8ca5693f1b0417020b838800 arcticfox-45.1.tar.gz +ce5312b4fcf07d0dd0496366f6e3be406ef19a389f67a3eb8e3df62232d9eb08ed1a5e212dee1725d907bb025bc3da19b6d0b0d97210893846eb8206890fe8de mozconfig +27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz +d4f9a2a64cb8c1e679a13429e62cfd2e8a44cf54896c2999258571ab990711fbc3d078ce655efd90437e60ef113af1e5277f416f5cf78dfea21f82c481f6929b arcticfox.desktop +50cc077df6d17358f5dcffcabb1a75087b58ac46f60d9d5fc8f2d407e93a26d89778e4c09a5203f2a55bc9f9ddb247f4482483d30f495bc9e3393fad37a322d7 hunspell.patch +bf63b06c030b388711554a4eff36fc50f2af802b59a9f1d7c5b42f11fcc1dd806d53980bdd89bf9518fc51ba25a812c892dfaf47e9d50b33a82ebad9462da92a override-cxx-version.patch +a0f97b8b3e5b0d93b155f1678a3d5984b52ede440202656d35237a6e7025b4a1315c114a1a87c3974d0d43b0f637e186b2be6422c44ba5f111ede53893e39c54 stackwalk-x86-ppc.patch" diff --git a/user/arcticfox/arcticfox.desktop b/user/arcticfox/arcticfox.desktop new file mode 100644 index 000000000..9e09c4abd --- /dev/null +++ b/user/arcticfox/arcticfox.desktop @@ -0,0 +1,76 @@ +[Desktop Entry] +Exec=arcticfox %u +Icon=arcticfox +Type=Application +Terminal=false +Name=Arctic Fox +GenericName=Web Browser +GenericName[af]=Web Blaaier +GenericName[ar]=متصفح ويب +GenericName[az]=Veb Səyyahı +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[br]=Furcher ar Gwiad +GenericName[bs]=WWW Preglednik +GenericName[ca]=Fullejador web +GenericName[cs]=WWW prohlížeč +GenericName[cy]=Porydd Gwe +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής Ιστού +GenericName[eo]=TTT-legilo +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fa]=مرورگر وب +GenericName[fi]=WWW-selain +GenericName[fo]=Alnótsfar +GenericName[fr]=Navigateur web +GenericName[gl]=Navegador Web +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[is]=Vafri +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lo]=ເວັບບຣາວເຊີ +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Web Pārlūks +GenericName[mk]=Прелистувач на Интернет +GenericName[mn]=Веб-Хөтөч +GenericName[nb]=Nettleser +GenericName[nds]=Nettkieker +GenericName[nl]=Webbrowser +GenericName[nn]=Nettlesar +GenericName[nso]=Seinyakisi sa Web +GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator de web +GenericName[ru]=Веб-браузер +GenericName[se]=Fierpmádatlogan +GenericName[sk]=Webový prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sr]=Веб претраживач +GenericName[sr@Latn]=Veb pretraživač +GenericName[ss]=Ibrawuza yeWeb +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[tg]=Тафсиргари вэб +GenericName[th]=เว็บบราวเซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[uz]=Веб-браузер +GenericName[ven]=Buronza ya Webu +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[xh]=Umkhangeli zincwadi we Web +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +GenericName[zu]=Umcingi we-Web +MimeType=text/html; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/user/arcticfox/hunspell.patch b/user/arcticfox/hunspell.patch new file mode 100644 index 000000000..9fa23eeb5 --- /dev/null +++ b/user/arcticfox/hunspell.patch @@ -0,0 +1,15 @@ +On musl libc, #define free is dangerous. + +Upstream-URL: https://github.com/rmottola/Arctic-Fox/issues/100 + +--- Arctic-Fox-45.1/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h.old 2024-09-30 19:54:44.000000000 +0000 ++++ Arctic-Fox-45.1/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h 2024-10-22 21:46:00.494798524 +0000 +@@ -47,6 +47,8 @@ + * allocated using C memory allocation functions. + */ + ++#include <sched.h> ++#include "mozilla/Logging.h" + #include "mozilla/mozalloc.h" + #include "mozHunspellAllocator.h" + diff --git a/user/arcticfox/mozconfig b/user/arcticfox/mozconfig new file mode 100644 index 000000000..e19a24be1 --- /dev/null +++ b/user/arcticfox/mozconfig @@ -0,0 +1,28 @@ +ac_add_options --prefix=/usr +ac_add_options --disable-crashreporter +ac_add_options --disable-eme +ac_add_options --disable-install-strip +ac_add_options --disable-jemalloc +ac_add_options --disable-mozril-geoloc +ac_add_options --disable-necko-wifi +ac_add_options --disable-precompiled-startupcache +ac_add_options --disable-profiling +ac_add_options --disable-strip +ac_add_options --disable-tests +ac_add_options --disable-updater +ac_add_options --disable-webrtc +ac_add_options --enable-alsa +ac_add_options --enable-application=browser +ac_add_options --enable-dbus +ac_add_options --enable-default-toolkit=cairo-gtk3 +ac_add_options --enable-pulseaudio +ac_add_options --enable-system-ffi +ac_add_options --enable-system-hunspell +ac_add_options --with-branding=browser/branding/arcticfox +ac_add_options --with-system-icu +ac_add_options --with-system-jpeg +ac_add_options --with-system-nspr +ac_add_options --with-system-pixman +ac_add_options --with-system-png +ac_add_options --with-system-zlib +ac_add_options --without-system-nss diff --git a/user/arcticfox/override-cxx-version.patch b/user/arcticfox/override-cxx-version.patch new file mode 100644 index 000000000..6486c702e --- /dev/null +++ b/user/arcticfox/override-cxx-version.patch @@ -0,0 +1,17 @@ +ICU 75 requires C++17 mode as a bare minimum. + +--- Arctic-Fox-45.1/build/moz.configure/toolchain.configure.old 2024-09-30 14:54:44.000000000 -0500 ++++ Arctic-Fox-45.1/build/moz.configure/toolchain.configure 2024-11-19 00:21:31.792210428 -0600 +@@ -339,9 +339,9 @@ + # Note: MSVC, while supporting C++11, still reports 199711L for __cplusplus. + # Note: this is a strict version check because we used to always add + # -std=gnu++11. +- if info.language == 'C++' and info.language_version != 201103: +- if info.type in ('clang-cl', 'clang', 'gcc'): +- append_flag('-std=gnu++11') ++ if info.language == 'C++' and info.language_version < 201703: ++ if info.type in ('clang', 'gcc'): ++ append_flag('-std=gnu++17') + + # We force clang-cl to emulate Visual C++ 2013 Update 3 with fallback to + # cl.exe. diff --git a/user/arcticfox/stackwalk-x86-ppc.patch b/user/arcticfox/stackwalk-x86-ppc.patch new file mode 100644 index 000000000..377edabb6 --- /dev/null +++ b/user/arcticfox/stackwalk-x86-ppc.patch @@ -0,0 +1,14 @@ +--- Arctic-Fox-45.1/mozglue/misc/StackWalk.cpp.old 2024-09-30 19:54:44.000000000 +0000 ++++ Arctic-Fox-45.1/mozglue/misc/StackWalk.cpp 2024-10-21 11:28:48.295293788 +0000 +@@ -42,10 +42,7 @@ + (defined(XP_DARWIN) && \ + (defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE))) + +-#define MOZ_STACKWALK_SUPPORTS_LINUX \ +- (defined(linux) && \ +- ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ +- defined(HAVE__UNWIND_BACKTRACE))) ++#define MOZ_STACKWALK_SUPPORTS_LINUX 0 + + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) + #define HAVE___LIBC_STACK_END 1 diff --git a/user/argp-standalone/001-throw-in-funcdef.patch b/user/argp-standalone/001-throw-in-funcdef.patch deleted file mode 100644 index 4a90751e1..000000000 --- a/user/argp-standalone/001-throw-in-funcdef.patch +++ /dev/null @@ -1,79 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - - -No __THROW in function implementation. - --jsaw - ---- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100 -+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100 -@@ -560,17 +560,17 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern inline - # endif - - ARGP_EI void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - ARGP_EI int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -582,7 +582,7 @@ - } - - ARGP_EI int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } ---- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100 -+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100 -@@ -1290,13 +1290,13 @@ - /* Defined here, in case a user is not inlining the definitions in - * argp.h */ - void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -1310,7 +1310,7 @@ - } - - int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } diff --git a/user/argp-standalone/APKBUILD b/user/argp-standalone/APKBUILD deleted file mode 100644 index 450af92f4..000000000 --- a/user/argp-standalone/APKBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=argp-standalone -pkgver=1.3 -pkgrel=5 -pkgdesc="Hierarchial argument parsing library broken out from glibc" -url="http://www.lysator.liu.se/~nisse/misc/" -arch="all" -options="!dbg" -license="LGPL-2.0+ AND Public-Domain" -depends="" -makedepends="libtool automake autoconf" -source="http://www.lysator.liu.se/~nisse/misc/$pkgname-$pkgver.tar.gz - 001-throw-in-funcdef.patch - gnu89-inline.patch - " - -prepare() { - default_prepare - autoreconf -vif -} - -build() { - export CFLAGS="$CFLAGS -fPIC" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make -C "$builddir" check -} - -package() { - install -D -m644 argp.h "$pkgdir"/usr/include/argp.h - install -D -m755 libargp.a "$pkgdir"/usr/lib/libargp.a -} - -sha512sums="58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9 argp-standalone-1.3.tar.gz -5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4 001-throw-in-funcdef.patch -69f1d8a4fcd542346f98bc1fb7151db748483fc2f331c8c35114e0891d867b41c603ddaa5f3130aaaf1c640e02c51ac71cee71b62c09301b146812e9059e9ade gnu89-inline.patch" diff --git a/user/argp-standalone/gnu89-inline.patch b/user/argp-standalone/gnu89-inline.patch deleted file mode 100644 index 71978eba5..000000000 --- a/user/argp-standalone/gnu89-inline.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 4658839..09f0267 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,16 +79,10 @@ AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name], - - # Set these flags *last*, or else the test programs won't compile - if test x$GCC = xyes ; then -- # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core -- if "$CC" --version | grep '^2\.96$' 1>/dev/null 2>&1; then -- true -- else -- CFLAGS="$CFLAGS -ggdb3" -- fi - CFLAGS="$CFLAGS -Wall -W \ - -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes \ - -Waggregate-return \ -- -Wpointer-arith -Wbad-function-cast -Wnested-externs" -+ -Wpointer-arith -Wbad-function-cast -Wnested-externs -fgnu89-inline" - fi - - CPPFLAGS="$CPPFLAGS -I$srcdir" diff --git a/user/aria2/APKBUILD b/user/aria2/APKBUILD new file mode 100644 index 000000000..7d5a89150 --- /dev/null +++ b/user/aria2/APKBUILD @@ -0,0 +1,71 @@ +# Contributor: Alice <alicela1n@protonmail.com> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Alice <alicela1n@protonmail.com> +pkgname=aria2 +pkgver=1.37.0 +pkgrel=0 +pkgdesc="The ultra fast download utility" +url="https://aria2.github.io/" +arch="all" +license="GPL-2.0+" +depends="ca-certificates" +checkdepends="cppunit-dev" +makedepends="openssl-dev sqlite-dev libuv-dev" +install="aria2.pre-install" +pkgusers="aria2" +pkggroups="aria2" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc::noarch" +source="https://github.com/aria2/$pkgname/releases/download/release-$pkgver/$pkgname-$pkgver.tar.xz + $pkgname.conf + $pkgname.initd + $pkgname.confd + $pkgname.logrotate + " + +build() { + ./configure --build=$CBUILD \ + --host=$CHOST \ + --with-openssl \ + --with-sqlite3 \ + --with-libuv \ + --enable-libaria2 \ + --enable-shared \ + --disable-static \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +openrc() { + default_openrc + pkgdesc="Support for running Aria2 as a daemon using OpenRC" + depends="$pkgname=$pkgver-r$pkgrel" + + mkdir -p "$subpkgdir" + + install -Dm755 "$srcdir"/$pkgname.initd "$subpkgdir"/etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd "$subpkgdir"/etc/conf.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.logrotate "$subpkgdir"/etc/logrotate.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.conf "$subpkgdir"/etc/$pkgname/$pkgname.conf + install -m750 -o aria2 -g aria2 -d "$subpkgdir"var/lib/$pkgname + install -m700 -o aria2 -g aria2 -d "$subpkgdir"/var/cache/$pkgname +} + +sha512sums="df3b8b4de8fa8d78f203ea00c059e43585e18a229009f202e42e6a9e59db67d09df0dbba8a016e99ed73c82f59e4f8b26f86c2288afdbb96a6807cbe2c56e6b3 aria2-1.37.0.tar.xz +dd716f27eae2628bd528fd2842de7881e8f8f00d587b179e832f1639241db5bd8f4e74a5b791ca4de984923654b38a28813a89ad49a864f64534903a46878a60 aria2.conf +c65bef73a519b567ab35558bd60310081f5d4fcb630538666a5b2435f23dc9d741c7bfa6080e4ff46e646e977f4d5e8ba937ce9cdfb55880a3dc0eb1c2ee617a aria2.initd +f1b5b66c00eeac4b332913d55441adb2ce7aa081f29ed030dc3c69c4767b68c4def6b7f16ea6d7ffbf149cee476df6878e35f8774eea300f241d4aca95e59ef6 aria2.confd +2ed9ff7a5fd1801643e4fb3cdd8cb21f0ead60420c87636bb581fe00828a98a5290a0888e49f6a6becb9f39c3c145b1399aa3a9ae452eb10ac2064c0e7bca1f8 aria2.logrotate" diff --git a/user/aria2/aria2.conf b/user/aria2/aria2.conf new file mode 100644 index 000000000..abca1ea73 --- /dev/null +++ b/user/aria2/aria2.conf @@ -0,0 +1,61 @@ +# Run aria2c --help=#all to see all the available options. + +# The directory to store the downloaded file. +dir=/var/lib/aria2 + +# Save error/unfinished downloads to this file on exit. +save-session=/var/lib/aria2/aria2.session +input-file=/var/lib/aria2/aria2.session + +# Save error/unfinished downloads to a file specified by save-session option +# every SEC seconds. If 0 is given, file will be saved only when aria2 exits. +save-session-interval=60 + +# Save download even if the download is completed or removed. +force-save=true + +# Continue downloading a partially downloaded files. Only for HTTP/FTP. +continue=true + +# Always resume download. +always-resume=true + +# Set log level to output to file. +# Possible Values: debug, info, notice, warn, error. +log-level=notice + +# Set interval to output download progress summary. +# Setting 0 suppresses the output. +summary-interval=0 + +# File allocation method. "falloc" is the best choice for newer file systems +# such as ext4, Btrfs or XFS. +file-allocation=falloc + + +## RPC + +# Specify a port number for JSON-RPC/XML-RPC server to listen to. +#rpc-listen-port=6800 + +# Listen incoming JSON-RPC/XML-RPC requests on all network interfaces. +#rpc-listen-all=false + +# RPC secret authorization token. Change to some random string! +rpc-secret=top-secret + + +## BitTorrent + +# Specify the external IP address to use in BitTorrent download and DHT. +#bt-external-ip= + +# TCP port number(s) for BitTorrent downloads. +#listen-port=6881-6999 + +# Requires BitTorrent message payload encryption with arc4. +#bt-force-encryption=false + +# Maximum number of files to open in multi-file BitTorrent/Metalink +# downloads globally. +#bt-max-open-files=100 diff --git a/user/aria2/aria2.confd b/user/aria2/aria2.confd new file mode 100644 index 000000000..8b20cb34d --- /dev/null +++ b/user/aria2/aria2.confd @@ -0,0 +1,10 @@ +# Configuration for /etc/init.d/aria2 + +# The user (and group) to run Aria2 daemon. +#command_user="aria2" + +# Path of the configuration file. +#cfgfile="/etc/aria2/aria2.conf" + +# Path of the log file. +#logfile="/var/log/aria2.log" diff --git a/user/aria2/aria2.initd b/user/aria2/aria2.initd new file mode 100644 index 000000000..a23b6eb0d --- /dev/null +++ b/user/aria2/aria2.initd @@ -0,0 +1,42 @@ +#!/sbin/openrc-run + +: ${cfgfile:="/etc/aria2/aria2.conf"} +: ${logfile:="/var/log/aria2.log"} +: ${command_user:="aria2"} + +command="/usr/bin/aria2c" +command_args=" + --enable-rpc=true + --quiet=true + --log=$logfile + --conf-path=$cfgfile + ${command_args:-}" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" +output_log="/dev/null" +error_log="/dev/null" +start_stop_daemon_args="--env XDG_CACHE_HOME=/var/cache" + +required_files="$cfgfile" + +depend() { + need net + use dns netmount +} + +start_pre() { + local _logfile=$(sed -En 's|^log=([^#]+)|\1|p' "$cfgfile") + + checkpath -f -m 640 -o "$command_user" "${_logfile:-$logfile}" + + # Session + local _inputfile=$(sed -En 's|^input-file=([^#]+)|\1|p' "$cfgfile") + + if [ "$_inputfile" != "" ]; then + checkpath -f -m 644 -o "$command_user" "$_inputfile" + fi + + # DHT + checkpath -d -m 755 -o "$command_user" "/var/cache/$command_user" +} diff --git a/user/aria2/aria2.logrotate b/user/aria2/aria2.logrotate new file mode 100644 index 000000000..e73ffc044 --- /dev/null +++ b/user/aria2/aria2.logrotate @@ -0,0 +1,6 @@ +/var/log/aria2.log { + compress + copytruncate + missingok + notifempty +} diff --git a/user/aria2/aria2.pre-install b/user/aria2/aria2.pre-install new file mode 100644 index 000000000..d819d3388 --- /dev/null +++ b/user/aria2/aria2.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -r aria2 2>/dev/null +useradd -c aria2 -d /var/lib/aria2 -s /sbin/nologin -g aria2 \ + -r aria2 2>/dev/null + +exit 0 diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD index 0713ce0f1..455d07b9d 100644 --- a/user/aspell-dict-lv/APKBUILD +++ b/user/aspell-dict-lv/APKBUILD @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0-only" depends="aspell" makedepends="cmd:which" -source="https://dict.dv.lv/download/aspell6-lv-$pkgver.tar.bz2" +source="https://distfiles.adelielinux.org/source/archive/$pkgname-$pkgver/aspell6-lv-$pkgver.tar.bz2" builddir="$srcdir/aspell6-lv-$pkgver" build() { diff --git a/user/assimp/01-rm-revision-test.patch b/user/assimp/01-rm-revision-test.patch deleted file mode 100644 index 47a2a61fe..000000000 --- a/user/assimp/01-rm-revision-test.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- assimp-5.0.0/test/unit/utVersion.cpp.orig 2019-10-27 02:51:11.128925442 +0000 -+++ assimp-5.0.0/test/unit/utVersion.cpp 2019-10-27 02:54:22.554333936 +0000 -@@ -66,9 +66,9 @@ - EXPECT_NE( aiGetCompileFlags(), 0U ); - } - --TEST_F( utVersion, aiGetVersionRevisionTest ) { -+/*TEST_F( utVersion, aiGetVersionRevisionTest ) { - EXPECT_NE( aiGetVersionRevision(), 0U ); --} -+}*/ - - TEST_F( utVersion, aiGetBranchNameTest ) { - EXPECT_NE( nullptr, aiGetBranchName() ); diff --git a/user/assimp/APKBUILD b/user/assimp/APKBUILD index 8d65667ee..da9d6cca1 100644 --- a/user/assimp/APKBUILD +++ b/user/assimp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Russ Webber <russ@rw.id.au> # Maintainer: Zach van Rijn <me@zv.io> pkgname=assimp -pkgver=5.2.5 +pkgver=5.4.1 pkgrel=0 pkgdesc="Open Asset Import Library imports and exports 3D model formats" url="http://www.assimp.org/" @@ -11,7 +11,6 @@ depends="" makedepends="cmake minizip-dev zlib-dev" subpackages="$pkgname-dev" source="https://github.com/assimp/assimp/archive/v$pkgver/assimp-v$pkgver.tar.gz - 01-rm-revision-test.patch 05-remove-failing-x86-test.patch " @@ -33,6 +32,5 @@ package() { make -C build DESTDIR="$pkgdir" install rm -vf "$pkgdir"/usr/lib/libIrrXML.a } -sha512sums="ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb assimp-v5.2.5.tar.gz -535a80c5899a2994735e7b17b4e3fdb3ff2b53e64c09ec8fcab1dbcea2ad696fed50aeb1667a3c4e00a8a3ddf411d33ec1d36fcb256e26f02cf951f0e2c83a73 01-rm-revision-test.patch +sha512sums="980db331ca39950359db116d36968b87f5fea4b470be52960dd983e2ec232e019cae754819182b63a095a13b1d98364d64bd02ac29db1ea4f627d095a03da742 assimp-v5.4.1.tar.gz bfb321b8493b2ef8c35ab0627173d0f1754519e9bae6f6c59cc164aaf91a07d8ae382fbc92550cfab6f52502565390ba22b7478efa5bba008eec0aa075c5e7d1 05-remove-failing-x86-test.patch" diff --git a/user/awesome/APKBUILD b/user/awesome/APKBUILD index 9d58ed199..0029587b0 100644 --- a/user/awesome/APKBUILD +++ b/user/awesome/APKBUILD @@ -4,9 +4,9 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=awesome pkgver=4.3 -pkgrel=0 +pkgrel=1 pkgdesc="lua-configurable window manager framework" -url="http://awesome.naquadah.org/" +url="https://awesomewm.org" arch="all" options="!check" # Tests require X and D-Bus license="GPL-2.0+" @@ -18,7 +18,9 @@ makedepends="lua5.3 lua5.3-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-d dbus-dev gdk-pixbuf-dev xcb-util-cursor-dev libxkbcommon-dev xcb-util-xrm-dev libexecinfo-dev xmlto" subpackages="$pkgname-doc" -source="https://github.com/awesomeWM/$pkgname-releases/raw/master/$pkgname-$pkgver.tar.xz" +source="https://github.com/awesomeWM/$pkgname-releases/raw/master/$pkgname-$pkgver.tar.xz + gcc10.patch + " build() { # Awesome does not support in-tree builds @@ -39,4 +41,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 awesome-4.3.tar.xz" +sha512sums="c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 awesome-4.3.tar.xz +cc0aa85c42eff24ff2599673cc41058c04ec265d153ebecdb7a038d638500389da34a2063c3ce4e04b0f78f8972b9e5c3b793c46a37feeeef5505909ef8167f8 gcc10.patch" diff --git a/user/awesome/gcc10.patch b/user/awesome/gcc10.patch new file mode 100644 index 000000000..f1d0c3404 --- /dev/null +++ b/user/awesome/gcc10.patch @@ -0,0 +1,236 @@ +From d256d9055095f27a33696e0aeda4ee20ed4fb1a0 Mon Sep 17 00:00:00 2001 +From: Reiner Herrmann <reiner@reiner-h.de> +Date: Fri, 17 Apr 2020 19:25:40 +0200 +Subject: [PATCH] Move variable declarations from header to C file to fix build + with GCC 10 + +GCC 10 builds with -fno-common by default, which causes linker errors when +variables are declared in header files and included in multiple places. + +See also: https://gcc.gnu.org/gcc-10/porting_to.html +--- + common/lualib.c | 2 ++ + common/lualib.h | 2 +- + luaa.c | 2 ++ + luaa.h | 2 +- + objects/button.c | 2 ++ + objects/button.h | 2 +- + objects/client.c | 2 ++ + objects/client.h | 2 +- + objects/drawin.c | 2 ++ + objects/drawin.h | 2 +- + objects/key.c | 2 ++ + objects/key.h | 2 +- + objects/tag.c | 2 ++ + objects/tag.h | 2 +- + objects/window.c | 1 + + objects/window.h | 2 +- + 16 files changed, 23 insertions(+), 8 deletions(-) + +diff --git a/common/lualib.c b/common/lualib.c +index 312fb2d594..bb110ac716 100644 +--- a/common/lualib.c ++++ b/common/lualib.c +@@ -20,6 +20,8 @@ + #include "common/lualib.h" + #include "luaa.h" + ++lua_CFunction lualib_dofunction_on_error; ++ + void luaA_checkfunction(lua_State *L, int idx) + { + if(!lua_isfunction(L, idx)) +diff --git a/common/lualib.h b/common/lualib.h +index 8a3ef089d7..a91261843c 100644 +--- a/common/lualib.h ++++ b/common/lualib.h +@@ -28,7 +28,7 @@ + #include "common/util.h" + + /** Lua function to call on dofunction() error */ +-lua_CFunction lualib_dofunction_on_error; ++extern lua_CFunction lualib_dofunction_on_error; + + void luaA_checkfunction(lua_State *, int); + void luaA_checktable(lua_State *, int); +diff --git a/luaa.c b/luaa.c +index 419a8c2eb2..aeaba9cd1f 100644 +--- a/luaa.c ++++ b/luaa.c +@@ -91,6 +91,8 @@ extern const struct luaL_Reg awesome_mouse_meta[]; + extern const struct luaL_Reg awesome_root_methods[]; + extern const struct luaL_Reg awesome_root_meta[]; + ++signal_array_t global_signals; ++ + /** A call into the Lua code aborted with an error. + * + * This signal is used in the example configuration, @{05-awesomerc.md}, +diff --git a/luaa.h b/luaa.h +index e159258348..d26c437691 100644 +--- a/luaa.h ++++ b/luaa.h +@@ -317,7 +317,7 @@ const char *luaA_find_config(xdgHandle *, const char *, luaA_config_callback *); + bool luaA_parserc(xdgHandle *, const char *); + + /** Global signals */ +-signal_array_t global_signals; ++extern signal_array_t global_signals; + + int luaA_class_index_miss_property(lua_State *, lua_object_t *); + int luaA_class_newindex_miss_property(lua_State *, lua_object_t *); +diff --git a/objects/button.c b/objects/button.c +index 892347a928..5ffdcd4432 100644 +--- a/objects/button.c ++++ b/objects/button.c +@@ -35,6 +35,8 @@ + + #include "button.h" + ++lua_class_t button_class; ++ + /** Button object. + * + * @tfield int button The mouse button number, or 0 for any button. +diff --git a/objects/button.h b/objects/button.h +index fb8bb8da28..8f0b894305 100644 +--- a/objects/button.h ++++ b/objects/button.h +@@ -39,7 +39,7 @@ typedef struct button_t + xcb_button_t button; + } button_t; + +-lua_class_t button_class; ++extern lua_class_t button_class; + LUA_OBJECT_FUNCS(button_class, button_t, button) + ARRAY_FUNCS(button_t *, button, DO_NOTHING) + +diff --git a/objects/client.c b/objects/client.c +index 7b2d3a2022..b617a9e7a9 100644 +--- a/objects/client.c ++++ b/objects/client.c +@@ -106,6 +106,8 @@ + #include <xcb/shape.h> + #include <cairo-xcb.h> + ++lua_class_t client_class; ++ + /** Client class. + * + * This table allow to add more dynamic properties to the clients. For example, +diff --git a/objects/client.h b/objects/client.h +index 74a23131c5..387e7c2aea 100644 +--- a/objects/client.h ++++ b/objects/client.h +@@ -192,7 +192,7 @@ struct client_t + ARRAY_FUNCS(client_t *, client, DO_NOTHING) + + /** Client class */ +-lua_class_t client_class; ++extern lua_class_t client_class; + + LUA_OBJECT_FUNCS(client_class, client_t, client) + +diff --git a/objects/drawin.c b/objects/drawin.c +index 3fd1cc4350..3bbd93179c 100644 +--- a/objects/drawin.c ++++ b/objects/drawin.c +@@ -46,6 +46,8 @@ + #include <cairo-xcb.h> + #include <xcb/shape.h> + ++lua_class_t drawin_class; ++ + /** Drawin object. + * + * @field border_width Border width. +diff --git a/objects/drawin.h b/objects/drawin.h +index 31f315aac5..2f8887d944 100644 +--- a/objects/drawin.h ++++ b/objects/drawin.h +@@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *); + + void drawin_class_setup(lua_State *); + +-lua_class_t drawin_class; ++extern lua_class_t drawin_class; + + #endif + // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 +diff --git a/objects/key.c b/objects/key.c +index c42f7446d8..365ba998cc 100644 +--- a/objects/key.c ++++ b/objects/key.c +@@ -43,6 +43,8 @@ + #include <xkbcommon/xkbcommon.h> + #include <glib.h> + ++lua_class_t key_class; ++ + /** Key object. + * + * @tfield string key The key to trigger an event. +diff --git a/objects/key.h b/objects/key.h +index 8aa07ffe3d..45f23cac79 100644 +--- a/objects/key.h ++++ b/objects/key.h +@@ -36,7 +36,7 @@ typedef struct keyb_t + xcb_keycode_t keycode; + } keyb_t; + +-lua_class_t key_class; ++extern lua_class_t key_class; + LUA_OBJECT_FUNCS(key_class, keyb_t, key) + DO_ARRAY(keyb_t *, key, DO_NOTHING) + +diff --git a/objects/tag.c b/objects/tag.c +index a0050cc2a9..1b1a135762 100644 +--- a/objects/tag.c ++++ b/objects/tag.c +@@ -203,6 +203,8 @@ + #include "ewmh.h" + #include "luaa.h" + ++lua_class_t tag_class; ++ + /** + * @signal request::select + */ +diff --git a/objects/tag.h b/objects/tag.h +index d6bb40e0d8..f830b1e2c5 100644 +--- a/objects/tag.h ++++ b/objects/tag.h +@@ -46,7 +46,7 @@ struct tag + client_array_t clients; + }; + +-lua_class_t tag_class; ++extern lua_class_t tag_class; + LUA_OBJECT_FUNCS(tag_class, tag_t, tag) + + void tag_class_setup(lua_State *); +diff --git a/objects/window.c b/objects/window.c +index 440970f3d0..371d06bcd3 100644 +--- a/objects/window.c ++++ b/objects/window.c +@@ -59,6 +59,7 @@ + #include "property.h" + #include "xwindow.h" + ++lua_class_t window_class; + LUA_CLASS_FUNCS(window, window_class) + + static xcb_window_t +diff --git a/objects/window.h b/objects/window.h +index 5386fafead..fbc5296cf5 100644 +--- a/objects/window.h ++++ b/objects/window.h +@@ -80,7 +80,7 @@ typedef struct + WINDOW_OBJECT_HEADER + } window_t; + +-lua_class_t window_class; ++extern lua_class_t window_class; + + void window_class_setup(lua_State *); + diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index 8b1e52851..0ea50a54f 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo pkgver=5.94.0 -pkgrel=0 +pkgrel=1 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" arch="all" diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD index 2862108d5..81a7355ed 100644 --- a/user/bash-completion/APKBUILD +++ b/user/bash-completion/APKBUILD @@ -15,6 +15,7 @@ makedepends="" subpackages="$pkgname-doc" source="https://github.com/scop/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz fix-tests.patch + gcc-x86-tests.patch " # Provided with util-linux and networkmanager: @@ -82,4 +83,5 @@ package() { } sha512sums="41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06 bash-completion-2.11.tar.xz -ada80cbec419a6f6b2eab648497d5aa6795883bc52a160c233c04d4479c6d543b5089745ab098c5d6d7b4a0f05d25708cf7cf9d3b565b5b70e96796b3042ca75 fix-tests.patch" +ada80cbec419a6f6b2eab648497d5aa6795883bc52a160c233c04d4479c6d543b5089745ab098c5d6d7b4a0f05d25708cf7cf9d3b565b5b70e96796b3042ca75 fix-tests.patch +fb65b60f52da373368dfb5fd8034ca6b2be4c68648d827679596908364d0e0a69ede51c2954411ad5d83cfc4ee7666eeade2b036f2b5f52c004a9dba51f328a7 gcc-x86-tests.patch" diff --git a/user/bash-completion/gcc-x86-tests.patch b/user/bash-completion/gcc-x86-tests.patch new file mode 100644 index 000000000..49d7838b0 --- /dev/null +++ b/user/bash-completion/gcc-x86-tests.patch @@ -0,0 +1,22 @@ +Now that we have a GCC that supports completions, we have a few test failures. + +* -march=native is an x86-specific flag. There is no -march on Power. + +* -mtune=generic is x86 and Arm specific; Power's equivalent is powerpc. + +Upstream-URL: https://github.com/scop/bash-completion/issues/1201 + +--- bash-completion-2.11/test/t/test_gcc.py.old 2020-07-25 06:49:49.000000000 -0500 ++++ bash-completion-2.11/test/t/test_gcc.py 2024-05-26 21:16:26.236036406 -0500 +@@ -56,9 +56,9 @@ + assert completion == "fam10" + + @pytest.mark.complete("gcc -march=") +- def test_march_native(self, completion, gcc_with_completion): ++ def test_march_native(self, completion, gcc_with_completion, gcc_x86): + assert "native" in completion + + @pytest.mark.complete("gcc -mtune=") +- def test_mtune_generic(self, completion, gcc_with_completion): ++ def test_mtune_generic(self, completion, gcc_with_completion, gcc_x86): + assert "generic" in completion diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD index b239ef05c..69fc94ef5 100644 --- a/user/bcnm/APKBUILD +++ b/user/bcnm/APKBUILD @@ -1,31 +1,32 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=bcnm -pkgver=0.0.1.6 +pkgver=0.0.2.0 pkgrel=0 pkgdesc="Client network manager" url="https://skarnet.org/software/bcnm/" arch="all" options="!check" # No test suite. license="ISC" +_skalibs_version=2.14.4 depends="" -makedepends="skalibs-dev>=2.13" -subpackages="$pkgname-dev" +makedepends="skalibs-dev>=$_skalibs_version" +subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" source="https://skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" build() { ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + --enable-shared \ + --disable-allstatic \ --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var + --with-pkgconfig \ + --enable-pkgconfig make } package() { make DESTDIR="$pkgdir" install + mkdir -p "$pkgdir/usr/share/doc" + cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="07418f685f99be042fd782b29732b6175f3e1774eba2f4d54fbaf4bbbaa1af2f8c3f1cfbb1a103e6ba069eef97d449a92479078ec8c4b4b6331dc1431dcccd90 bcnm-0.0.1.6.tar.gz" +sha512sums="826f8f5dce5bc07396c5c8af116c438ad9da0b320e9002e33e3da8f16619f36f2c295f25ef2acbdbf90e241b5887f6d0b51abab5f3f547d5e067378d220913f5 bcnm-0.0.2.0.tar.gz" diff --git a/user/bearssl/APKBUILD b/user/bearssl/APKBUILD index b79ca366c..0056de1f8 100644 --- a/user/bearssl/APKBUILD +++ b/user/bearssl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=bearssl -pkgver=0.6_git20230221 -_pkgcommit=79c060eea3eea1257797f15ea1608a9a9923aa6f +pkgver=0.6_git20241009 +_pkgcommit=3c040368f6791553610e362401db1efff4b4c5b8 pkgrel=0 pkgdesc="The BearSSL implementation of the SSL/TLS protocol" url="https://bearssl.org/" @@ -13,6 +13,7 @@ makedepends="" subpackages="$pkgname-dev" source="bearssl-$pkgver.tar.gz::https://bearssl.org/gitweb/?p=BearSSL;a=snapshot;h=$_pkgcommit;sf=tgz bearssl-brssl-dynamic.patch + bearssl.pc " builddir="${srcdir}"/BearSSL-$(printf "%s" "${_pkgcommit}" | cut -c -7) @@ -39,7 +40,9 @@ package() { cp -f "$builddir/build/libbearssl.so.$pkgver" "$pkgdir/lib/" ln -sf "libbearssl.so.$pkgver" "$pkgdir/lib/libbearssl.so.${pkgver%%.*}" ln -sf "libbearssl.so.${pkgver%%.*}" "$pkgdir/lib/libbearssl.so" + install -D -m644 "$srcdir"/bearssl.pc "$pkgdir"/usr/lib/pkgconfig/bearssl.pc } -sha512sums="bffe5171f3ef27d8f141a43f5b485dcb659b20f1fc65d68c8f6e04f26dd99aadfc39a5943f5d6952f032533e2a709da9083c634f3dcc387b5c2ad64c1785bf6b bearssl-0.6_git20230221.tar.gz -f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c bearssl-brssl-dynamic.patch" +sha512sums="1d6957515833c81ca3fa070bef1ddc82fab3ff03ca3e8a81aae3f8c09b01d1ed488eb8f54988f25c09cbfbc7a90a4cd1de13ba179f205580c9c73164a0ced2a8 bearssl-0.6_git20241009.tar.gz +f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c bearssl-brssl-dynamic.patch +9b4972cb47e59b3e090429d08734d90c77bc29868cdb3efe3de7b38de4b183880e71552319242f0cac9d7ffe8547b6238fa483a6be462598f5f53c394fe4371c bearssl.pc" diff --git a/user/bearssl/bearssl.pc b/user/bearssl/bearssl.pc new file mode 100644 index 000000000..3ecd2fb46 --- /dev/null +++ b/user/bearssl/bearssl.pc @@ -0,0 +1,5 @@ +Name: bearssl +Description: The BearSSL implementation of the SSL/TLS protocol +URL: https://bearssl.org/ +Version: 0.6 +Libs: -lbearssl diff --git a/user/beforelight/APKBUILD b/user/beforelight/APKBUILD index 4cb502c9d..ee6f0da72 100644 --- a/user/beforelight/APKBUILD +++ b/user/beforelight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=beforelight -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Example screen saver for X.Org" url="https://www.X.Org/" @@ -10,13 +10,7 @@ license="X11" depends="" makedepends="util-macros libx11-dev libxscrnsaver-dev libxt-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/beforelight-$pkgver.tar.bz2" - -prepare() { - default_prepare - chmod a+w config.sub - update_config_sub -} +source="https://www.x.org/releases/individual/app/beforelight-$pkgver.tar.xz" build() { ./configure \ @@ -37,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968 beforelight-1.0.5.tar.bz2" +sha512sums="48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz" diff --git a/user/bindgen-cli/APKBUILD b/user/bindgen-cli/APKBUILD new file mode 100644 index 000000000..ec4e1ee1a --- /dev/null +++ b/user/bindgen-cli/APKBUILD @@ -0,0 +1,241 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bindgen-cli +pkgver=0.70.1 +pkgrel=0 +pkgdesc="Automatically generates Rust FFI bindings to C (and some C++) libraries." +url="https://rust-lang.github.io/rust-bindgen/" +arch="all" +license="BSD-3-Clause" +depends="clang-libs" +makedepends="rust cargo" +subpackages="" +source="" + +cargo_deps=" +aho-corasick 0.7.20 +annotate-snippets 0.9.1 +bindgen 0.70.1 +bindgen-cli 0.70.1 +bitflags 1.3.2 +bitflags 2.2.1 +block 0.1.6 +cc 1.0.78 +cexpr 0.6.0 +cfg-if 1.0.0 +clang-sys 1.4.0 +clap 4.1.4 +clap_complete 4.2.0 +clap_derive 4.1.0 +clap_lex 0.3.1 +either 1.8.1 +env_logger 0.10.0 +env_logger 0.8.4 +errno-dragonfly 0.1.2 +errno 0.3.1 +fastrand 1.8.0 +getrandom 0.2.8 +glob 0.3.1 +heck 0.4.0 +hermit-abi 0.3.2 +humantime 2.1.0 +instant 0.1.12 +io-lifetimes 1.0.4 +is-terminal 0.4.7 +itertools 0.13.0 +libc 0.2.154 +libloading 0.7.4 +linux-raw-sys 0.3.8 +log 0.4.17 +malloc_buf 0.0.6 +memchr 2.5.0 +minimal-lexical 0.2.1 +nom 7.1.3 +objc 0.2.7 +once_cell 1.17.0 +os_str_bytes 6.4.1 +owo-colors 3.5.0 +prettyplease 0.2.7 +proc-macro-error-attr 1.0.4 +proc-macro-error 1.0.4 +proc-macro2 1.0.60 +quickcheck 1.0.3 +quote 1.0.28 +rand 0.8.5 +rand_core 0.6.4 +redox_syscall 0.3.5 +regex-syntax 0.6.28 +regex 1.7.1 +rustc-hash 1.1.0 +rustix 0.37.7 +shlex 1.3.0 +similar 2.2.1 +strsim 0.10.0 +syn 1.0.107 +syn 2.0.18 +tempfile 3.5.0 +termcolor 1.2.0 +unicode-ident 1.0.6 +unicode-width 0.1.10 +version_check 0.9.4 +wasi 0.11.0+wasi-snapshot-preview1 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-util 0.1.5 +winapi-x86_64-pc-windows-gnu 0.4.0 +winapi 0.3.9 +windows-sys 0.42.0 +windows-sys 0.45.0 +windows-sys 0.48.0 +windows-targets 0.42.2 +windows-targets 0.48.1 +windows_aarch64_gnullvm 0.42.2 +windows_aarch64_gnullvm 0.48.0 +windows_aarch64_msvc 0.42.2 +windows_aarch64_msvc 0.48.0 +windows_i686_gnu 0.42.2 +windows_i686_gnu 0.48.0 +windows_i686_msvc 0.42.2 +windows_i686_msvc 0.48.0 +windows_x86_64_gnu 0.42.2 +windows_x86_64_gnu 0.48.0 +windows_x86_64_gnullvm 0.42.2 +windows_x86_64_gnullvm 0.48.0 +windows_x86_64_msvc 0.42.2 +windows_x86_64_msvc 0.48.0 +yansi-term 0.1.2 +" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config.toml" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2#g'); do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + cargo build -j $JOBS --release +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + cargo test -j $JOBS --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --no-track --path . --root="$pkgdir"/usr +} + +sha512sums="ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5 aho-corasick-0.7.20.tar.gz +e1e8b262a6681730ad068c29d7e0f3879acf0c7138721f606851228bd5d90292f24ac2c225fe49f26264e7d35de5ed3904850e522da8cd2c44a67f7db36f2d8e annotate-snippets-0.9.1.tar.gz +cf1c87ea7ab9ed4df953795f1aa77e6ae6d72e768de3b517300074501ce49db6a3def1f58b9d824b5727974cab84a48461e7d98086fc440dc73ad9cf173ad5ed bindgen-0.70.1.tar.gz +70ba89860ac86bcbc546cea8459b3d2f4f0762e3fef758df2358e2aeea09249775174a6ccbcbd707f9dba107c1d49a8f066b122af88f05cf98b0d0e087fa13f5 bindgen-cli-0.70.1.tar.gz +3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz +413b602edb82f8a4553735e46feefe323137b742d003368e037406157f916e5a5ea002d015a27cf8d41accca75f103c6712e2268fe2853d4d5e93e7264682182 bitflags-2.2.1.tar.gz +c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710 block-0.1.6.tar.gz +b85bec4c75cb1d1e252419052e9dd22b6892e54ea36195ff483a04f785b5b103e82b30b778459fd45324ffeb2463aa4f5696baeff2779c25ffe9f65eb99ae893 cc-1.0.78.tar.gz +766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886 cexpr-0.6.0.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a clang-sys-1.4.0.tar.gz +0828a67a5dda8a32251ce5de6570e020cb54ff7198a7df0051e1e78c75bf7c3f7b9e47ee1f6ff93fcac985d06a65c0d6ec061de4b967954949f77c12110053bb clap-4.1.4.tar.gz +6af0d15c54aea2dd90fe49688053936f158f374290a568df80ca7907c6a6a93edf2c84f281c3ff0a4ca716619e71714922928b2f90885cb79a3b64666e83bebd clap_complete-4.2.0.tar.gz +dc191ccd0b596395d029e9ded5d1cb2cb86c8392a4de52ddb877b59dafe85369287b6ec2749d01f33372fcd4cb6a4e12a9cb02b394f50d65ebdc4693af062807 clap_derive-4.1.0.tar.gz +2619ba0fb961d8ee86e42864b56511378ef837674aab6b1a21defee20f321e4f29b3b3fead0665b4385b0675d7bc63a7dd7df00dde51dee7ee99c7add6828b89 clap_lex-0.3.1.tar.gz +5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e either-1.8.1.tar.gz +4dd02f9d333a1f15657167ef4bd403eda5426cad17e0a4a43fa20cc65449345eb4d3fae2d6b10a3480016b9e23497fac13ed7e70b40c9450ef430be9f910d3e4 env_logger-0.10.0.tar.gz +9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049 env_logger-0.8.4.tar.gz +f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 errno-dragonfly-0.1.2.tar.gz +00d64157d066f1e7601c522c0f4e777eb662ca5cce64682f616de0734857765c343396f7161ac2908c3db0c474995ae157bfe9d8a9880743724d9bd428dfdf54 errno-0.3.1.tar.gz +82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1 fastrand-1.8.0.tar.gz +cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5 getrandom-0.2.8.tar.gz +29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b glob-0.3.1.tar.gz +33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f heck-0.4.0.tar.gz +22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6 hermit-abi-0.3.2.tar.gz +3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c humantime-2.1.0.tar.gz +fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 instant-0.1.12.tar.gz +1b2b151561dc79d1467b699590b2cb5d4acb39f75f38c05a94edb6d1543acca541b5a083fe7b606bc37cb2812692b7acb46996d0b096b96b0b085d31b1336775 io-lifetimes-1.0.4.tar.gz +56c00b2942963f8a0b5c40c96a885f85565fb09e247bfd5a3e77ca5c9e0e0e40a17a8d809c0541177e8b496fef87baac4b86c751765491ffffdb631515d8acf5 is-terminal-0.4.7.tar.gz +c6cb8f93a93b6ac1a2cbb3033e66fc81a39f83be773b734bea3311332b96bc71bbb518aae3e6b40cb537590c23de1ca4964361c336795c3985bde63232d410c4 itertools-0.13.0.tar.gz +891a36cf153a9f4d58793412c104504c57280994e428ce8ba208673a924b2de38cc21eece09b91696eaea3b2359606dbe9f1509f9bf364bdabdb366ef2dd0f61 libc-0.2.154.tar.gz +34439d9eca68bac8fcbe2bc94a70e07550e7e95d713ab74ed60ba6736ec807fd9c9135c178d436fbeb39afb074b2a9b05775d953340845c088f5f8712f5f56a1 libloading-0.7.4.tar.gz +cb0e5c54870dacfa513ad05f7a84e9e90dc1a42f55685fe3e252fd25cffa4b875f1b65eaf4ad132ef0a19e6677c7763b360d71ff0060fe6ce5198f38b9956375 linux-raw-sys-0.3.8.tar.gz +2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 log-0.4.17.tar.gz +463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed malloc_buf-0.0.6.tar.gz +444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa memchr-2.5.0.tar.gz +385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c minimal-lexical-0.2.1.tar.gz +1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad nom-7.1.3.tar.gz +7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988 objc-0.2.7.tar.gz +291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46 once_cell-1.17.0.tar.gz +2199502ad24449e08370686a596f905325f5b145e105e8c7bf90ed7729bbc405e065fce62c98eada40f77f0665ca041db41f16cc8e62473501eca32c24e56f43 os_str_bytes-6.4.1.tar.gz +1718f03d9f3296ffe3145161e038ebdb8dc40b69c0e2cb80a51866b519cf857b6573aedb7704895401e10cea11ca422a384c3594b8762be29eaa90908e24f7aa owo-colors-3.5.0.tar.gz +b8625d09c9709d0cbb7c49bf887574e40419df2b21978ad9ba22693358abb295c3d9f85830fb41b64c4adc76d64a514de174fcc4a11b54d59fa6aca3f8b85c3c prettyplease-0.2.7.tar.gz +2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495 proc-macro-error-attr-1.0.4.tar.gz +8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db proc-macro-error-1.0.4.tar.gz +2a3d33d2e42e3b7edac7a099dcaf83c43ad47852217424c2bcf8ed5b894292975ef5a11df01ebb3479971e94d5b032b9d043c28bed476d6f7087fb9297fbaac0 proc-macro2-1.0.60.tar.gz +07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a quickcheck-1.0.3.tar.gz +846d718153f78cbae6dc714caa9413a5d5964bcc5e032f5c6c5356c62c33bf22635955ebdff0dede69ba1c9657387e65d61de7c537f6f56f8060721dfa52d735 quote-1.0.28.tar.gz +8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 rand-0.8.5.tar.gz +36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 rand_core-0.6.4.tar.gz +16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde redox_syscall-0.3.5.tar.gz +ba5fb1622a330b67a4eb820551c7f20dbfdc6b38eb697b9bfddea4cf0060b473472045e93aaf6cb9727ae609e06ed285e1e42f06f34ac730ac39fb90425bbe85 regex-syntax-0.6.28.tar.gz +ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f regex-1.7.1.tar.gz +84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 rustc-hash-1.1.0.tar.gz +e72fcf16722b62dc9821a498b21254b6f794580aef64e2ae9db15eaf5f5c63bd55a22e0014a00e2a2fcdb4f6ad703c2fa8b75b2db387d1a658a34da7a4ca424e rustix-0.37.7.tar.gz +5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a shlex-1.3.0.tar.gz +9a353bfbe495bab83e401314bb97c6605fa6283af06e03bad50bc429388c7abf44bb9cc68db781ef2b786840eb444907f35b70b17343b2cb993800536b4e36a2 similar-2.2.1.tar.gz +78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 strsim-0.10.0.tar.gz +58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623 syn-1.0.107.tar.gz +2642eb35d52022c6d21bb893843beb9b737a267f620e1f5a6c9096d434fd1fab05fe007c8d8b6f1fe00a25007d6f55dbd4ec620b9f5c1154659bf34c246334dd syn-2.0.18.tar.gz +8e8775a9727e32f6931b3289d2b8aefa5ede7b224ae2e1937da3aff371ef5f6078587f060eb36793e9779249992a97acc39c02c6095c41467929e39ada12c7db tempfile-3.5.0.tar.gz +cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 termcolor-1.2.0.tar.gz +ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86 unicode-ident-1.0.6.tar.gz +9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b unicode-width-0.1.10.tar.gz +b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 version_check-0.9.4.tar.gz +043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f wasi-0.11.0+wasi-snapshot-preview1.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd winapi-util-0.1.5.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz +b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354 windows-sys-0.42.0.tar.gz +f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47 windows-sys-0.45.0.tar.gz +bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed windows-sys-0.48.0.tar.gz +84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9 windows-targets-0.42.2.tar.gz +e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2 windows-targets-0.48.1.tar.gz +75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1 windows_aarch64_gnullvm-0.42.2.tar.gz +80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711 windows_aarch64_gnullvm-0.48.0.tar.gz +d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63 windows_aarch64_msvc-0.42.2.tar.gz +617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df windows_aarch64_msvc-0.48.0.tar.gz +ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c windows_i686_gnu-0.42.2.tar.gz +15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68 windows_i686_gnu-0.48.0.tar.gz +c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804 windows_i686_msvc-0.42.2.tar.gz +11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b windows_i686_msvc-0.48.0.tar.gz +5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f windows_x86_64_gnu-0.42.2.tar.gz +38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602 windows_x86_64_gnu-0.48.0.tar.gz +d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3 windows_x86_64_gnullvm-0.42.2.tar.gz +8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396 windows_x86_64_gnullvm-0.48.0.tar.gz +53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788 windows_x86_64_msvc-0.42.2.tar.gz +6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795 windows_x86_64_msvc-0.48.0.tar.gz +ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6 yansi-term-0.1.2.tar.gz" diff --git a/user/bitmap/APKBUILD b/user/bitmap/APKBUILD index 660643ef7..864ffbb84 100644 --- a/user/bitmap/APKBUILD +++ b/user/bitmap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bitmap -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="X Bitmap (XBM) editor and utilities" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3d6c94675f10772daeb71598c3e0ddcb51569b1bfc4771159e9df89599bfeb8bf49f464c24fef54d30a8f737af32136f859f844be03e088d24ed962f88381193 bitmap-1.1.0.tar.xz" +sha512sums="69096a73739019545f2eb44b823e659b84377cf7c497243c89cbf3f26c9623c31fecfa36628022d241a581a5930e9e2394ec116e5c6d9df94097b45661261307 bitmap-1.1.1.tar.xz" diff --git a/user/brillo/APKBUILD b/user/brillo/APKBUILD new file mode 100644 index 000000000..f377b047f --- /dev/null +++ b/user/brillo/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=brillo +pkgver=1.4.12 +pkgrel=0 +pkgdesc="Utility for controlling display brightness" +url="https://gitlab.com/cameronnemo/brillo" +arch="all" +options="!check" # no testsuite +license="GPL-3.0-only AND 0BSD" +depends="udev polkit" +makedepends="" +subpackages="" +source="https://gitlab.com/cameronnemo/brillo/-/archive/v$pkgver/brillo-v$pkgver.tar.bz2" +builddir="$srcdir/brillo-v$pkgver" + +build() { + make +} + +package() { + make DESTDIR="$pkgdir" install.bin install.udev install.polkit +} + +sha512sums="f7bb6df12a8ddd7df6ac3c973cf24a0b4974387479d20477c7cec75503ca0bfbff8d16645464f79f73074711e62614ffcc5c9388384100274ba8be0bfaae26b8 brillo-v1.4.12.tar.bz2" diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD index d9be3529f..3f1823ece 100644 --- a/user/cairo/APKBUILD +++ b/user/cairo/APKBUILD @@ -1,25 +1,22 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=cairo -pkgver=1.16.0 -pkgrel=3 +pkgver=1.18.4 +pkgrel=0 pkgdesc="A vector graphics library" url="https://cairographics.org/" arch="all" -options="!check" # Recursive dependency on gtk+2.0 for check. +options="!check" # Times out (after 3600 seconds). license="LGPL-2.0+ AND MPL-1.1" depends="" -depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev - xcb-util-dev libxext-dev $pkgname-tools" -makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev cmd:which" +depends_dev="$pkgname-tools" +makedepends="expat-dev fontconfig-dev freetype-dev glib-dev gtk-doc libpng-dev + libx11-dev libxext-dev libxrender-dev meson pixman-dev xcb-util-dev + zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools" -# fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate -_ultver="2016-04-23" source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz - fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz musl-stacksize.patch - CVE-2018-19876.patch - CVE-2019-6462.patch - CVE-2020-35492.patch + cairo-respect-fontconfig_pb.patch + cairo-webkit-html5-fix.patch " # secfixes: @@ -29,42 +26,30 @@ source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz # 1.16.0-r1: # - CVE-2018-19876 -prepare() { - default_prepare +build() { + meson setup \ + -Dprefix=/usr \ + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dglib=enabled \ + -Dpng=enabled \ + -Dspectre=disabled \ + -Dtee=enabled \ + -Dxcb=enabled \ + -Dxlib=enabled \ + -Dzlib=enabled \ + -Dgtk_doc=true \ + build - # infinality - for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do - msg "Applying ${j}" - patch -p1 -i $j - done + meson compile -C build } -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-ft \ - --enable-gobject \ - --enable-pdf \ - --enable-png \ - --enable-ps \ - --enable-svg \ - --enable-tee \ - --enable-x \ - --enable-xcb \ - --enable-xcb-shm \ - --enable-xlib \ - --enable-xlib-xrender \ - --disable-xlib-xcb \ - --disable-static - make +check() { + meson test -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } gobject() { @@ -81,9 +66,7 @@ tools() { "$subpkgdir"/usr/lib/cairo/ } -sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz -d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz +sha512sums="863679f817ed67dc2c916c035d740916e27e7e69c04fca63936e37d274e7f4c79848d16c8f7c481798864602e8847c489f698df89b785cbc576c925dbd513316 cairo-1.18.4.tar.xz 86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch -9020c596caa54a2ac435d5dae0f121d36d3c3f34d487b9c1032665b1bd15813506adf31984e34b5dd328ee0e068de0627e1d061230758328cae4fa993c3a9209 CVE-2018-19876.patch -ebe5d71b18aa9eefe1e0a6c150761bb7abef41f144f37eb0bfa8a01947aacb1292ac131cf815dcaaaa6478c0aac07ca5428fba28ad346a00c5aaa5fa64f6ff5b CVE-2019-6462.patch -8dcb95b6a8e023ad5675f81f9a87a087868dc74113cd0ab96568d525582266c366064cc7cc168738dc75968385ab0444911f54754d31962dfe1235526afbd72c CVE-2020-35492.patch" +bdc01ec3619e40e6e260890e038628607076d56d8e64ceaf8a3fd3c92e348d451a12852148a168f2e0e69d40285800fa66e39fdee771d1e0d632311c61923ca2 cairo-respect-fontconfig_pb.patch +9bf936f9c84f00409d75665034b21fa345c2e1c414715a899ad37ae10eaf54348537a3386ce078a56f1e931c749c3e50a99dd3b4e8aab484077ee18b5b89abe9 cairo-webkit-html5-fix.patch" diff --git a/user/cairo/CVE-2018-19876.patch b/user/cairo/CVE-2018-19876.patch deleted file mode 100644 index 33731e4fc..000000000 --- a/user/cairo/CVE-2018-19876.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <cgarcia@igalia.com> -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.21.0 - diff --git a/user/cairo/CVE-2019-6462.patch b/user/cairo/CVE-2019-6462.patch deleted file mode 100644 index 2a26876c3..000000000 --- a/user/cairo/CVE-2019-6462.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bbeaf08190d3006a80b80a77724801cd477a37b8 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin <hlewin@worldiety.de> -Date: Sat, 17 Apr 2021 19:15:03 +0200 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -GitLab - diff --git a/user/cairo/CVE-2020-35492.patch b/user/cairo/CVE-2020-35492.patch deleted file mode 100644 index d7369b3d6..000000000 --- a/user/cairo/CVE-2020-35492.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin <heiko.lewin@worldiety.de> -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - ---- - src/cairo-image-compositor.c | 8 ++-- - test/Makefile.sources | 1 + - test/bug-image-compositor.c | 39 ++++++++++++++++++++ - test/reference/bug-image-compositor.ref.png | Bin 0 -> 185 bytes - 4 files changed, 44 insertions(+), 4 deletions(-) - create mode 100644 test/bug-image-compositor.c - create mode 100644 test/reference/bug-image-compositor.ref.png - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index 79ad69f68..4f8aaed99 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2610,14 +2610,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2655,7 +2655,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2684,7 +2684,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; - diff --git a/user/cairo/cairo-respect-fontconfig_pb.patch b/user/cairo/cairo-respect-fontconfig_pb.patch new file mode 100644 index 000000000..0bb0f4a7a --- /dev/null +++ b/user/cairo/cairo-respect-fontconfig_pb.patch @@ -0,0 +1,13 @@ +--- a/src/cairo-ft-font.c 2015-03-10 23:21:07.000000000 +0100 ++++ b/src/cairo-ft-font.c 2015-03-11 21:59:05.747697134 +0100 +@@ -1932,7 +1932,9 @@ _cairo_ft_options_merge (cairo_ft_option + options->base.subpixel_order = other->base.subpixel_order; + } + +- if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT) ++ options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT; ++ ++ if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT) + options->base.hint_style = other->base.hint_style; + + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) diff --git a/user/cairo/cairo-webkit-html5-fix.patch b/user/cairo/cairo-webkit-html5-fix.patch new file mode 100644 index 000000000..07c5c6db8 --- /dev/null +++ b/user/cairo/cairo-webkit-html5-fix.patch @@ -0,0 +1,30 @@ +From 0742b90a214b35951414558f6f5579f79b8a8194 Mon Sep 17 00:00:00 2001 +From: Massimo Valentini <mvalentini@src.gnome.org> +Date: Thu, 21 Aug 2014 17:15:51 +0200 +Subject: [PATCH] Fix segfault rendering videos in webkit based browsers + +do not tessellate empty boxes. + +Reported-by: Henrique Lengler <henriqueleng@openmailbox.org> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81699 +--- + src/cairo-bentley-ottmann-rectangular.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c +index 5541bdc..4bcd8d1 100644 +--- a/src/cairo-bentley-ottmann-rectangular.c ++++ b/src/cairo-bentley-ottmann-rectangular.c +@@ -834,6 +834,9 @@ _cairo_bentley_ottmann_tessellate_boxes (const cairo_boxes_t *in, + for (i = 0; i < chunk->count; i++) { + int h; + ++ if (box[i].p1.y == box[i].p2.y) ++ continue; ++ + if (box[i].p1.x < box[i].p2.x) { + rectangles[j].left.x = box[i].p1.x; + rectangles[j].left.dir = 1; +-- +1.9.3 + diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD index 7f7b8784b..e2ef30812 100644 --- a/user/cbindgen/APKBUILD +++ b/user/cbindgen/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: Zach van Rijn <me@zv.io> pkgname=cbindgen -pkgver=0.24.3 -pkgrel=1 +pkgver=0.26.0 +pkgrel=0 pkgdesc="Tool to generate C bindings from Rust code" url="https://github.com/eqrion/cbindgen" arch="all" @@ -17,52 +17,55 @@ source="" # dependencies taken from Cargo.lock cargo_deps="$pkgname-$pkgver -hashbrown-0.11.2 -strsim-0.10.0 -serial_test-0.5.1 -syn-1.0.89 -hermit-abi-0.1.19 +atty-0.2.14 autocfg-1.1.0 -libc-0.2.121 -ryu-1.0.9 -fastrand-1.7.0 -winapi-x86_64-pc-windows-gnu-0.4.0 bitflags-1.3.2 -parking_lot_core-0.8.5 -parking_lot-0.11.2 -toml-0.5.8 -proc-macro2-1.0.36 -log-0.4.16 -os_str_bytes-6.0.0 cfg-if-1.0.0 -memchr-2.4.1 -serial_test_derive-0.5.1 -heck-0.4.0 -winapi-util-0.1.5 -scopeguard-1.1.0 -quote-1.0.17 -indexmap-1.8.0 +clap-3.2.25 +clap_lex-0.2.4 +fastrand-1.9.0 +hashbrown-0.12.3 +heck-0.4.1 +hermit-abi-0.1.19 +indexmap-1.9.3 instant-0.1.12 -winapi-i686-pc-windows-gnu-0.4.0 +itoa-1.0.6 lazy_static-1.4.0 -serde_json-1.0.79 -itoa-1.0.1 +libc-0.2.144 +lock_api-0.4.9 +log-0.4.17 +os_str_bytes-6.5.0 +parking_lot-0.11.2 +parking_lot_core-0.8.6 +proc-macro2-1.0.66 +quote-1.0.27 +redox_syscall-0.2.16 remove_dir_all-0.5.3 -textwrap-0.15.0 -winapi-0.3.9 -clap-3.1.6 -unicode-xid-0.2.2 -atty-0.2.14 -lock_api-0.4.6 -redox_syscall-0.2.12 -smallvec-1.8.0 -serde-1.0.136 -serde_derive-1.0.136 -termcolor-1.1.3 +ryu-1.0.13 +scopeguard-1.1.0 +serde-1.0.163 +serde_derive-1.0.163 +serde_json-1.0.96 +serial_test-0.5.1 +serial_test_derive-0.5.1 +smallvec-1.10.0 +strsim-0.10.0 +syn-1.0.109 +syn-2.0.16 tempfile-3.3.0 +termcolor-1.2.0 +textwrap-0.16.0 +toml-0.5.11 +unicode-ident-1.0.8 +winapi-0.3.9 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 " -source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g') + ppc-libc-hugetlb.patch + " prepare() { export CARGO_HOME="$srcdir/cargo-home" @@ -111,47 +114,49 @@ package() { } -sha512sums="3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05 cbindgen-0.24.3.tar.gz -c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c hashbrown-0.11.2.tar.gz -78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 strsim-0.10.0.tar.gz -e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e serial_test-0.5.1.tar.gz -6b2a9411c015b2b0ed5c5e18cae67f357d1a735e184416c6f8533be191ba65c0963dc9341ba3829195c6616ce71d4a79cbc7768fdbaa98b798b8f67746c6ab4a syn-1.0.89.tar.gz -1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a hermit-abi-0.1.19.tar.gz +sha512sums="2de81f46c9c68c985241a349f13125876667d1460d3658ead8c4ee9788cd139c30dbc08bebddc172cf0bd4644f3f17c02cf66f2a3ef706c52366fdaf0f9d8059 cbindgen-0.26.0.tar.gz +d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 atty-0.2.14.tar.gz df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f autocfg-1.1.0.tar.gz -aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953 libc-0.2.121.tar.gz -4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb ryu-1.0.9.tar.gz -6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673 fastrand-1.7.0.tar.gz -4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz -c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00 parking_lot_core-0.8.5.tar.gz -526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e parking_lot-0.11.2.tar.gz -26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082 toml-0.5.8.tar.gz -f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a proc-macro2-1.0.36.tar.gz -b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1 log-0.4.16.tar.gz -d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8 os_str_bytes-6.0.0.tar.gz 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz -d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11 memchr-2.4.1.tar.gz -e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e serial_test_derive-0.5.1.tar.gz -33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f heck-0.4.0.tar.gz -7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd winapi-util-0.1.5.tar.gz -368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d scopeguard-1.1.0.tar.gz -d34fa0c864e3b9007449269ad5ea8736bbaa359e61eeb454e9c1cc30f9739a96778a04421e2a014879aeee417d8b51e20c6c41ebdab6878567af027096ff9ebd quote-1.0.17.tar.gz -6af44320a80c8256291cc6e3c90311ce67b7f69ce039d640bb3abbcb6057f16eb443a407060ba647d7b16f44214acf59b566772a4802ba5000f036f69ca82a43 indexmap-1.8.0.tar.gz +557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea clap-3.2.25.tar.gz +6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f clap_lex-0.2.4.tar.gz +321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52 fastrand-1.9.0.tar.gz +b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 hashbrown-0.12.3.tar.gz +8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 heck-0.4.1.tar.gz +1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a hermit-abi-0.1.19.tar.gz +2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 indexmap-1.9.3.tar.gz fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 instant-0.1.12.tar.gz -a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31 itoa-1.0.6.tar.gz e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 lazy_static-1.4.0.tar.gz -83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7 serde_json-1.0.79.tar.gz -8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295 itoa-1.0.1.tar.gz +576da68e3845a7149f64bee425529ffec4bbb8df0272790182e49c8bad5b9744de21ffb5c1206753b57b7fe45af02c6c429e16522b72a77e5262482d64df5692 libc-0.2.144.tar.gz +9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 lock_api-0.4.9.tar.gz +2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 log-0.4.17.tar.gz +cde7779ba24304256cc57de78208af4d26bc91dae7fbb9c85e3f67c3e35cb6268caf3fc9eef530a8d3cbdc951ec3534223f3559d2a013561912231ebdb1801b2 os_str_bytes-6.5.0.tar.gz +526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e parking_lot-0.11.2.tar.gz +906241f8e2d71784d572fb78978c9550b19af9c4e32fe3b2da751287806d0faeba61f5bd36f7aab026970b2bffaaa1f62ddc10c64dc348eae61bf7b51297ef80 parking_lot_core-0.8.6.tar.gz +85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407 proc-macro2-1.0.66.tar.gz +5fb5802aa667c60d1a721766081b01bfd6cd929db7a5d71cb74627c2325f7108740752e514db73fb3612c163840e60ef2d4bde31c41978f3d77605418bdf2b4a quote-1.0.27.tar.gz +63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 redox_syscall-0.2.16.tar.gz 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c remove_dir_all-0.5.3.tar.gz -f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd textwrap-0.15.0.tar.gz +25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13 ryu-1.0.13.tar.gz +368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d scopeguard-1.1.0.tar.gz +752738ef5f67f1b4435bdd4e76e740ba192bd93e83cac55fd667809af26ceaf02db7083aaf7b2074644b38964021af206000b6130199e7994c12c9c57cd31a34 serde-1.0.163.tar.gz +744c4235330781c8d9c6ab4f49f6ddd11fcd70b97c97fcbf1434ccac02ba7d29eacfed21ee8e005f5541dd8ab4a34023e95d85231f11c5f4d6e24fcf806f7283 serde_derive-1.0.163.tar.gz +39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e serde_json-1.0.96.tar.gz +e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e serial_test-0.5.1.tar.gz +e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e serial_test_derive-0.5.1.tar.gz +a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae smallvec-1.10.0.tar.gz +78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 strsim-0.10.0.tar.gz +12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d syn-1.0.109.tar.gz +75d6728614a39d7f676536fc345be6777e8dba6198f031e576ecd199e503347c4069fc7294c4da3e829cb919c08347513447dc86fbf0c545df2d347311621da3 syn-2.0.16.tar.gz +ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e tempfile-3.3.0.tar.gz +cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 termcolor-1.2.0.tar.gz +97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 textwrap-0.16.0.tar.gz +eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 toml-0.5.11.tar.gz +8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088 unicode-ident-1.0.8.tar.gz ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz -397c277eeb9acafc1098f6b6aa7e428cf7c7016356a99139dbff66dd6c6e12434b14a457679fd99ea50c1fb0b54b9b96bad65f1198025986835810484e542824 clap-3.1.6.tar.gz -92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8 unicode-xid-0.2.2.tar.gz -d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 atty-0.2.14.tar.gz -ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d lock_api-0.4.6.tar.gz -c89b2aa6ab9b34ba10983c9b6c90108e0b7e380357c9b5f50a72ea6ab54311437c88859d2345b28747d2539fdac29a597b72e7e47b4ded9b6dfbc54ea9792048 redox_syscall-0.2.12.tar.gz -17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c smallvec-1.8.0.tar.gz -d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019 serde-1.0.136.tar.gz -92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289 serde_derive-1.0.136.tar.gz -5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a termcolor-1.1.3.tar.gz -ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e tempfile-3.3.0.tar.gz" +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd winapi-util-0.1.5.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +299fbec38c0874bd53987ee8f8d793ac2f7b7695af22fb85b01dd0f3a20190d6920cc2deacc2a9da35bd58fd8eaab177aaa3460ef9e3f0897cd80d0c180e3ce0 ppc-libc-hugetlb.patch" diff --git a/user/cbindgen/ppc-libc-hugetlb.patch b/user/cbindgen/ppc-libc-hugetlb.patch new file mode 100644 index 000000000..8a1bfe78d --- /dev/null +++ b/user/cbindgen/ppc-libc-hugetlb.patch @@ -0,0 +1,12 @@ +diff -ur a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs +--- a/libc-0.2.144/src/unix/linux_like/linux/musl/b32/powerpc.rs 2024-09-02 00:25:08.560000000 +0000 ++++ b/libc-0.2.144/src/unix/linux_like/linux/musl/b32/powerpc.rs 2024-09-02 00:25:41.080000000 +0000 +@@ -377,8 +377,6 @@ + + pub const EXTPROC: ::tcflag_t = 0x10000000; + +-pub const MAP_HUGETLB: ::c_int = 0x040000; +- + pub const F_GETLK: ::c_int = 12; + pub const F_GETOWN: ::c_int = 9; + pub const F_SETLK: ::c_int = 13; diff --git a/user/chelf/APKBUILD b/user/chelf/APKBUILD deleted file mode 100644 index cf3b34228..000000000 --- a/user/chelf/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=chelf -pkgver=0.2.2 -pkgrel=0 -pkgdesc="Display or change the stack size of an ELF binary" -url=" " -arch="all" -options="!check" # No test suite. -license="BSD-2-Clause" -depends="" -makedepends="" -subpackages="" -source="$pkgname-$pkgver.tar.xz::https://distfiles.adelielinux.org/source/$pkgname-$pkgver.txz" - -build() { - make -} - -package() { - install -D -m755 chelf "$pkgdir"/usr/bin/chelf -} - -sha512sums="bf29f0f526ca1977e0d0743901f6afeb23b2dd78b60618ea65201ea95000832854250f44de6e7625b6d546cace4638be094989cdb96b4e842285ef85718c0082 chelf-0.2.2.tar.xz" diff --git a/user/chrpath/APKBUILD b/user/chrpath/APKBUILD deleted file mode 100644 index 7bdb44c39..000000000 --- a/user/chrpath/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: -pkgname=chrpath -pkgver=0.16 -pkgrel=2 -pkgdesc="Modify rpath of compiled programs" -url="https://github.com/jwilk-mirrors/chrpath" -arch="all" -license="GPL-2.0-only" -depends="" -makedepends="" -subpackages="$pkgname-doc" -source="https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz" - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname-$pkgver \ - install -} - -sha512sums="aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa chrpath-0.16.tar.gz" diff --git a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch index a6fbcdd3f..9f2612440 100644 --- a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch +++ b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch @@ -24,7 +24,7 @@ index 7b34a09256..7a3774a4f1 100644 AlpineLinux, ArchLinux, DebianLenny, -@@ -130,3 +130,5 @@ public: +@@ -134,3 +135,5 @@ public: } + bool IsAdelieLinux() const { return DistroVal == AdelieLinux; } @@ -36,7 +36,7 @@ index 2c4d44faf8..7ef35ab379 100644 +++ b/lib/Driver/Distro.cpp @@ -36,6 +36,7 @@ for (StringRef Line : Lines) - if (Version == Distro::UnknownDistro && Line.startswith("ID=")) + if (Version == Distro::UnknownDistro && Line.starts_with("ID=")) Version = llvm::StringSwitch<Distro::DistroType>(Line.substr(3)) + .Case("adelie", Distro::AdelieLinux) .Case("alpine", Distro::AlpineLinux) @@ -44,9 +44,9 @@ index 2c4d44faf8..7ef35ab379 100644 .Case("gentoo", Distro::Gentoo) --- cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp.old 2018-11-29 18:52:22.000000000 +0000 +++ cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp 2019-04-23 23:49:37.786181838 +0000 -@@ -188,13 +188,13 @@ +@@ -226,13 +226,13 @@ - Distro Distro(D.getVFS()); + Distro Distro(D.getVFS(), Triple); - if (Distro.IsAlpineLinux() || Triple.isAndroid()) { + if (Distro.IsAdelieLinux() || Distro.IsAlpineLinux() || Triple.isAndroid()) { @@ -60,13 +60,3 @@ index 2c4d44faf8..7ef35ab379 100644 ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -234,7 +234,8 @@ - if (!IsMips && !IsHexagon) { - if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || - (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) || -- (IsAndroid && !Triple.isAndroidVersionLT(23))) -+ (IsAndroid && !Triple.isAndroidVersionLT(23)) || -+ Distro.IsAdelieLinux()) - ExtraOpts.push_back("--hash-style=gnu"); - - if (Distro.IsDebian() || Distro.IsOpenSUSE() || diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index d829f0032..5084a4020 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=clang # Note: Update together with llvm. -pkgver=14.0.6 -pkgrel=0 +pkgver=18.1.8 +pkgrel=1 _llvmver=${pkgver%%.*} pkgdesc="A C language family front-end for LLVM" arch="all" @@ -16,16 +16,14 @@ makedepends="cmake isl-dev libedit-dev libexecinfo-dev libxml2-dev libxml2-utils z3 z3-dev" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-analyzer::noarch" -source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/$pkgname-$pkgver.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz +source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz 0001-Add-support-for-Ad-lie-Linux.patch + big-endian-32.patch cfe-005-ppc64-dynamic-linker-path.patch ppc-dirwatcher.patch - ppc-interp.patch - ppc64-elfv2.patch use-llvm-lit.patch " -builddir="$srcdir/$pkgname-$pkgver.src" +builddir="$srcdir/llvm-project-$pkgver.src/$pkgname" prepare() { default_prepare @@ -63,12 +61,22 @@ prepare() { test/utils/update_cc_test_checks/replace-value-regex-across-runs.test \ test/utils/update_cc_test_checks/resolve-tmp-conflict.test \ ; + + rm -f test/Driver/ppc-float-abi-warning.cpp + # known broken on 32-bit platforms + rm -f test/CodeGenCUDA/static-device-var-rdc.cu } build() { + _build_type=MinSizeRel + case $CARCH in + ppc64) + # https://github.com/llvm/llvm-project/issues/102192 + _build_type=Release;; + esac CMAKE_PREFIX_PATH=/usr/lib/llvm$_llvmver/lib/cmake \ cmake -Wno-dev \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_BUILD_TYPE=$_build_type \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_VERBOSE_MAKEFILE=OFF \ -DCLANG_VENDOR=${DISTRO_SHORT_NAME:-Adélie} \ @@ -80,7 +88,7 @@ build() { -DLLVM_ENABLE_EH=ON \ -DLLVM_ENABLE_RTTI=ON \ -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src" \ - -DLLVM_EXTERNAL_LIT="$builddir/build/bin/llvm-lit" \ + -DLLVM_EXTERNAL_LIT="/usr/lib/llvm$_llvmver/bin/lit" \ -Bbuild \ . @@ -94,7 +102,6 @@ build() { } check() { - [ -f build/bin/llvm-lit ] || ln -s /usr/bin/lit build/bin/llvm-lit make -C build check-clang } @@ -143,11 +150,9 @@ analyzer() { mv usr/share/scan-* "$subpkgdir"/usr/share/ } -sha512sums="5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b clang-14.0.6.src.tar.xz -6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d llvm-14.0.6.src.tar.xz -7f422f671167498102789e8c0b3ab4e46d6a4433d89f0f6b2cf0736ad257146e5eeb04b6f1d9431cce4635c9691d0cc80e643f852269bf7119ce312ae9bb8068 0001-Add-support-for-Ad-lie-Linux.patch -b3c999ef1e380b02a25f1ebca4811f1c696b88309b73af0c19865e3b92084becc9529b910d24b4fb7133606c1e105860104017406d876f95e9260c716348bd1c cfe-005-ppc64-dynamic-linker-path.patch +sha512sums="25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db llvm-project-18.1.8.src.tar.xz +d37d2339a76c21666aa4405b2a620100e6967eb933535b5cea05f5de25a4d75510479443500715529cea38014028741d71553c7b247d5f349a05660133d66bc6 0001-Add-support-for-Ad-lie-Linux.patch +241a087888b7b5373b54653c4675c77c70d82b61a1b79359cba7d5fe0187851e790cb4e7e278a0a59c660b9a980cf087b393dc43a19a975fc9b97717bca12bc4 big-endian-32.patch +8272ec0eeb93287c9cc961099139f7cb0f94561befc31a4521387fa5f7216dc4b3d99750c4560a0b71ec4acde5bd776abef733cfafe81058ef054b62f72fc209 cfe-005-ppc64-dynamic-linker-path.patch 0032fdd3864870d345caff9c4ff44f58bebc802bddf06c4b3bf30276c89e237167e6dea03456d322d3f6e2ee5e3a2ecf9f649ed033f0ab078b80bda44371b3ce ppc-dirwatcher.patch -0d8f77100cd8550be0dc251704081574b0cdc46169df1428ad8cc9f689cdaa47adcd9ff45a816e238ee279395036c7548bf1033307aabbb3a62cce9f360698eb ppc-interp.patch -4f534e72cf3ec9134d9f77a1a787c84859a5ee84b52da529d47745eb7d75d383070573018588bfbf622e826fcb281fdf20fa79217024df5cb824e6ae1ea1d7bf ppc64-elfv2.patch -1f93918d512849e8bf7eb4e71d2b623c0ae3361e4b6ed5b50b76b0fe78e3d70f8773061b1ea0f327950a4f7c2ffdcdaafcb224301732df2a7469c742e8f5883f use-llvm-lit.patch" +6c6b4fc49539ecf02e4eec9c2bbd89cc37fe01383e7884aa52c90ab0a4aa23cd9a86716bc645af6949f787d2fe3b9a3ad177baef1edbec928437872d14db536d use-llvm-lit.patch" diff --git a/user/clang/big-endian-32.patch b/user/clang/big-endian-32.patch new file mode 100644 index 000000000..9235d2f5e --- /dev/null +++ b/user/clang/big-endian-32.patch @@ -0,0 +1,183 @@ +From 4f37ed5ff6c18c8cf0de244bb064d5f4f60065a4 Mon Sep 17 00:00:00 2001 +From: Jessica Clarke <jrtc27@jrtc27.com> +Date: Fri, 18 Oct 2024 16:50:22 +0100 +Subject: [PATCH 1/2] [clang] Make LazyOffsetPtr more portable + +LazyOffsetPtr currently relies on uint64_t being able to store a pointer +and, unless sizeof(uint64_t) == sizeof(void *), little endianness, since +getAddressOfPointer reinterprets the memory as a pointer. This also +doesn't properly respect the C++ object model. + +As removing getAddressOfPointer would have wide-reaching implications, +improve the implementation to account for these problems by using +placement new and a suitably sized-and-aligned buffer, "right"-aligning +the objects on big-endian platforms so the LSBs are in the same place +for use as the discriminator. + +Fixes: bc73ef0031b50f7443615fef614fb4ecaaa4bd11 +Fixes: https://github.com/llvm/llvm-project/issues/111993 +--- + clang/include/clang/AST/ExternalASTSource.h | 48 +++++++++++++++------ + 1 file changed, 35 insertions(+), 13 deletions(-) + +diff --git clang/include/clang/AST/ExternalASTSource.h clang/include/clang/AST/ExternalASTSource.h +index 385c32edbae0fd..caf37144d5eb73 100644 +--- clang/include/clang/AST/ExternalASTSource.h ++++ clang/include/clang/AST/ExternalASTSource.h +@@ -25,10 +25,12 @@ + #include "llvm/ADT/SmallVector.h" + #include "llvm/ADT/iterator.h" + #include "llvm/Support/PointerLikeTypeTraits.h" ++#include <algorithm> + #include <cassert> + #include <cstddef> + #include <cstdint> + #include <iterator> ++#include <new> + #include <optional> + #include <utility> + +@@ -326,29 +328,49 @@ struct LazyOffsetPtr { + /// + /// If the low bit is clear, a pointer to the AST node. If the low + /// bit is set, the upper 63 bits are the offset. +- mutable uint64_t Ptr = 0; ++ static constexpr size_t DataSize = std::max(sizeof(uint64_t), sizeof(T *)); ++ alignas(uint64_t) alignas(T *) mutable unsigned char Data[DataSize] = {}; ++ ++ unsigned char GetLSB() const { ++ return Data[llvm::sys::IsBigEndianHost ? DataSize - 1 : 0]; ++ } ++ ++ template <typename U> U &As(bool New) const { ++ unsigned char *Obj = ++ Data + (llvm::sys::IsBigEndianHost ? DataSize - sizeof(U) : 0); ++ if (New) ++ return *new (Obj) U; ++ return *std::launder(reinterpret_cast<U *>(Obj)); ++ } ++ ++ T *&GetPtr() const { return As<T *>(false); } ++ uint64_t &GetU64() const { return As<uint64_t>(false); } ++ void SetPtr(T *Ptr) const { As<T *>(true) = Ptr; } ++ void SetU64(uint64_t U64) const { As<uint64_t>(true) = U64; } + + public: + LazyOffsetPtr() = default; +- explicit LazyOffsetPtr(T *Ptr) : Ptr(reinterpret_cast<uint64_t>(Ptr)) {} ++ explicit LazyOffsetPtr(T *Ptr) : Data() { SetPtr(Ptr); } + +- explicit LazyOffsetPtr(uint64_t Offset) : Ptr((Offset << 1) | 0x01) { ++ explicit LazyOffsetPtr(uint64_t Offset) : Data() { + assert((Offset << 1 >> 1) == Offset && "Offsets must require < 63 bits"); + if (Offset == 0) +- Ptr = 0; ++ SetPtr(NULL); ++ else ++ SetU64((Offset << 1) | 0x01); + } + + LazyOffsetPtr &operator=(T *Ptr) { +- this->Ptr = reinterpret_cast<uint64_t>(Ptr); ++ SetPtr(Ptr); + return *this; + } + + LazyOffsetPtr &operator=(uint64_t Offset) { + assert((Offset << 1 >> 1) == Offset && "Offsets must require < 63 bits"); + if (Offset == 0) +- Ptr = 0; ++ SetPtr(NULL); + else +- Ptr = (Offset << 1) | 0x01; ++ SetU64((Offset << 1) | 0x01); + + return *this; + } +@@ -356,15 +378,15 @@ struct LazyOffsetPtr { + /// Whether this pointer is non-NULL. + /// + /// This operation does not require the AST node to be deserialized. +- explicit operator bool() const { return Ptr != 0; } ++ explicit operator bool() const { return isOffset() || GetPtr() != NULL; } + + /// Whether this pointer is non-NULL. + /// + /// This operation does not require the AST node to be deserialized. +- bool isValid() const { return Ptr != 0; } ++ bool isValid() const { return isOffset() || GetPtr() != NULL; } + + /// Whether this pointer is currently stored as an offset. +- bool isOffset() const { return Ptr & 0x01; } ++ bool isOffset() const { return GetLSB() & 0x01; } + + /// Retrieve the pointer to the AST node that this lazy pointer points to. + /// +@@ -375,9 +397,9 @@ struct LazyOffsetPtr { + if (isOffset()) { + assert(Source && + "Cannot deserialize a lazy pointer without an AST source"); +- Ptr = reinterpret_cast<uint64_t>((Source->*Get)(Ptr >> 1)); ++ SetPtr((Source->*Get)(GetU64() >> 1)); + } +- return reinterpret_cast<T*>(Ptr); ++ return GetPtr(); + } + + /// Retrieve the address of the AST node pointer. Deserializes the pointee if +@@ -385,7 +407,7 @@ struct LazyOffsetPtr { + T **getAddressOfPointer(ExternalASTSource *Source) const { + // Ensure the integer is in pointer form. + (void)get(Source); +- return reinterpret_cast<T**>(&Ptr); ++ return &GetPtr(); + } + }; + + +From 35eed5f3f5e09c4275cabac09e277a167a98f742 Mon Sep 17 00:00:00 2001 +From: Jessica Clarke <jrtc27@jrtc27.com> +Date: Fri, 18 Oct 2024 17:45:28 +0100 +Subject: [PATCH 2/2] NULL -> nullptr + +--- + clang/include/clang/AST/ExternalASTSource.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git clang/include/clang/AST/ExternalASTSource.h clang/include/clang/AST/ExternalASTSource.h +index caf37144d5eb73..582ed7c65f58ca 100644 +--- clang/include/clang/AST/ExternalASTSource.h ++++ clang/include/clang/AST/ExternalASTSource.h +@@ -355,7 +355,7 @@ struct LazyOffsetPtr { + explicit LazyOffsetPtr(uint64_t Offset) : Data() { + assert((Offset << 1 >> 1) == Offset && "Offsets must require < 63 bits"); + if (Offset == 0) +- SetPtr(NULL); ++ SetPtr(nullptr); + else + SetU64((Offset << 1) | 0x01); + } +@@ -368,7 +368,7 @@ struct LazyOffsetPtr { + LazyOffsetPtr &operator=(uint64_t Offset) { + assert((Offset << 1 >> 1) == Offset && "Offsets must require < 63 bits"); + if (Offset == 0) +- SetPtr(NULL); ++ SetPtr(nullptr); + else + SetU64((Offset << 1) | 0x01); + +@@ -378,12 +378,12 @@ struct LazyOffsetPtr { + /// Whether this pointer is non-NULL. + /// + /// This operation does not require the AST node to be deserialized. +- explicit operator bool() const { return isOffset() || GetPtr() != NULL; } ++ explicit operator bool() const { return isOffset() || GetPtr() != nullptr; } + + /// Whether this pointer is non-NULL. + /// + /// This operation does not require the AST node to be deserialized. +- bool isValid() const { return isOffset() || GetPtr() != NULL; } ++ bool isValid() const { return isOffset() || GetPtr() != nullptr; } + + /// Whether this pointer is currently stored as an offset. + bool isOffset() const { return GetLSB() & 0x01; } diff --git a/user/clang/cfe-005-ppc64-dynamic-linker-path.patch b/user/clang/cfe-005-ppc64-dynamic-linker-path.patch index eadc65bfa..0238ca5c6 100644 --- a/user/clang/cfe-005-ppc64-dynamic-linker-path.patch +++ b/user/clang/cfe-005-ppc64-dynamic-linker-path.patch @@ -1,6 +1,6 @@ --- a/lib/Driver/ToolChains/Linux.cpp +++ b/lib/Driver/ToolChains/Linux.cpp -@@ -485,12 +485,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { +@@ -551,12 +551,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { Loader = "ld.so.1"; break; case llvm::Triple::ppc64: diff --git a/user/clang/ppc-interp.patch b/user/clang/ppc-interp.patch deleted file mode 100644 index a8cb6bc90..000000000 --- a/user/clang/ppc-interp.patch +++ /dev/null @@ -1,25 +0,0 @@ -PPC32 doesn't support some of the clang-repl due to R_PPC_REL24 not being -implemented in RuntimeDyld. - ---- clang-14.0.6.src/test/Interpreter/execute.cpp.old 2022-06-22 16:46:24.000000000 +0000 -+++ clang-14.0.6.src/test/Interpreter/execute.cpp 2022-12-05 01:04:26.517960246 +0000 -@@ -1,7 +1,7 @@ - // RUN: clang-repl "int i = 10;" 'extern "C" int printf(const char*,...);' \ - // RUN: 'auto r1 = printf("i = %d\n", i);' | FileCheck --check-prefix=CHECK-DRIVER %s - // REQUIRES: host-supports-jit --// UNSUPPORTED: system-aix -+// UNSUPPORTED: system-aix, powerpc- - // CHECK-DRIVER: i = 10 - // RUN: cat %s | clang-repl | FileCheck %s - extern "C" int printf(const char *, ...); ---- clang-14.0.6.src/unittests/Interpreter/InterpreterTest.cpp.old 2022-06-22 16:46:24.000000000 +0000 -+++ clang-14.0.6.src/unittests/Interpreter/InterpreterTest.cpp 2022-12-05 01:53:47.058187317 +0000 -@@ -205,7 +205,7 @@ - return R.getFoundDecl(); - } - --#ifdef _AIX -+#if defined(_AIX) || (!defined(__powerpc64__) && defined(__powerpc__)) - TEST(IncrementalProcessing, DISABLED_InstantiateTemplate) { - #else - TEST(IncrementalProcessing, InstantiateTemplate) { diff --git a/user/clang/ppc64-elfv2.patch b/user/clang/ppc64-elfv2.patch deleted file mode 100644 index 7c5ef421c..000000000 --- a/user/clang/ppc64-elfv2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cfe-8.0.0.src/lib/Basic/Targets/PPC.h.old 2019-02-12 11:19:21.000000000 +0000 -+++ cfe-8.0.0.src/lib/Basic/Targets/PPC.h 2019-06-01 23:18:07.613180102 +0000 -@@ -427,7 +427,7 @@ - ABI = "elfv2"; - } else { - DataLayout = "E-m:e-i64:64-n32:64"; -- ABI = "elfv1"; -+ ABI = (Triple.getEnvironment() == llvm::Triple::Musl) ? "elfv2" : "elfv1"; - } - - if (Triple.isOSFreeBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) { diff --git a/user/clang/use-llvm-lit.patch b/user/clang/use-llvm-lit.patch index 4ce2bedde..5652ff12f 100644 --- a/user/clang/use-llvm-lit.patch +++ b/user/clang/use-llvm-lit.patch @@ -1,6 +1,6 @@ --- cfe-6.0.1.src/test/CMakeLists.txt.old 2017-12-12 19:47:40.000000000 +0000 +++ cfe-6.0.1.src/test/CMakeLists.txt 2018-09-13 17:01:03.690000000 +0000 -@@ -164,7 +164,7 @@ +@@ -170,7 +170,7 @@ add_lit_testsuite(check-clang "Running the Clang regression tests" ${CMAKE_CURRENT_BINARY_DIR} diff --git a/user/clazy/APKBUILD b/user/clazy/APKBUILD index d8e20a742..cdf5211ae 100644 --- a/user/clazy/APKBUILD +++ b/user/clazy/APKBUILD @@ -1,7 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=clazy -pkgver=1.11 +pkgver=1.12 +_llvmver=18 pkgrel=0 pkgdesc="Clang compiler plugin to warn about Qt best practices" url="https://kde.org/applications/development/org.kde.clazy" @@ -9,7 +10,7 @@ arch="all" license="LGPL-2.1+" options="!check" # need 'clang-tools-extra' depends="" -makedepends="cmake clang-dev llvm14-dev" +makedepends="cmake clang-dev llvm$_llvmver-dev" subpackages="$pkgname-doc" source="https://download.kde.org/stable/clazy/$pkgver/src/clazy-$pkgver.tar.xz fix-link-fs-lib.patch @@ -26,6 +27,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DLLVM_ROOT="/usr/lib/llvm$_llvmver" \ ${CMAKE_CROSSOPTS} \ . make @@ -39,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6a7c162392dd30aea29669275cea814d6daccf7931b8cdb20997f9bbff5619832d5461a6d0f854ecbc4726e52b6937c4f9cb8651087ffe73676c04239a38ca2b clazy-1.11.tar.xz -4b7b946f3e8f748d5cc1eb3a10ff751f33285160eb2d28c532fc62e54bc7d8be0ffefc90861b22df3a2abf26776eb278748baeffa277f5f6c7929e8197411894 fix-link-fs-lib.patch" +sha512sums="7a2b4a753098f15936a4731c82c660c1cd4d81949279435e87f00f7f72bef3e32cb574c8991c0707798581278e9fbcae34d354c1e6b77a15a5e26166d658fa9e clazy-1.12.tar.xz +92e10ad26bae84021b6d076d90e46ad570c9bcb676bcdd3f0d53b46b47b379fb0c757310e91b995851703892003cbc870dacef7de5419575502eccc2715a8ea7 fix-link-fs-lib.patch" diff --git a/user/clazy/fix-link-fs-lib.patch b/user/clazy/fix-link-fs-lib.patch index 9096ec57b..6bd09bd32 100644 --- a/user/clazy/fix-link-fs-lib.patch +++ b/user/clazy/fix-link-fs-lib.patch @@ -1,7 +1,7 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2022-08-19 00:58:47.518958902 +0000 +++ b/CMakeLists.txt 2022-08-19 01:03:37.193667800 +0000 -@@ -264,6 +264,7 @@ +@@ -262,6 +262,7 @@ target_link_libraries(clazy-standalone clangFrontend) else() target_link_libraries(clazy-standalone ClazyPlugin) diff --git a/user/clearsans/APKBUILD b/user/clearsans/APKBUILD index 82c7a7291..64e815afe 100644 --- a/user/clearsans/APKBUILD +++ b/user/clearsans/APKBUILD @@ -11,7 +11,7 @@ license="Apache-2.0" depends="fontconfig" makedepends="" subpackages="" -source="https://01.org/sites/default/files/downloads/clear-sans/clearsans-$pkgver.zip" +source="https://distfiles.adelielinux.org/source/archive/$pkgname-$pkgver/$pkgname-$pkgver.zip" builddir="$srcdir" package() { diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD index 18089c391..d102ee728 100644 --- a/user/clutter/APKBUILD +++ b/user/clutter/APKBUILD @@ -2,15 +2,16 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=clutter pkgver=1.26.4 -pkgrel=0 +pkgrel=1 pkgdesc="OpenGL-based interactive canvas library" url="https://gnome.org" arch="all" options="!check" # Test suite skipped all tests. license="LGPL-2.0+ AND MIT AND LGPL-2.1+ AND GPL-2.0+" depends="" -makedepends="glib-dev mesa-dev cogl-dev cairo-dev pango-dev json-glib-dev - atk-dev vala gobject-introspection-dev" +makedepends="glib-dev libglvnd-dev cogl-dev cairo-dev pango-dev json-glib-dev + atk-dev vala gobject-introspection-dev wayland-dev wayland-protocols + libxkbcommon-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/clutter/1.26/clutter-$pkgver.tar.xz" @@ -21,7 +22,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --enable-wayland-backend=yes make } diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index 2f1b161e3..7e0311e66 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=cogl pkgver=1.22.8 -pkgrel=0 +pkgrel=1 pkgdesc="GObject-based GL/GLES abstraction library" url="https://gnome.org" arch="all" @@ -10,7 +10,8 @@ options="!check" # broken testsuite, no logs/messages to determine why license="MIT AND SGI-B-2.0 AND BSD-3-Clause AND Public-Domain AND LGPL-2.0+ AND Apache-2.0" depends="" makedepends="glib-dev libxcomposite-dev libxrandr-dev mesa-dev cairo-dev - pango-dev vala gobject-introspection-dev gdk-pixbuf-dev" + pango-dev vala gobject-introspection-dev gdk-pixbuf-dev libglvnd-dev + wayland-dev wayland-protocols" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/cogl/1.22/cogl-$pkgver.tar.xz" @@ -23,7 +24,9 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --enable-kms-egl-platform=yes \ - --enable-xlib-egl-platform=yes + --enable-xlib-egl-platform=yes \ + --enable-wayland-egl-platform=yes \ + --enable-wayland-egl-server=yes make } diff --git a/user/colordiff/APKBUILD b/user/colordiff/APKBUILD new file mode 100644 index 000000000..0ef752514 --- /dev/null +++ b/user/colordiff/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Alice <alicela1n@protonmail.com> +# Maintainer: Alice <alicela1n@protonmail.com> +pkgname=colordiff +pkgver=1.0.21 +pkgrel=0 +pkgdesc="Wrapper for diff that produces the same output but with syntax highlighting" +url="https://www.colordiff.org/" +arch="noarch" +options="!check" # No test suite +license="GPL-3.0+" +depends="diffutils less perl" +makedepends="xmlto w3m" +subpackages="$pkgname-doc" +source="https://www.colordiff.org/$pkgname-$pkgver.tar.gz" + +build() { + make +} + +package() { + install -Dm 755 colordiff.pl "$pkgdir"/usr/bin/colordiff + install -Dm 755 cdiff.sh "$pkgdir"/usr/bin/cdiff + install -Dm 644 colordiff.1 "$pkgdir"/usr/share/man/man1/colordiff.1 + install -Dm 644 cdiff.1 "$pkgdir"/usr/share/man/man1/cdiff.1 + install -Dm 644 colordiffrc "$pkgdir"/etc/colordiffrc +} + +sha512sums="e814e38db0db6e0ba420c64bc53815c1c9e74457390bbe45f31eb9539c068efc9354c11dbf1259b1a64bd3cd5b2cc452441f822e030af80d18fe5b5c5f627c9d colordiff-1.0.21.tar.gz" diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD index 233ffdec6..3b0dee878 100644 --- a/user/compton/APKBUILD +++ b/user/compton/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=compton pkgver=4 -pkgrel=0 +pkgrel=1 pkgdesc="Lightweight compositor for X11" url="https://github.com/yshui/compton" arch="all" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="MIT AND MPL-2.0" depends="" makedepends="meson libx11-dev libxext-dev libev-dev xcb-util-renderutil-dev - xcb-util-image-dev pixman-dev libconfig-dev pcre-dev mesa-dev + xcb-util-image-dev pixman-dev libconfig-dev pcre-dev libglvnd-dev dbus-dev" source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index 346878925..d0e40e35e 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters -pkgver=1.25.13 +pkgver=1.28.16 pkgrel=0 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" arch="all" license="GPL-2.0-only AND GPL-2.0+ AND GPL-3.0-only AND MIT" -depends="gnu-ghostscript poppler-utils bc ttf-freefont" +depends="gnu-ghostscript poppler-utils bc" checkdepends="ttf-dejavu" -makedepends="cups-dev libjpeg-turbo-dev poppler-dev zlib-dev libpng-dev - tiff-dev lcms2-dev freetype-dev fontconfig-dev qpdf-dev dbus-dev linux-headers - coreutils gnutls-dev python3" +makedepends="cups-dev dbus-dev fontconfig-dev freetype-dev gnutls-dev lcms2-dev + libexif-dev libjpeg-turbo-dev libpng-dev poppler-dev qpdf-dev tiff-dev + zlib-dev linux-headers coreutils python3" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz" @@ -59,4 +59,4 @@ libs() { mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611 cups-filters-1.25.13.tar.xz" +sha512sums="0369f96a8ae5e33bf75c8765947d5ad7285b3532e9d9b0ded7e206798834c9ade3a2ac3f1d16e0fdd43346f2bc7852c541130e935cbb20f9c1239a53118d1239 cups-filters-1.28.16.tar.xz" diff --git a/user/cyrus-sasl/APKBUILD b/user/cyrus-sasl/APKBUILD index b061d41ad..31753ae53 100644 --- a/user/cyrus-sasl/APKBUILD +++ b/user/cyrus-sasl/APKBUILD @@ -8,7 +8,7 @@ url="https://www.cyrusimap.org/sasl/" arch="all" options="!check" # No test suite. license="BSD-4-Clause" -depends="" +depends="adelie-core" # #1167 makedepends="db-dev openssl-dev krb5-dev autoconf automake libtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-gssapi $pkgname-gs2 $pkgname-scram $pkgname-ntlm $pkgname-crammd5 $pkgname-digestmd5 diff --git a/user/darkman/APKBUILD b/user/darkman/APKBUILD new file mode 100644 index 000000000..1600fae79 --- /dev/null +++ b/user/darkman/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=darkman +pkgver=2.0.1 +pkgrel=0 +pkgdesc="Framework for managing dark- and light-mode transitions" +url="https://darkman.whynothugo.nl/" +arch="all" +options="!check" # no testsuite +license="0BSD" +depends="" +makedepends="gcc-go scdoc" +subpackages="$pkgname-doc $pkgname-systemd" +source="https://gitlab.com/WhyNotHugo/darkman/-/archive/v$pkgver/darkman-v$pkgver.tar.bz2" +builddir="$srcdir/darkman-v$pkgver" + +build() { + make VERSION="$pkgver" +} + +package() { + make VERSION="$pkgver" DESTDIR="$pkgdir" install +} + +sha512sums="8036e3470d22e1f689d8305cb3faf81a1fc2f0692afd8fb9657c2c22af417f25fd928189fcda42df7c053cb9129c90cdf11df64e6f597498af95f330de76f282 darkman-v2.0.1.tar.bz2" diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD index fcd7da74d..a3f0847b0 100644 --- a/user/dbus/APKBUILD +++ b/user/dbus/APKBUILD @@ -12,7 +12,7 @@ license="AFL-2.1 OR GPL-2.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc $pkgname-x11" triggers="$pkgname.trigger=/etc/dbus-1/system.d" -depends="" +depends="adelie-core" # #1167 depends_dev="util-linux-dev" makedepends="$depends_dev expat-dev libx11-dev autoconf automake libtool xmlto libsm-dev" diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD index d009af3a5..7c3bb273c 100644 --- a/user/dhcpcd/APKBUILD +++ b/user/dhcpcd/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=dhcpcd -pkgver=9.4.0 +pkgver=9.5.2 pkgrel=0 pkgdesc="RFC2131 compliant DHCP client" url="https://roy.marples.name/projects/dhcpcd" @@ -12,7 +12,7 @@ license="BSD-2-Clause" makedepends="linux-headers bsd-compat-headers eudev-dev" install="$pkgname.post-upgrade" subpackages="$pkgname-doc $pkgname-openrc" -source="https://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.xz +source="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${pkgver}/$pkgname-$pkgver.tar.xz fix-chrony-conf-location.patch dhcpcd.initd " @@ -42,6 +42,6 @@ package() { "$pkgdir"/etc/init.d/dhcpcd } -sha512sums="e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f dhcpcd-9.4.0.tar.xz +sha512sums="de9040b6ce6b4eb6dbf193fe3d983984a58a3bc14384bdd7ffbd2040056d72a786bc033a8bc69f7df37fbf9202b35ff3bca4196ae31ee78670eed0d779e5fd6a dhcpcd-9.5.2.tar.xz 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd" diff --git a/user/digikam/APKBUILD b/user/digikam/APKBUILD index 79c57bd29..e2b01ba40 100644 --- a/user/digikam/APKBUILD +++ b/user/digikam/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=digikam pkgver=7.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="Professional photo management and digital camera import" url="https://www.digikam.org/" arch="all" @@ -22,6 +22,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/digikam/$pkgver/digiKam-$pkgver.tar.xz backport.patch + isdigit.patch " build() { @@ -51,4 +52,5 @@ package() { } sha512sums="72cae1f36249687d2c82392b7d5bcede39364372f935a2d09ba561d0b7f51b6f9a1e6a83a8974616061a8200f3d997b96fb021a16323a2f30b404cf628188216 digiKam-7.6.0.tar.xz -44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41 backport.patch" +44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41 backport.patch +691d65a1f8f48820380e98bc72059cb4fb4ac4ace96ae46a04e60f1bc778b1e01af6f7a8c0c2f9951b5597017bca830baea2e919a145b2635e3be468f8e81862 isdigit.patch" diff --git a/user/digikam/isdigit.patch b/user/digikam/isdigit.patch new file mode 100644 index 000000000..82122b5d8 --- /dev/null +++ b/user/digikam/isdigit.patch @@ -0,0 +1,12 @@ +--- digikam-7.6.0/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp.old 2022-03-01 02:42:07.000000000 -0600 ++++ digikam-7.6.0/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp 2024-05-28 18:24:34.849989979 -0500 +@@ -23,9 +23,7 @@ + #include <windows.h> + #endif + +-#if qiPhone || qAndroid + #include <ctype.h> // for isdigit +-#endif + + /*****************************************************************************/ + diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index c7a0ebe1c..b85f3a97e 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -5,13 +5,13 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=dovecot -pkgver=2.3.21 +pkgver=2.3.21.1 case "$pkgver" in *.*.*.*) _pkgvermajor=${pkgver%.*.*};; *.*.*) _pkgvermajor=${pkgver%.*};; esac -pkgrel=0 -_pigeonholevel=0.5.20 +pkgrel=1 +_pigeonholevel=0.5.21.1 pkgdesc="IMAP and POP3 server" url="https://www.dovecot.org/" arch="all" @@ -46,6 +46,9 @@ source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz _builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholevel" # secfixes: +# 2.3.21.1-r0: +# - CVE-2024-23184 +# - CVE-2024-23185 # 2.3.19.1-r0: # - CVE-2022-30550 # 2.3.19-r0: @@ -259,8 +262,8 @@ _submv() { done } -sha512sums="2d463c38639c3fd3d617ee5b1a4e4d0c11362339c4d4d62a5a90164a8b10bc58919545679bbf379139bdb743fdb013033abfddc1fc6401eb8099463cdc2401ca dovecot-2.3.21.tar.gz -45683e6bd678db00fc3e3c61d27a264d30d0e9aeb9ceb7ab55f94f0317d387056fa092e266062117cbe2a9dc2c90ddca03d154e78aad9c0d61fe8cf2c9187603 dovecot-2.3-pigeonhole-0.5.20.tar.gz +sha512sums="9de6ce3a579ef2040248b692874a6d64a732bb735a9cee3144604927cad49690c4b0e29f7ecf3af23190d56f30956d955d13acd5d352534df62fbdfde4b60f9f dovecot-2.3.21.1.tar.gz +7387b417611599fe70d1a83d3b408321e66f5a883bf78a9d55c7496b1a17220677daebaefde2061e0d7064fe07c410ecfc64662878bb253ddcd9e128dd83fbaa dovecot-2.3-pigeonhole-0.5.21.1.tar.gz a73e7323a582ea9504c33ea3591784af8187af8fffbcc47b69f549e33620c532d976853f0f7a9071af6ef2970d4899e2c5b30aac605dd5c933b3c6faa391bad4 fix-time64.patch fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a skip-iconv-check.patch 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5 split-protocols.patch diff --git a/user/dovecot/dovecot.pre-install b/user/dovecot/dovecot.pre-install index 73a0aa3e3..0f6df4c75 100644 --- a/user/dovecot/dovecot.pre-install +++ b/user/dovecot/dovecot.pre-install @@ -2,7 +2,7 @@ groupadd -r dovecot 2>/dev/null groupadd -r dovenull 2>/dev/null -useradd -r -u 90 -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null -useradd -r -u 91 -h /dev/null -s /sbin/nologin -g dovenull dovenull 2>/dev/null +useradd -r -u 90 -d / -s /sbin/nologin -g dovecot dovecot 2>/dev/null +useradd -r -u 91 -d / -s /sbin/nologin -g dovenull dovenull 2>/dev/null exit 0 diff --git a/user/drm_info/APKBUILD b/user/drm_info/APKBUILD new file mode 100644 index 000000000..2f367c1a4 --- /dev/null +++ b/user/drm_info/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Michał Polański <michal@polanski.me> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=drm_info +pkgver=2.7.0 +pkgrel=0 +pkgdesc="Small utility to dump info about DRM devices" +url="https://gitlab.freedesktop.org/emersion/drm_info" +license="MIT" +arch="all" +options="!check" # no test suite +makedepends="meson libdrm-dev pciutils-dev json-c-dev scdoc" +subpackages="$pkgname-doc" +source="https://gitlab.freedesktop.org/emersion/drm_info/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz" +builddir="$srcdir/$pkgname-v$pkgver" + +build() { + meson setup \ + -Dprefix=/usr \ + output + meson compile -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} +sha512sums="1eeaa103699655dd6b5d0e81e43c5422b843bb8cea991585047c3cc3e118b65c7dac4cef84155346df2c887ca57702a82e6fac202fe0146fe5280e3c83519ab8 drm_info-v2.7.0.tar.gz" diff --git a/user/dwl/APKBUILD b/user/dwl/APKBUILD new file mode 100644 index 000000000..000ac4151 --- /dev/null +++ b/user/dwl/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=dwl +pkgver=0.7 +pkgrel=0 +pkgdesc="Minimal, DWM-like compositor for Wayland" +url="https://codeberg.org/dwl/dwl" +arch="all" +options="!check" # no testsuite +license="GPL-3.0+ AND MIT AND CC0-1.0" +depends="wlroots-0.18" +makedepends="libinput-dev libxkbcommon-dev wayland-dev wayland-protocols wlroots-0.18-dev" +subpackages="$pkgname-doc" +source="https://codeberg.org/dwl/dwl/releases/download/v$pkgver/dwl-v$pkgver.tar.gz" +builddir="$srcdir/dwl-v$pkgver" + +build() { + make PREFIX="/usr" +} + +package() { + make PREFIX="/usr" DESTDIR="$pkgdir" install +} + +sha512sums="d2ec9467bb7758ea52e0face555cb505624062eb66c8959b59e715b7d1c7bb74c649029f365c9bfd07d7b5806fdef018f555d7e64bd62e7e413ead45b5d73986 dwl-v0.7.tar.gz" diff --git a/user/edid-decode/APKBUILD b/user/edid-decode/APKBUILD new file mode 100644 index 000000000..b4a4610b2 --- /dev/null +++ b/user/edid-decode/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=edid-decode +pkgver=0_git20240827 +pkgrel=0 +pkgdesc="Utility for extracting EDID information" +url="https://git.linuxtv.org/edid-decode.git/" +arch="all" +options="!check" # no tests +license="MIT" +depends="" +makedepends="meson" +subpackages="$pkgname-doc" +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" +giturl="git://linuxtv.org/edid-decode.git" +reporev="10bc5ee3901ef337f6d255a8d5bee211277543c0" +disturl="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + build + meson compile -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build +} + +sha512sums="1e3d0c149662ed05166838a0e11185505a03b0804a28a0846505e6e8f94adadf073962a6d442ddb408561d57a7da4c6769e4f9a40ea47cb014e919e9cc1603c4 edid-decode-0_git20240827.tar.gz" diff --git a/user/editres/APKBUILD b/user/editres/APKBUILD index f593df2cc..e22e79115 100644 --- a/user/editres/APKBUILD +++ b/user/editres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=editres -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=0 pkgdesc="Examine Xt widgets and edit X11 resources dynamically" url="http://www.rahul.net/kenton/editres.html" @@ -9,7 +9,7 @@ arch="all" license="X11" depends="" makedepends="util-macros libx11-dev libxaw-dev libxmu-dev libxt-dev - xorgproto-dev" + xorgproto-dev libxkbfile-dev" subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a007ed7a02abf61af8b65a163a7289a1e960db390db401bdfad162aa642e0eb887ecf85be14093efd8567c68f5e01450bb8321403a203a00065fa21985c7922 editres-1.0.8.tar.xz" +sha512sums="b1abf32cad8f881b8b98c8b4a3280b09f581fc3a86188e86d5d435801676ec75377d8a636b9479a335c5c2321d358841f1194861913b2c17803758b626517230 editres-1.0.9.tar.xz" diff --git a/user/elixir/APKBUILD b/user/elixir/APKBUILD index 389f7b97f..40b16876e 100644 --- a/user/elixir/APKBUILD +++ b/user/elixir/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Marlus Saraiva <marlus.saraiva@gmail.com> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=elixir -pkgver=1.15.7 +pkgver=1.17.2 pkgrel=0 pkgdesc="Dynamic, functional language designed for building scalable and maintainable applications" url="https://elixir-lang.org/" @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" PREFIX=/usr install } -sha512sums="a46f0569cbff342f15a04776f8d57cf2554867546004adabd9b9dff36c184ec56a78f2df2fc6c0855e65c11277662f694f5e6a8c6e1716cf4e22d8fdd5e1d4ae elixir-1.15.7.tar.gz" +sha512sums="f9d4983c3e7bd054a76bfe0dfa4aea483a4dd84ada432ae5a144167ff8d268499077704214eaaecfda84469c2f747a3594258ca95a7955bffde0c7b0f65985f2 elixir-1.17.2.tar.gz" diff --git a/user/encodings/APKBUILD b/user/encodings/APKBUILD index 75963f52b..d1b03e036 100644 --- a/user/encodings/APKBUILD +++ b/user/encodings/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=encodings -pkgver=1.0.6 +pkgver=1.1.0 pkgrel=0 pkgdesc="Font encoding files for X11" url="https://www.X.Org/" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134 encodings-1.0.6.tar.xz" +sha512sums="ae912e120847954f5756193cc8860f50ada6c79bb3ba44f7f0cd1913b13aeed7885e140282cb47989a93fae0a0e8cedebe9a2420f65b1936b40192dc7d208427 encodings-1.1.0.tar.xz" diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD index 09b94cc5b..437ca4783 100644 --- a/user/erl-rebar3/APKBUILD +++ b/user/erl-rebar3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alyx Wolcott <alyx@leuhta.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=erl-rebar3 -pkgver=3.18.0 +pkgver=3.23.0 pkgrel=0 pkgdesc="Erlang build tool" url="https://www.rebar3.org/" @@ -30,4 +30,4 @@ package() { install -m644 ./manpages/rebar3.1.gz $pkgdir/usr/share/man/man1/ } -sha512sums="4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed erl-rebar3-3.18.0.tar.gz" +sha512sums="4da1db8ed830c59fb322c1a652c2efe28d54e09ad74d12a87381ea7a7f13965b91815f383221831fbc14e6deed1a75db1039164f7df128a977d5b64048540cc3 erl-rebar3-3.23.0.tar.gz" diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD index a314041cf..31778994d 100644 --- a/user/erlang/APKBUILD +++ b/user/erlang/APKBUILD @@ -1,21 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=erlang -pkgver=24.3.3 +pkgver=27.0 pkgrel=0 pkgdesc="Soft real-time system programming language" url="https://www.erlang.org/" arch="all" license="Apache-2.0" depends="" -makedepends="autoconf automake flex libxml2-utils libxslt-dev m4 ncurses-dev - openssl-dev perl unixodbc-dev" +makedepends="flex libxml2-utils libxslt-dev ncurses-dev openssl-dev perl + unixodbc-dev" subpackages="$pkgname-dev" source="erlang-$pkgver.tar.gz::https://github.com/erlang/otp/archive/OTP-$pkgver.tar.gz" builddir="$srcdir/otp-OTP-$pkgver" build() { - ./otp_build autoconf ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,8 +35,7 @@ check() { make release_tests for _header in erl_fixed_size_int_types.h \ - ${CHOST}/erl_int_sizes_config.h \ - erl_memory_trace_parser.h; do + ${CHOST}/erl_int_sizes_config.h; do cp erts/include/$_header erts/emulator/beam/ done cd release/tests/test_server @@ -48,4 +46,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e erlang-24.3.3.tar.gz" +sha512sums="16945c50c09caad9aac6808470ea2a0e282713f23e54cd4ad60510b114811b5deac427acb36cc8049443b4e3c3302c40b02c696cf3f2028f8bd3e836c8c48ea9 erlang-27.0.tar.gz" diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index 3aac43a30..8e928d919 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=exo -pkgver=4.18.0 +pkgver=4.20.0 pkgrel=0 pkgdesc="Support library for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32f3a319ff31a37cdaf8e2e7bdbdbaa9b797d6731a27854838b47d6078f45af83ed1a664aef4663f616fd9abcae9233c6f68ab2cc18599f1b2ced487602c51ce exo-4.18.0.tar.bz2" +sha512sums="7481f47bb0c8eb5cdc8d7db3e67c1cdaa81e3ef0833281b5380f3eab41e3c2f7112a22b37a3ce305a052b261444fd9f11c130150663deb1b4a220a998321284b exo-4.20.0.tar.bz2" diff --git a/user/fastfetch/APKBUILD b/user/fastfetch/APKBUILD index 5bbe3e20c..9c527663e 100644 --- a/user/fastfetch/APKBUILD +++ b/user/fastfetch/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Horst G. Burkhardt <horst@adelielinux.org> pkgname=fastfetch pkgver=2.5.0 -pkgrel=0 +pkgrel=1 pkgdesc="Tool for fetching and presenting system information" url="https://github.com/fastfetch-cli/fastfetch" arch="all" @@ -12,7 +12,7 @@ license="MIT" depends="" makedepends="cmake dbus-dev dconf-dev libdrm-dev libxcb-dev libxrandr-dev mesa-dev networkmanager-dev pciutils-dev pulseaudio-dev sqlite-dev - utmps-dev wayland-dev xfconf-dev zlib-dev" + utmps-dev wayland-dev xfconf-dev zlib-dev libglvnd-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/$pkgver.tar.gz" build() { diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 89989291a..66803e8b4 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -1,8 +1,9 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=firefox-esr -pkgver=91.13.0 -pkgrel=3 +pkgver=128.10.1 +_llvmver=18 +pkgrel=0 pkgdesc="Firefox web browser (extended support release)" url="https://www.mozilla.org/firefox/" arch="all !ppc" # #837 @@ -14,13 +15,13 @@ depends="" # system-libs # actual deps makedepends=" - autoconf2.13 cargo cbindgen clang llvm14-dev node ncurses-dev + autoconf2.13 cargo cbindgen clang llvm${_llvmver}-dev node ncurses-dev perl python3 rust rust-std cmd:which ncurses-dev openssl-dev alsa-lib-dev bzip2-dev icu-dev libevent-dev libffi-dev libpng-dev - libjpeg-turbo-dev nspr-dev nss-dev pulseaudio-dev zlib-dev + libjpeg-turbo-dev nspr-dev nss-dev pcre-dev pulseaudio-dev zlib-dev dbus-glib-dev fts-dev gconf-dev gtk+3.0-dev hunspell-dev libnotify-dev libsm-dev libxcomposite-dev libxdamage-dev @@ -32,30 +33,30 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f mozconfig bad-google-code.patch - BTS-1074.patch - disable-arm-flac.patch fix-mutex-build.patch fix-seccomp-bpf.patch - gcc89074.patch + icu-75.patch jpeg-link.patch + js-endian.patch mozilla-build-arm.patch - newer-cbindgen.patch pmmx-double-format.patch ppc32-fix.patch - python3.11-open-U.patch - python3.11-regex-inline-flags.patch rust-32bit.patch shut-up-warning.patch + skia-endian.patch skia-unified.patch stackwalk-x86-ppc.patch - triplet-vendor-support.patch webrender.patch + without-jit.patch firefox.desktop firefox-safe.desktop " builddir="$srcdir/firefox-$pkgver" _mozappdir=/usr/lib/firefox +somask="libgkcodecs.so libipcclientcerts.so liblgpllibs.so libmozavcodec.so + libmozavutil.so libmozgtk.so libmozsandbox.so libmozsqlite3.so + libmozwayland.so libxul.so" ldpath="$_mozappdir" # secfixes: firefox-esr @@ -71,7 +72,7 @@ prepare() { # arch-specific configuration case "$CARCH" in - pmmx|x86*|arm*) + pmmx|x86*|arm*|aarch64) echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig ;; ppc) @@ -95,11 +96,14 @@ prepare() { } build() { + export CFLAGS="$CFLAGS -Wno-dangling-pointer -Wno-array-bounds -Wno-comment -Wno-maybe-uninitialized -Wno-misleading-indentation" + export CXXFLAGS="$CFLAGS -Wno-class-memaccess -Wno-changes-meaning" + export PATH="/usr/lib/llvm${_llvmver}/bin:${PATH}" #1230 export SHELL=/bin/sh export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 export USE_SHORT_LIBNAME=1 - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # set rpath so linker finds the libs export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}" @@ -114,11 +118,11 @@ run() { export LD_LIBRARY_PATH=. export PROFILE_DIR="$builddir"/obj-$CHOST/tmp/profile-default [ -d $PROFILE_DIR ] || ./firefox -no-remote -CreateProfile "Test $PROFILE_DIR" - ./firefox -no-remote -profile "$builddir"/obj-$CHOST/tmp/profile-default + ./firefox -no-remote -profile "$PROFILE_DIR" about:buildconfig } package() { - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system DESTDIR="$pkgdir" ./mach install install -m755 -d ${pkgdir}/usr/share/applications @@ -154,26 +158,23 @@ package() { EOF } -sha512sums="38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516 firefox-91.13.0esr.source.tar.xz -86168a5e5b8aa3ea7cc0d40174baa97595c82b8e599937155fbd7761e7df7220980c74f75e96c34e5f660423e42ad67761f57b2923389be363253868bac033a9 mozconfig -ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch -57410e4b9199f3c7db1cd4a0cf3e67cd962b585730c073edb1cadc3bcac5b0aec4e6f7efe24f3eadd1020aefef475e08e97f13dc6b6534e639f33cc6fb1abe04 BTS-1074.patch -33c6c9d845981137e41e396463c09a55c4effe56628f9f7a4e13b7328e4591b97bc607df484393994a9da07d701f2eaee4e30b463284159e4206e1c42a1a4cdc disable-arm-flac.patch -c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch -70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch -6eb7fb134760f5d232710c56f18f14de4f533e41e269531edd01f5650f6d641513e34a8d2294af5ad6fd184736f674c734efb4cc003636a75e14a8fdba2fe3b0 gcc89074.patch -240d6c9290a20e2c9ccfa2d15c9a636fc1b09b62f09285eb688974d888390da2a84271f14c397570b58ccdcf29b99370f7183cc0dbbbe581bf6e7d7ee8dcabd2 jpeg-link.patch -e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch -eb158bf2e4b9d513ae36f3c977a3b110ea8c4801c3c94841bc3ad4cdca3bdfc96d4a662e5a2e662fe7a01b0f1af097280097b16f5d0e83d29b4a7e6cbb8c7396 newer-cbindgen.patch -573b90c73512d2b9971e466b138ffeea94b28f9a20e11e75ee1121e3f6a14fb4bf1a30622da6d48f67e5ea0bc58b200ba5fc3e930bae52f83b2f25f6c10806dd pmmx-double-format.patch +sha512sums="6e7363d8cbecda1cedaf534ac10dc046b5f515399ec754492357e8a558c61ee3389f7bb90aa929dbcb4d6eba041ae1e778a0a8f90aa1e1f939eea517333b6c45 firefox-128.10.1esr.source.tar.xz +aaeec88eda3ca5ef00503f2e1656f8a143017d5ff60bd289ce7a49b7f8352ce5b61556c732e5eb3b6859e1c30551219eb5bbb954e9b88eca8d3f44683bdd747d mozconfig +1fff71be77aa34791ef8aa972b5dc5f131d79f4b895ebbfb59bc223078764d6f79c82a3a4e4c717a3893ecbe4907d556f27e97d2692e41f02365f06da759a71a bad-google-code.patch +5e6c3fa027052cc43ba161cf5c12016b07723e7c0b002a42431bbd5d716d512d5245ab6befbb56c37c7d244441533f810f4e7b583f83bbe965981931f1435a94 fix-mutex-build.patch +9f2892eff9d09f3eed1f9a9ee98ba9c6a6826c30ccdeabfefb8733abc98e7b612418827262423568e830c6354a2b8242f471bc200b7079f21862bb00947da716 fix-seccomp-bpf.patch +0a84e8cb6604fdb7601745b60c04ee74733632ada32bfd85eb32db8fee095cfb79c82033e5e3cf3bbc7b7f4df753e86ffe18e26e63a6603a93c3bb5a459aabd3 icu-75.patch +a2400c8df888637d9ebe33d82dc2fb95792685c9938b5486230a5c15bc819cbb850a2bdcb54a775516652fc8ffd6b40f8c591ab7941211f9516064101380ebbf jpeg-link.patch +d40e6c1a6e62d5e1dc350dc0bbaf2b8488b19ea0911532784f1df1199a7a5af0aae81b0b0d77c4398a2d903d86b5560f4442386eb446d9af8d58e73eea475e4f js-endian.patch +9f5730ee3a29b86786089abcfffab32bf2210f1a1ec43260ae824a08acda687dbfa37306b82a4978dd022bcf747eab155f7f3c5f73a1375f1c3c4fcd106dae3e mozilla-build-arm.patch +1864c6c63c647f3ed1b3ca4df7f52a2c7ec4c65f2e067a9842d24a242f01e047d59ffbf88ad3740d830df1eb0bade929e245e640db135fe14f4c0d879269cb7e pmmx-double-format.patch 06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch -07c311921e50fdb86c587000418306292548117f32a69b78db9d8ebd3a1b08196774a3d284b7e2898a2f1fbb9987b2367092f33957824514fd3d7c7b618a83e2 python3.11-open-U.patch -c9c5610b99e73a1eedd3510e73921cba84f8c6d0c58fc7fe5b4a7ec261bd5fe530560856fba46d6b37f84c6e467d5b43946968dc8230b5491bba976b0b5ae33c python3.11-regex-inline-flags.patch -153f955169e1489d49867be90f68e8a4722cad8edb3a9d1ddb6161e34399e1b4e9e82dc8d72aaba1d5f585bca7c4852433e8ecb068be1583df7155c7cce0223b rust-32bit.patch -39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch -961fa1c856e97e4d08da4682f520ecf23075571a532a781c5e14dbec4915130b02a8199caf6602013ea904d347c4f06d086b0fe84a3850dd6910d351232da599 skia-unified.patch -452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch -60ffc4b95ba72aa19fb4f4aaf91393e8c730dae536a19248e2dd21c38cc32891bff69a6b51ea903f185ecc680dae4b21ec11d8cac67b3b038b3f0e757639ad94 triplet-vendor-support.patch -b7c1ac21cd03b7cdc887e005ed970cf13ff95643c7651decf1e6d42094cda6a0464dc2ba3cded3827f6d0f3682c2c9b081a7667f386133aa6e3072d0464e72e8 webrender.patch +e1c8a85c46a9cc804eb6b5946d35b63fa2cfc7ad8b4f250c5eaf1b590b139a66d9a833246bc26ae2e340fffb81b6761cf51c600181895bd49feb9a3b8fbfe331 rust-32bit.patch +c2248297df00633771da7e6b9f2caba3dd5108d93617f652fa8b2fb4e6975821e5fee866c00713f8fce08e760fa456e2dd19a8ef7370e5a2c65dc09614526be9 shut-up-warning.patch +11f7ce86376b54281082fa5b9d3fefee8046eabe38a0ec17266764b4f62cb90f4744245c1ca93d73ed74cf81c066dab7ddcb3fe9704be8f91e0a2a4f664b203a skia-endian.patch +a6a14104ee6985867efb1937a262aba1538ed4b069bba56e400d75f51d84d29363d8bbb2183ee27785758ad3a8b8ae4350e23dc854d50c92cb2147eddf83b9bb skia-unified.patch +9df89366bd51670f534591e4c169186703ad3166a493f522e58f129fb79af375d71baaf0f6b238126792118a2d3ed0f011b010e39497ab5901ee5bea63a84fa2 stackwalk-x86-ppc.patch +7d6c5f3cafd29eae4e7c5433b14f49cc679eebdcb4e602af18819f685500747a6daa8d38fbb0f91878331b14ce299ca8b731f62ab013b69e579fc450b29fe743 webrender.patch +ed78e15030d79b10026ebae26e44a68d16c2a8567082072b5099b0dde4f79ae217a21737e0d9c7ec6a3cc99de3ab3c9083cca7d82889d559bb18cc15fa7e6f2a without-jit.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/user/firefox-esr/BTS-1074.patch b/user/firefox-esr/BTS-1074.patch deleted file mode 100644 index fdc5478b4..000000000 --- a/user/firefox-esr/BTS-1074.patch +++ /dev/null @@ -1,62 +0,0 @@ -gas(1) under binutils-2.41 no longer allows invalid negative shifts. - -This patch fixes the bundled FFmpeg in Firefox to not use them. - ---- a/media/ffvpx/libavcodec/x86/mathops.h.old 2023-10-03 22:15:24.440738743 -0500 -+++ b/media/ffvpx/libavcodec/x86/mathops.h 2023-10-03 22:15:41.458911245 -0500 -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - diff --git a/user/firefox-esr/bad-google-code.patch b/user/firefox-esr/bad-google-code.patch index e214af432..31659370d 100644 --- a/user/firefox-esr/bad-google-code.patch +++ b/user/firefox-esr/bad-google-code.patch @@ -1,6 +1,6 @@ --- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -@@ -45,6 +45,7 @@ +@@ -47,6 +47,7 @@ #include <sys/mman.h> #include <sys/stat.h> #include <unistd.h> @@ -34,7 +34,7 @@ --- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h +++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -@@ -1134,6 +1134,12 @@ struct kernel_statfs { +@@ -1246,6 +1246,12 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 285 #endif diff --git a/user/firefox-esr/disable-arm-flac.patch b/user/firefox-esr/disable-arm-flac.patch deleted file mode 100644 index fa1ba8753..000000000 --- a/user/firefox-esr/disable-arm-flac.patch +++ /dev/null @@ -1,15 +0,0 @@ -32-bit ARM assembler is mostly for Android32 accel anyway. - -It doesn't link properly on musl (TEXTRELs). - ---- firefox-91.13.0/toolkit/moz.configure.old 2023-10-09 10:40:18.231733637 +0000 -+++ firefox-91.13.0/toolkit/moz.configure 2023-10-10 02:22:34.743712070 +0000 -@@ -1894,7 +1894,7 @@ - flac_only = True - elif target.cpu == "x86_64": - flags = ["-D__x86_64__", "-DPIC", "-DELF", "-Pconfig_unix64.asm"] -- elif target.cpu in ("x86", "arm", "aarch64"): -+ elif target.cpu in ("x86", "aarch64"): - flac_only = True - else: - enable = False diff --git a/user/firefox-esr/fix-mutex-build.patch b/user/firefox-esr/fix-mutex-build.patch index a569e5aa7..1d1d0772b 100644 --- a/user/firefox-esr/fix-mutex-build.patch +++ b/user/firefox-esr/fix-mutex-build.patch @@ -1,18 +1,18 @@ --- firefox-60.3.0/memory/build/Mutex.h.old 2018-10-17 20:39:32.000000000 +0000 +++ firefox-60.3.0/memory/build/Mutex.h 2018-10-26 05:22:54.980000000 +0000 -@@ -39,7 +39,7 @@ +@@ -57,7 +57,7 @@ } #elif defined(XP_DARWIN) - mMutex = OS_SPINLOCK_INIT; + mMutex = OS_UNFAIR_LOCK_INIT; -#elif defined(XP_LINUX) && !defined(ANDROID) +#elif defined(XP_LINUX) && defined(__GLIBC__) pthread_mutexattr_t attr; if (pthread_mutexattr_init(&attr) != 0) { return false; -@@ -107,7 +107,7 @@ +@@ -142,7 +142,7 @@ # if defined(XP_DARWIN) - # define STATIC_MUTEX_INIT OS_SPINLOCK_INIT + # define STATIC_MUTEX_INIT OS_UNFAIR_LOCK_INIT -# elif defined(XP_LINUX) && !defined(ANDROID) +# elif defined(XP_LINUX) && defined(__GLIBC__) # define STATIC_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP diff --git a/user/firefox-esr/fix-seccomp-bpf.patch b/user/firefox-esr/fix-seccomp-bpf.patch index 47cde56c7..08068b5f5 100644 --- a/user/firefox-esr/fix-seccomp-bpf.patch +++ b/user/firefox-esr/fix-seccomp-bpf.patch @@ -1,8 +1,8 @@ --- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig 2015-09-23 09:10:08.812740571 +0200 +++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-09-23 09:11:38.404746155 +0200 -@@ -23,6 +23,11 @@ - #include "sandbox/linux/services/android_ucontext.h" - #endif +@@ -25,6 +25,11 @@ + #include "sandbox/linux/system_headers/linux_seccomp.h" + #include "sandbox/linux/system_headers/linux_signal.h" +// musl libc defines siginfo_t __si_fields instead of _sifields +#if defined(OS_LINUX) && !defined(__GLIBC__) diff --git a/user/firefox-esr/gcc89074.patch b/user/firefox-esr/gcc89074.patch deleted file mode 100644 index e9713193c..000000000 --- a/user/firefox-esr/gcc89074.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-URL: https://bugzilla.mozilla.org/show_bug.cgi?id=1688122 -Upstream-URL: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89074 - -Valid code, but only used for debugging. GCC 12 fixed this. -Moz upstream not interested. - ---- firefox-91.13.0/dom/base/nsTreeSanitizer.cpp.old 2022-08-15 13:04:32.000000000 -0500 -+++ firefox-91.13.0/dom/base/nsTreeSanitizer.cpp 2022-11-19 00:42:15.892580023 -0600 -@@ -632,15 +632,6 @@ - constexpr const nsStaticAtom* const kURLAttributesSVG[] = {nsGkAtoms::href, - nullptr}; - --static_assert(AllOf(std::begin(kURLAttributesSVG), std::end(kURLAttributesSVG), -- [](auto aURLAttributeSVG) { -- return AnyOf(std::begin(kAttributesSVG), -- std::end(kAttributesSVG), -- [&](auto aAttributeSVG) { -- return aAttributeSVG == aURLAttributeSVG; -- }); -- })); -- - const nsStaticAtom* const kElementsMathML[] = { - nsGkAtoms::abs_, // abs - nsGkAtoms::_and, // and diff --git a/user/firefox-esr/icu-75.patch b/user/firefox-esr/icu-75.patch new file mode 100644 index 000000000..617dd76a9 --- /dev/null +++ b/user/firefox-esr/icu-75.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/917599 +https://bugzilla.mozilla.org/show_bug.cgi?id=1862601 +https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2 + +# HG changeset patch +# User André Bargull <andre.bargull@gmail.com> +# Date 1697435923 -7200 +# Node ID d5f3b0c4f08a426ce00a153c04e177eecb6820e2 +# Parent c63994f8259efdf6e745c960aa9e1409d5477049 +Bug xxx - Part 12: Add new line break classes. r? + +diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp +--- a/intl/lwbrk/LineBreaker.cpp ++++ b/intl/lwbrk/LineBreaker.cpp +@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB + /* JT = 34, [JT] */ CLASS_CHARACTER, + /* JV = 35, [JV] */ CLASS_CHARACTER, + /* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER, + /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE, + /* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER, + /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER, + /* E_BASE = 40, [EB] */ CLASS_BREAKABLE, + /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER, +- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER}; ++ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER, ++ /* AKSARA = 43, [AK] */ CLASS_CHARACTER, ++ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER, ++ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER, ++ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER, ++ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER, ++ }; + + static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass), + "Gecko vs ICU LineBreak class mismatch"); + + auto cls = GetLineBreakClass(u); + MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass)); + + // Overrides based on rules for the different line-break values given in + + diff --git a/user/firefox-esr/jpeg-link.patch b/user/firefox-esr/jpeg-link.patch index a04d924d4..724bc76fb 100644 --- a/user/firefox-esr/jpeg-link.patch +++ b/user/firefox-esr/jpeg-link.patch @@ -1,6 +1,6 @@ --- firefox-91.13.0/toolkit/moz.configure.old 2022-08-15 13:05:59.000000000 -0500 +++ firefox-91.13.0/toolkit/moz.configure 2022-11-15 01:26:57.874201494 -0600 -@@ -1758,14 +1758,14 @@ +@@ -2274,14 +2274,14 @@ ) with only_when("--with-system-jpeg"): diff --git a/user/firefox-esr/js-endian.patch b/user/firefox-esr/js-endian.patch new file mode 100644 index 000000000..44f21d2d1 --- /dev/null +++ b/user/firefox-esr/js-endian.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User A. Wilcox <AWilcox@Wilcox-Tech.com> +# Date 1729710191 18000 +# Wed Oct 23 14:03:11 2024 -0500 +# Node ID 6102585e0d752de1729135d4c7d917e751b268c5 +# Parent 61f7d9c0998e2ce8008cd15b187f86dfdba21a26 +Bug 1926667 - Ensure JSStructuredCloneReader::readTransferMap respects endianness r?sfink + +Differential Revision: https://phabricator.services.mozilla.com/D226707 + +diff --git a/js/src/vm/StructuredClone.cpp b/js/src/vm/StructuredClone.cpp +--- a/js/src/vm/StructuredClone.cpp ++++ b/js/src/vm/StructuredClone.cpp +@@ -3387,7 +3387,8 @@ bool JSStructuredCloneReader::readTransf + } + + headerPos.write( +- PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRING)); ++ NativeEndian::swapToLittleEndian( ++ PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRING))); + + uint64_t numTransferables; + MOZ_ALWAYS_TRUE(in.readPair(&tag, &data)); +@@ -3512,7 +3513,8 @@ bool JSStructuredCloneReader::readTransf + MOZ_ASSERT(TransferableMapHeader(data) == SCTAG_TM_TRANSFERRING); + #endif + headerPos.write( +- PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRED)); ++ NativeEndian::swapToLittleEndian( ++ PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRED))); + + return true; + } diff --git a/user/firefox-esr/mozconfig b/user/firefox-esr/mozconfig index ed1f42dbb..b49d3be3f 100644 --- a/user/firefox-esr/mozconfig +++ b/user/firefox-esr/mozconfig @@ -23,3 +23,4 @@ ac_add_options --with-system-nss ac_add_options --with-system-pixman ac_add_options --with-system-png ac_add_options --with-system-zlib +ac_add_options --without-wasm-sandboxed-libraries diff --git a/user/firefox-esr/mozilla-build-arm.patch b/user/firefox-esr/mozilla-build-arm.patch index dcf2f6d8a..17c95d01d 100644 --- a/user/firefox-esr/mozilla-build-arm.patch +++ b/user/firefox-esr/mozilla-build-arm.patch @@ -1,10 +1,10 @@ --- ./gfx/ycbcr/moz.build.orig 2014-04-03 13:50:38.990296661 +0000 +++ ./gfx/ycbcr/moz.build 2014-04-03 13:52:26.878268547 +0000 -@@ -59,7 +59,7 @@ +@@ -53,7 +53,7 @@ 'yuv_row_other.cpp', ] --if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: +-if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['HAVE_ARM_NEON']: +if CONFIG['HAVE_ARM_NEON']: SOURCES += [ 'yuv_row_arm.s', diff --git a/user/firefox-esr/newer-cbindgen.patch b/user/firefox-esr/newer-cbindgen.patch deleted file mode 100644 index 9829237ee..000000000 --- a/user/firefox-esr/newer-cbindgen.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove an extra constant definition that is now being - generated by newer versions of cbindgen (0.24), and causing - build failures because it is defined in several places. -Author: Olivier Tilloy <olivier.tilloy@canonical.com> -Upstream-URL: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 - ---- a/gfx/webrender_bindings/webrender_ffi.h -+++ b/gfx/webrender_bindings/webrender_ffi.h -@@ -77,8 +77,6 @@ struct WrPipelineInfo; - struct WrPipelineIdAndEpoch; - using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla - diff --git a/user/firefox-esr/pmmx-double-format.patch b/user/firefox-esr/pmmx-double-format.patch index 4b2289fab..e520987b3 100644 --- a/user/firefox-esr/pmmx-double-format.patch +++ b/user/firefox-esr/pmmx-double-format.patch @@ -12,5 +12,5 @@ index 51d79f9c2ec59..fafd7d6fc1e0d 100644 typedef double __double_t; +#endif typedef __double_t double_t; + typedef float __float_t; - /* diff --git a/user/firefox-esr/python3.11-open-U.patch b/user/firefox-esr/python3.11-open-U.patch deleted file mode 100644 index 8cbab9c0a..000000000 --- a/user/firefox-esr/python3.11-open-U.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- thunderbird-91.11.0/dom/base/usecounters.py.python-open-U 2022-06-28 04:37:00.000000000 +0200 -+++ thunderbird-91.11.0/dom/base/usecounters.py 2022-07-11 19:17:46.266517761 +0200 -@@ -8,7 +8,7 @@ import re - - def read_conf(conf_filename): - # Can't read/write from a single StringIO, so make a new one for reading. -- stream = open(conf_filename, "rU") -+ stream = open(conf_filename, "r") - - def parse_counters(stream): - for line_num, line in enumerate(stream): ---- thunderbird-91.11.0/python/mozbuild/mozbuild/action/process_define_files.py.python-open-U 2022-06-28 04:37:39.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/action/process_define_files.py 2022-07-11 19:18:24.056417112 +0200 -@@ -36,7 +36,7 @@ def process_define_file(output, input): - ) and not config.substs.get("JS_STANDALONE"): - config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - -- with open(path, "rU") as input: -+ with open(path, "r") as input: - r = re.compile( - "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U - ) ---- thunderbird-91.11.0/python/mozbuild/mozbuild/backend/base.py.python-open-U 2022-06-28 04:37:39.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/backend/base.py 2022-07-11 19:18:34.165390187 +0200 -@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): - return status - - @contextmanager -- def _write_file(self, path=None, fh=None, readmode="rU"): -+ def _write_file(self, path=None, fh=None, readmode="r"): - """Context manager to write a file. - - This is a glorified wrapper around FileAvoidWrite with integration to ---- thunderbird-91.11.0/python/mozbuild/mozbuild/preprocessor.py.python-open-U 2022-06-28 04:37:20.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/preprocessor.py 2022-07-11 19:19:30.677239685 +0200 -@@ -531,7 +531,7 @@ class Preprocessor: - - if args: - for f in args: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - self.processFile(input=input, output=out) - if depfile: - mk = Makefile() -@@ -860,7 +860,7 @@ class Preprocessor: - args = self.applyFilters(args) - if not os.path.isabs(args): - args = os.path.join(self.curdir, args) -- args = io.open(args, "rU", encoding="utf-8") -+ args = io.open(args, "r", encoding="utf-8") - except Preprocessor.Error: - raise - except Exception: -@@ -914,7 +914,7 @@ class Preprocessor: - def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): - pp = Preprocessor(defines=defines, marker=marker) - for f in includes: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - pp.processFile(input=input, output=output) - return pp.includes - ---- thunderbird-91.11.0/python/mozbuild/mozbuild/util.py.python-open-U 2022-06-28 04:37:40.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/util.py 2022-07-11 19:19:19.903268374 +0200 -@@ -225,7 +225,7 @@ class FileAvoidWrite(BytesIO): - still occur, as well as diff capture if requested. - """ - -- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): -+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): - BytesIO.__init__(self) - self.name = filename - assert type(capture_diff) == bool -@@ -1447,7 +1447,7 @@ def patch_main(): - - def my_get_command_line(): - with open( -- os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "rU" -+ os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "r" - ) as fork_file: - fork_code = fork_file.read() - # Add our relevant globals. ---- thunderbird-91.11.0/python/mozbuild/mozpack/files.py.python-open-U 2022-06-28 04:37:40.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozpack/files.py 2022-07-11 19:19:40.372213866 +0200 -@@ -574,7 +574,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - with _open(os.devnull, "w") as output: - pp.processFile(input=input, output=output) - -@@ -631,7 +631,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - pp.processFile(input=input, output=dest, depfile=deps_out) - - dest.close() diff --git a/user/firefox-esr/python3.11-regex-inline-flags.patch b/user/firefox-esr/python3.11-regex-inline-flags.patch deleted file mode 100644 index 39481ec01..000000000 --- a/user/firefox-esr/python3.11-regex-inline-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py.python-inline-flags 2022-06-28 04:39:56.000000000 +0200 -+++ thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py 2022-07-11 21:55:05.287553042 +0200 -@@ -1563,13 +1563,13 @@ class IDLParser(object): - t_ignore = " \t" - - def t_multilinecomment(self, t): -- r"/\*(?s).*?\*/" -+ r"/\*(?s:.*?)\*/" - t.lexer.lineno += t.value.count("\n") - if t.value.startswith("/**"): - self._doccomments.append(t.value) - - def t_singlelinecomment(self, t): -- r"(?m)//.*?$" -+ r"(?m://.*?$)" - - def t_IID(self, t): - return t -@@ -1582,7 +1582,7 @@ class IDLParser(object): - return t - - def t_LCDATA(self, t): -- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?" -+ r"(?s:%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?)" - t.type = "CDATA" - t.value = t.lexer.lexmatch.group("cdata") - t.lexer.lineno += t.value.count("\n") diff --git a/user/firefox-esr/rust-32bit.patch b/user/firefox-esr/rust-32bit.patch index cff36e90b..4829e44bf 100644 --- a/user/firefox-esr/rust-32bit.patch +++ b/user/firefox-esr/rust-32bit.patch @@ -1,32 +1,30 @@ ---- firefox-91.13.0/config/makefiles/rust.mk.old 2022-08-15 13:04:32.000000000 -0500 -+++ firefox-91.13.0/config/makefiles/rust.mk 2022-11-15 01:35:10.150096648 -0600 -@@ -64,19 +64,19 @@ +LTO kills the build on 32-bit architectures. + +--- firefox-128.0/config/makefiles/rust.mk.old 2024-07-04 11:20:25.000000000 -0500 ++++ firefox-128.0/config/makefiles/rust.mk 2024-08-04 03:20:25.375459833 -0500 +@@ -82,25 +82,6 @@ # These flags are passed via `cargo rustc` and only apply to the final rustc # invocation (i.e., only the top-level crate, not its dependencies). cargo_rustc_flags = $(CARGO_RUSTCFLAGS) -ifndef DEVELOPER_OPTIONS -ifndef MOZ_DEBUG_RUST -+#ifndef DEVELOPER_OPTIONS -+#ifndef MOZ_DEBUG_RUST - # Enable link-time optimization for release builds, but not when linking - # gkrust_gtest. And not when doing cross-language LTO. +-# Enable link-time optimization for release builds, but not when linking +-# gkrust_gtest. And not when doing cross-language LTO. -ifndef MOZ_LTO_RUST_CROSS +-# Never enable when sancov is enabled to work around https://github.com/rust-lang/rust/issues/90300. +-ifndef rustflags_sancov +-# Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. +-ifndef MOZ_CODE_COVERAGE -ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) --cargo_rustc_flags += -Clto +-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) -endif -+#ifndef MOZ_LTO_RUST_CROSS -+#ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) -+#cargo_rustc_flags += -Clto -+#endif - # We need -Cembed-bitcode=yes for all crates when using -Clto. +-# We need -Cembed-bitcode=yes for all crates when using -Clto. -RUSTFLAGS += -Cembed-bitcode=yes -endif -endif -endif -+#RUSTFLAGS += -Cembed-bitcode=yes -+#endif -+#endif -+#endif +-endif +-endif ifdef CARGO_INCREMENTAL export CARGO_INCREMENTAL diff --git a/user/firefox-esr/shut-up-warning.patch b/user/firefox-esr/shut-up-warning.patch index 8df045af1..bc90b6e2b 100644 --- a/user/firefox-esr/shut-up-warning.patch +++ b/user/firefox-esr/shut-up-warning.patch @@ -1,6 +1,6 @@ --- firefox-68.0.1/gfx/2d/HelpersCairo.h.old 2019-07-17 20:51:26.000000000 +0000 +++ firefox-68.0.1/gfx/2d/HelpersCairo.h 2019-08-10 11:38:36.047380153 +0000 -@@ -147,7 +147,7 @@ +@@ -149,7 +149,7 @@ case SurfaceFormat::R5G6B5_UINT16: return CAIRO_FORMAT_RGB16_565; default: diff --git a/user/firefox-esr/skia-endian.patch b/user/firefox-esr/skia-endian.patch new file mode 100644 index 000000000..7a88b0869 --- /dev/null +++ b/user/firefox-esr/skia-endian.patch @@ -0,0 +1,112 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1888396 + +--- firefox-128.0/gfx/skia/skia/include/private/SkColorData.h ++++ firefox-128.0/gfx/skia/skia/include/private/SkColorData.h +@@ -12,6 +12,13 @@ #include "include/core/SkColor.h" + #include "include/core/SkColorPriv.h" + #include "include/private/base/SkTo.h" + ++/* Macro to covert between big endian and little endian memory order. */ ++#ifdef SK_CPU_BENDIAN ++#define BE_CONVERT(c) ((((c) & 0xff)<<24) | (((c) & 0xff00)<<8) | (((c) & 0xff0000)>>8) | (((c) & 0xff000000)>>24)) ++#else ++#define BE_CONVERT(c) c ++#endif ++ + //////////////////////////////////////////////////////////////////////////////////////////// + // Convert a 16bit pixel to a 32bit pixel + +--- firefox-128.0/gfx/skia/skia/src/core/SkBlitRow_D32.cpp ++++ firefox-128.0/gfx/skia/skia/src/core/SkBlitRow_D32.cpp +@@ -555,7 +555,7 @@ } + void SkBlitRow::Color32(SkPMColor dst[], int count, SkPMColor color) { + switch (SkGetPackedA32(color)) { + case 0: /* Nothing to do */ return; +- case 255: SkOpts::memset32(dst, color, count); return; ++ case 255: SkOpts::memset32(dst, BE_CONVERT(color), count); return; + } +- return SkOpts::blit_row_color32(dst, count, color); ++ return SkOpts::blit_row_color32(dst, count, BE_CONVERT(color)); + } +--- firefox-128.0/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp ++++ firefox-128.0/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp +@@ -1487,7 +1487,7 @@ } + unsigned aa = antialias[0]; + if (aa) { + if ((opaqueMask & aa) == 255) { +- SkOpts::memset32(device, color, count); ++ SkOpts::memset32(device, BE_CONVERT(color), count); + } else { + uint32_t sc = SkAlphaMulQ(color, SkAlpha255To256(aa)); + SkBlitRow::Color32(device, count, sc); +@@ -1503,17 +1503,17 @@ void SkARGB32_Blitter::blitAntiH2(int x, + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x + 1, y);) + +- device[0] = SkBlendARGB32(fPMColor, device[0], a0); +- device[1] = SkBlendARGB32(fPMColor, device[1], a1); ++ device[0] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[0]), a0)); ++ device[1] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[1]), a1)); + } + + void SkARGB32_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x, y + 1);) + +- device[0] = SkBlendARGB32(fPMColor, device[0], a0); ++ device[0] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[0]), a0)); + device = (uint32_t*)((char*)device + fDevice.rowBytes()); +- device[0] = SkBlendARGB32(fPMColor, device[0], a1); ++ device[0] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[0]), a1)); + } + + ////////////////////////////////////////////////////////////////////////////////////// +@@ -1604,17 +1604,17 @@ void SkARGB32_Opaque_Blitter::blitAntiH2 + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x + 1, y);) + +- device[0] = SkFastFourByteInterp(fPMColor, device[0], a0); +- device[1] = SkFastFourByteInterp(fPMColor, device[1], a1); ++ device[0] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[0]), a0)); ++ device[1] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[1]), a1)); + } + + void SkARGB32_Opaque_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x, y + 1);) + +- device[0] = SkFastFourByteInterp(fPMColor, device[0], a0); ++ device[0] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[0]), a0)); + device = (uint32_t*)((char*)device + fDevice.rowBytes()); +- device[0] = SkFastFourByteInterp(fPMColor, device[0], a1); ++ device[0] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[0]), a1)); + } + + /////////////////////////////////////////////////////////////////////////////// +@@ -1634,7 +1634,7 @@ } + unsigned dst_scale = SkAlpha255To256(255 - SkGetPackedA32(color)); + size_t rowBytes = fDevice.rowBytes(); + while (--height >= 0) { +- device[0] = color + SkAlphaMulQ(device[0], dst_scale); ++ device[0] = BE_CONVERT(color + SkAlphaMulQ(BE_CONVERT(device[0]), dst_scale)); + device = (uint32_t*)((char*)device + rowBytes); + } + } +@@ -1651,7 +1651,7 @@ uint32_t color = fPMColor; + size_t rowBytes = fDevice.rowBytes(); + + if (SkGetPackedA32(fPMColor) == 0xFF) { +- SkOpts::rect_memset32(device, color, width, rowBytes, height); ++ SkOpts::rect_memset32(device, BE_CONVERT(color), width, rowBytes, height); + } else { + while (height --> 0) { + SkBlitRow::Color32(device, width, color); +@@ -1680,7 +1680,7 @@ } + unsigned aa = antialias[0]; + if (aa) { + if (aa == 255) { +- SkOpts::memset32(device, black, count); ++ SkOpts::memset32(device, BE_CONVERT(black), count); + } else { + SkPMColor src = aa << SK_A32_SHIFT; + unsigned dst_scale = 256 - aa; diff --git a/user/firefox-esr/skia-unified.patch b/user/firefox-esr/skia-unified.patch index 77bc56299..cacfe3451 100644 --- a/user/firefox-esr/skia-unified.patch +++ b/user/firefox-esr/skia-unified.patch @@ -1,69 +1,786 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1344659 +This patch is not complete. ---- firefox-102.1.0/gfx/2d/Types.h -+++ firefox-102.1.0/gfx/2d/Types.h -@@ -91,15 +91,8 @@ UNKNOWN, - // The following values are endian-independent synonyms. The _UINT32 suffix - // indicates that the name reflects the layout when viewed as a uint32_t - // value. --#if MOZ_LITTLE_ENDIAN() - A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB - X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB --#elif MOZ_BIG_ENDIAN() -- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB -- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB --#else --# error "bad endianness" --#endif +It attempts to completely remove endian-specific surface formats from the +entire tree, then replace it with a single swizzle in Skia. - // The following values are OS and endian-independent synonyms. - // +Most things are working, including most Web sites and graphics. However, +notably, native widgets (like menus, or 'Remember password?' popups) cause +an assertion failure. +We need to ship beta6 and this gets people a browser with many unfortunate +caveats, which is better than no browser at all. -https://bugzilla.mozilla.org/show_bug.cgi?id=1325259 +I intend to remain working with upstream on finding a way forward with the +overall idea of this patch and hope to land something eventually. ---- firefox-102.1.0/gfx/2d/DrawTargetSkia.cpp -+++ firefox-102.1.0/gfx/2d/DrawTargetSkia.cpp -@@ -154,8 +154,12 @@ } - return surfaceBounds.Intersect(bounds); +diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp +--- a/dom/canvas/CanvasRenderingContext2D.cpp ++++ b/dom/canvas/CanvasRenderingContext2D.cpp +@@ -383,7 +383,7 @@ class AdjustedTargetForFilter { + } + + if (!mFinalTarget->CanCreateSimilarDrawTarget(mSourceGraphicRect.Size(), +- SurfaceFormat::B8G8R8A8)) { ++ SurfaceFormat::OS_RGBA)) { + mTarget = mFinalTarget; + mCtx = nullptr; + mFinalTarget = nullptr; +@@ -391,7 +391,7 @@ class AdjustedTargetForFilter { + } + + mTarget = mFinalTarget->CreateSimilarDrawTarget(mSourceGraphicRect.Size(), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + + if (mTarget) { + // See bug 1524554. +@@ -419,7 +419,7 @@ class AdjustedTargetForFilter { + } + + RefPtr<DrawTarget> dt = mFinalTarget->CreateSimilarDrawTarget( +- aRect.Size(), SurfaceFormat::B8G8R8A8); ++ aRect.Size(), SurfaceFormat::OS_RGBA); + + if (dt) { + // See bug 1524554. +@@ -516,7 +516,7 @@ class AdjustedTargetForShadow { + bounds.RoundOut(); + if (!bounds.ToIntRect(&mTempRect) || + !mFinalTarget->CanCreateSimilarDrawTarget(mTempRect.Size(), +- SurfaceFormat::B8G8R8A8)) { ++ SurfaceFormat::OS_RGBA)) { + mTarget = mFinalTarget; + mCtx = nullptr; + mFinalTarget = nullptr; +@@ -524,7 +524,7 @@ class AdjustedTargetForShadow { + } + + mTarget = mFinalTarget->CreateShadowDrawTarget( +- mTempRect.Size(), SurfaceFormat::B8G8R8A8, mSigma); ++ mTempRect.Size(), SurfaceFormat::OS_RGBA, mSigma); + + if (mTarget) { + // See bug 1524554. +@@ -2117,7 +2117,7 @@ CanvasRenderingContext2D::GetOptimizedSn + } + + SurfaceFormat CanvasRenderingContext2D::GetSurfaceFormat() const { +- return mOpaque ? SurfaceFormat::B8G8R8X8 : SurfaceFormat::B8G8R8A8; ++ return mOpaque ? SurfaceFormat::OS_RGBX : SurfaceFormat::OS_RGBA; } -+#if __sparc -+static const int kARGBAlphaOffset = 0; -+#else - static const int kARGBAlphaOffset = - SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; + // +@@ -5295,7 +5295,7 @@ static already_AddRefed<SourceSurface> E + } + + RefPtr<DrawTarget> subrectDT = aTargetDT->CreateSimilarDrawTarget( +- roundedOutSourceRectInt.Size(), SurfaceFormat::B8G8R8A8); ++ roundedOutSourceRectInt.Size(), SurfaceFormat::OS_RGBA); + + if (subrectDT) { + // See bug 1524554. +@@ -6061,7 +6061,7 @@ void CanvasRenderingContext2D::DrawWindo + } + } + drawDT = gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- dtSize, SurfaceFormat::B8G8R8A8); ++ dtSize, SurfaceFormat::OS_RGBA); + if (!drawDT || !drawDT->IsValid()) { + aError.Throw(NS_ERROR_FAILURE); + return; +@@ -6315,7 +6315,7 @@ void CanvasRenderingContext2D::EnsureErr + + RefPtr<DrawTarget> errorTarget = + gfxPlatform::GetPlatform()->CreateOffscreenCanvasDrawTarget( +- IntSize(1, 1), SurfaceFormat::B8G8R8A8); ++ IntSize(1, 1), SurfaceFormat::OS_RGBA); + MOZ_ASSERT(errorTarget, "Failed to allocate the error target!"); + + sErrorTarget.set(errorTarget.forget().take()); +@@ -6437,7 +6437,7 @@ void CanvasRenderingContext2D::PutImageD + dstData = lockedBits + dirtyRect.y * dstStride + dirtyRect.x * 4; + } else { + sourceSurface = Factory::CreateDataSourceSurface( +- dirtyRect.Size(), SurfaceFormat::B8G8R8A8, false); ++ dirtyRect.Size(), SurfaceFormat::OS_RGBA, false); + + // In certain scenarios, requesting larger than 8k image fails. Bug + // 803568 covers the details of how to run into it, but the full +diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp +--- a/dom/canvas/ImageBitmap.cpp ++++ b/dom/canvas/ImageBitmap.cpp +@@ -227,7 +227,7 @@ static already_AddRefed<DataSourceSurfac + // this rectangle are outside the area where the input bitmap was placed, then + // they will be transparent black in output." + // So, instead, we force the output format to be SurfaceFormat::B8G8R8A8. +- const SurfaceFormat format = SurfaceFormat::B8G8R8A8; ++ const SurfaceFormat format = SurfaceFormat::OS_RGBA; + const int bytesPerPixel = BytesPerPixel(format); + const IntSize dstSize = + IntSize(positiveCropRect.width, positiveCropRect.height); +@@ -500,6 +500,11 @@ static already_AddRefed<layers::Image> C + + // Convert RGBA to BGRA + RefPtr<DataSourceSurface> rgbaDataSurface = rgbaSurface->GetDataSurface(); ++ ++ if (SurfaceFormat::OS_RGBA == SurfaceFormat::R8G8B8A8) { ++ return CreateImageFromSurface(rgbaDataSurface); ++ } ++ + DataSourceSurface::ScopedMap rgbaMap(rgbaDataSurface, + DataSourceSurface::READ); + if (NS_WARN_IF(!rgbaMap.IsMapped())) { +@@ -724,7 +729,7 @@ SurfaceFromElementResult ImageBitmap::Su + bool requiresCrop = !allowUncropped && hasCropRect; + if (wantExactSize || requiresPremult || requiresCrop || mSurface) { + RefPtr<DrawTarget> dt = Factory::CreateDrawTarget( +- BackendType::SKIA, IntSize(1, 1), SurfaceFormat::B8G8R8A8); ++ BackendType::SKIA, IntSize(1, 1), SurfaceFormat::OS_RGBA); + sfer.mSourceSurface = PrepareForDrawTarget(dt); + + if (!sfer.mSourceSurface) { +@@ -831,7 +836,7 @@ already_AddRefed<SourceSurface> ImageBit + // black, even if the surface is opaque, so force to an alpha format in + // that case. + if (!surfPortion.IsEqualEdges(mPictureRect) && isOpaque) { +- format = SurfaceFormat::B8G8R8A8; ++ format = SurfaceFormat::OS_RGBA; + } + + // If we need to pre-multiply the alpha, then we need to be able to +diff --git a/dom/canvas/OffscreenCanvasDisplayHelper.cpp b/dom/canvas/OffscreenCanvasDisplayHelper.cpp +--- a/dom/canvas/OffscreenCanvasDisplayHelper.cpp ++++ b/dom/canvas/OffscreenCanvasDisplayHelper.cpp +@@ -181,7 +181,7 @@ bool OffscreenCanvasDisplayHelper::Commi + + MutexAutoLock lock(mMutex); + +- gfx::SurfaceFormat format = gfx::SurfaceFormat::B8G8R8A8; ++ gfx::SurfaceFormat format = gfx::SurfaceFormat::OS_RGBA; + layers::TextureFlags flags = layers::TextureFlags::IMMUTABLE; + + if (!mCanvasElement) { +@@ -207,7 +207,7 @@ bool OffscreenCanvasDisplayHelper::Commi + + if (mData.mIsOpaque) { + flags |= layers::TextureFlags::IS_OPAQUE; +- format = gfx::SurfaceFormat::B8G8R8X8; ++ format = gfx::SurfaceFormat::OS_RGBX; + } else if (!mData.mIsAlphaPremult) { + flags |= layers::TextureFlags::NON_PREMULTIPLIED; + } +diff --git a/gfx/2d/HelpersSkia.h b/gfx/2d/HelpersSkia.h +--- a/gfx/2d/HelpersSkia.h ++++ b/gfx/2d/HelpersSkia.h +@@ -26,6 +26,9 @@ namespace gfx { + static inline SkColorType GfxFormatToSkiaColorType(SurfaceFormat format) { + switch (format) { + case SurfaceFormat::B8G8R8A8: ++#if MOZ_BIG_ENDIAN() ++ //MOZ_DIAGNOSTIC_ASSERT(false, "wrong way unsupported by Skia"); ++#endif + return kBGRA_8888_SkColorType; + case SurfaceFormat::B8G8R8X8: + // We probably need to do something here. +@@ -37,7 +40,9 @@ static inline SkColorType GfxFormatToSki + case SurfaceFormat::R8G8B8A8: + return kRGBA_8888_SkColorType; + case SurfaceFormat::A8R8G8B8: ++#if MOZ_LITTLE_ENDIAN() + MOZ_DIAGNOSTIC_ASSERT(false, "A8R8G8B8 unsupported by Skia"); +#endif + return kRGBA_8888_SkColorType; + default: + MOZ_DIAGNOSTIC_ASSERT(false, "Unknown surface format"); +@@ -49,20 +54,20 @@ static inline SurfaceFormat SkiaColorTyp + SkColorType aColorType, SkAlphaType aAlphaType = kPremul_SkAlphaType) { + switch (aColorType) { + case kBGRA_8888_SkColorType: +- return aAlphaType == kOpaque_SkAlphaType ? SurfaceFormat::B8G8R8X8 +- : SurfaceFormat::B8G8R8A8; ++ return aAlphaType == kOpaque_SkAlphaType ? SurfaceFormat::OS_RGBX ++ : SurfaceFormat::OS_RGBA; + case kRGB_565_SkColorType: + return SurfaceFormat::R5G6B5_UINT16; + case kAlpha_8_SkColorType: + return SurfaceFormat::A8; + default: +- return SurfaceFormat::B8G8R8A8; ++ return SurfaceFormat::OS_RGBA; + } + } - static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, - const int32_t aStride, SurfaceFormat aFormat) { -# HG changeset patch -# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec -Problem description: Tab-titles that are too long to fit into a tab get faded out. - On big endian this is broken and instead of fading out, the - tab gets white and the font transparent, leading to an unreadable - tab-title -Solution: This is not a real solution, but a hack. The real solution would have been - to byte-swap the correct buffer, but I could not find it. - So the next best thing is to deactivate the fading-effect. Now all tab-titles - are readable, albeit not as pretty to look at as they could be. -Side-effects: I have not yet found an unwanted side-effect. - -diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp ---- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 -+++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 -@@ -1861,6 +1861,14 @@ - SkCanvas::kPreserveLCDText_SaveLayerFlag | - (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); - -+#if MOZ_BIG_ENDIAN -+ // Pushing a layer where an aMask is defined produces wrong output. -+ // We _should_ endian swap the data, but I couldn't find a workable way to do so -+ // Therefore I deactivate those layers in the meantime. -+ // The result is: Tab-titles that are longer than the available space should be faded out. -+ // The fading doesn't work, so we deactivate the fading-effect here. -+ if (!aMask) + static inline SkAlphaType GfxFormatToSkiaAlphaType(SurfaceFormat format) { + switch (format) { +- case SurfaceFormat::B8G8R8X8: ++ case SurfaceFormat::OS_RGBX: + case SurfaceFormat::R5G6B5_UINT16: + return kOpaque_SkAlphaType; + default: +diff --git a/gfx/ipc/CrossProcessPaint.cpp b/gfx/ipc/CrossProcessPaint.cpp +--- a/gfx/ipc/CrossProcessPaint.cpp ++++ b/gfx/ipc/CrossProcessPaint.cpp +@@ -107,7 +107,7 @@ PaintFragment PaintFragment::Record(dom: + nsContentUtils::FlushLayoutForTree(ds->GetWindow()); + + // Initialize the recorder +- SurfaceFormat format = SurfaceFormat::B8G8R8A8; ++ SurfaceFormat format = SurfaceFormat::OS_RGBA; + RefPtr<DrawTarget> referenceDt = Factory::CreateDrawTarget( + gfxPlatform::GetPlatform()->GetSoftwareBackend(), IntSize(1, 1), format); + +@@ -254,7 +254,7 @@ bool CrossProcessPaint::Start(dom::Windo + // Create the destination draw target + RefPtr<DrawTarget> drawTarget = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- root->mSize, SurfaceFormat::B8G8R8A8); ++ root->mSize, SurfaceFormat::OS_RGBA); + if (!drawTarget || !drawTarget->IsValid()) { + CPP_LOG("Couldn't create (%d x %d) surface for fragment %" PRIu64 + ".\n", +diff --git a/gfx/ipc/GfxMessageUtils.h b/gfx/ipc/GfxMessageUtils.h +--- a/gfx/ipc/GfxMessageUtils.h ++++ b/gfx/ipc/GfxMessageUtils.h +@@ -677,7 +677,7 @@ struct ParamTraits<GeckoProcessType> + template <> + struct ParamTraits<mozilla::gfx::SurfaceFormat> + : public ContiguousEnumSerializer<mozilla::gfx::SurfaceFormat, +- mozilla::gfx::SurfaceFormat::B8G8R8A8, ++ mozilla::gfx::SurfaceFormat::OS_RGBA, + mozilla::gfx::SurfaceFormat::UNKNOWN> {}; + + template <> +diff --git a/gfx/layers/Compositor.cpp b/gfx/layers/Compositor.cpp +--- a/gfx/layers/Compositor.cpp ++++ b/gfx/layers/Compositor.cpp +@@ -36,7 +36,7 @@ class CompositorRecordedFrame final : pu + gfx::IntSize size = mBuffer->GetSize(); + + mSurface = gfx::Factory::CreateDataSourceSurface( +- size, gfx::SurfaceFormat::B8G8R8A8, ++ size, gfx::SurfaceFormat::OS_RGBA, + /* aZero = */ false); + + if (!mBuffer->MapAndCopyInto(mSurface, size)) { +diff --git a/gfx/layers/ImageDataSerializer.cpp b/gfx/layers/ImageDataSerializer.cpp +--- a/gfx/layers/ImageDataSerializer.cpp ++++ b/gfx/layers/ImageDataSerializer.cpp +@@ -288,16 +288,16 @@ already_AddRefed<DataSourceSurface> Data + RefPtr<DataSourceSurface> result; + if (aSurface) { + MOZ_ASSERT(aSurface->GetSize() == size); +- MOZ_ASSERT(aSurface->GetFormat() == gfx::SurfaceFormat::B8G8R8X8); ++ MOZ_ASSERT(aSurface->GetFormat() == gfx::SurfaceFormat::OS_RGBX); + if (aSurface->GetSize() == size && +- aSurface->GetFormat() == gfx::SurfaceFormat::B8G8R8X8) { ++ aSurface->GetFormat() == gfx::SurfaceFormat::OS_RGBX) { + result = aSurface; + } + } + + if (!result) { + result = +- Factory::CreateDataSourceSurface(size, gfx::SurfaceFormat::B8G8R8X8); ++ Factory::CreateDataSourceSurface(size, gfx::SurfaceFormat::OS_RGBX); + } + if (NS_WARN_IF(!result)) { + return nullptr; +@@ -320,7 +320,7 @@ already_AddRefed<DataSourceSurface> Data + ycbcrData.mChromaSubsampling = aDescriptor.chromaSubsampling(); + +- gfx::ConvertYCbCrToRGB(ycbcrData, gfx::SurfaceFormat::B8G8R8X8, size, ++ gfx::ConvertYCbCrToRGB(ycbcrData, gfx::SurfaceFormat::OS_RGBX, size, + map.mData, map.mStride); + + result->Unmap(); + return result.forget(); +diff --git a/gfx/layers/composite/TextureHost.cpp b/gfx/layers/composite/TextureHost.cpp +--- a/gfx/layers/composite/TextureHost.cpp ++++ b/gfx/layers/composite/TextureHost.cpp +@@ -182,7 +182,7 @@ already_AddRefed<TextureHost> CreateDumm + aFlags &= ~TextureFlags::DEALLOCATE_CLIENT; + aFlags |= TextureFlags::DUMMY_TEXTURE; + UniquePtr<TextureData> textureData(BufferTextureData::Create( +- gfx::IntSize(1, 1), gfx::SurfaceFormat::B8G8R8A8, gfx::BackendType::SKIA, ++ gfx::IntSize(1, 1), gfx::SurfaceFormat::OS_RGBA, gfx::BackendType::SKIA, + aBackend, aFlags, TextureAllocationFlags::ALLOC_DEFAULT, nullptr)); + SurfaceDescriptor surfDesc; + textureData->Serialize(surfDesc); +diff --git a/gfx/layers/ipc/SharedSurfacesChild.cpp b/gfx/layers/ipc/SharedSurfacesChild.cpp +--- a/gfx/layers/ipc/SharedSurfacesChild.cpp ++++ b/gfx/layers/ipc/SharedSurfacesChild.cpp +@@ -241,7 +241,7 @@ nsresult SharedSurfacesChild::ShareInter + + SurfaceFormat format = aSurface->GetFormat(); + MOZ_RELEASE_ASSERT( +- format == SurfaceFormat::B8G8R8X8 || format == SurfaceFormat::B8G8R8A8, ++ format == SurfaceFormat::OS_RGBX || format == SurfaceFormat::OS_RGBA, + "bad format"); + + data->MarkShared(manager->GetNextExternalImageId()); +diff --git a/gfx/layers/wr/WebRenderLayerManager.cpp b/gfx/layers/wr/WebRenderLayerManager.cpp +--- a/gfx/layers/wr/WebRenderLayerManager.cpp ++++ b/gfx/layers/wr/WebRenderLayerManager.cpp +@@ -512,7 +512,7 @@ void WebRenderLayerManager::MakeSnapshot + #ifdef MOZ_WIDGET_ANDROID + SurfaceFormat::R8G8B8A8; + #else +- SurfaceFormat::B8G8R8A8; ++ SurfaceFormat::OS_RGBA; + #endif + RefPtr<TextureClient> texture = TextureClient::CreateForRawBufferAccess( + WrBridge(), format, aSize.ToUnknownSize(), BackendType::SKIA, +diff --git a/gfx/layers/wr/WebRenderTextureHost.cpp b/gfx/layers/wr/WebRenderTextureHost.cpp +--- a/gfx/layers/wr/WebRenderTextureHost.cpp ++++ b/gfx/layers/wr/WebRenderTextureHost.cpp +@@ -159,7 +159,7 @@ int32_t WebRenderTextureHost::GetRGBStri + // XXX this stride is used until yuv image rendering by webrender is used. + // Software converted RGB buffers strides are aliened to 16 + return gfx::GetAlignedStride<16>( +- GetSize().width, BytesPerPixel(gfx::SurfaceFormat::B8G8R8A8)); ++ GetSize().width, BytesPerPixel(gfx::SurfaceFormat::OS_RGBA)); + } + return ImageDataSerializer::ComputeRGBStride(format, GetSize().width); + } +diff --git a/gfx/thebes/gfx2DGlue.h b/gfx/thebes/gfx2DGlue.h +--- a/gfx/thebes/gfx2DGlue.h ++++ b/gfx/thebes/gfx2DGlue.h +@@ -68,9 +68,9 @@ inline gfxRect ThebesRect(const RectDoub + + inline gfxImageFormat SurfaceFormatToImageFormat(SurfaceFormat aFormat) { + switch (aFormat) { +- case SurfaceFormat::B8G8R8A8: ++ case SurfaceFormat::OS_RGBA: + return SurfaceFormat::A8R8G8B8_UINT32; +- case SurfaceFormat::B8G8R8X8: ++ case SurfaceFormat::OS_RGBX: + return SurfaceFormat::X8R8G8B8_UINT32; + case SurfaceFormat::R5G6B5_UINT16: + return SurfaceFormat::R5G6B5_UINT16; +@@ -84,16 +84,16 @@ inline gfxImageFormat SurfaceFormatToIma + inline SurfaceFormat ImageFormatToSurfaceFormat(gfxImageFormat aFormat) { + switch (aFormat) { + case SurfaceFormat::A8R8G8B8_UINT32: +- return SurfaceFormat::B8G8R8A8; ++ return SurfaceFormat::OS_RGBA; + case SurfaceFormat::X8R8G8B8_UINT32: +- return SurfaceFormat::B8G8R8X8; ++ return SurfaceFormat::OS_RGBX; + case SurfaceFormat::R5G6B5_UINT16: + return SurfaceFormat::R5G6B5_UINT16; + case SurfaceFormat::A8: + return SurfaceFormat::A8; + default: + case SurfaceFormat::UNKNOWN: +- return SurfaceFormat::B8G8R8A8; ++ return SurfaceFormat::OS_RGBA; + } + } + +@@ -102,9 +102,11 @@ inline gfxContentType ContentForFormat(c + case SurfaceFormat::R5G6B5_UINT16: + case SurfaceFormat::B8G8R8X8: + case SurfaceFormat::R8G8B8X8: ++ case SurfaceFormat::X8R8G8B8: + return gfxContentType::COLOR; + case SurfaceFormat::A8: + return gfxContentType::ALPHA; ++ case SurfaceFormat::A8R8G8B8: + case SurfaceFormat::B8G8R8A8: + case SurfaceFormat::R8G8B8A8: + default: +diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp +--- a/gfx/thebes/gfxPlatform.cpp ++++ b/gfx/thebes/gfxPlatform.cpp +@@ -987,7 +987,7 @@ void gfxPlatform::Init() { + + gPlatform->mScreenReferenceDrawTarget = + gPlatform->CreateOffscreenContentDrawTarget(IntSize(1, 1), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + if (!gPlatform->mScreenReferenceDrawTarget || + !gPlatform->mScreenReferenceDrawTarget->IsValid()) { + // If TDR is detected, create a draw target with software backend +diff --git a/gfx/thebes/gfxPlatformWorker.cpp b/gfx/thebes/gfxPlatformWorker.cpp +--- a/gfx/thebes/gfxPlatformWorker.cpp ++++ b/gfx/thebes/gfxPlatformWorker.cpp +@@ -64,7 +64,7 @@ RefPtr<mozilla::gfx::DrawTarget> + gfxPlatformWorker::ScreenReferenceDrawTarget() { + if (!mScreenReferenceDrawTarget) { + mScreenReferenceDrawTarget = Factory::CreateDrawTarget( +- BackendType::SKIA, IntSize(1, 1), SurfaceFormat::B8G8R8A8); ++ BackendType::SKIA, IntSize(1, 1), SurfaceFormat::OS_RGBA); + } + return mScreenReferenceDrawTarget; + } +diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp +--- a/gfx/thebes/gfxUtils.cpp ++++ b/gfx/thebes/gfxUtils.cpp +@@ -1082,10 +1082,10 @@ nsresult gfxUtils::EncodeSourceSurfaceAs + } + + RefPtr<DataSourceSurface> dataSurface; +- if (aSurface->GetFormat() != SurfaceFormat::B8G8R8A8) { ++ if (aSurface->GetFormat() != SurfaceFormat::OS_RGBA) { + // FIXME bug 995807 (B8G8R8X8), bug 831898 (R5G6B5) + dataSurface = gfxUtils::CopySurfaceToDataSourceSurfaceWithFormat( +- aSurface, SurfaceFormat::B8G8R8A8); ++ aSurface, SurfaceFormat::OS_RGBA); + } else { + dataSurface = aSurface->GetDataSurface(); + } +diff --git a/gfx/webrender_bindings/RenderCompositorSWGL.cpp b/gfx/webrender_bindings/RenderCompositorSWGL.cpp +--- a/gfx/webrender_bindings/RenderCompositorSWGL.cpp ++++ b/gfx/webrender_bindings/RenderCompositorSWGL.cpp +@@ -7,6 +7,7 @@ + #include "RenderCompositorSWGL.h" + + #include "mozilla/gfx/Logging.h" ++#include "mozilla/gfx/Swizzle.h" + #include "mozilla/widget/CompositorWidget.h" + + #ifdef MOZ_WIDGET_GTK +@@ -92,8 +93,8 @@ bool RenderCompositorSWGL::AllocateMappe + gfx::SurfaceFormat format = gfx::SurfaceFormat::UNKNOWN; + if (bufferMode != layers::BufferMode::BUFFERED && !mSurface && + mDT->LockBits(&data, &size, &stride, &format) && +- (format != gfx::SurfaceFormat::B8G8R8A8 && +- format != gfx::SurfaceFormat::B8G8R8X8)) { ++ (format != gfx::SurfaceFormat::OS_RGBA && ++ format != gfx::SurfaceFormat::OS_RGBX)) { + // We tried to lock the DT and it succeeded, but the size or format + // of the data is not compatible, so just release it and fall back below... + mDT->ReleaseBits(data); +@@ -127,7 +128,7 @@ bool RenderCompositorSWGL::AllocateMappe + size = bounds.Size().ToUnknownSize(); + if (!mSurface || mSurface->GetSize() != size) { + mSurface = gfx::Factory::CreateDataSourceSurface( +- size, gfx::SurfaceFormat::B8G8R8A8); ++ size, gfx::SurfaceFormat::OS_RGBA); + } + gfx::DataSourceSurface::MappedSurface map = {nullptr, 0}; + if (!mSurface || !mSurface->Map(gfx::DataSourceSurface::READ_WRITE, &map)) { +@@ -242,6 +243,12 @@ void RenderCompositorSWGL::CommitMappedB + } + mDT->Flush(); + ++#if MOZ_BIG_ENDIAN() ++ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8, ++ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8, ++ mDT->GetSize()); +#endif - mCanvas->saveLayer(saveRec); ++ + // Done with the DT. Hand it back to the widget and clear out any trace of it. + mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion); + mDirtyRegion.SetEmpty(); +diff --git a/gfx/webrender_bindings/RenderTextureHostSWGL.cpp b/gfx/webrender_bindings/RenderTextureHostSWGL.cpp +--- a/gfx/webrender_bindings/RenderTextureHostSWGL.cpp ++++ b/gfx/webrender_bindings/RenderTextureHostSWGL.cpp +@@ -36,8 +36,8 @@ bool RenderTextureHostSWGL::UpdatePlanes + } + GLenum internalFormat = 0; + switch (format) { +- case gfx::SurfaceFormat::B8G8R8A8: +- case gfx::SurfaceFormat::B8G8R8X8: ++ case gfx::SurfaceFormat::OS_RGBA: ++ case gfx::SurfaceFormat::OS_RGBX: + MOZ_ASSERT(colorDepth == gfx::ColorDepth::COLOR_8); + internalFormat = LOCAL_GL_RGBA8; + break; +diff --git a/gfx/webrender_bindings/WebRenderTypes.h b/gfx/webrender_bindings/WebRenderTypes.h +--- a/gfx/webrender_bindings/WebRenderTypes.h ++++ b/gfx/webrender_bindings/WebRenderTypes.h +@@ -105,7 +105,7 @@ inline Maybe<wr::ImageFormat> SurfaceFor + inline gfx::SurfaceFormat ImageFormatToSurfaceFormat(ImageFormat aFormat) { + switch (aFormat) { + case ImageFormat::BGRA8: +- return gfx::SurfaceFormat::B8G8R8A8; ++ return gfx::SurfaceFormat::OS_RGBA; + case ImageFormat::R8: + return gfx::SurfaceFormat::A8; + case ImageFormat::R16: +diff --git a/image/imgTools.cpp b/image/imgTools.cpp +--- a/image/imgTools.cpp ++++ b/image/imgTools.cpp +@@ -425,8 +425,8 @@ static nsresult EncodeImageData(DataSour + const nsACString& aMimeType, + const nsAString& aOutputOptions, + nsIInputStream** aStream) { +- MOZ_ASSERT(aDataSurface->GetFormat() == SurfaceFormat::B8G8R8A8 || +- aDataSurface->GetFormat() == SurfaceFormat::B8G8R8X8, ++ MOZ_ASSERT(aDataSurface->GetFormat() == SurfaceFormat::OS_RGBA || ++ aDataSurface->GetFormat() == SurfaceFormat::OS_RGBX, + "We're assuming B8G8R8A8/X8"); + + // Get an image encoder for the media type +@@ -474,13 +474,13 @@ imgTools::EncodeImage(imgIContainer* aCo + + RefPtr<DataSourceSurface> dataSurface; + +- if (frame->GetFormat() == SurfaceFormat::B8G8R8A8 || +- frame->GetFormat() == SurfaceFormat::B8G8R8X8) { ++ if (frame->GetFormat() == SurfaceFormat::OS_RGBA || ++ frame->GetFormat() == SurfaceFormat::OS_RGBX) { + dataSurface = frame->GetDataSurface(); + } else { + // Convert format to SurfaceFormat::B8G8R8A8 + dataSurface = gfxUtils::CopySurfaceToDataSourceSurfaceWithFormat( +- frame, SurfaceFormat::B8G8R8A8); ++ frame, SurfaceFormat::OS_RGBA); + } + + NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE); +@@ -522,8 +522,8 @@ imgTools::EncodeScaledImage(imgIContaine + + // If the given surface is the right size/format, we can encode it directly. + if (scaledSize == frame->GetSize() && +- (frame->GetFormat() == SurfaceFormat::B8G8R8A8 || +- frame->GetFormat() == SurfaceFormat::B8G8R8X8)) { ++ (frame->GetFormat() == SurfaceFormat::OS_RGBA || ++ frame->GetFormat() == SurfaceFormat::OS_RGBX)) { + RefPtr<DataSourceSurface> dataSurface = frame->GetDataSurface(); + if (dataSurface) { + return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream); +@@ -533,7 +533,7 @@ imgTools::EncodeScaledImage(imgIContaine + // Otherwise we need to scale it using a draw target. + // Ensure the surface is initialized to clear in case we need to blend to it. + RefPtr<DataSourceSurface> dataSurface = Factory::CreateDataSourceSurface( +- scaledSize, SurfaceFormat::B8G8R8A8, true); ++ scaledSize, SurfaceFormat::OS_RGBA, true); + if (NS_WARN_IF(!dataSurface)) { + return NS_ERROR_FAILURE; + } +@@ -545,7 +545,7 @@ imgTools::EncodeScaledImage(imgIContaine + + RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData( + BackendType::SKIA, map.GetData(), dataSurface->GetSize(), map.GetStride(), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + if (!dt) { + gfxWarning() << "imgTools::EncodeImage failed in CreateDrawTargetForData"; + return NS_ERROR_OUT_OF_MEMORY; +@@ -603,7 +603,7 @@ imgTools::EncodeCroppedImage(imgIContain + frameHeight >= aOffsetY + aHeight); + + RefPtr<DataSourceSurface> dataSurface = Factory::CreateDataSourceSurface( +- IntSize(aWidth, aHeight), SurfaceFormat::B8G8R8A8, ++ IntSize(aWidth, aHeight), SurfaceFormat::OS_RGBA, + /* aZero = */ true); + if (NS_WARN_IF(!dataSurface)) { + return NS_ERROR_FAILURE; +@@ -616,7 +616,7 @@ imgTools::EncodeCroppedImage(imgIContain + + RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData( + BackendType::SKIA, map.GetData(), dataSurface->GetSize(), map.GetStride(), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + if (!dt) { + gfxWarning() + << "imgTools::EncodeCroppedImage failed in CreateDrawTargetForData"; +diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp +--- a/layout/base/PresShell.cpp ++++ b/layout/base/PresShell.cpp +@@ -5124,7 +5124,7 @@ already_AddRefed<SourceSurface> PresShel + + RefPtr<DrawTarget> dt = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- IntSize(pixelArea.width, pixelArea.height), SurfaceFormat::B8G8R8A8); ++ IntSize(pixelArea.width, pixelArea.height), SurfaceFormat::OS_RGBA); + if (!dt || !dt->IsValid()) { + return nullptr; + } +diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp +--- a/layout/base/nsLayoutUtils.cpp ++++ b/layout/base/nsLayoutUtils.cpp +@@ -7022,9 +7022,9 @@ SurfaceFromElementResult nsLayoutUtils:: + result.mAlphaType = gfxAlphaType::Opaque; + RefPtr<DrawTarget> ref = + aTarget ? aTarget : gfxPlatform::ThreadLocalScreenReferenceDrawTarget(); +- if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8)) { ++ if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA)) { + RefPtr<DrawTarget> dt = +- ref->CreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8); ++ ref->CreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA); + if (dt) { + result.mSourceSurface = dt->Snapshot(); + } +@@ -7102,12 +7102,12 @@ SurfaceFromElementResult nsLayoutUtils:: + : gfxPlatform::GetPlatform() + ->ThreadLocalScreenReferenceDrawTarget(); + if (!ref->CanCreateSimilarDrawTarget(displaySize, +- SurfaceFormat::B8G8R8A8)) { ++ SurfaceFormat::OS_RGBA)) { + return result; + } + + RefPtr<DrawTarget> dt = +- ref->CreateSimilarDrawTarget(displaySize, SurfaceFormat::B8G8R8A8); ++ ref->CreateSimilarDrawTarget(displaySize, SurfaceFormat::OS_RGBA); + if (!dt) { + return result; + } +@@ -7380,9 +7380,9 @@ SurfaceFromElementResult nsLayoutUtils:: + RefPtr<DrawTarget> ref = + aTarget ? aTarget + : gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget(); +- if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8)) { ++ if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA)) { + RefPtr<DrawTarget> dt = +- ref->CreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8); ++ ref->CreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA); + if (dt) { + result.mSourceSurface = dt->Snapshot(); + } +diff --git a/layout/painting/nsCSSRenderingGradients.cpp b/layout/painting/nsCSSRenderingGradients.cpp +--- a/layout/painting/nsCSSRenderingGradients.cpp ++++ b/layout/painting/nsCSSRenderingGradients.cpp +@@ -1160,7 +1160,7 @@ bool nsCSSGradientRenderer::TryPaintTile + { + RefPtr<gfx::DrawTarget> tileTarget = + aContext.GetDrawTarget()->CreateSimilarDrawTarget( +- tileSize, gfx::SurfaceFormat::B8G8R8A8); ++ tileSize, gfx::SurfaceFormat::OS_RGBA); + if (!tileTarget || !tileTarget->IsValid()) { + return false; + } +diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp +--- a/layout/painting/nsDisplayList.cpp ++++ b/layout/painting/nsDisplayList.cpp +@@ -5043,7 +5043,7 @@ void nsDisplayBlendMode::Paint(nsDisplay + // we're going to draw to. This will include the same transform as + // is currently on |dt|. + RefPtr<DrawTarget> temp = +- dt->CreateClippedDrawTarget(rect, SurfaceFormat::B8G8R8A8); ++ dt->CreateClippedDrawTarget(rect, SurfaceFormat::OS_RGBA); + if (!temp) { + return; + } +@@ -6870,7 +6870,7 @@ void nsDisplayTransform::Paint(nsDisplay + RefPtr<DrawTarget> untransformedDT = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( + IntSize(pixelBounds.Width(), pixelBounds.Height()), +- SurfaceFormat::B8G8R8A8, true); ++ SurfaceFormat::OS_RGBA, true); + if (!untransformedDT || !untransformedDT->IsValid()) { + return; + } +diff --git a/layout/painting/nsImageRenderer.cpp b/layout/painting/nsImageRenderer.cpp +--- a/layout/painting/nsImageRenderer.cpp ++++ b/layout/painting/nsImageRenderer.cpp +@@ -469,7 +469,7 @@ ImgDrawResult nsImageRenderer::Draw(nsPr + return ImgDrawResult::SUCCESS; + } + RefPtr<DrawTarget> tempDT = ctx->GetDrawTarget()->CreateSimilarDrawTarget( +- tmpDTRect.Size(), SurfaceFormat::B8G8R8A8); ++ tmpDTRect.Size(), SurfaceFormat::OS_RGBA); + if (!tempDT || !tempDT->IsValid()) { + gfxDevCrash(LogReason::InvalidContext) + << "ImageRenderer::Draw problem " << gfx::hexa(tempDT); +diff --git a/layout/svg/FilterInstance.cpp b/layout/svg/FilterInstance.cpp +--- a/layout/svg/FilterInstance.cpp ++++ b/layout/svg/FilterInstance.cpp +@@ -666,7 +666,7 @@ void FilterInstance::BuildSourcePaint(So + + RefPtr<DrawTarget> offscreenDT = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- neededRect.Size(), SurfaceFormat::B8G8R8A8); ++ neededRect.Size(), SurfaceFormat::OS_RGBA); + if (!offscreenDT || !offscreenDT->IsValid()) { + return; + } +@@ -714,7 +714,7 @@ void FilterInstance::BuildSourceImage(Dr + } + + RefPtr<DrawTarget> offscreenDT; +- SurfaceFormat format = SurfaceFormat::B8G8R8A8; ++ SurfaceFormat format = SurfaceFormat::OS_RGBA; + if (aDest->CanCreateSimilarDrawTarget(neededRect.Size(), format)) { + offscreenDT = aDest->CreateSimilarDrawTargetForFilter( + neededRect.Size(), format, aFilter, aSource, aSourceRect, Point(0, 0)); +diff --git a/layout/svg/SVGMaskFrame.cpp b/layout/svg/SVGMaskFrame.cpp +--- a/layout/svg/SVGMaskFrame.cpp ++++ b/layout/svg/SVGMaskFrame.cpp +@@ -68,7 +68,7 @@ already_AddRefed<SourceSurface> SVGMaskF + RefPtr<DrawTarget> maskDT; + if (maskType == StyleMaskType::Luminance) { + maskDT = aParams.dt->CreateClippedDrawTarget(maskSurfaceRect, +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + } else { + maskDT = + aParams.dt->CreateClippedDrawTarget(maskSurfaceRect, SurfaceFormat::A8); +diff --git a/layout/svg/SVGPatternFrame.cpp b/layout/svg/SVGPatternFrame.cpp +--- a/layout/svg/SVGPatternFrame.cpp ++++ b/layout/svg/SVGPatternFrame.cpp +@@ -370,7 +370,7 @@ already_AddRefed<SourceSurface> SVGPatte + } + + RefPtr<DrawTarget> dt = aDrawTarget->CreateSimilarDrawTargetWithBacking( +- surfaceSize, SurfaceFormat::B8G8R8A8); ++ surfaceSize, SurfaceFormat::OS_RGBA); + if (!dt || !dt->IsValid()) { + return nullptr; + } +diff --git a/layout/svg/SVGUtils.cpp b/layout/svg/SVGUtils.cpp +--- a/layout/svg/SVGUtils.cpp ++++ b/layout/svg/SVGUtils.cpp +@@ -488,7 +488,7 @@ class MixModeBlender { + + RefPtr<DrawTarget> targetDT = + mSourceCtx->GetDrawTarget()->CreateSimilarDrawTarget( +- drawRect.Size(), SurfaceFormat::B8G8R8A8); ++ drawRect.Size(), SurfaceFormat::OS_RGBA); + if (!targetDT || !targetDT->IsValid()) { + return nullptr; + } +diff --git a/widget/gtk/DMABufSurface.cpp b/widget/gtk/DMABufSurface.cpp +--- a/widget/gtk/DMABufSurface.cpp ++++ b/widget/gtk/DMABufSurface.cpp +@@ -948,8 +948,8 @@ bool DMABufSurfaceRGBA::HasAlpha() { + } + + gfx::SurfaceFormat DMABufSurfaceRGBA::GetFormat() { +- return HasAlpha() ? gfx::SurfaceFormat::B8G8R8A8 +- : gfx::SurfaceFormat::B8G8R8X8; ++ return HasAlpha() ? gfx::SurfaceFormat::OS_RGBA ++ : gfx::SurfaceFormat::OS_RGBX; + } + + // GL uses swapped R and B components so report accordingly. +@@ -1662,7 +1662,7 @@ DMABufSurfaceYUV::GetAsSourceSurface() { + LOGDMABUF(("DMABufSurfaceYUV::GetAsSourceSurface UID %d", mUID)); + + gfx::IntSize size(GetWidth(), GetHeight()); +- const auto format = gfx::SurfaceFormat::B8G8R8A8; ++ const auto format = gfx::SurfaceFormat::OS_RGBA; + RefPtr<gfx::DataSourceSurface> source = + gfx::Factory::CreateDataSourceSurface(size, format); + if (NS_WARN_IF(!source)) { +@@ -1692,7 +1692,7 @@ nsresult DMABufSurfaceYUV::BuildSurfaceD + LOGDMABUF(("DMABufSurfaceYUV::BuildSurfaceDescriptorBuffer UID %d", mUID)); + + gfx::IntSize size(GetWidth(), GetHeight()); +- const auto format = gfx::SurfaceFormat::B8G8R8A8; ++ const auto format = gfx::SurfaceFormat::OS_RGBA; - SetPermitSubpixelAA(aOpaque); + uint8_t* buffer = nullptr; + int32_t stride = 0; +diff --git a/widget/gtk/WindowSurfaceX11.cpp b/widget/gtk/WindowSurfaceX11.cpp +--- a/widget/gtk/WindowSurfaceX11.cpp ++++ b/widget/gtk/WindowSurfaceX11.cpp +@@ -24,13 +24,13 @@ gfx::SurfaceFormat WindowSurfaceX11::Get + case 32: + if (aVisual->red_mask == 0xff0000 && aVisual->green_mask == 0xff00 && + aVisual->blue_mask == 0xff) { +- return gfx::SurfaceFormat::B8G8R8A8; ++ return gfx::SurfaceFormat::OS_RGBA; + } + break; + case 24: + if (aVisual->red_mask == 0xff0000 && aVisual->green_mask == 0xff00 && + aVisual->blue_mask == 0xff) { +- return gfx::SurfaceFormat::B8G8R8X8; ++ return gfx::SurfaceFormat::OS_RGBX; + } + break; + case 16: diff --git a/user/firefox-esr/stackwalk-x86-ppc.patch b/user/firefox-esr/stackwalk-x86-ppc.patch index eed7a0956..df9ebfd94 100644 --- a/user/firefox-esr/stackwalk-x86-ppc.patch +++ b/user/firefox-esr/stackwalk-x86-ppc.patch @@ -1,16 +1,16 @@ --- thunderbird-52.6.0/mozglue/misc/StackWalk.cpp +++ thunderbird-52.6.0/mozglue/misc/StackWalk.cpp -@@ -41,13 +41,7 @@ static CriticalAddress gCriticalAddress; - #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 +@@ -50,13 +50,6 @@ static CriticalAddress gCriticalAddress; + # define HAVE___LIBC_STACK_END 0 #endif -#if (defined(linux) && \ - ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ -- defined(HAVE__UNWIND_BACKTRACE))) +- defined(HAVE__UNWIND_BACKTRACE)) && \ +- (HAVE___LIBC_STACK_END || ANDROID)) -# define MOZ_STACKWALK_SUPPORTS_LINUX 1 -#else # define MOZ_STACKWALK_SUPPORTS_LINUX 0 -#endif - - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) - #define HAVE___LIBC_STACK_END 1 + + #if HAVE___LIBC_STACK_END diff --git a/user/firefox-esr/triplet-vendor-support.patch b/user/firefox-esr/triplet-vendor-support.patch deleted file mode 100644 index d0ca17e81..000000000 --- a/user/firefox-esr/triplet-vendor-support.patch +++ /dev/null @@ -1,316 +0,0 @@ -Squashed version of https://github.com/bytecodealliance/target-lexicon/pull/35 - -diff -Naur firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/build.rs firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/build.rs ---- firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/build.rs 2022-08-15 13:05:59.000000000 -0500 -+++ firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/build.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -32,6 +32,7 @@ - } - } - -+use self::targets::Vendor; - use self::triple::Triple; - - fn main() { -@@ -52,6 +53,8 @@ - writeln!(out, "use crate::Aarch64Architecture::*;")?; - writeln!(out, "#[allow(unused_imports)]")?; - writeln!(out, "use crate::ArmArchitecture::*;")?; -+ writeln!(out, "#[allow(unused_imports)]")?; -+ writeln!(out, "use crate::CustomVendor;")?; - writeln!(out)?; - writeln!(out, "/// The `Triple` of the current host.")?; - writeln!(out, "pub const HOST: Triple = Triple {{")?; -@@ -60,7 +63,7 @@ - " architecture: Architecture::{:?},", - triple.architecture - )?; -- writeln!(out, " vendor: Vendor::{:?},", triple.vendor)?; -+ writeln!(out, " vendor: {},", vendor_display(&triple.vendor))?; - writeln!( - out, - " operating_system: OperatingSystem::{:?},", -@@ -90,7 +93,7 @@ - writeln!(out, "impl Vendor {{")?; - writeln!(out, " /// Return the vendor for the current host.")?; - writeln!(out, " pub const fn host() -> Self {{")?; -- writeln!(out, " Vendor::{:?}", triple.vendor)?; -+ writeln!(out, " {}", vendor_display(&triple.vendor))?; - writeln!(out, " }}")?; - writeln!(out, "}}")?; - writeln!(out)?; -@@ -138,7 +141,11 @@ - " architecture: Architecture::{:?},", - triple.architecture - )?; -- writeln!(out, " vendor: Vendor::{:?},", triple.vendor)?; -+ writeln!( -+ out, -+ " vendor: {},", -+ vendor_display(&triple.vendor) -+ )?; - writeln!( - out, - " operating_system: OperatingSystem::{:?},", -@@ -160,3 +167,13 @@ - - Ok(()) - } -+ -+fn vendor_display(vendor: &Vendor) -> String { -+ match vendor { -+ Vendor::Custom(custom) => format!( -+ "Vendor::Custom(CustomVendor::Static({:?}))", -+ custom.as_str() -+ ), -+ known => format!("Vendor::{:?}", known), -+ } -+} -diff -Naur firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/lib.rs firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/src/lib.rs ---- firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/lib.rs 2022-08-15 13:05:37.000000000 -0500 -+++ firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/src/lib.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -28,7 +28,7 @@ - pub use self::host::HOST; - pub use self::parse_error::ParseError; - pub use self::targets::{ -- Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, Environment, OperatingSystem, -- Vendor, -+ Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, CustomVendor, Environment, -+ OperatingSystem, Vendor, - }; - pub use self::triple::{CallingConvention, Endianness, PointerWidth, Triple}; -diff -Naur firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/targets.rs firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/src/targets.rs ---- firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/targets.rs 2022-08-15 13:05:42.000000000 -0500 -+++ firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/src/targets.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -1,7 +1,10 @@ - // This file defines all the identifier enums and target-aware logic. - - use crate::triple::{Endianness, PointerWidth, Triple}; -+use alloc::boxed::Box; -+use alloc::string::String; - use core::fmt; -+use core::hash::{Hash, Hasher}; - use core::str::FromStr; - - /// The "architecture" field, which in some cases also specifies a specific -@@ -290,9 +293,42 @@ - } - } - -+/// A string for a `Vendor::Custom` that can either be used in `const` -+/// contexts or hold dynamic strings. -+#[derive(Clone, Debug, Eq)] -+pub enum CustomVendor { -+ /// An owned `String`. This supports the general case. -+ Owned(Box<String>), -+ /// A static `str`, so that `CustomVendor` can be constructed in `const` -+ /// contexts. -+ Static(&'static str), -+} -+ -+impl CustomVendor { -+ /// Extracts a string slice. -+ pub fn as_str(&self) -> &str { -+ match self { -+ CustomVendor::Owned(s) => s, -+ CustomVendor::Static(s) => s, -+ } -+ } -+} -+ -+impl PartialEq for CustomVendor { -+ fn eq(&self, other: &Self) -> bool { -+ self.as_str() == other.as_str() -+ } -+} -+ -+impl Hash for CustomVendor { -+ fn hash<H: Hasher>(&self, state: &mut H) { -+ self.as_str().hash(state) -+ } -+} -+ - /// The "vendor" field, which in practice is little more than an arbitrary - /// modifier. --#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] -+#[derive(Clone, Debug, PartialEq, Eq, Hash)] - #[allow(missing_docs)] - pub enum Vendor { - Unknown, -@@ -306,6 +342,15 @@ - Sun, - Uwp, - Wrs, -+ -+ /// A custom vendor. "Custom" in this context means that the vendor is -+ /// not specifically recognized by upstream Autotools, LLVM, Rust, or other -+ /// relevant authorities on triple naming. It's useful for people building -+ /// and using locally patched toolchains. -+ /// -+ /// Outside of such patched environments, users of `target-lexicon` should -+ /// treat `Custom` the same as `Unknown` and ignore the string. -+ Custom(CustomVendor), - } - - /// The "operating system" field, which sometimes implies an environment, and -@@ -717,6 +762,7 @@ - Vendor::Sun => "sun", - Vendor::Uwp => "uwp", - Vendor::Wrs => "wrs", -+ Vendor::Custom(ref name) => name.as_str(), - }; - f.write_str(s) - } -@@ -738,7 +784,43 @@ - "sun" => Vendor::Sun, - "uwp" => Vendor::Uwp, - "wrs" => Vendor::Wrs, -- _ => return Err(()), -+ custom => { -+ use alloc::borrow::ToOwned; -+ -+ // A custom vendor. Since triple syntax is so loosely defined, -+ // be as conservative as we can to avoid potential ambiguities. -+ // We err on the side of being too strict here, as we can -+ // always relax it if needed. -+ -+ // Don't allow empty string names. -+ if custom.is_empty() { -+ return Err(()); -+ } -+ -+ // Don't allow any other recognized name as a custom vendor, -+ // since vendors can be omitted in some contexts. -+ if Architecture::from_str(custom).is_ok() -+ || OperatingSystem::from_str(custom).is_ok() -+ || Environment::from_str(custom).is_ok() -+ || BinaryFormat::from_str(custom).is_ok() -+ { -+ return Err(()); -+ } -+ -+ // Require the first character to be an ascii lowercase. -+ if !custom.chars().nth(0).unwrap().is_ascii_lowercase() { -+ return Err(()); -+ } -+ -+ // Restrict the set of characters permitted in a custom vendor. -+ if custom.chars().any(|c: char| { -+ !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.') -+ }) { -+ return Err(()); -+ } -+ -+ Vendor::Custom(CustomVendor::Owned(Box::new(custom.to_owned()))) -+ } - }) - } - } -@@ -1120,4 +1202,87 @@ - assert_eq!(t.environment, Environment::Eabihf); - assert_eq!(t.binary_format, BinaryFormat::Elf); - } -+ -+ #[test] -+ fn custom_vendors() { -+ // Test various invalid cases. -+ assert!(Triple::from_str("x86_64--linux").is_err()); -+ assert!(Triple::from_str("x86_64-42-linux").is_err()); -+ assert!(Triple::from_str("x86_64-__customvendor__-linux").is_err()); -+ assert!(Triple::from_str("x86_64-^-linux").is_err()); -+ assert!(Triple::from_str("x86_64- -linux").is_err()); -+ assert!(Triple::from_str("x86_64-CustomVendor-linux").is_err()); -+ assert!(Triple::from_str("x86_64-linux-linux").is_err()); -+ assert!(Triple::from_str("x86_64-x86_64-linux").is_err()); -+ assert!(Triple::from_str("x86_64-elf-linux").is_err()); -+ assert!(Triple::from_str("x86_64-gnu-linux").is_err()); -+ assert!(Triple::from_str("x86_64-linux-customvendor").is_err()); -+ assert!(Triple::from_str("customvendor").is_err()); -+ assert!(Triple::from_str("customvendor-x86_64").is_err()); -+ assert!(Triple::from_str("x86_64-").is_err()); -+ assert!(Triple::from_str("x86_64--").is_err()); -+ -+ // Test various Unicode things. -+ assert!( -+ Triple::from_str("x86_64-𝓬𝓾𝓼𝓽𝓸𝓶𝓿𝓮𝓷𝓭𝓸𝓻-linux").is_err(), -+ "unicode font hazard" -+ ); -+ assert!( -+ Triple::from_str("x86_64-ćúśtőḿvéńdőŕ-linux").is_err(), -+ "diacritical mark stripping hazard" -+ ); -+ assert!( -+ Triple::from_str("x86_64-customvendοr-linux").is_err(), -+ "homoglyph hazard" -+ ); -+ assert!(Triple::from_str("x86_64-customvendor-linux").is_ok()); -+ assert!( -+ Triple::from_str("x86_64-ffi-linux").is_err(), -+ "normalization hazard" -+ ); -+ assert!(Triple::from_str("x86_64-ffi-linux").is_ok()); -+ assert!( -+ Triple::from_str("x86_64-customvendor-linux").is_err(), -+ "zero-width character hazard" -+ ); -+ assert!( -+ Triple::from_str("x86_64-customvendor-linux").is_err(), -+ "BOM hazard" -+ ); -+ -+ // Test some valid cases. -+ let t = Triple::from_str("x86_64-customvendor-linux") -+ .expect("can't parse target with custom vendor"); -+ assert_eq!(t.architecture, Architecture::X86_64); -+ assert_eq!( -+ t.vendor, -+ Vendor::Custom(CustomVendor::Static("customvendor")) -+ ); -+ assert_eq!(t.operating_system, OperatingSystem::Linux); -+ assert_eq!(t.environment, Environment::Unknown); -+ assert_eq!(t.binary_format, BinaryFormat::Elf); -+ assert_eq!(t.to_string(), "x86_64-customvendor-linux"); -+ -+ let t = -+ Triple::from_str("x86_64-customvendor").expect("can't parse target with custom vendor"); -+ assert_eq!(t.architecture, Architecture::X86_64); -+ assert_eq!( -+ t.vendor, -+ Vendor::Custom(CustomVendor::Static("customvendor")) -+ ); -+ assert_eq!(t.operating_system, OperatingSystem::Unknown); -+ assert_eq!(t.environment, Environment::Unknown); -+ assert_eq!(t.binary_format, BinaryFormat::Unknown); -+ -+ assert_eq!( -+ Triple::from_str("unknown-foo"), -+ Ok(Triple { -+ architecture: Architecture::Unknown, -+ vendor: Vendor::Custom(CustomVendor::Static("foo")), -+ operating_system: OperatingSystem::Unknown, -+ environment: Environment::Unknown, -+ binary_format: BinaryFormat::Unknown, -+ }) -+ ); -+ } - } -diff -Naur firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/triple.rs firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/src/triple.rs ---- firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/triple.rs 2022-08-15 13:05:59.000000000 -0500 -+++ firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/src/triple.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -323,10 +323,6 @@ - Err(ParseError::UnrecognizedArchitecture("foo".to_owned())) - ); - assert_eq!( -- Triple::from_str("unknown-foo"), -- Err(ParseError::UnrecognizedVendor("foo".to_owned())) -- ); -- assert_eq!( - Triple::from_str("unknown-unknown-foo"), - Err(ParseError::UnrecognizedOperatingSystem("foo".to_owned())) - ); -diff -Naur firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/.cargo-checksum.json firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json ---- firefox-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/.cargo-checksum.json 2022-08-15 13:05:38.000000000 -0500 -+++ firefox-91.13.0/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json 2022-11-23 01:16:14.304912521 -0600 -@@ -1 +1 @@ --{"files":{"Cargo.lock":"a1a162e6ce8fc2234a6ddf7090410006a1920ace8738772e32a5b50e4780c19d","Cargo.toml":"f3b545fa0f184fd0d3624e6e5c205fcbdf1ad0934a2e08406549ad53c2a62ac3","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"723100e9cdc30cd8c48407233c2cffa10f5b10703a0a11bac1230d8b86e49ccf","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","newlist":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","src/host.rs":"fb543df4f362e9119a58523563e453110f4e3a426f0995911d0ca386657cf1d9","src/lib.rs":"4414353c30f25d44df6cc14f7f9eea9991222289c6aa662b74406f6923235970","src/parse_error.rs":"b3735eabc0fd0a9dfdd6375662f20ec96a79852a00a05a98fb2e421545285e53","src/targets.rs":"9ccc0849cff06d8906dacbdc15136cc47fab85ccd795033ddfdde1397dfcfe32","src/triple.rs":"949bd83b043b53b18f643ebc3fbebbfe02a13998b787fda432a5d36aa27d20bd","test.sh":"22e3c630a6c84e90d5c70c367a6712be8eeca1e7682c00d1f65bf53e330e9191"},"package":"6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"} -\ No newline at end of file -+{"files":{"Cargo.lock":"a1a162e6ce8fc2234a6ddf7090410006a1920ace8738772e32a5b50e4780c19d","Cargo.toml":"f3b545fa0f184fd0d3624e6e5c205fcbdf1ad0934a2e08406549ad53c2a62ac3","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"85d6a1b6392b56946f48c0ff1526736a37fe012951bf3855709da1d6cfb4baa0","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","newlist":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","src/host.rs":"fb543df4f362e9119a58523563e453110f4e3a426f0995911d0ca386657cf1d9","src/lib.rs":"89986c98b9a04e0f1e957e0127e23a53048a1f0d597493723c4bba031c2ca32d","src/parse_error.rs":"b3735eabc0fd0a9dfdd6375662f20ec96a79852a00a05a98fb2e421545285e53","src/targets.rs":"f2048f06e3e2151a8181d8c92651fa45e64b8bfdfd18ead4b6c18ee7c9fb9003","src/triple.rs":"4704266fec8763bc70d230aad3608bdb790b51e41149056daa2ce0d5fdaef5a3","test.sh":"22e3c630a6c84e90d5c70c367a6712be8eeca1e7682c00d1f65bf53e330e9191"},"package":"6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"} diff --git a/user/firefox-esr/webrender.patch b/user/firefox-esr/webrender.patch index a2457e576..cfc920cfd 100644 --- a/user/firefox-esr/webrender.patch +++ b/user/firefox-esr/webrender.patch @@ -6,35 +6,9 @@ # Parent 20d81e68da033746bf81acbb08490f16679853da Bug 1716707 [s390x] Software WebRender does not support big endian -diff -r 20d81e68da03 -r 903e5f164c0e gfx/webrender_bindings/RenderCompositorSWGL.cpp ---- a/gfx/webrender_bindings/RenderCompositorSWGL.cpp Thu Mar 24 06:57:58 2022 +0000 -+++ b/gfx/webrender_bindings/RenderCompositorSWGL.cpp Thu Mar 24 02:36:16 2022 -0700 -@@ -7,6 +7,7 @@ - #include "RenderCompositorSWGL.h" - - #include "mozilla/gfx/Logging.h" -+#include "mozilla/gfx/Swizzle.h" - #include "mozilla/widget/CompositorWidget.h" - - #ifdef MOZ_WIDGET_GTK -@@ -235,6 +237,13 @@ - } - mDT->Flush(); - -+#if MOZ_BIG_ENDIAN() -+ // One swizzle to rule them all. -+ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8, -+ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8, -+ mDT->GetSize()); -+#endif -+ - // Done with the DT. Hand it back to the widget and clear out any trace of it. - mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion); - mDirtyRegion.SetEmpty(); -diff -r 20d81e68da03 -r 903e5f164c0e image/imgFrame.cpp ---- a/image/imgFrame.cpp Thu Mar 24 06:57:58 2022 +0000 -+++ b/image/imgFrame.cpp Thu Mar 24 02:36:16 2022 -0700 -@@ -372,6 +372,17 @@ +--- firefox-128.0/image/imgFrame.cpp ++++ firefox-128.0/image/imgFrame.cpp +@@ -382,6 +382,17 @@ mAborted = true; return NS_ERROR_OUT_OF_MEMORY; } diff --git a/user/firefox-esr/without-jit.patch b/user/firefox-esr/without-jit.patch new file mode 100644 index 000000000..dff372ec0 --- /dev/null +++ b/user/firefox-esr/without-jit.patch @@ -0,0 +1,28 @@ +diff -r 81fc811c3c39 toolkit/components/translations/actors/TranslationsParent.sys.mjs +--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs Thu Aug 08 21:26:29 2024 -0700 ++++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs Sat Aug 10 16:45:13 2024 -0700 +@@ -618,16 +618,25 @@ + * Detect if Wasm SIMD is supported, and cache the value. It's better to check + * for support before downloading large binary blobs to a user who can't even + * use the feature. This function also respects mocks and simulating unsupported + * engines. + * + * @type {boolean} + */ + static getIsTranslationsEngineSupported() { ++ try { ++ // Ensure WebAssembly is supported and enabled (may not be on tier-3). ++ if (!WebAssembly) { ++ return false; ++ } ++ } catch(e) { ++ return false; ++ } ++ + if (lazy.simulateUnsupportedEnginePref) { + // Use the non-lazy console.log so that the user is always informed as to why + // the translations engine is not working. + console.log( + "Translations: The translations engine is disabled through the pref " + + '"browser.translations.simulateUnsupportedEngine".' + ); diff --git a/user/flameshot/APKBUILD b/user/flameshot/APKBUILD new file mode 100644 index 000000000..3ac292020 --- /dev/null +++ b/user/flameshot/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=flameshot +pkgver=12.1.0 +pkgrel=0 +pkgdesc="Simple, powerful screenshot utility" +url="https://flameshot.org/" +arch="all" +license="GPL-3.0+ AND LGPL-3.0+ AND MIT AND (GPL-3.0+ AND GPL-2.0-only) AND Apache-2.0 AND CC0-1.0 AND FAL-1.3" +depends="" +makedepends="cmake qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="flameshot-$pkgver.tar.gz::https://github.com/flameshot-org/flameshot/archive/refs/tags/v$pkgver.tar.gz" +langdir="/usr/share/flameshot/translations" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c flameshot-12.1.0.tar.gz" diff --git a/user/fltk/APKBUILD b/user/fltk/APKBUILD index 886584625..c1842602f 100644 --- a/user/fltk/APKBUILD +++ b/user/fltk/APKBUILD @@ -3,14 +3,14 @@ pkgname=fltk pkgver=1.3.5 _realver=1.3.5 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform C++ GUI toolkit" url="https://www.fltk.org/" arch="all" options="!check" # No test suite. license="LGPL-2.0-only WITH FLTK-exception" depends="" -depends_dev="libx11-dev libxext-dev libxft-dev mesa-dev" +depends_dev="libglvnd-dev libx11-dev libxext-dev libxft-dev" makedepends="$depends_dev libjpeg-turbo-dev libpng-dev libxinerama-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-fluid" source="https://www.fltk.org/pub/fltk/1.3.5/$pkgname-$_realver-source.tar.gz" diff --git a/user/fluxbox/APKBUILD b/user/fluxbox/APKBUILD index c45ce0ec9..bc5882b50 100644 --- a/user/fluxbox/APKBUILD +++ b/user/fluxbox/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=fluxbox pkgver=1.3.7 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight and highly-configurable window manager" url="http://www.fluxbox.org" arch="all" @@ -12,7 +12,9 @@ depends="gxmessage" makedepends="libxinerama-dev libxpm-dev libxrandr imlib2-dev libxrender-dev libxrandr-dev libxinerama-dev freetype-dev libxft-dev xorgproto" subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + modern-c.patch + " build() { # TODO: Enable NLS when we get 'gencat' @@ -29,4 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c fluxbox-1.3.7.tar.bz2" +sha512sums="c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c fluxbox-1.3.7.tar.bz2 +5b06cb617ff7ef9a2b605e4b590d35ed5cab95ded91f56e3a7ad75a1ec1caa0e5543624c4a5f7a5924b60c4568c7b3d7d11811c54ab55c40df7ccd0ef6c45bd1 modern-c.patch" diff --git a/user/fluxbox/modern-c.patch b/user/fluxbox/modern-c.patch new file mode 100644 index 000000000..c8890c71f --- /dev/null +++ b/user/fluxbox/modern-c.patch @@ -0,0 +1,25 @@ +From 22866c4d30f5b289c429c5ca88d800200db4fc4f Mon Sep 17 00:00:00 2001 +From: John Sennesael <john@aminking.com> +Date: Mon, 2 Nov 2015 15:14:32 -0600 +Subject: fixes bug #1138 + +--- + util/fluxbox-remote.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc +index 59852e6..504015b 100644 +--- a/util/fluxbox-remote.cc ++++ b/util/fluxbox-remote.cc +@@ -73,7 +73,7 @@ int main(int argc, char **argv) { + if (strcmp(cmd, "result") == 0) { + XTextProperty text_prop; + if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0 +- && text_prop.value > 0 ++ && text_prop.value != 0 + && text_prop.nitems > 0) { + + printf("%s", text_prop.value); +-- +cgit v0.11.2 + diff --git a/user/font-adobe-100dpi/APKBUILD b/user/font-adobe-100dpi/APKBUILD index e141b606b..f3fc23252 100644 --- a/user/font-adobe-100dpi/APKBUILD +++ b/user/font-adobe-100dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-adobe-100dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="100dpi X11 fonts from Adobe" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987 font-adobe-100dpi-1.0.3.tar.bz2" +sha512sums="fedb86672c3b9cb624ee5d74d1d710f21d92c2d48a1fcf0a45b54b3f992f6f5599fc271d38a7e25ef123b64d405fa60a3d46883fe7a9d71ebad83c9b418f8383 font-adobe-100dpi-1.0.4.tar.xz" diff --git a/user/font-adobe-75dpi/APKBUILD b/user/font-adobe-75dpi/APKBUILD index 5ef4fe5a8..3ac3fb6b1 100644 --- a/user/font-adobe-75dpi/APKBUILD +++ b/user/font-adobe-75dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-adobe-75dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="75dpi X11 fonts from Adobe" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d font-adobe-75dpi-1.0.3.tar.bz2" +sha512sums="4e63c268525f21c03525870129c8d42cbd17a03d86d9c88bebdccb5094a1093acef1d2b6d4dde221559cb19f047b86baf58fa8ad65d28d4cb6c3064ec164836a font-adobe-75dpi-1.0.4.tar.xz" diff --git a/user/font-adobe-utopia-100dpi/APKBUILD b/user/font-adobe-utopia-100dpi/APKBUILD index 7f7b77dd7..60ff800dc 100644 --- a/user/font-adobe-utopia-100dpi/APKBUILD +++ b/user/font-adobe-utopia-100dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-adobe-utopia-100dpi -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="100dpi Utopia X11 font from Adobe" url="https://www.X.Org/" @@ -16,7 +16,7 @@ license="Utopia" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -43,4 +43,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b font-adobe-utopia-100dpi-1.0.4.tar.bz2" +sha512sums="9685d66de107ab3142aa9322bbded20f4f538d7bcd8c97bfb4db8eb1fc440724b0c7574ee8b4b5e96c81044c8ee4da175dd638f03dc3e1e650200fdf7b8a169b font-adobe-utopia-100dpi-1.0.5.tar.xz" diff --git a/user/font-adobe-utopia-75dpi/APKBUILD b/user/font-adobe-utopia-75dpi/APKBUILD index 02e746ddf..86e02adb1 100644 --- a/user/font-adobe-utopia-75dpi/APKBUILD +++ b/user/font-adobe-utopia-75dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-adobe-utopia-75dpi -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="75dpi Utopia X11 font from Adobe" url="https://www.X.Org/" @@ -16,7 +16,7 @@ license="Utopia" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -43,4 +43,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92 font-adobe-utopia-75dpi-1.0.4.tar.bz2" +sha512sums="9608698288fca47bf61cff911b8f081593807eed9f138ea22f05a7b6c26c481ec5144d79665cf509ba889df35ef5406e0de71710362bcf6de6b602c12158e22a font-adobe-utopia-75dpi-1.0.5.tar.xz" diff --git a/user/font-adobe-utopia-type1/APKBUILD b/user/font-adobe-utopia-type1/APKBUILD index ee684a79e..a48e51517 100644 --- a/user/font-adobe-utopia-type1/APKBUILD +++ b/user/font-adobe-utopia-type1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-adobe-utopia-type1 -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Type 1 Utopia X11 font from Adobe" url="https://www.X.Org/" @@ -16,7 +16,7 @@ license="Utopia" depends="encodings font-alias fontconfig mkfontscale" makedepends="util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.xz" prepare() { default_prepare @@ -44,4 +44,4 @@ package() { find "$pkgdir" -name fonts.scale -exec rm {} + } -sha512sums="53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6 font-adobe-utopia-type1-1.0.4.tar.bz2" +sha512sums="e30f4c7702f47a3a42206975fbcfec058317681956d246411e50e372b669bdc875c5d7fe28bad7d298bc61b71a997c7836fb6ac16effd223a96723a6e9ece649 font-adobe-utopia-type1-1.0.5.tar.xz" diff --git a/user/font-alias/APKBUILD b/user/font-alias/APKBUILD index 793405de7..d09841afe 100644 --- a/user/font-alias/APKBUILD +++ b/user/font-alias/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-alias -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Font alias definitions from X.Org" url="https://www.X.Org/" @@ -9,7 +9,7 @@ license="MIT" depends="" makedepends="util-macros" subpackages="" -source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d font-alias-1.0.4.tar.bz2" +sha512sums="86bffa6b9ff789eeba715c079965157806ed633d44cd3dbf5e2a4bba2b390a0f48db65edc8e3264acbc2368d78a8d7e05bc2e2e3a86ddbf6b08bfe7f5e862bcc font-alias-1.0.5.tar.xz" diff --git a/user/font-arabic-misc/APKBUILD b/user/font-arabic-misc/APKBUILD index 66e7cb372..858091f83 100644 --- a/user/font-arabic-misc/APKBUILD +++ b/user/font-arabic-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-arabic-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Arabic X11 fonts" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0 font-arabic-misc-1.0.3.tar.bz2" +sha512sums="afd5fae32440b133c5ee0195af44ad1462d35c2f451dcf4b1c93e0ce245d009b120d39eb5f780b003ae2f572408965e6d149437e9ebbf5738cb69193aaa4d488 font-arabic-misc-1.0.4.tar.xz" diff --git a/user/font-bh-100dpi/APKBUILD b/user/font-bh-100dpi/APKBUILD index 2dff87e24..344e7567f 100644 --- a/user/font-bh-100dpi/APKBUILD +++ b/user/font-bh-100dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-bh-100dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="100dpi X11 fonts from Bigelow & Holmes" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="Lucida" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-bh-100dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-bh-100dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2 font-bh-100dpi-1.0.3.tar.bz2" +sha512sums="5fe2a24df0d0e9109f1c1cb2556f4cdbf07cc16441e565333f01a00815dd4555b6ef0dd689ef3196ddb76db7480bca8f0b501d4244262d6c64d4751d75503b44 font-bh-100dpi-1.0.4.tar.xz" diff --git a/user/font-bh-75dpi/APKBUILD b/user/font-bh-75dpi/APKBUILD index 619f8ce0c..c8edcddd6 100644 --- a/user/font-bh-75dpi/APKBUILD +++ b/user/font-bh-75dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-bh-75dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="75dpi X11 fonts from Bigelow & Holmes" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="Lucida" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-bh-75dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-bh-75dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50 font-bh-75dpi-1.0.3.tar.bz2" +sha512sums="8ccc5accdd43b4e1b8007c94e7916c6ee947ff0d57e3b0ce92154b718ef0ac2579659719738a50ef3ab0998a8bcea5b055e6a2e4d72b9fa5755b786143303955 font-bh-75dpi-1.0.4.tar.xz" diff --git a/user/font-bh-lucidatypewriter-100dpi/APKBUILD b/user/font-bh-lucidatypewriter-100dpi/APKBUILD index 118787f42..275072468 100644 --- a/user/font-bh-lucidatypewriter-100dpi/APKBUILD +++ b/user/font-bh-lucidatypewriter-100dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-bh-lucidatypewriter-100dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="100dpi Lucida Typewriter X11 font from Bigelow & Holmes" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="Lucida" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2" +sha512sums="31a4d061430089c5523815dde7d7cf73c9cba768ab79004eb65af8a1684fdd57d0829d9f4249c8e542e733266cc5f83e38eff403423a77a06af15008ce95d2ab font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz" diff --git a/user/font-bh-lucidatypewriter-75dpi/APKBUILD b/user/font-bh-lucidatypewriter-75dpi/APKBUILD index 67d155853..9a2d26282 100644 --- a/user/font-bh-lucidatypewriter-75dpi/APKBUILD +++ b/user/font-bh-lucidatypewriter-75dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-bh-lucidatypewriter-75dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="75dpi Lucida Typewriter X11 font from Bigelow & Holmes" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="Lucida" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2" +sha512sums="bfe2776b84533dd23648df42b2c74fb7f49e665e4f2128c6af529425a1569051c9ddadb696dfa7a6bd959a4929f8a75f7e4fbd7da7767d272a0a8a5424a879cf font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz" diff --git a/user/font-bitstream-100dpi/APKBUILD b/user/font-bitstream-100dpi/APKBUILD index 491e7622b..8ddf0edc8 100644 --- a/user/font-bitstream-100dpi/APKBUILD +++ b/user/font-bitstream-100dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-bitstream-100dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="100dpi X11 fonts from Bitstream" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd font-bitstream-100dpi-1.0.3.tar.bz2" +sha512sums="1389681eee8b9e2bbfe0293b0aa1add7c6fa86149ff3cb779195ddcc548b1a519336c2d43b6988c899dc09d44ca30de9ffb5daca24fc3906694ab0fd391eb437 font-bitstream-100dpi-1.0.4.tar.xz" diff --git a/user/font-bitstream-75dpi/APKBUILD b/user/font-bitstream-75dpi/APKBUILD index fa6149d10..0c9bf3e4b 100644 --- a/user/font-bitstream-75dpi/APKBUILD +++ b/user/font-bitstream-75dpi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-bitstream-75dpi -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="75dpi X11 fonts from Bitstream" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650 font-bitstream-75dpi-1.0.3.tar.bz2" +sha512sums="d678c58493696b3a744878991838b329243e5ba7985b1a435b62e9b1a05b5609d0b66d5943d840479ce2c5fc1da1b0633c33f28e3613712d26802fc41ee22c22 font-bitstream-75dpi-1.0.4.tar.xz" diff --git a/user/font-bitstream-type1/APKBUILD b/user/font-bitstream-type1/APKBUILD index cf4d86d6d..2cb1696f1 100644 --- a/user/font-bitstream-type1/APKBUILD +++ b/user/font-bitstream-type1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-bitstream-type1 -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Type 1 X11 fonts from Bitstream" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="fontconfig mkfontscale" makedepends="util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-bitstream-type1-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-bitstream-type1-$pkgver.tar.xz" prepare() { default_prepare @@ -38,4 +38,4 @@ package() { find "$pkgdir" -name fonts.scale -exec rm {} + } -sha512sums="71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61 font-bitstream-type1-1.0.3.tar.bz2" +sha512sums="f09d60abb88c9be6227c57f5519f08e5e3c59c916183d32a512d3c2ace0047eaad2b377c3725c8987e8b4c55468eb7821322ff5447f000d4c2be6cb909f6219b font-bitstream-type1-1.0.4.tar.xz" diff --git a/user/font-cronyx-cyrillic/APKBUILD b/user/font-cronyx-cyrillic/APKBUILD index 38765a4a3..8b6582f67 100644 --- a/user/font-cronyx-cyrillic/APKBUILD +++ b/user/font-cronyx-cyrillic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-cronyx-cyrillic -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Cyrillic X11 fonts from Cronyx" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-cronyx-cyrillic-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-cronyx-cyrillic-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456 font-cronyx-cyrillic-1.0.3.tar.bz2" +sha512sums="39c0bfc08ac746fd98a668d7545da503e8413d5d66cdb1884489ed7221fa4f09dad8dc997ca39595113e2f12fd65de6d2bfd8eaf1480aa93d5eb961d2e2f7cff font-cronyx-cyrillic-1.0.4.tar.xz" diff --git a/user/font-cursor-misc/APKBUILD b/user/font-cursor-misc/APKBUILD index f5b870917..56ffa3838 100644 --- a/user/font-cursor-misc/APKBUILD +++ b/user/font-cursor-misc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-cursor-misc -pkgver=1.0.3 -pkgrel=4 +pkgver=1.0.4 +pkgrel=0 pkgdesc="X11 cursor fonts" url="https://www.X.Org/" arch="noarch" @@ -9,7 +9,7 @@ license="Public-Domain" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.xz" prepare() { default_prepare @@ -33,4 +33,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83 font-cursor-misc-1.0.3.tar.bz2" +sha512sums="22bd86a81cdfb1e17f885dc3961071c08920171a6f0736ae52d95c8e576b1debc7570aa3b7e1007f474b50435fba411f0eb1847894e8b52f6e6268d91cf9f2db font-cursor-misc-1.0.4.tar.xz" diff --git a/user/font-daewoo-misc/APKBUILD b/user/font-daewoo-misc/APKBUILD index 0e75b5af6..44f2c7c79 100644 --- a/user/font-daewoo-misc/APKBUILD +++ b/user/font-daewoo-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-daewoo-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="X11 fonts from Daewoo" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-daewoo-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-daewoo-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06 font-daewoo-misc-1.0.3.tar.bz2" +sha512sums="be9f550e8cb84f9e24afb6b739c357cb159da8a06f8bc2c26c9fbb62320427dd7522e04d10492cec91ab559b2e5dd5067012ff3225695a8337f1cd7db9801f57 font-daewoo-misc-1.0.4.tar.xz" diff --git a/user/font-dec-misc/APKBUILD b/user/font-dec-misc/APKBUILD index 6f6189efd..003b51a98 100644 --- a/user/font-dec-misc/APKBUILD +++ b/user/font-dec-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-dec-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="X11 fonts from Digital" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-dec-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-dec-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6 font-dec-misc-1.0.3.tar.bz2" +sha512sums="bf6c0e4924835346f1f7913a04fa3903a7c55d292317526dd8eaa799dfb3b52eb2157c34692d659b41a18123af8389785dcb4aa0c31fc387cb368642801c3335 font-dec-misc-1.0.4.tar.xz" diff --git a/user/font-isas-misc/APKBUILD b/user/font-isas-misc/APKBUILD index 9acfa2cb3..7bf811639 100644 --- a/user/font-isas-misc/APKBUILD +++ b/user/font-isas-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-isas-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Chinese X11 fonts from Academia Sinica" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-isas-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-isas-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b font-isas-misc-1.0.3.tar.bz2" +sha512sums="7c8cc9083600949fff4a0373f9f22df80f6a2c97d8d56bc2c4d03b102d16ad071b984b1ecf547d2d17ede9335e5c3a418512631a18938b7728c66b4339dcedd5 font-isas-misc-1.0.4.tar.xz" diff --git a/user/font-jis-misc/APKBUILD b/user/font-jis-misc/APKBUILD index 1b047736a..bac5e655a 100644 --- a/user/font-jis-misc/APKBUILD +++ b/user/font-jis-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-jis-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Japanese Industrial Standard X11 fonts" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="Public-Domain" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-jis-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-jis-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c font-jis-misc-1.0.3.tar.bz2" +sha512sums="c54034205e7bd7a01b311c25c890f9fd1abc25f842315812d5c83d4e4091e5e6c2125a43d4d532b88c79d51cb812b86cfa8e7e4c1a87175746f1bd4e38129440 font-jis-misc-1.0.4.tar.xz" diff --git a/user/font-micro-misc/APKBUILD b/user/font-micro-misc/APKBUILD index 8eae0a5a4..8bf9bd49b 100644 --- a/user/font-micro-misc/APKBUILD +++ b/user/font-micro-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-micro-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Smol X11 font" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="Public-Domain" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-micro-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-micro-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69 font-micro-misc-1.0.3.tar.bz2" +sha512sums="e9a402a5042eef0b618bc30b319256cae9f71f546c167c8b638a780f93cbdc2d61c472203efaee7077acedfac3b3981feefbc1017cfee8512077e61deff42ed3 font-micro-misc-1.0.4.tar.xz" diff --git a/user/font-misc-cyrillic/APKBUILD b/user/font-misc-cyrillic/APKBUILD index ffe4760e6..fb93e953b 100644 --- a/user/font-misc-cyrillic/APKBUILD +++ b/user/font-misc-cyrillic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-misc-cyrillic -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Cyrillic X11 fonts" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT AND Public-Domain" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-misc-cyrillic-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-misc-cyrillic-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf font-misc-cyrillic-1.0.3.tar.bz2" +sha512sums="fb2102805fedbd04b1533b85abcde79f432b97b72822bcfcdc09f525488d0d0c63815c8c25b79bab864bbe11fa1b72e2c34f5ba7b96eee1b6c84b841bb333353 font-misc-cyrillic-1.0.4.tar.xz" diff --git a/user/font-misc-ethiopic/APKBUILD b/user/font-misc-ethiopic/APKBUILD index 87b71086c..534dc3937 100644 --- a/user/font-misc-ethiopic/APKBUILD +++ b/user/font-misc-ethiopic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-misc-ethiopic -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Ethiopic X11 fonts" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.xz" build() { ./configure \ @@ -33,4 +33,4 @@ package() { find "$pkgdir" -name fonts.scale -exec rm {} + } -sha512sums="4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5 font-misc-ethiopic-1.0.4.tar.bz2" +sha512sums="7732a828c005e3762b6383729134c5656fd575ac59288504d047fbe26e9965a80519a37b0cc4c6b89379a85a62160c5ea76017f790447a230c015aa7a9143ba0 font-misc-ethiopic-1.0.5.tar.xz" diff --git a/user/font-misc-misc/APKBUILD b/user/font-misc-misc/APKBUILD index 66f55e2ad..e731c9de6 100644 --- a/user/font-misc-misc/APKBUILD +++ b/user/font-misc-misc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-misc-misc -pkgver=1.1.2 -pkgrel=4 +pkgver=1.1.3 +pkgrel=0 pkgdesc="Miscellaneous X11 fonts included with X.Org" url="https://www.X.Org/" arch="noarch" @@ -9,7 +9,7 @@ license="Public-Domain" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.xz" prepare() { default_prepare @@ -33,4 +33,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74 font-misc-misc-1.1.2.tar.bz2" +sha512sums="fac4bfda0e4189d1a9999abc47bdd404f2beeec5301da190d92afc2176cd344789b7223c1b2f4748bd0efe1b9a81fa7f13f7037015d5d800480fa2236f369b48 font-misc-misc-1.1.3.tar.xz" diff --git a/user/font-mutt-misc/APKBUILD b/user/font-mutt-misc/APKBUILD index 575ad7e2e..2520a4138 100644 --- a/user/font-mutt-misc/APKBUILD +++ b/user/font-mutt-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-mutt-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="MUTT X11 font family" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-mutt-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-mutt-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db font-mutt-misc-1.0.3.tar.bz2" +sha512sums="9cbc82e6a519572576cb60f4d6b9795468666d53ac7df17d6736ab04190cb5f58c8b57be61ab509fc9372e1114c6aaa5e0d098ec1fa63dc5d8638916614f7046 font-mutt-misc-1.0.4.tar.xz" diff --git a/user/font-schumacher-misc/APKBUILD b/user/font-schumacher-misc/APKBUILD index d8a3bfb90..cf288951a 100644 --- a/user/font-schumacher-misc/APKBUILD +++ b/user/font-schumacher-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-schumacher-misc -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="X11 fonts from Dale Schumacher" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-schumacher-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-schumacher-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a font-schumacher-misc-1.1.2.tar.bz2" +sha512sums="83b25495535176a5e348269358ac34af8223023a55e2c5c599725ee90ec9ff3ea9ff19cca46b93eeae7ef985da325f9065c83d829a4a8c72d0c3c197242a1b64 font-schumacher-misc-1.1.3.tar.xz" diff --git a/user/font-screen-cyrillic/APKBUILD b/user/font-screen-cyrillic/APKBUILD index 4e0d72cd6..b52c8978f 100644 --- a/user/font-screen-cyrillic/APKBUILD +++ b/user/font-screen-cyrillic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-screen-cyrillic -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Cyrillic X11 fonts" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-screen-cyrillic-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-screen-cyrillic-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51 font-screen-cyrillic-1.0.4.tar.bz2" +sha512sums="9f136fc6f6a3621c4b38302af5396789b1e6558b9b4b1b991624945eb9aac8497a6cd415460abc7dbcbaad1ef8ebd23cacfb3448c6e34cc9ba0726e7973c1a99 font-screen-cyrillic-1.0.5.tar.xz" diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD index 2d5a256ff..ff55dc5b4 100644 --- a/user/font-sony-misc/APKBUILD +++ b/user/font-sony-misc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-sony-misc -pkgver=1.0.3 -pkgrel=3 +pkgver=1.0.4 +pkgrel=0 pkgdesc="X11 fonts from Sony" url="https://www.X.Org/" arch="noarch" @@ -9,7 +9,7 @@ license="MIT" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf font-util-dev util-macros" subpackages="" -source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.xz" prepare() { default_prepare @@ -33,4 +33,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d font-sony-misc-1.0.3.tar.bz2" +sha512sums="f361fca66db2ec80b1467fb6bff57bd2cfc6722473bd7ad119026a97552eef07ff77552c01eb8f98f3299d7fd40c8c2cb3e0d0b01adca2f81c2c2f75581dc113 font-sony-misc-1.0.4.tar.xz" diff --git a/user/font-sun-misc/APKBUILD b/user/font-sun-misc/APKBUILD index e3134ef91..578c8c3b2 100644 --- a/user/font-sun-misc/APKBUILD +++ b/user/font-sun-misc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-sun-misc -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="X11 fonts from Sun Microsystems" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-sun-misc-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-sun-misc-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275 font-sun-misc-1.0.3.tar.bz2" +sha512sums="9eeb330c1190557479636119af8aeb49917f1faeaa42d3a93e35d318348ee4247405544107ce9f5a244dbe2c0001c8d34b604b961bd9d92431f84b992fe9739e font-sun-misc-1.0.4.tar.xz" diff --git a/user/font-util/APKBUILD b/user/font-util/APKBUILD index 9674cb3b1..76a35ee3d 100644 --- a/user/font-util/APKBUILD +++ b/user/font-util/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-util -pkgver=1.3.3 +pkgver=1.4.1 pkgrel=0 pkgdesc="X.org font utilities" url="https://www.X.Org/" @@ -29,4 +29,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9 font-util-1.3.3.tar.xz" +sha512sums="cec7fc38ba64ca9c81c59a8395da94d71c75e14f19faf6457da0a1a8c3c1cf51bcaab227834f6f5a6d274ba2557555e542dbe2bd88e527c45ea196318bbc38d0 font-util-1.4.1.tar.xz" diff --git a/user/font-winitzki-cyrillic/APKBUILD b/user/font-winitzki-cyrillic/APKBUILD index 09853fc30..29d904d94 100644 --- a/user/font-winitzki-cyrillic/APKBUILD +++ b/user/font-winitzki-cyrillic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-winitzki-cyrillic -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Cyrillic X11 fonts from Serge Winitzki" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="Public-Domain" depends="encodings font-alias fontconfig mkfontscale" makedepends="bdftopcf util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-winitzki-cyrillic-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-winitzki-cyrillic-$pkgver.tar.xz" prepare() { default_prepare @@ -37,4 +37,4 @@ package() { find "$pkgdir" -name fonts.dir -exec rm {} + } -sha512sums="f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7 font-winitzki-cyrillic-1.0.3.tar.bz2" +sha512sums="11e366f96abe65aed9fb6fd087b2bd90af9f60548de0cebfeb348262860957a63a997616e00092d312b8ae9c262a7bb52da69c704a27d34018a45b98a87eb158 font-winitzki-cyrillic-1.0.4.tar.xz" diff --git a/user/font-xfree86-type1/APKBUILD b/user/font-xfree86-type1/APKBUILD index 308217e65..66521e717 100644 --- a/user/font-xfree86-type1/APKBUILD +++ b/user/font-xfree86-type1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-xfree86-type1 -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Type 1 X11 fonts from the XFree86 project" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="fontconfig mkfontdir mkfontscale" makedepends="util-macros" subpackages="" -source="https://www.x.org/releases/individual/font/font-xfree86-type1-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/font/font-xfree86-type1-$pkgver.tar.xz" prepare() { default_prepare @@ -38,4 +38,4 @@ package() { find "$pkgdir" -name fonts.scale -exec rm {} + } -sha512sums="2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c font-xfree86-type1-1.0.4.tar.bz2" +sha512sums="0a92d911269c5c4d815dfb617bfcc57c3bd54e4cd308eba87f9ec49851369d99dea61950dbd6cdc0f85db92c0c24055da88063b083b4b0cafb3315051bb650ed font-xfree86-type1-1.0.5.tar.xz" diff --git a/user/fontconfig/APKBUILD b/user/fontconfig/APKBUILD index aeae4256d..415f0c925 100644 --- a/user/fontconfig/APKBUILD +++ b/user/fontconfig/APKBUILD @@ -1,40 +1,41 @@ # Contributor: Mika Havela <mika.havela@gmail.com> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fontconfig -pkgver=2.13.1 +pkgver=2.15.0 pkgrel=0 pkgdesc="Library for configuring and customizing font access" url="https://www.freedesktop.org/wiki/Software/fontconfig/" arch="all" -options="!check" # Fails test with fixed fonts license="MIT" depends="" -makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev" +makedepends="expat-dev freetype-dev gperf meson python3-dev util-linux-dev" triggers="$pkgname.trigger=/usr/share/fonts/*" subpackages="$pkgname-dev $pkgname-lang" -source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.gz" +source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.xz + disable-crbug.patch + " build() { - # regenerate hash functions - rm -f src/fcobjshash.h - - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static \ - --disable-docs - make + --wrap-mode=nofallback \ + -Dnls=enabled \ + -Dtests=enabled \ + -Dtools=enabled \ + build + + meson compile -C build } check() { - make check + meson test -C build } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="830df32e944ee21ad02a9df04787b9902af36ffc13913524acef6e38799a38c5df7a6e407cc0ff9c24455520549d53b3d85d22642a229ac654dc9269926f130b fontconfig-2.13.1.tar.gz" +sha512sums="754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417 fontconfig-2.15.0.tar.xz +4295ce39520f0b24348ee0ad742de627a7f46084744022d8920da6a67a15e529fd89d31e7cfa33c2b7e613186bf9c20ad03a090f18dab63a66fbf9f50bbe6bfb disable-crbug.patch" diff --git a/user/fontconfig/disable-crbug.patch b/user/fontconfig/disable-crbug.patch new file mode 100644 index 000000000..2c2720ac6 --- /dev/null +++ b/user/fontconfig/disable-crbug.patch @@ -0,0 +1,13 @@ +i.e. the comment. + +--- fontconfig-2.15.0/test/meson.build.old 2020-12-16 23:27:27.000000000 -0600 ++++ fontconfig-2.15.0/test/meson.build 2025-05-09 20:36:03.552602973 -0500 +@@ -14,8 +14,6 @@ + # FIXME: ['test-migration.c'], + ['test-bz106632.c', {'c_args': ['-DFONTFILE="@0@"'.format(join_paths(meson.current_source_dir(), '4x6.pcf'))]}], + ['test-issue107.c'], # FIXME: fails on mingw +- # FIXME: this needs NotoSans-hinted.zip font downloaded and unpacked into test build directory! see run-test.sh +- ['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread + ] + + if get_option('default_library') == 'static' diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD index 475301816..bdb4e1cfa 100644 --- a/user/fonttosfnt/APKBUILD +++ b/user/fonttosfnt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fonttosfnt -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="Wrap X11 bitmap fonts in TrueType containers" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ceac6ccb064043d46f9f16f31fb89c6cbf7f026d049f7b5325d6af97e809b4cd068e6149413bb328c0af601a98b5070e21d469888a6853f6cabecd5b46f60240 fonttosfnt-1.2.2.tar.bz2" +sha512sums="9464ef05f3ff7dddfd7a4f0d46a6cc5bb79cf8e019824c2d40164cd18025cd9ed33b31d7b808b4c289af58f09be0be7591f6dfab5624aab1931e4c6a7da68463 fonttosfnt-1.2.3.tar.xz" diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD index e6f8fd11d..084885517 100644 --- a/user/freeglut/APKBUILD +++ b/user/freeglut/APKBUILD @@ -1,17 +1,20 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=freeglut -pkgver=3.2.1 -pkgrel=0 -pkgdesc="free reimplementation of OpenGL Utility Toolkit (GLUT) library" -url="http://freeglut.sourceforge.net/" +pkgver=3.2.2 +pkgrel=1 +pkgdesc="Free reimplementation of OpenGL Utility Toolkit (GLUT) library" +url="https://freeglut.sourceforge.net/" arch="all" options="!check" # No test suite. license="X11" -depends_dev="mesa-dev libx11-dev libice-dev libxxf86vm-dev libxi-dev glu-dev" +depends_dev="glu-dev libglvnd-dev libice-dev libx11-dev libxi-dev + libxxf86vm-dev" makedepends="$depends_dev cmake" subpackages="$pkgname-dev" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + glvnd.patch + " build() { cmake . \ @@ -19,6 +22,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DFREEGLUT_BUILD_STATIC_LIBS=0 \ + -DOpenGL_GL_PREFERENCE=GLVND \ . make } @@ -27,4 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 freeglut-3.2.1.tar.gz" +sha512sums="190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9 freeglut-3.2.2.tar.gz +ae99d5d749b0ed8a7c822651060cdf0d0d1d33610a16ddd6bd16dcf84c67ad475be6dd1278edf1ab4fdfbcb784217f0d05eab4503f1de63a3d6979edff12e8b9 glvnd.patch" diff --git a/user/freeglut/glvnd.patch b/user/freeglut/glvnd.patch new file mode 100644 index 000000000..123e943b7 --- /dev/null +++ b/user/freeglut/glvnd.patch @@ -0,0 +1,13 @@ +This allows us to link to the new GLVND libraries. Otherwise, there will be linker errors. + +--- freeglut-3.2.2/CMakeLists.txt.old 2022-02-06 10:50:52.000000000 +0000 ++++ freeglut-3.2.2/CMakeLists.txt 2024-11-26 12:50:25.436599428 +0000 +@@ -264,7 +264,7 @@ + LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) + ELSE() + FIND_PACKAGE(OpenGL REQUIRED) +- LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) ++ LIST(APPEND LIBS ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY}) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) + ENDIF() + diff --git a/user/fts/APKBUILD b/user/fts/APKBUILD deleted file mode 100644 index 866f43eea..000000000 --- a/user/fts/APKBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor: Ariadne Conill <ariadne@dereferenced.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=fts -pkgver=1.2.7 -pkgrel=1 -pkgdesc="Provides the fts(3) functions, which are missing in musl libc" -url="https://github.com/pullmoll/musl-fts/" -arch="all" -license="BSD-3-Clause" -depends="" -makedepends="automake autoconf libtool" -subpackages="$pkgname-dev" -source="$pkgname-$pkgver.zip::https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip" -builddir="$srcdir/musl-$pkgname-$pkgver" - -prepare() { - default_prepare - ./bootstrap.sh -} - -build() { - CFLAGS=-fPIC ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install - - mkdir -p "$pkgdir"/usr/lib/pkgconfig - cp "$builddir"/musl-fts.pc "$pkgdir"/usr/lib/pkgconfig/libfts.pc -} - -sha512sums="69aceaa7a8dc7ab5845d3288e315357f92ac32fac55c3d670186f2c5756f665a11471fc81f67126755a707058a8d293ba926d906f542c1360a49ca3c9b357976 fts-1.2.7.zip" diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index a6c7990bb..a3e99e3b6 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=garcon -pkgver=4.18.2 +pkgver=4.20.0 pkgrel=0 pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f74547a29dbf47469e9448ea0fb89a297d02c7a5d2f7ec1a1f05706f89160730e04743ce84de29de21f32a2d2e4e4410f6c12fd14777c65944529f5104973cee garcon-4.18.2.tar.bz2" +sha512sums="5ed8b031cceb5943af56d006b05dc9f8ac28695a35d17a8f27f8bde1a0a75067fc4d307c87250a436d1b317f92d501f01ce4078b5c961e4e9daccd175f2f261a garcon-4.20.0.tar.bz2" diff --git a/user/gdbm/APKBUILD b/user/gdbm/APKBUILD index 351236639..b52d44fce 100644 --- a/user/gdbm/APKBUILD +++ b/user/gdbm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=gdbm -pkgver=1.18.1 +pkgver=1.23 pkgrel=0 pkgdesc="Set of database routines that use extensible hashing" url="https://www.gnu.org/software/gdbm/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef gdbm-1.18.1.tar.gz" +sha512sums="918080cb0225b221c11eb7339634a95e00c526072395f7a3d46ccf42ef020dea7c4c5bec34aff2c4f16033e1fff6583252b7e978f68b8d7f8736b0e025838e10 gdbm-1.23.tar.gz" diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD index 7377083bb..e6268e4c9 100644 --- a/user/gdk-pixbuf/APKBUILD +++ b/user/gdk-pixbuf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdk-pixbuf -pkgver=2.40.0 +pkgver=2.42.12 pkgrel=0 pkgdesc="GTK+ image loading library" url="https://www.gtk.org/" @@ -9,7 +9,7 @@ options="!check" # bug753605-atsize.jpg is missing from tarball. license="LGPL-2.0+" depends="shared-mime-info" makedepends="glib-dev gobject-introspection-dev libjpeg-turbo-dev libpng-dev - meson ninja python3 tiff-dev xmlto" + meson python3 py3-docutils tiff-dev xmlto" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -22,19 +22,19 @@ source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$p # - CVE-2017-6314 build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dinstalled_tests=false \ build - ninja -C build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa gdk-pixbuf-2.40.0.tar.xz" +sha512sums="ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8 gdk-pixbuf-2.42.12.tar.xz" diff --git a/user/gitlab-runner/APKBUILD b/user/gitlab-runner/APKBUILD index a2ef8fd9c..c5b01bd3b 100644 --- a/user/gitlab-runner/APKBUILD +++ b/user/gitlab-runner/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Zach van Rijn <me@zv.io> pkgname=gitlab-runner -pkgver=12.1.0 -pkgrel=1 +pkgver=15.0.0 +pkgrel=0 _testver=91956efe _branch="${pkgver%.*}" _branch="${pkgver%%.*}-${_branch#*.}-stable" @@ -22,19 +22,14 @@ source="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$pkgver/gitlab-ru https://dev.sick.bike/dist/gitlab-test-$_testver.tar.gz $pkgname.confd $pkgname.initd - clean-tmpdirs.patch disable-crap.patch gccgo.patch - posix-shell.patch - posix-shell-escape.patch tests.patch - fix-multiple-redef-seek.patch " builddir="$srcdir/$pkgname-v$pkgver" unpack() { default_unpack - mkdir "$builddir"/tmp mv gitlab-test "$builddir"/tmp } @@ -43,7 +38,11 @@ _make() { } build() { - _make build_simple + export GO111MODULE=on + export GOCACHE="$builddir"/tmp/go-build + export GOMODCACHE="$builddir"/go-mod + export GOFLAGS="-buildvcs=false -p=$JOBS -v -mod=readonly -modcacherw" + go build -o gitlab-runner . } check() { @@ -65,7 +64,7 @@ check() { } package() { - install -Dm755 out/binaries/gitlab-runner \ + install -Dm755 gitlab-runner \ "$pkgdir"/usr/bin/gitlab-runner install -dm750 -g gitlab-runner \ "$pkgdir"/etc/gitlab-runner @@ -78,14 +77,10 @@ package() { "$pkgdir"/etc/init.d/$pkgname } -sha512sums="1b3f06b7000252631bec04a58474dda826b0fb8d28c4144051a231fba5ef0c5c4b6e0f9ca6bdf9bf9b16b9117cbcf6385eb7bac85bda7b9f99de4300cbcc2066 gitlab-runner-v12.1.0.tar.gz +sha512sums="8ba54e690fc45c1e22d174b649fbe3cf78707fd5a146c738c73cba045e6ac00499ddedd7a5f905c0c7e4e804a533d3fc718f8f7ac3c9ec5581de4dd9b3599c80 gitlab-runner-v15.0.0.tar.gz 7bccab81aa1cb88c6a0f83a6d3dfc509e6f9ecb4d0168a5b30cc4e8fdd823294b95fe3633e09757905466f83bb3bf73b1d28fac475dff2dc3164604db4b5b995 gitlab-test-91956efe.tar.gz f8a0c7e77cd563d7e5b4fb2319181ceab8de44c555cefa4803e985ad3ac6a9fea7bca469d80b28974edcfb65f2095d019bfdf0abd8a3221464276a8d89debc0d gitlab-runner.confd 7f785a65b46919f6a6695e25fdc414ee3204eb9aa1a3735e7884575434af94b20a48f2fe7a1fb787473de23a7bd2d56bc1e9c1fc6b522c6f0c05c47b3d37ab1c gitlab-runner.initd -f17a6b5053933d83d90272be7e98d4abf8d63e8a9c5ad30bbb61a29dbfa1e1b55421ba14be9f7db17cae30b2ff04efcb5da68543a2fa3d0e3e1882bc128cac06 clean-tmpdirs.patch -a32b7a6fa28c7f5bcb505308e615f17de179c15ce8c2ef73078143204195e36d99b18489114ce694c3d821378c1e9ccb26a999a50372b97df163e2512080f07e disable-crap.patch -4bc8f827cbcec212fcb1c5598aaf725138efa9a1de699d6261a65207cca7ef46f441edc02987efdd6d7c6e62943fda8f3f2a5a596d8d33b49fb78ba5df612e8b gccgo.patch -444adec507c5eebcfae268f2f475d29316119f30750f06877a91dff56942d0e4d34ed3011b774b0d7acd59acfe2ddbe75082b3cd5aebd72ddb4703fd083ad301 posix-shell.patch -05d12046448c79a12bf92974089ff97781304083f7bf35abb0b0c0f990c536bd6ff51652e16035a38e4ba5620dcad6e051ecdf4a80eb62039a15371073e525b5 posix-shell-escape.patch -dae9c3f86fdf21bd41202fc2c0bc7dd764078ea9215d7ddbac1f7bc47b0943f7a912250a3006122f74ed50052378ed2c946eefe5c1ce8400cd682b183221025a tests.patch -693d3abd94a85be70337bdfcbc3c643d65b95991689e085c573a793e4568f71966e398be960fd6bd985481613a1b85c459af814f83396d23e773afeee956b9f3 fix-multiple-redef-seek.patch" +020a388f63758ecbcdd19ce3a290d2fd044e852174b6b7e1c79dc39d8d83ac161be5b63df8a9c60da315895e5385e9ac02bd3a46e02d45b96b8f939c90c444cd disable-crap.patch +6bb477d2f40e651cb59f18ea18cfb051dd06cdfa3f976c6e17b72ee35733e9520a6323cec1f6b34d85fa46050b97bd20d4bb0f08a44f2cbfd4eb6914cfd5d604 gccgo.patch +9b64665ec4c7f0edb7151b146666ea22283ac109193ff354510da018f14f1442c99707c753e5185caed2eb034600aa93ef5c95d960443339db89696acef96c3c tests.patch" diff --git a/user/gitlab-runner/clean-tmpdirs.patch b/user/gitlab-runner/clean-tmpdirs.patch deleted file mode 100644 index 89efd7a22..000000000 --- a/user/gitlab-runner/clean-tmpdirs.patch +++ /dev/null @@ -1,21 +0,0 @@ -Backport of: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1978 - ---- gitlab-runner-v12.1.0/executors/custom/executor.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/executors/custom/executor.go 2020-04-27 00:19:46.613372635 +0000 -@@ -7,6 +7,7 @@ import ( - "fmt" - "io" - "io/ioutil" -+ "os" - "path/filepath" - - "github.com/sirupsen/logrus" -@@ -216,6 +217,8 @@ func (e *executor) Cleanup() { - return - } - -+ defer os.RemoveAll(e.tempDir) -+ - // nothing to do, as there's no cleanup_script - if e.config.CleanupExec == "" { - return diff --git a/user/gitlab-runner/disable-crap.patch b/user/gitlab-runner/disable-crap.patch index b375934fc..aab6a98b1 100644 --- a/user/gitlab-runner/disable-crap.patch +++ b/user/gitlab-runner/disable-crap.patch @@ -1,9 +1,10 @@ --- gitlab-runner-v12.1.0/main.go 2019-07-19 12:13:32.000000000 +0000 +++ gitlab-runner-v12.1.0/main.go 2020-03-04 22:28:31.741878923 +0000 -@@ -11,18 +11,11 @@ import ( - "gitlab.com/gitlab-org/gitlab-runner/helpers/cli" +@@ -12,19 +12,11 @@ import ( + cli_helpers "gitlab.com/gitlab-org/gitlab-runner/helpers/cli" "gitlab.com/gitlab-org/gitlab-runner/log" +- _ "gitlab.com/gitlab-org/gitlab-runner/cache/azure" - _ "gitlab.com/gitlab-org/gitlab-runner/cache/gcs" - _ "gitlab.com/gitlab-org/gitlab-runner/cache/s3" _ "gitlab.com/gitlab-org/gitlab-runner/commands" @@ -16,6 +17,6 @@ _ "gitlab.com/gitlab-org/gitlab-runner/executors/shell" _ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh" - _ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox" + _ "gitlab.com/gitlab-org/gitlab-runner/helpers/secrets/resolvers/vault" _ "gitlab.com/gitlab-org/gitlab-runner/shells" ) - diff --git a/user/gitlab-runner/fix-multiple-redef-seek.patch b/user/gitlab-runner/fix-multiple-redef-seek.patch deleted file mode 100644 index 5a9d1ef10..000000000 --- a/user/gitlab-runner/fix-multiple-redef-seek.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go ---- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go 2023-01-04 02:17:18.689781320 +0000 -+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go 2023-01-04 02:19:46.688219811 +0000 -@@ -45,7 +45,13 @@ - - // Underlying system call writes to newoffset via pointer. - // Implemented in assembly to avoid allocation. --func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno) -+func seek(fd int, offset int64, whence int) (int64, syscall.Errno) { -+ var newoffset int64 -+ offsetLow := uint32(offset & 0xffffffff) -+ offsetHigh := uint32((offset >> 32) & 0xffffffff) -+ _, _, err := Syscall6(SYS__LLSEEK, uintptr(fd), uintptr(offsetHigh), uintptr(offsetLow), uintptr(unsafe.Pointer(&newoffset)), uintptr(whence), 0) -+ return newoffset, err -+} - - func Seek(fd int, offset int64, whence int) (newoffset int64, err error) { - newoffset, errno := seek(fd, offset, whence) -diff -ur a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go ---- a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go 2023-01-04 02:17:18.689781320 +0000 -+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go 2023-01-04 02:20:04.283558738 +0000 -@@ -2,7 +2,7 @@ - // Use of this source code is governed by a BSD-style - // license that can be found in the LICENSE file. - --// +build linux,gccgo,arm -+// +build linux,!gccgo,arm - - package unix - -@@ -11,6 +11,7 @@ - "unsafe" - ) - -+// this file should not be built - func seek(fd int, offset int64, whence int) (int64, syscall.Errno) { - var newoffset int64 - offsetLow := uint32(offset & 0xffffffff) diff --git a/user/gitlab-runner/gccgo.patch b/user/gitlab-runner/gccgo.patch index 6c10893c7..c8704280c 100644 --- a/user/gitlab-runner/gccgo.patch +++ b/user/gitlab-runner/gccgo.patch @@ -12,45 +12,45 @@ BUILT := $(shell date -u +%Y-%m-%dT%H:%M:%S%z) -export TESTFLAGS ?= -cover - LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1) + LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" | sort -rV | awk '!/rc/' | head -n 1) export IS_LATEST := -@@ -45,14 +44,11 @@ export PATH := $(GOPATH_BIN):$(PATH) +@@ -36,14 +35,11 @@ export PATH := $(GOPATH_BIN):$(PATH) + BUILD_DIR := $(CURDIR) + TARGET_DIR := $(BUILD_DIR)/out - # Packages in vendor/ are included in ./... - # https://github.com/golang/go/issues/11659 --export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -v '/vendor/')) -+export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -ve '/vendor/' -e '/cache/gcs' -e '/cache/s3' -e '/docker' -e '/kubernetes' -e '/parallels' -e '/virtualbox')) + export MAIN_PACKAGE ?= gitlab.com/gitlab-org/gitlab-runner -GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \ - -X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \ - -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH) \ -- -s -w -+GO_LDFLAGS ?= -s -w - GO_FILES ?= $(shell find . -name '*.go' | grep -v './.gopath/') +- -w ++GO_LDFLAGS ?= -w + GO_FILES ?= $(shell find . -name '*.go') -export CGO_ENABLED ?= 0 +export CGO_ENABLED ?= 1 # Development Tools -@@ -114,7 +110,7 @@ build: $(GOX) - build_simple: $(GOPATH_SETUP) - # Building $(NAME) in version $(VERSION) for current platform -- go build \ -- -ldflags "$(GO_LDFLAGS)" \ -+ go build -v \ -+ -gccgoflags "$(GO_LDFLAGS)" \ - -o "out/binaries/$(NAME)" \ - $(PKG) - -@@ -123,7 +119,7 @@ build_current: helper-docker build_simpl - check_race_conditions: - @./scripts/check_race_conditions $(OUR_PACKAGES) +@@ -137,7 +133,7 @@ build_current: helper-docker build_simpl + simple-test: TEST_PKG ?= $(shell go list ./...) + simple-test: + # use env -i to clear parent environment variables for go test +- ./scripts/go_test_no_env $(TEST_PKG) $(TESTFLAGS) -ldflags "$(GO_LDFLAGS)" ++ ./scripts/go_test_no_env $(TEST_PKG) $(TESTFLAGS) -gccgoflags "$(GO_LDFLAGS)" --test: $(PKG_BUILD_DIR) helper-docker -+test: $(PKG_BUILD_DIR) - go test $(OUR_PACKAGES) $(TESTFLAGS) - - parallel_test_prepare: $(GOPATH_SETUP) + git1.8-test: export TEST_PKG = gitlab.com/gitlab-org/gitlab-runner/executors/shell gitlab.com/gitlab-org/gitlab-runner/shells + git1.8-test: +--- gitlab-runner-v13.0.0/Makefile.build.mk.old 2020-05-20 03:10:39.000000000 -0500 ++++ gitlab-runner-v13.0.0/Makefile.build.mk 2024-05-30 22:18:11.590776424 -0500 +@@ -1,6 +1,5 @@ + runner-bin: $(GOX) + # Building $(NAME) in version $(VERSION) for $(BUILD_PLATFORMS) +- $(GOX) $(BUILD_PLATFORMS) \ +- -ldflags "$(GO_LDFLAGS)" \ +- -output="out/binaries/$(NAME)-{{.OS}}-{{.Arch}}" \ ++ go build -v \ ++ -gccgoflags "$(GO_LDFLAGS)" \ + $(PKG) --- gitlab-runner-v12.1.0/common/version.go 2019-07-19 12:13:32.000000000 +0000 +++ gitlab-runner-v12.1.0/common/version.go 2020-04-27 00:57:04.923408027 +0000 @@ -9,9 +9,9 @@ import ( @@ -60,9 +60,9 @@ -var VERSION = "development version" -var REVISION = "HEAD" -var BRANCH = "HEAD" -+var VERSION = "12.1.0" -+var REVISION = "v12.1.0" -+var BRANCH = "12-1-stable" ++var VERSION = "15.0.0" ++var REVISION = "v15.0.0" ++var BRANCH = "15-0-stable" var BUILT = "unknown" var AppVersion AppVersionInfo diff --git a/user/gitlab-runner/posix-shell-escape.patch b/user/gitlab-runner/posix-shell-escape.patch deleted file mode 100644 index b454141ed..000000000 --- a/user/gitlab-runner/posix-shell-escape.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- gitlab-runner-v12.1.0/helpers/shell_escape.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/helpers/shell_escape.go 2020-04-26 23:12:59.813309281 +0000 -@@ -4,7 +4,6 @@ package helpers - - import ( - "bytes" -- "encoding/hex" - "strings" - ) - -@@ -13,35 +12,10 @@ import ( - */ - - const ( -- ACK = 6 -- TAB = 9 -- LF = 10 -- CR = 13 -- US = 31 -- SPACE = 32 -- AMPERSTAND = 38 - SINGLE_QUOTE = 39 -- PLUS = 43 -- NINE = 57 -- QUESTION = 63 -- LOWERCASE_Z = 90 -- OPEN_BRACKET = 91 - BACKSLASH = 92 -- UNDERSCORE = 95 -- CLOSE_BRACKET = 93 -- BACKTICK = 96 -- TILDA = 126 -- DEL = 127 - ) - --// ShellEscape is taken from https://github.com/solidsnack/shell-escape/blob/master/Text/ShellEscape/Bash.hs --/* --A Bash escaped string. The strings are wrapped in @$\'...\'@ if any --bytes within them must be escaped; otherwise, they are left as is. --Newlines and other control characters are represented as ANSI escape --sequences. High bytes are represented as hex codes. Thus Bash escaped --strings will always fit on one line and never contain non-ASCII bytes. --*/ - func ShellEscape(str string) string { - if str == "" { - return "''" -@@ -50,85 +24,20 @@ func ShellEscape(str string) string { - out := bytes.NewBuffer(make([]byte, 0, len(str)*2)) - i := 0 - l := len(in) -- escape := false -- -- hex := func(char byte) { -- escape = true -- -- data := []byte{BACKSLASH, 'x', 0, 0} -- hex.Encode(data[2:], []byte{char}) -- out.Write(data) -- } -- -- backslash := func(char byte) { -- escape = true -- out.Write([]byte{BACKSLASH, char}) -- } -- -- escaped := func(str string) { -- escape = true -- out.WriteString(str) -- } -- -- quoted := func(char byte) { -- escape = true -- out.WriteByte(char) -- } -- -- literal := func(char byte) { -- out.WriteByte(char) -- } - -+ out.WriteByte(SINGLE_QUOTE) - for i < l { - char := in[i] -- switch { -- case char == TAB: -- escaped(`\t`) -- case char == LF: -- escaped(`\n`) -- case char == CR: -- escaped(`\r`) -- case char <= US: -- hex(char) -- case char <= AMPERSTAND: -- quoted(char) -- case char == SINGLE_QUOTE: -- backslash(char) -- case char <= PLUS: -- quoted(char) -- case char <= NINE: -- literal(char) -- case char <= QUESTION: -- quoted(char) -- case char <= LOWERCASE_Z: -- literal(char) -- case char == OPEN_BRACKET: -- quoted(char) -- case char == BACKSLASH: -- backslash(char) -- case char <= CLOSE_BRACKET: -- quoted(char) -- case char == UNDERSCORE: -- literal(char) -- case char <= BACKTICK: -- quoted(char) -- case char <= TILDA: -- quoted(char) -- case char == DEL: -- hex(char) -- default: -- hex(char) -+ if (char == SINGLE_QUOTE) { -+ out.Write([]byte{SINGLE_QUOTE, BACKSLASH, SINGLE_QUOTE, SINGLE_QUOTE}) -+ } else { -+ out.WriteByte(char) - } - i++ - } -+ out.WriteByte(SINGLE_QUOTE) - -- outStr := out.String() -- -- if escape { -- outStr = "$'" + outStr + "'" -- } -- -- return outStr -+ return out.String() - } - - func ToBackslash(path string) string { diff --git a/user/gitlab-runner/posix-shell.patch b/user/gitlab-runner/posix-shell.patch deleted file mode 100644 index 6169c3ecc..000000000 --- a/user/gitlab-runner/posix-shell.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- gitlab-runner-v12.1.0/shells/bash.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/shells/bash.go 2020-04-26 23:07:57.303304498 +0000 -@@ -102,12 +102,12 @@ func (b *BashWriter) Variable(variable c - } - - func (b *BashWriter) IfDirectory(path string) { -- b.Line(fmt.Sprintf("if [[ -d %q ]]; then", path)) -+ b.Line(fmt.Sprintf("if [ -d %q ]; then", path)) - b.Indent() - } - - func (b *BashWriter) IfFile(path string) { -- b.Line(fmt.Sprintf("if [[ -e %q ]]; then", path)) -+ b.Line(fmt.Sprintf("if [ -e %q ]; then", path)) - b.Indent() - } - -@@ -200,9 +200,10 @@ func (b *BashWriter) Finish(trace bool) - io.WriteString(w, "set -o xtrace\n") - } - -- io.WriteString(w, "set -eo pipefail\n") -+ io.WriteString(w, "set -e\n") - io.WriteString(w, "set +o noclobber\n") -- io.WriteString(w, ": | eval "+helpers.ShellEscape(b.String())+"\n") -+ io.WriteString(w, "(\nexec </dev/null\n") -+ io.WriteString(w, b.String() + "\n)\n") - io.WriteString(w, "exit 0\n") - w.Flush() - return buffer.String() diff --git a/user/gitlab-runner/tests.patch b/user/gitlab-runner/tests.patch index 1aff6c653..0762b6b13 100644 --- a/user/gitlab-runner/tests.patch +++ b/user/gitlab-runner/tests.patch @@ -1,58 +1,23 @@ --- gitlab-runner-v12.1.0/shells/bash_test.go 2019-07-19 12:13:32.000000000 +0000 +++ gitlab-runner-v12.1.0/shells/bash_test.go 2020-04-27 00:07:06.763360621 +0000 -@@ -10,12 +10,12 @@ func TestBash_CommandShellEscapes(t *tes - writer := &BashWriter{} +@@ -16,12 +16,12 @@ func TestBash_CommandShellEscapes(t *tes + writer := &BashWriter{useNewEscape: false} writer.Command("foo", "x&(y)") - assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String()) + assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String()) } - func TestBash_IfCmdShellEscapes(t *testing.T) { - writer := &BashWriter{} + func TestBash_IfCmdShellEscapesLegacy(t *testing.T) { + writer := &BashWriter{useNewEscape: false} writer.IfCmd("foo", "x&(y)") -- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) +- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>&1; then`+"\n", writer.String()) + assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) } ---- gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2020-04-27 00:01:12.813355024 +0000 -@@ -166,7 +166,7 @@ func TestBuildAbort(t *testing.T) { - defer abortTimer.Stop() - - err = runBuild(t, build) -- assert.EqualError(t, err, "aborted: interrupt") -+ assert.EqualError(t, err, "aborted: Interrupt") - }) - } - ---- gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2020-04-27 00:00:42.493354545 +0000 -@@ -234,7 +234,7 @@ func TestBuildAbort(t *testing.T) { - defer abortTimer.Stop() - - err = runBuild(t, build) -- assert.EqualError(t, err, "aborted: interrupt") -+ assert.EqualError(t, err, "aborted: Interrupt") - }) - } - ---- gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2020-04-27 00:02:36.213356343 +0000 -@@ -24,8 +24,8 @@ func TestShellEscape(t *testing.T) { - in string - out string - }{ -- {"standard string", "$'standard string'"}, -- {"+\t\n\r&", "$'+\\t\\n\\r&'"}, -+ {"standard string", "'standard string'"}, -+ {"+\t\n\r&", "'+\t\n\r&'"}, - {"", "''"}, - } - --- gitlab-runner-v12.1.0/common/build_test.go 2019-07-19 12:13:32.000000000 +0000 +++ gitlab-runner-v12.1.0/common/build_test.go 2020-04-27 00:23:35.173376249 +0000 -@@ -1133,7 +1133,7 @@ func TestWaitForTerminal(t *testing.T) { +@@ -1255,7 +1255,7 @@ func TestWaitForTerminal(t *testing.T) { }, jobTimeout: 3600, waitForTerminalTimeout: time.Hour, diff --git a/user/glew/APKBUILD b/user/glew/APKBUILD index 9ff8e9090..ae313c711 100644 --- a/user/glew/APKBUILD +++ b/user/glew/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glew pkgver=2.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform C/C++ extension loading library" url="http://glew.sourceforge.net" arch="all" options="!check" # No test suite. license="BSD-3-Clause AND MIT" depends="" -depends_dev="libxi-dev libxmu-dev mesa-dev" -makedepends="$depends_dev glu-dev" +depends_dev="libglvnd-dev libxi-dev libxmu-dev" +makedepends="$depends_dev glu-dev mesa-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz" diff --git a/user/glfw/APKBUILD b/user/glfw/APKBUILD index 7acd66438..3da47f557 100644 --- a/user/glfw/APKBUILD +++ b/user/glfw/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glfw pkgver=3.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="OpenGL desktop development library" url="https://www.glfw.org/" arch="all" options="!check" # Tests require X11, GL, and manual intervention. license="Zlib" depends="" -depends_dev="mesa-dev" +depends_dev="libglvnd-dev" makedepends="$depends_dev cmake doxygen libx11-dev libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev" subpackages="$pkgname-dev $pkgname-doc" diff --git a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch index 50a9a8c28..ba4c03906 100644 --- a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch +++ b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch @@ -20,7 +20,7 @@ diff --git a/glib/gquark.c b/glib/gquark.c index 9e51a92..17ecd7f 100644 --- a/glib/gquark.c +++ b/glib/gquark.c -@@ -57,6 +57,11 @@ static gint quark_block_offset = 0; +@@ -60,6 +60,11 @@ static gint quark_block_offset = 0; void g_quark_init (void) { diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 45d91ed79..1de391541 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,17 +1,16 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.72.4 +pkgver=2.84.0 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" arch="all" -options="!check" # Now requires D-Bus running. license="LGPL-2.1+" depends="dbus" depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" -checkdepends="tzdata shared-mime-info" -makedepends="$depends_dev dbus-dev meson ninja pcre-dev xmlto zlib-dev" +checkdepends="dbus-x11 tzdata shared-mime-info" +makedepends="$depends_dev dbus-dev meson pcre2-dev py3-docutils xmlto zlib-dev" triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules" subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" @@ -21,7 +20,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve i386-fpu-test.patch musl-no-locale.patch ridiculous-strerror-nonconformance.patch - meson-sucks-and-i-hate-you-so-much-right-now.patch + sigstksz.patch " # secfixes: @@ -29,20 +28,23 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # - CVE-2019-12450 build() { - meson --default-library=both \ + meson setup \ + --default-library=both \ -Dprefix=/usr \ -Dselinux=disabled \ - -Dman=true build - ninja -C build + -Dman-pages=enabled \ + --wrap-mode=nofallback \ + build + meson compile -C build } check() { # workaround if a user builds it on a computer running X11 - DISPLAY= ninja -C build test + DISPLAY= dbus-run-session meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build rm -rf "$pkgdir"/usr/lib/charset.alias } @@ -75,10 +77,10 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="b4e2e0985e2184ee9656c4f1b4e15d8d1264f3d23d31349bc43d92e8432cffa48e1685c40517efb08dc5b57b8285acf65f2747deeb50e50d9cacec7160e7edf8 glib-2.72.4.tar.xz -32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch -48d367d21a740161431c6ea2e062415e403d1a7af40515c71c60f11a8784d8725595386dc5a801c351540d67dee4186fb4af875f0165d21d13fe1a5167e02099 broken-gio-tests.patch -aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch -db9de1fbf953afe76df9047d878c405ceeb6bd674c4382a8437612d788ff1c65c78012831888b2c4916f8125dab6bda50f1bba040744563dc8dcad30aeb1dd4d musl-no-locale.patch -56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch -dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch" +sha512sums="72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7 glib-2.84.0.tar.xz +ee128ea2f1b4d1b3179bbc4af56ebb671e1e6a1d0c4d9b279ecf77bc33dc6ab34d5dcbe35af7f5fd703c4eda3cc06cfabe1ee39ead059401ff7902500f2eefe6 0001-gquark-fix-initialization-with-c-constructors.patch +348fa10b38c8d7ea4181dbfd321c33d62475fc83461235e33ff5fb5170f2af44e587bd2f4805c49004ef6e33ed89252a493cf88687a246c4e34c1c09e14cb047 broken-gio-tests.patch +69e23d20b2682eb6adc013f78160902ad9a9703e06904b98725541b6d20f6bf5ce8958a5b43831485c87f6d8116768f591a5d5ee6c2c6ce6843581d6d05b8599 i386-fpu-test.patch +0b5515a9fd4bfe566d2d236374a8cdbec49191030aa74c56e0fe1b297daf65b172ce5e02477d3bc1e67a2c07bc979fd9de4ce2fb7a00a9754f88b5e76d2dddf2 musl-no-locale.patch +06af1c22004c34ae896bb5eaeb94599b42e46769408ac4c2575d809307922005d65d0053b9aeccb2049b85303cc1ba5d26cac733608aa2d407ad9ae39210beb0 ridiculous-strerror-nonconformance.patch +893a61dac6b4da6330bab9d5b9a9f7b3ae6643f4681895e24cc4a55518bdf16996af6175149299fbf782e633f7a37e308e7c3b52f9eb58d24f7fcf0c015e947b sigstksz.patch" diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch index 75354ad8b..bb5b32418 100644 --- a/user/glib/broken-gio-tests.patch +++ b/user/glib/broken-gio-tests.patch @@ -1,7 +1,7 @@ Requires update-desktop-database --- glib-2.52.1/gio/tests/appinfo.c.old 2016-10-22 00:17:49.000000000 -0500 +++ glib-2.52.1/gio/tests/appinfo.c 2017-08-20 23:23:32.581229536 -0500 -@@ -486,7 +486,7 @@ +@@ -637,7 +637,7 @@ g_test_add_func ("/appinfo/launch-context", test_launch_context); g_test_add_func ("/appinfo/launch-context-signals", test_launch_context_signals); g_test_add_func ("/appinfo/tryexec", test_tryexec); @@ -15,7 +15,7 @@ Requires update-desktop-database Requires working iconv --- glib-2.52.1/gio/tests/converter-stream.c.old 2016-10-22 00:18:11.000000000 -0500 +++ glib-2.52.1/gio/tests/converter-stream.c 2017-08-20 23:21:31.711358101 -0500 -@@ -1203,7 +1203,7 @@ +@@ -1208,7 +1208,7 @@ }; CharsetTest charset_tests[] = { { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 }, @@ -30,7 +30,7 @@ Requires working iconv Requires update-desktop-database --- glib-2.52.1/gio/tests/resources.c.old 2016-10-22 00:18:12.000000000 -0500 +++ glib-2.52.1/gio/tests/resources.c 2017-08-20 23:39:47.127025718 -0500 -@@ -426,6 +426,7 @@ +@@ -819,6 +819,7 @@ g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n"); g_bytes_unref (data); @@ -40,7 +40,7 @@ Requires update-desktop-database found = g_resources_get_info ("/resourceplugin/test1.txt", --- a/gio/tests/resources.c +++ b/gio/tests/resources.c -@@ -763,6 +763,7 @@ +@@ -828,6 +828,7 @@ g_assert_false (found); g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND); g_clear_error (&error); diff --git a/user/glib/i386-fpu-test.patch b/user/glib/i386-fpu-test.patch index 986c33164..f400a10d6 100644 --- a/user/glib/i386-fpu-test.patch +++ b/user/glib/i386-fpu-test.patch @@ -1,6 +1,6 @@ --- glib-2.54.2/glib/tests/timer.c.old 2016-10-22 00:21:30.000000000 -0500 +++ glib-2.54.2/glib/tests/timer.c 2018-03-03 18:39:40.424741042 -0600 -@@ -203,7 +203,10 @@ +@@ -386,7 +386,10 @@ { g_test_init (&argc, &argv, NULL); diff --git a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch deleted file mode 100644 index 1e63ac0f4..000000000 --- a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- glib-2.58.0/glib/libcharset/meson.build.old 2018-08-30 17:12:09.000000000 +0000 -+++ glib-2.58.0/glib/libcharset/meson.build 2018-09-10 03:42:01.930000000 +0000 -@@ -1,4 +1,5 @@ - charset_lib = static_library('charset', 'localcharset.c', - include_directories : configinc, - pic : true, -+ install : true, - c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args) diff --git a/user/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch index 1624b0078..461454fc0 100644 --- a/user/glib/musl-no-locale.patch +++ b/user/glib/musl-no-locale.patch @@ -1,6 +1,6 @@ --- glib-2.52.1/glib/tests/option-context.c.old 2016-10-22 05:21:34.000000000 +0000 +++ glib-2.52.1/glib/tests/option-context.c 2017-08-20 23:14:46.364133517 +0000 -@@ -638,7 +638,7 @@ +@@ -641,7 +641,7 @@ old_locale = g_strdup (setlocale (LC_NUMERIC, locale)); current_locale = setlocale (LC_NUMERIC, NULL); @@ -11,7 +11,7 @@ goto cleanup; --- glib-2.52.1/glib/tests/convert.c.old 2016-10-22 00:21:34.000000000 -0500 +++ glib-2.52.1/glib/tests/convert.c 2017-08-20 22:51:48.363430954 -0500 -@@ -707,7 +707,7 @@ +@@ -995,7 +995,7 @@ g_test_add_func ("/conversion/no-conv", test_no_conv); g_test_add_func ("/conversion/iconv-state", test_iconv_state); @@ -23,7 +23,7 @@ g_test_add_func ("/conversion/filename-utf8", test_filename_utf8); --- glib-2.56.1/glib/tests/gdatetime.c.old 2018-07-02 21:11:49.890000000 -0500 +++ glib-2.56.1/glib/tests/gdatetime.c 2018-07-02 21:19:30.340000000 -0500 -@@ -2329,7 +2329,6 @@ +@@ -3547,7 +3547,6 @@ g_test_add_func ("/GDateTime/printf", test_GDateTime_printf); g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf); g_test_add_func ("/GDateTime/strftime", test_strftime); diff --git a/user/glib/ridiculous-strerror-nonconformance.patch b/user/glib/ridiculous-strerror-nonconformance.patch index 3ffc0aafa..b900672a8 100644 --- a/user/glib/ridiculous-strerror-nonconformance.patch +++ b/user/glib/ridiculous-strerror-nonconformance.patch @@ -1,6 +1,6 @@ --- glib-2.52.1/glib/tests/strfuncs.c.old 2016-10-22 00:21:44.000000000 -0500 +++ glib-2.52.1/glib/tests/strfuncs.c 2017-08-20 22:48:18.233702952 -0500 -@@ -1335,7 +1335,7 @@ +@@ -2067,7 +2067,7 @@ setlocale (LC_ALL, "C"); strs = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/user/glib/sigstksz.patch b/user/glib/sigstksz.patch new file mode 100644 index 000000000..b0de031f1 --- /dev/null +++ b/user/glib/sigstksz.patch @@ -0,0 +1,20 @@ +See-also: https://inbox.vuxu.org/musl/D3S38EL8UO9V.U731IQFLR32X@ayaya.dev/ + +--- glib-2.84.0/glib/tests/unix.c.old 2025-03-06 07:09:13.000000000 -0600 ++++ glib-2.84.0/glib/tests/unix.c 2025-05-04 21:55:45.796547202 -0500 +@@ -588,13 +588,13 @@ + #ifndef SA_ONSTACK + g_test_skip ("alternate stack is not supported"); + #else +- size_t minsigstksz = MINSIGSTKSZ; ++ size_t minsigstksz = 32768; + guint8 *stack_memory = NULL; + guint8 *zero_mem = NULL; + stack_t stack = { 0 }; + stack_t old_stack = { 0 }; + +-#ifdef _SC_MINSIGSTKSZ ++#if 0 + /* Use the kernel-provided minimum stack size, if available. Otherwise default + * to MINSIGSTKSZ. Unfortunately that might not be big enough for huge + * register files for big CPU instruction set extensions. */ diff --git a/user/glm/APKBUILD b/user/glm/APKBUILD index 54c1d2be6..17f12e864 100644 --- a/user/glm/APKBUILD +++ b/user/glm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=glm pkgver=0.9.9.5 -pkgrel=0 +pkgrel=1 pkgdesc="C++ header-only mathematics library for graphics programming" url="https://glm.g-truc.net/" arch="noarch" @@ -14,25 +14,25 @@ builddir="$srcdir/$pkgname" replaces="glm-dev" build() { - mkdir build - cd build + mkdir -p build - cmake .. \ + # See #1170, and upstream#1087 + export CXXFLAGS="$CXXFLAGS -fno-ipa-modref -fno-stack-protector" + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DGLM_TEST_ENABLE=bool:ON - make + -DGLM_TEST_ENABLE=bool:ON \ + -Bbuild + make -C build } check() { - cd build - make test + make -C build test } package() { - cd build - make install DESTDIR="$pkgdir" + make -C build install DESTDIR="$pkgdir" } sha512sums="ea4f03d31596e27bd8c3d8d0a82a3ae0050ec0df5a747f3d92e467eacab579bb8b191499cb63bf8574da7a1085b9fe6dd7cd0ce93b758d8d7978b2389cc58b94 glm-0.9.9.5.zip diff --git a/user/glpk/APKBUILD b/user/glpk/APKBUILD new file mode 100644 index 000000000..d3261d526 --- /dev/null +++ b/user/glpk/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: Zach van Rijn <me@zv.io> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=glpk +pkgver=5.0 +pkgrel=0 +pkgdesc="Multiple-precision floating-point library" +url="https://www.gnu.org/software/glpk/" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="gmp-dev" +subpackages="$pkgname-dev" +source="https://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --with-gmp + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d glpk-5.0.tar.gz" diff --git a/user/glslang/APKBUILD b/user/glslang/APKBUILD new file mode 100644 index 000000000..afe29113f --- /dev/null +++ b/user/glslang/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=glslang +pkgver=14.3.0 +pkgrel=0 +pkgdesc="OpenGL and OpenGL ES reference compiler for shading languages" +url="https://github.com/KhronosGroup/glslang" +arch="all" +license="BSD-3-Clause AND MIT AND BSD-2-Clause AND GPL-3.0+ WITH Bison-2.2-exception" +depends="spirv-tools" +makedepends="cmake python3 spirv-tools-dev" +subpackages="$pkgname-dev" +source="glslang-$pkgver.tar.gz::https://github.com/KhronosGroup/glslang/archive/$pkgver.tar.gz + remap-endian.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DALLOW_EXTERNAL_SPIRV_TOOLS=YES \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="ce6d09cc4d98b01d162ec5a196eec017c4a5f25eaf98c6612695d911f8d136c2f7193ff8f2c07931b2e94182d2c654833adc3b645f0c225e1d07c4e6e7abfd76 glslang-14.3.0.tar.gz +4745982dac709fc106f50e4f51800cefef07f11f609dfdaa234c3d61fab5f7bd2350720a294a686e88eb92916d1ccdfa203993419d697eb780ee741395bde8c2 remap-endian.patch" diff --git a/user/glslang/remap-endian.patch b/user/glslang/remap-endian.patch new file mode 100644 index 000000000..4c1fc78ff --- /dev/null +++ b/user/glslang/remap-endian.patch @@ -0,0 +1,46 @@ +Issue: https://github.com/KhronosGroup/glslang/issues/3799 + +--- glslang-14.3.0/StandAlone/spirv-remap.cpp.old 2024-06-25 17:42:43.000000000 -0500 ++++ glslang-14.3.0/StandAlone/spirv-remap.cpp 2024-11-22 15:27:02.655869572 -0600 +@@ -38,6 +38,7 @@ + #include <cstring> + #include <stdexcept> + #include <filesystem> ++#include <byteswap.h> + + // + // Include remapper +@@ -48,6 +49,8 @@ + + typedef unsigned int SpvWord; + ++ static const SpvWord MagicNumber = 0x07230203; ++ + // Poor man's basename: given a complete path, return file portion. + // E.g: + // Linux: /foo/bar/test -> test +@@ -82,6 +85,7 @@ + void read(std::vector<SpvWord>& spv, const std::string& inFilename, int verbosity) + { + std::ifstream fp; ++ bool isNativeEndian = true; + + if (verbosity > 0) + logHandler(std::string(" reading: ") + inFilename); +@@ -97,11 +101,16 @@ + spv.reserve(size_t(fp.tellg()) / sizeof(SpvWord)); + fp.seekg(0, fp.beg); + ++ char begin = fp.peek(); ++ char native_begin = reinterpret_cast<const char*>(&MagicNumber)[0]; ++ if (begin != native_begin) isNativeEndian = false; ++ + while (!fp.eof()) { + SpvWord inWord; + fp.read((char *)&inWord, sizeof(inWord)); + + if (!fp.eof()) { ++ if (!isNativeEndian) inWord = __bswap_32(inWord); + spv.push_back(inWord); + if (fp.fail()) + errHandler(std::string("error reading file: ") + inFilename); diff --git a/user/glu/APKBUILD b/user/glu/APKBUILD index 6e74574aa..1047e2666 100644 --- a/user/glu/APKBUILD +++ b/user/glu/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glu pkgver=9.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Mesa OpenGL Utility library" url="https://cgit.freedesktop.org/mesa/glu/" arch="all" options="!check" # No test suite. license="SGI-B-1.1 AND SGI-B-2.0" depends="" -depends_dev="mesa-dev" +depends_dev="libglvnd-dev" makedepends="$depends_dev" subpackages="$pkgname-dev" source="ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.gz" diff --git a/user/gnucobol/APKBUILD b/user/gnucobol/APKBUILD index 39889457a..f0807703b 100644 --- a/user/gnucobol/APKBUILD +++ b/user/gnucobol/APKBUILD @@ -13,7 +13,7 @@ depends="db-dev gmp-dev json-c-dev libxml2-dev ncurses-dev" makedepends="autoconf automake help2man libtool texinfo" subpackages="$pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/gnu/gnucobol/gnucobol-$pkgver.tar.xz - https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z + https://distfiles.adelielinux.org/source/archive/$pkgname-$pkgver/newcob.val.Z 0001-move-packed-decimal.patch 0002-errno.patch diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD index 9400b0400..da94aa56d 100644 --- a/user/gprbuild/APKBUILD +++ b/user/gprbuild/APKBUILD @@ -1,8 +1,6 @@ # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=gprbuild -pkgver=2020 -_pkgver=2020-20200814-19ABE -_xmlver=2020-20200814-19BC4 +pkgver=24.0.0 pkgrel=0 pkgdesc="An advanced build system for multi-language systems" url="https://github.com/AdaCore/gprbuild" @@ -11,14 +9,19 @@ options="!check" # No test suite. license="GPL-3.0+" depends="" makedepends="gcc-gnat" -source="$pkgname-$_pkgver-src.tar.gz::https://community.download.adacore.com/v1/4e13d41920eac86fd139b5d7984eb908d697d868?filename=$pkgname-$_pkgver-src.tar.gz - xmlada-$_xmlver-src.tar.gz::https://community.download.adacore.com/v1/9cf1ab59b526d1260e007fa9719126c5498632d2?filename=xmlada-$_xmlver-src.tar.gz +source="https://github.com/AdaCore/gprbuild/archive/v$pkgver/$pkgname-$pkgver.tar.gz + https://github.com/AdaCore/xmlada/archive/v$pkgver/xmlada-$pkgver.tar.gz foxkit.xml " -builddir="$srcdir/$pkgname-$_pkgver-src" + +prepare() { + default_prepare + ln -s gpr-util-put_resource_usage__unix.adb \ + "$builddir"/gpr/src/gpr-util-put_resource_usage.adb +} build() { - xmlada="../xmlada-$_xmlver-src" + xmlada="../xmlada-$pkgver" incflags="-Isrc -Igpr/src -I$xmlada/dom -I$xmlada/input_sources \ -I$xmlada/sax -I$xmlada/schema -I$xmlada/unicode" gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o @@ -40,13 +43,13 @@ package() { cp gprlib gprbind \ "$pkgdir"/usr/libexec/gprbuild mkdir -p "$pkgdir"/usr/share/gpr - cp share/_default.gpr \ + cp share/_default.gpr share/share.gpr \ "$pkgdir"/usr/share/gpr mkdir -p "$pkgdir"/usr/share/gprconfig - cp share/gprconfig/* "$srcdir"/foxkit.xml \ + cp "$srcdir"/foxkit.xml \ "$pkgdir"/usr/share/gprconfig } -sha512sums="cd9cb2a1f7867f17a5b69d8500476f3a97ca4856b171344d3bf887f55a4860d0ae32ec89ad82e9c7cec13fa20e58cd8ab890554115774095111ed38f9760050e gprbuild-2020-20200814-19ABE-src.tar.gz -51365bc1baaa0886caf46d75d3d27d56b37d5a02f04673321a60bda14a2adda0edd43321f8b34583d4aeaf852f4a21a924f841899c458076b3f261d881bb29a1 xmlada-2020-20200814-19BC4-src.tar.gz +sha512sums="09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03 gprbuild-24.0.0.tar.gz +4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d xmlada-24.0.0.tar.gz e369c094963d3dcfb03d7ac0949825531bae6410ef9c4bec774cb0da70d2bd4a784bdec37db5151c0371ce769712ee02fc04f36896ccc8bddcdb585c1ee8dbbc foxkit.xml" diff --git a/user/gptfdisk/APKBUILD b/user/gptfdisk/APKBUILD index 65f372d39..1021cbd57 100644 --- a/user/gptfdisk/APKBUILD +++ b/user/gptfdisk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gptfdisk pkgver=1.0.5 -pkgrel=0 +pkgrel=1 pkgdesc="Utility for manipulating GUID Partition Tables (GPT)" url="https://www.rodsbooks.com/gdisk/index.html" arch="all" diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD index c240a647a..5afe9c229 100644 --- a/user/grfcodec/APKBUILD +++ b/user/grfcodec/APKBUILD @@ -1,27 +1,33 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grfcodec -pkgver=6.0.6 +pkgver=6.1.0 pkgrel=0 pkgdesc="Tool for manipulating OpenTTD GRF files" -url="https://dev.openttdcoop.org/projects/grfcodec" +url=" " arch="all" options="!check" # No test suite. license="GPL-2.0-only" depends="" -makedepends="boost-dev" +makedepends="boost-dev cmake libpng-dev" subpackages="$pkgname-doc" -source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz - va_copy.patch - " +source="https://github.com/OpenTTD/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-source.tar.xz" build() { - make + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - make prefix=/usr DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make -C build install } -sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 grfcodec-6.0.6-source.tar.xz -4e7034132f889ac62b82d08dae8c928c8a7efd5a0c3dc0d3f35d6c394fb78082a37a22678c5a428489bd26608d868054131a14fb10201d5ce478d46eb9c96890 va_copy.patch" +sha512sums="9129e0f38b151e11c90585e0fe966e042ad08ec90f800ee80f749865aed6c72c733639b8d02ecd613409f2a0ae6d1f72fa1d3524f7c450a0f06ff42ee170f16f grfcodec-6.1.0-source.tar.xz" diff --git a/user/grfcodec/va_copy.patch b/user/grfcodec/va_copy.patch deleted file mode 100644 index 04a549d60..000000000 --- a/user/grfcodec/va_copy.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- grfcodec-6.0.6/src/sanity_defines.h.old 2015-05-09 10:59:46.000000000 +0000 -+++ grfcodec-6.0.6/src/sanity_defines.h 2019-01-14 19:17:36.690000000 +0000 -@@ -77,10 +77,10 @@ - ~apWrapper(){va_end(_ap);} - operator va_list&(){return _ap;} - operator const va_list&()const{return _ap;} --#ifdef __va_copy -+#ifdef va_copy - va_list&operator=(va_list&ap){ -- __va_copy(_ap,ap); -- return _ap; -+ va_copy(_ap,ap); -+ return _ap; - } - #else - va_list const&operator=(va_list const&ap){ diff --git a/user/grub/0001-unmerged-usr.patch b/user/grub/0001-unmerged-usr.patch deleted file mode 100644 index 93dd838c3..000000000 --- a/user/grub/0001-unmerged-usr.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e641b4ab32f1724005ec8bf58214df86de7e81d9 Mon Sep 17 00:00:00 2001 -From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> -Date: Mon, 10 Jul 2023 23:55:43 -0500 -Subject: util/grub.d/25_bli.in: Fix shebang on unmerged-usr - -On an unmerged-usr system, grub-mkconfig errors out with the following -error due to /usr/bin/sh not existing: - - /usr/sbin/grub-mkconfig: /etc/grub.d/25_bli: /usr/bin/sh: bad interpreter: No such file or directory - -Use a /bin/sh shebang to fix the error as well as match the other -existing files. - -Fixes: 158a6583e (util/grub.d/25_bli.in: Activate bli module on EFI) - -Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com> -Reviewed-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> -Reviewed-by: Oliver Steffen <osteffen@redhat.com> ---- - util/grub.d/25_bli.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/grub.d/25_bli.in b/util/grub.d/25_bli.in -index 6e45387..26e27a0 100644 ---- a/util/grub.d/25_bli.in -+++ b/util/grub.d/25_bli.in -@@ -1,4 +1,4 @@ --#!/usr/bin/sh -+#! /bin/sh - set -e - - # grub-mkconfig helper script. --- -cgit v1.1 - diff --git a/user/grub/0002-revert-gawk.patch b/user/grub/0002-revert-gawk.patch index 565e22d6a..93ed3448d 100644 --- a/user/grub/0002-revert-gawk.patch +++ b/user/grub/0002-revert-gawk.patch @@ -6,7 +6,7 @@ We don't ship gawk, so we can't use asorti. The old way worked fine enough. --- grub-2.12-rc1/grub-core/genmoddep.awk.old 2023-07-10 15:43:48.000000000 +0000 +++ grub-2.12-rc1/grub-core/genmoddep.awk 2023-10-01 07:52:03.407286373 +0000 -@@ -59,9 +59,7 @@ +@@ -63,9 +63,7 @@ } modlist = "" depcount[mod] = 0 diff --git a/user/grub/0003-spcr-revision.patch b/user/grub/0003-spcr-revision.patch deleted file mode 100644 index 48b5e2f48..000000000 --- a/user/grub/0003-spcr-revision.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b0890d371ca1e49877c45d696deb9102f1b605c3 Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Wed, 26 Jul 2023 16:02:36 -0500 -Subject: term/ns8250-spcr: Continue processing SPCR table even if revision is - < 2 - -According to commit 0231d00082 (ACPI: SPCR: Make SPCR available to x86) -to the Linux kernel, "On x86, many systems have a valid SPCR table but the -table version is not 2 so the table version check must be a warning." - -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/term/ns8250-spcr.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/grub-core/term/ns8250-spcr.c b/grub-core/term/ns8250-spcr.c -index d101bff..d52b52c 100644 ---- a/grub-core/term/ns8250-spcr.c -+++ b/grub-core/term/ns8250-spcr.c -@@ -18,6 +18,7 @@ - - #if !defined(GRUB_MACHINE_IEEE1275) && !defined(GRUB_MACHINE_QEMU) - -+#include <grub/misc.h> - #include <grub/serial.h> - #include <grub/ns8250.h> - #include <grub/types.h> -@@ -34,7 +35,8 @@ grub_ns8250_spcr_init (void) - if (spcr == NULL) - return NULL; - if (spcr->hdr.revision < 2) -- return NULL; -+ grub_dprintf ("serial", "SPCR table revision %d < 2, continuing anyway\n", -+ (int) spcr->hdr.revision); - if (spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550 && - spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550X) - return NULL; --- -cgit v1.1 - diff --git a/user/grub/0004-videoinfo-no-reinit.patch b/user/grub/0004-videoinfo-no-reinit.patch deleted file mode 100644 index c3877bf07..000000000 --- a/user/grub/0004-videoinfo-no-reinit.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1de58326994b0045ccfb28017d05fc1ddecdb92d Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Fri, 11 Aug 2023 16:30:04 -0500 -Subject: commands/videoinfo: Prevent crash when run while video driver already - active - -The videoinfo command will initialize all non-active video adapters. Video -drivers tend to zero out the global framebuffer object on initialization. -This is not a problem when there is no active video adapter. However, when -there is, then outputting to the video adapter will cause a crash because -methods in the framebuffer object are reinitialized. For example, this -command sequence will cause a crash. - - terminal_output --append gfxterm; videoinfo - -When running in a QEMU headless with GRUB built for the x86_64-efi target, -the first command initializes the Bochs video adapter, which, among -other things, sets the set_page() member function. Then when videoinfo is -run, all non-Bochs video adapters will be initialized, each one wiping -the framebuffer and thus setting set_page to NULL. Soon after the videoinfo -command finishes there will be a call to grub_refresh(), which will -ultimately call the framebuffer's set_page which will be NULL and cause -a crash when called. - -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/commands/videoinfo.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c -index 5eb9697..205ba78 100644 ---- a/grub-core/commands/videoinfo.c -+++ b/grub-core/commands/videoinfo.c -@@ -191,6 +191,11 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)), - /* Don't worry about errors. */ - grub_errno = GRUB_ERR_NONE; - } -+ else if (id != GRUB_VIDEO_DRIVER_NONE) -+ { -+ grub_puts_ (N_(" A video driver is active, cannot initialize this driver until it is deactivated\n")); -+ continue; -+ } - else - { - if (adapter->init ()) --- -cgit v1.1 - diff --git a/user/grub/0005-vsnprintf.patch b/user/grub/0005-vsnprintf.patch deleted file mode 100644 index 88c3e0f09..000000000 --- a/user/grub/0005-vsnprintf.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 14c95e57fddb6c826bee7755232de62efc8eb45b Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Fri, 18 Aug 2023 12:15:27 -0500 -Subject: kern/misc: Make grub_vsnprintf() C99/POSIX conformant - -To comply with C99 and POSIX standards, snprintf() should return the -number of bytes that would be written to the string (excluding the -terminating NUL byte) if the buffer size was big enough. Before this -change, the return value was the minimum of the standard return and the -length of the buffer. Rarely is the return value of grub_snprintf() or -grub_vsnprintf() used with current code, and the few places where it is -used do not need to be changed. - -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/kern/misc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 2890aad..b57249a 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -1201,7 +1201,7 @@ grub_vsnprintf (char *str, grub_size_t n, const char *fmt, va_list ap) - - free_printf_args (&args); - -- return ret < n ? ret : n; -+ return ret; - } - - int --- -cgit v1.1 - diff --git a/user/grub/0006-cryptodisk-retval.patch b/user/grub/0006-cryptodisk-retval.patch deleted file mode 100644 index 9db7f8434..000000000 --- a/user/grub/0006-cryptodisk-retval.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 296d3ec835ed6e3b90d740e497bb534f14fe4b79 Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Fri, 18 Aug 2023 12:27:22 -0500 -Subject: disk/cryptodisk: Fix missing change when updating to use - grub_uuidcasecmp() - -This was causing the cryptomount command to return failure even though -the crypto device was successfully added. Of course, this meant that any -script using the return code would behave unexpectedly. - -Fixes: 3cf2e848bc03 (disk/cryptodisk: Allows UUIDs to be compared in a dash-insensitive manner) - -Suggested-by: Olaf Hering <olaf@aepfle.de> -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Patrich Steinhardt <ps@pks.im> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/disk/cryptodisk.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c -index 34b67a7..fb807e2 100644 ---- a/grub-core/disk/cryptodisk.c -+++ b/grub-core/disk/cryptodisk.c -@@ -1236,7 +1236,8 @@ grub_cryptodisk_scan_device (const char *name, - dev = grub_cryptodisk_scan_device_real (name, source, cargs); - if (dev) - { -- ret = (cargs->search_uuid != NULL && grub_strcasecmp (cargs->search_uuid, dev->uuid) == 0); -+ ret = (cargs->search_uuid != NULL -+ && grub_uuidcasecmp (cargs->search_uuid, dev->uuid, sizeof (dev->uuid)) == 0); - goto cleanup; - } - --- -cgit v1.1 - diff --git a/user/grub/0007-efi_gop-shadow.patch b/user/grub/0007-efi_gop-shadow.patch deleted file mode 100644 index 7709641cd..000000000 --- a/user/grub/0007-efi_gop-shadow.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 34a3adff822a6d136430e631d0a93448b27fac4e Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> -Date: Mon, 28 Aug 2023 23:50:09 +0200 -Subject: video/efi_gop: Require shadow if PixelBltOnly - -If the EFI graphics pixel format is PixelBltOnly, we cannot write directly -to the frame buffer. We need the shadow frame buffer which we copy via -the BitBlt operation to the hardware. - -If the pixel format is PixelBltOnly and allocation of the shadow frame -buffer fails, we must raise an error to signal that the EFI GOP protocol -is not usable. - -Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/video/efi_gop.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c -index 7247aee..9452f5e 100644 ---- a/grub-core/video/efi_gop.c -+++ b/grub-core/video/efi_gop.c -@@ -480,6 +480,10 @@ grub_video_gop_setup (unsigned int width, unsigned int height, - if (!buffer) - { - grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); -+ -+ if (info->pixel_format == GRUB_EFI_GOT_BLT_ONLY) -+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); -+ - grub_errno = 0; - grub_video_gop_fill_mode_info (gop->mode->mode, info, - &framebuffer.mode_info); --- -cgit v1.1 - diff --git a/user/grub/0008-efi-pure64.patch b/user/grub/0008-efi-pure64.patch deleted file mode 100644 index e07323c63..000000000 --- a/user/grub/0008-efi-pure64.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 67ae3981dc5113e5af3a0539174bcd7eab8f7722 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel <ardb@kernel.org> -Date: Thu, 3 Aug 2023 15:24:09 +0200 -Subject: loader/i386/linux: Prefer entry in long mode when booting via EFI - -The x86_64 Linux kernel can be booted in 32-bit mode, in which case the -startup code creates a set of preliminary page tables that map the first -4 GiB of physical memory 1:1 and enables paging. This is a prerequisite -for 64-bit execution and can therefore only be implemented in 32-bit code. - -The x86_64 Linux kernel can also be booted in 64-bit mode directly: this -implies that paging is already enabled and it is the responsibility of -the bootloader to ensure that the active page tables cover the entire -loaded image, including its BSS space, the size of which is described in -the image's setup header. - -Given that the EFI spec mandates execution in long mode for x86_64 and -stipulates that all system memory is mapped 1:1, the Linux/x86 -requirements for 64-bit entry can be met trivially when booting on -x86_64 via EFI. So, enter via the 64-bit entry point in this case. - -This involves inspecting the xloadflags field in the setup header to -check whether the 64-bit entry point is supported. This field was -introduced in Linux version v3.8 (early 2013). - -This change ensures that all EFI firmware tables and other assets passed -by the firmware or bootloader in memory remain mapped and accessible -throughout the early startup code. - -Avoiding the drop out of long mode will also be needed to support -upcoming CPU designs that no longer implement 32-bit mode at all -(as recently announced by Intel [0]). - -[0] https://www.intel.com/content/www/us/en/developer/articles/technical/envisioning-future-simplified-architecture.html - -Cc: Daniel Kiper <daniel.kiper@oracle.com> -Cc: Julian Andres Klode <julian.klode@canonical.com> -Signed-off-by: Ard Biesheuvel <ardb@kernel.org> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/loader/i386/linux.c | 12 ++++++++++++ - include/grub/i386/linux.h | 15 +++++++++++++-- - 2 files changed, 25 insertions(+), 2 deletions(-) - -diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 997647a..977757f 100644 ---- a/grub-core/loader/i386/linux.c -+++ b/grub-core/loader/i386/linux.c -@@ -624,6 +624,18 @@ grub_linux_boot (void) - } - #endif - -+#if defined (__x86_64__) && defined (GRUB_MACHINE_EFI) -+ if (grub_le_to_cpu16 (ctx.params->version) >= 0x020c && -+ (linux_params.xloadflags & LINUX_X86_XLF_KERNEL_64) != 0) -+ { -+ struct grub_relocator64_efi_state state64; -+ -+ state64.rsi = ctx.real_mode_target; -+ state64.rip = ctx.params->code32_start + LINUX_X86_STARTUP64_OFFSET; -+ return grub_relocator64_efi_boot (relocator, state64); -+ } -+#endif -+ - /* FIXME. */ - /* asm volatile ("lidt %0" : : "m" (idt_desc)); */ - state.ebp = state.edi = state.ebx = 0; -diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h -index 0fd6e12..d4b5508 100644 ---- a/include/grub/i386/linux.h -+++ b/include/grub/i386/linux.h -@@ -69,6 +69,16 @@ - #define GRUB_LINUX_OFW_SIGNATURE \ - (' ' << 24 | 'W' << 16 | 'F' << 8 | 'O') - -+#define LINUX_X86_XLF_KERNEL_64 (1<<0) -+#define LINUX_X86_XLF_CAN_BE_LOADED_ABOVE_4G (1<<1) -+#define LINUX_X86_XLF_EFI_HANDOVER_32 (1<<2) -+#define LINUX_X86_XLF_EFI_HANDOVER_64 (1<<3) -+#define LINUX_X86_XLF_EFI_KEXEC (1<<4) -+#define LINUX_X86_XLF_5LEVEL (1<<5) -+#define LINUX_X86_XLF_5LEVEL_ENABLED (1<<6) -+ -+#define LINUX_X86_STARTUP64_OFFSET 0x200 -+ - #ifndef ASM_FILE - - #define GRUB_E820_RAM 1 -@@ -138,7 +148,7 @@ struct linux_i386_kernel_header - grub_uint32_t kernel_alignment; - grub_uint8_t relocatable; - grub_uint8_t min_alignment; -- grub_uint8_t pad[2]; -+ grub_uint16_t xloadflags; - grub_uint32_t cmdline_size; - grub_uint32_t hardware_subarch; - grub_uint64_t hardware_subarch_data; -@@ -315,7 +325,8 @@ struct linux_kernel_params - grub_uint32_t initrd_addr_max; /* Maximum initrd address */ - grub_uint32_t kernel_alignment; /* Alignment of the kernel */ - grub_uint8_t relocatable_kernel; /* Is the kernel relocatable */ -- grub_uint8_t pad1[3]; -+ grub_uint8_t min_alignment; -+ grub_uint16_t xloadflags; - grub_uint32_t cmdline_size; /* Size of the kernel command line */ - grub_uint32_t hardware_subarch; - grub_uint64_t hardware_subarch_data; --- -cgit v1.1 - diff --git a/user/grub/0009-linux-mixed-mode.patch b/user/grub/0009-linux-mixed-mode.patch deleted file mode 100644 index d3b2135f2..000000000 --- a/user/grub/0009-linux-mixed-mode.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 1f5b180742ff2706bc3a696d115ddbc677ec75b9 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel <ardb@kernel.org> -Date: Mon, 7 Aug 2023 14:21:51 +0200 -Subject: loader/efi/linux: Implement x86 mixed mode using legacy boot - -Recent mixed-mode Linux kernels, i.e., v4.0 or newer, can access EFI -runtime services at OS runtime even when the OS was not entered via the -EFI stub. This is because, instead of reverting back to the firmware's -segment selectors, GDTs and IDTs, the 64-bit kernel simply calls 32-bit -runtime services using compatibility mode, i.e., the same mode used for -32-bit user space, without taking down all interrupt handling, exception -handling, etc. - -This means that GRUB's legacy x86 boot mode is sufficient to make use of -this: 32-bit i686 builds of GRUB can already boot 64-bit kernels in EFI -enlightened mode, but without going via the EFI stub, and provide all -the metadata that the OS needs to map the EFI runtime regions and call -EFI runtime services successfully. - -It does mean that GRUB should not attempt to invoke the firmware's -LoadImage()/StartImage() methods on kernel builds that it knows cannot -be started natively. So, add a check for this in the native EFI boot -path and fall back to legacy x86 mode in such cases. - -Note that in the general case, booting non-native images of the same -native word size, e.g., x64 EFI apps on arm64 firmware, might be -supported by means of emulation. So, let's only disallow images that use -a non-native word size. This will also permit booting i686 kernels on -x86_64 builds, although without access to runtime services, as this is -not supported by Linux. - -This change on top of 2.12-rc1 is sufficient to boot ordinary Linux -mixed mode builds and get full access to the EFI runtime services. - -Cc: Daniel Kiper <daniel.kiper@oracle.com> -Cc: Steve McIntyre <steve@einval.com> -Cc: Julian Andres Klode <julian.klode@canonical.com> -Signed-off-by: Ard Biesheuvel <ardb@kernel.org> -Acked-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/loader/efi/linux.c | 3 +++ - include/grub/efi/pe32.h | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index ab8fb35..bfbd95a 100644 ---- a/grub-core/loader/efi/linux.c -+++ b/grub-core/loader/efi/linux.c -@@ -117,6 +117,9 @@ grub_arch_efi_linux_load_image_header (grub_file_t file, - return grub_error (GRUB_ERR_FILE_READ_ERROR, "failed to read COFF image header"); - } - -+ if (lh->pe_image_header.optional_header.magic != GRUB_PE32_NATIVE_MAGIC) -+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "non-native image not supported"); -+ - /* - * Linux kernels built for any architecture are guaranteed to support the - * LoadFile2 based initrd loading protocol if the image version is >= 1. -diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h -index 101859a..4e6e9d2 100644 ---- a/include/grub/efi/pe32.h -+++ b/include/grub/efi/pe32.h -@@ -267,6 +267,12 @@ struct grub_pe32_section_table - - #define GRUB_PE32_SIGNATURE_SIZE 4 - -+#if GRUB_TARGET_SIZEOF_VOID_P == 8 -+#define GRUB_PE32_NATIVE_MAGIC GRUB_PE32_PE64_MAGIC -+#else -+#define GRUB_PE32_NATIVE_MAGIC GRUB_PE32_PE32_MAGIC -+#endif -+ - struct grub_pe_image_header - { - /* This is always PE\0\0. */ --- -cgit v1.1 - diff --git a/user/grub/0010-fix-gcc-no-pie-specs.patch b/user/grub/0010-fix-gcc-no-pie-specs.patch index ecd59d24d..74b76f29e 100644 --- a/user/grub/0010-fix-gcc-no-pie-specs.patch +++ b/user/grub/0010-fix-gcc-no-pie-specs.patch @@ -1,7 +1,7 @@ diff -ur a/configure b/configure --- a/configure 2023-10-03 12:10:39.434444137 -0500 +++ b/configure 2023-10-03 12:10:58.731025605 -0500 -@@ -37616,7 +37616,7 @@ +@@ -37656,7 +37656,7 @@ if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then efiemu_excuse="no suitable link format for efiemu64 found" else diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 82605a4c9..ecc2b60bb 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub -pkgver=2.12_rc1 +pkgver=2.12 _pkgver=$(printf '%s' "$pkgver" | tr _ \~) -pkgrel=2 +pkgrel=0 pkgdesc="Boot loader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all" @@ -34,19 +34,12 @@ done install="$pkgname.post-upgrade" -source="https://alpha.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tar.xz +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tar.xz adelie-branding.patch grub2-accept-empty-module.patch - 0001-unmerged-usr.patch 0002-revert-gawk.patch - 0003-spcr-revision.patch - 0004-videoinfo-no-reinit.patch - 0005-vsnprintf.patch - 0006-cryptodisk-retval.patch - 0007-efi_gop-shadow.patch - 0008-efi-pure64.patch - 0009-linux-mixed-mode.patch 0010-fix-gcc-no-pie-specs.patch + xfs.patch grub-xen-host_grub.cfg default-grub update-grub @@ -81,6 +74,8 @@ _build_flavor() { } build() { + # missing from source tarball, will cause build error + printf "depends bli part_gpt\n" > "$builddir"/grub-core/extra_deps.lst f="" for f in $flavors; do case "$f" in @@ -189,19 +184,12 @@ mount() { mv "$pkgdir"/usr/bin/grub-mount "$subpkgdir"/usr/bin/ } -sha512sums="6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb grub-2.12~rc1.tar.xz +sha512sums="761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3 grub-2.12.tar.xz 4a6c909a1150b057fb0563f7a0646db33e16f84d6a8c443ef7db4003efd56c211a52f87699c5c95a6ccde65f6db46a8711a5b784f38479db804938dfe3115439 adelie-branding.patch -6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch -de798c8907ab5c3f00b42bf10a63a5666af2076932a46ec6e484c67303bef0509e7787910392f75b3e4ccb9aa17d67f2ef5f5fc1eed3dcdf96f598dc2400ade4 0001-unmerged-usr.patch -60e299ef0677dbd4e1e60623353be3dd8fbb1a795cbf24a9e1a2511f6a7322033254daf71116e95e93335d5e76a7a85488d66f357779a9f589f04119df8f0aea 0002-revert-gawk.patch -d7f22e5f02dfbebad5e9122a01a9d6e5fffd0bb4731790c97e5184c148a5e1e8f4d5d3d49b09b26a7768648b147b134c3b316649608d2ac8390ab63b7f278a07 0003-spcr-revision.patch -1daba1b4857c45f4e729d24cd800eb6f6b659ea5c8399394487f75817b4f7092e5972676fc8c28b6289e04f0fe41d4ca54dc4523db1393cdb65751d377a06d8a 0004-videoinfo-no-reinit.patch -0a69b2f9cb178b8ae4a7b96f1cb801ef6d6d7942a842346de5017b6fdb5a8bd6db1ad55fdd9cc41a6c4660be9985621008d1da1dc45510d6ffed425f0f4997d1 0005-vsnprintf.patch -9b444c596c3c7387c18f3d6747ce4000d8e1ac89a07d919f3c648b07a3492911a6b7a84764c7f953a8a7873f26dedf10549a46008bc23e38d1da3eeb6d1850e3 0006-cryptodisk-retval.patch -a16569a037b29a669d5bd68f6130b1c59870f8bb660bf98b318f0dac39bb9a0026d76e2d47298e2b22a91f75aa34c234785149b61e699dfdde27020210023e84 0007-efi_gop-shadow.patch -13a819813b82ed13752dff2bf2ddaf47e1c369f10148a988a2517d51f33c11ee187f3c6909c08a1b922440aebebe1f3178fe8f63f85055129b74893885e0db1f 0008-efi-pure64.patch -911a28fa28f966369039e14062deaf90c81818c06fb3f44add27c395a3074b8c1b858a47c1a97909e07b813a87633bf244e5ee4db23f9d429edd9a05f5b5d72a 0009-linux-mixed-mode.patch -1552f56c17c55aabae26c64beeb9ed507623331794d4b590721fa0f22b658831bbef3475dfb8c125ab05e8ec62939d5928416c32d2c968a4a2a98bee0744c1fd 0010-fix-gcc-no-pie-specs.patch +f1daae3015c84af94aeffce20de1068c3de272aff59f809e956a085cf289c371c61b64ad1d440765c98a4d674761ea67d2986cc4b1d0dfffcf71caaf94c6f600 grub2-accept-empty-module.patch +18502c79128d88154885a6e595bb42d4167f4e08e89e5bd9471234d4e4ba0d6a6ab7dc50a324e9c71ee8a92f3dee8f1a800942adf62ac8bc4041c6a154b19beb 0002-revert-gawk.patch +4b369af412a303464fb538f0f1d7c51dfba4481448409204290e7959397243cb544ecaa8bd9db096788e1eccae0c4c6fac1af9b7819c34f20d01a0eb6c5105ff 0010-fix-gcc-no-pie-specs.patch +60f884595a713e52052eb1741bd2a9f42110736b689c045d9fb23d08970fb8475f25bfdf056552040a7b5559817289774f987c825ef006e556d79f718935376f xfs.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg 1cb675fa0af9a1fd8d1a868e3e9de3bfef7eada66c5df0cfef23eca33e93e676eed6e1f67c679690f3e581565b350a9f3ba01aa9b89de66c970ea61ca21bcd65 default-grub 8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55 update-grub diff --git a/user/grub/grub2-accept-empty-module.patch b/user/grub/grub2-accept-empty-module.patch index f4f62d433..b6def4f94 100644 --- a/user/grub/grub2-accept-empty-module.patch +++ b/user/grub/grub2-accept-empty-module.patch @@ -10,7 +10,7 @@ also no relocations that's no problem (and that is checked independendly). --- grub-2.02~beta3/util/grub-module-verifierXX.c.mm 2016-02-11 10:57:41.000000000 +0000 +++ grub-2.02~beta3/util/grub-module-verifierXX.c 2016-08-31 15:26:36.000000000 +0000 -@@ -225,7 +225,8 @@ check_symbols (const struct grub_module_ +@@ -305,7 +305,8 @@ check_symbols (const struct grub_module_ s = find_section (arch, e, ".moddeps"); if (!s) diff --git a/user/grub/xfs.patch b/user/grub/xfs.patch new file mode 100644 index 000000000..922c40923 --- /dev/null +++ b/user/grub/xfs.patch @@ -0,0 +1,56 @@ +From 68dd65cfdaad08b1f8ec01b84949b0bf88bc0d8c Mon Sep 17 00:00:00 2001 +From: Jon DeVree <nuxi@vault24.org> +Date: Sun, 11 Feb 2024 10:34:58 -0500 +Subject: fs/xfs: Handle non-continuous data blocks in directory extents + +The directory extent list does not have to be a continuous list of data +blocks. When GRUB tries to read a non-existant member of the list, +grub_xfs_read_file() will return a block of zero'ed memory. Checking for +a zero'ed magic number is sufficient to skip this non-existant data block. + +Prior to commit 07318ee7e (fs/xfs: Fix XFS directory extent parsing) +this was handled as a subtle side effect of reading the (non-existant) +tail data structure. Since the block was zero'ed the computation of the +number of directory entries in the block would return 0 as well. + +Fixes: 07318ee7e (fs/xfs: Fix XFS directory extent parsing) +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2254370 + +Signed-off-by: Jon DeVree <nuxi@vault24.org> +Reviewed-By: Vladimir Serbinenko <phcoder@gmail.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + grub-core/fs/xfs.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index bc2224dbb..8e02ab4a3 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -902,6 +902,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + grub_xfs_first_de(dir->data, dirblock); + int entries = -1; + char *end = dirblock + dirblk_size; ++ grub_uint32_t magic; + + numread = grub_xfs_read_file (dir, 0, 0, + blk << dirblk_log2, +@@ -912,6 +913,15 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + return 0; + } + ++ /* ++ * If this data block isn't actually part of the extent list then ++ * grub_xfs_read_file() returns a block of zeros. So, if the magic ++ * number field is all zeros then this block should be skipped. ++ */ ++ magic = *(grub_uint32_t *)(void *) dirblock; ++ if (!magic) ++ continue; ++ + /* + * Leaf and tail information are only in the data block if the number + * of extents is 1. +-- +cgit v1.2.3-70-g09d2 + diff --git a/user/gsl/APKBUILD b/user/gsl/APKBUILD index 35d6417dd..8c694d429 100644 --- a/user/gsl/APKBUILD +++ b/user/gsl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gsl -pkgver=2.7.1 -pkgrel=2 +pkgver=2.8 +pkgrel=0 pkgdesc="Modern numerical library for C and C++" url="https://www.gnu.org/software/gsl/gsl.html" arch="all" @@ -12,6 +12,7 @@ makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="https://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz gsl-2.4-portable.patch + static-inline.patch " prepare() { @@ -19,7 +20,7 @@ prepare() { case "$CTARGET_ARCH" in pmmx) #763 (applies to this entire block) - override="multifit_nlinear multilarge_nlinear"; + override="multifit_nlinear multilarge_nlinear specfunc"; for k in $override; do sed -i $k/Makefile.in \ -e '/^CFLAGS = /s/$/ -O0/g' \ @@ -64,5 +65,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 gsl-2.7.1.tar.gz -f6a22e82c8f4a1d5ea7b647cbd015cdb9d2e4e9d39728e8f2dba3fdefac64d3f7c8fbc5ec597e6ab315ec1bd49e0e3af4aba091b358a68d9d789884331f4be24 gsl-2.4-portable.patch" +sha512sums="4427f6ce59dc14eabd6d31ef1fcac1849b4d7357faf48873aef642464ddf21cc9b500d516f08b410f02a2daa9a6ff30220f3995584b0a6ae2f73c522d1abb66b gsl-2.8.tar.gz +f6a22e82c8f4a1d5ea7b647cbd015cdb9d2e4e9d39728e8f2dba3fdefac64d3f7c8fbc5ec597e6ab315ec1bd49e0e3af4aba091b358a68d9d789884331f4be24 gsl-2.4-portable.patch +7aa882af7136b6948124885eec6b9bdb2703f581d1656488a6aab8c48f601690fa87f2d6d2566c3a8fa200a5c09310ee076aec847779490ff02e03a5bcd0a2a0 static-inline.patch" diff --git a/user/gsl/static-inline.patch b/user/gsl/static-inline.patch new file mode 100644 index 000000000..4f89f30da --- /dev/null +++ b/user/gsl/static-inline.patch @@ -0,0 +1,12 @@ +diff -ur a/gsl_inline.h b/gsl_inline.h +--- a/gsl_inline.h 2024-06-05 08:59:43.655369544 -0500 ++++ b/gsl_inline.h 2024-06-05 09:00:02.707862690 -0500 +@@ -49,7 +49,7 @@ + #ifdef HAVE_INLINE + # if defined(__GNUC_STDC_INLINE__) || defined(GSL_C99_INLINE) || defined(HAVE_C99_INLINE) + # define INLINE_DECL inline /* use C99 inline */ +-# define INLINE_FUN inline ++# define INLINE_FUN static inline + # else + # define INLINE_DECL /* use GNU extern inline */ + # define INLINE_FUN extern inline diff --git a/user/gspell/APKBUILD b/user/gspell/APKBUILD new file mode 100644 index 000000000..69599a5c1 --- /dev/null +++ b/user/gspell/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=gspell +pkgver=1.14.0 +pkgrel=0 +pkgdesc="Spelling checker library for GTK programs" +url="https://gnome.org" +arch="all" +options="!check" # does not support enchant aspell backend; see + # https://bugzilla.gnome.org/show_bug.cgi?id=772406 +license="LGPL-2.1+" +depends="" +checkdepends="aspell aspell-dict-en" +makedepends="enchant-dev glib-dev gobject-introspection-dev gtk-doc gtk+3.0-dev meson vala-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.gnome.org/sources/gspell/${pkgver%.*}/gspell-$pkgver.tar.xz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + LANG="en_US.UTF-8" meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="d2e9931f4c37170b483ece9ee50b0af8aa281cf1bde5ac009d2a0c7dd2dbfc90e591df13dd555465c04cccdc2864b788d372625be9f71d6541e6e6b0fd3c4370 gspell-1.14.0.tar.xz" diff --git a/user/gst-plugins-bad/APKBUILD b/user/gst-plugins-bad/APKBUILD index 2ddff96a5..4a6cef267 100644 --- a/user/gst-plugins-bad/APKBUILD +++ b/user/gst-plugins-bad/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-bad -pkgver=1.20.2 -pkgrel=1 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Lower-quality plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" +options="!check" # nvidious license="LGPL-2.1+" # rtpmanagerbad depends on rtpmanager # symptom: tests 'rtpsrc' and 'rtpsink' will fail @@ -15,14 +16,11 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev meson curl-dev fluidsynth-dev gtk+3.0-dev ladspa-dev libdrm-dev libgudev-dev libsndfile-dev libqrencode-dev librsvg-dev libsoup-dev libusb-dev mesa-dev neon-dev nettle-dev openal-soft-dev opus-dev pango-dev sbc-dev - wayland-dev wayland-protocols gsm-dev" + wayland-dev wayland-protocols gsm-dev vulkan-loader-dev libglvnd-dev" subpackages="$pkgname-dev $pkgname-lang" ldpath="/usr/lib/gstreamer-1.0" source="https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz - camerabin.patch curlhttpsrc.patch - mpegts.patch - fix-arm-test-alignment.patch " build() { @@ -43,8 +41,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70 gst-plugins-bad-1.20.2.tar.xz -7f6023e766895ac8213f9dabd4d8acbeb03f18c2d98fa27865e7656c439e0ea97d02f9e9f0ea98205238ddb8f6473062af524b799d1da0cbe41a3055a11df250 camerabin.patch -d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch -d70f409f86b072d689d51b87db6e9fb161c0914a381eccbf66f1ffcd61b9a793f9e4087cdd071e615aaa63687c6ee476f023239920dd1ebd0d3cde346031dc86 mpegts.patch -566fbdc37c9f9fb5b671ecffa2f596a95f6431668ff8dd8b91bc827a280b5fb18a8fac3122a38f060263cb3f2d2138805af1e1c324eb619188f982c8cc575221 fix-arm-test-alignment.patch" +sha512sums="69c78970f0396c08fbddbd44e080142688fcd1ecdc0fa88709b934f6c546754904338469ceecd0f16c6a6b8585bf5faec3230426272b7eb2b63a21b9034d94db gst-plugins-bad-1.26.1.tar.xz +d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch" diff --git a/user/gst-plugins-bad/fix-arm-test-alignment.patch b/user/gst-plugins-bad/fix-arm-test-alignment.patch deleted file mode 100644 index 1a03eafa7..000000000 --- a/user/gst-plugins-bad/fix-arm-test-alignment.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57a1296d5913b222be87ccee1ae981b84931a7da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Tue, 13 Jun 2023 01:29:14 +0100 -Subject: [PATCH 2/2] asfmux: fix potentially unaligned write on 32-bit ARM - -Fixes #2665 ---- - .../gst-plugins-bad/gst/asfmux/gstasfobjects.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c -index d9739826384..fa0f2849d17 100644 ---- a/gst/asfmux/gstasfobjects.c -+++ b/gst/asfmux/gstasfobjects.c -@@ -311,14 +311,10 @@ gst_asf_put_time (guint8 * buf, guint64 time) - void - gst_asf_put_guid (guint8 * buf, Guid guid) - { -- guint32 *aux32 = (guint32 *) buf; -- guint16 *aux16 = (guint16 *) & (buf[4]); -- guint64 *aux64 = (guint64 *) & (buf[8]); -- *aux32 = GUINT32_TO_LE (guid.v1); -- *aux16 = GUINT16_TO_LE (guid.v2); -- aux16 = (guint16 *) & (buf[6]); -- *aux16 = GUINT16_TO_LE (guid.v3); -- *aux64 = GUINT64_TO_BE (guid.v4); -+ GST_WRITE_UINT32_LE (buf + 0, guid.v1); -+ GST_WRITE_UINT16_LE (buf + 4, guid.v2); -+ GST_WRITE_UINT16_LE (buf + 6, guid.v3); -+ GST_WRITE_UINT64_BE (buf + 8, guid.v4); - } - - /** --- -GitLab diff --git a/user/gst-plugins-bad/mpegts.patch b/user/gst-plugins-bad/mpegts.patch deleted file mode 100644 index 1579c4e32..000000000 --- a/user/gst-plugins-bad/mpegts.patch +++ /dev/null @@ -1,120 +0,0 @@ -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1314 - ---- gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c 2022-07-02 23:19:51.027302943 -0500 -@@ -296,7 +296,7 @@ - dvb_text_from_utf8 (const gchar * text, gsize * out_size) - { - GError *error = NULL; -- gchar *out_text; -+ gchar *out_text = NULL; - guint8 *out_buffer; - guint encoding; - GIConv giconv = (GIConv) - 1; -@@ -304,7 +304,8 @@ - /* We test character maps one-by-one. Start with the default */ - encoding = _ICONV_ISO6937; - giconv = _get_iconv (_ICONV_UTF8, encoding); -- out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); -+ if (giconv != (GIConv) - 1) -+ out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); - - if (out_text) { - GST_DEBUG ("Using default ISO6937 encoding"); ---- gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c 2022-07-02 23:41:27.379013955 -0500 -@@ -71,6 +71,14 @@ - 0xc0, 0x00, 0xc4, 0x86, 0x56, 0xa5 - }; - -+static gboolean -+_has_iso6937_iconv (void) -+{ -+ GIConv test = (GIConv) - 1; -+ test = g_iconv_open("iso6937", "utf-8"); -+ return (test != (GIConv) - 1); -+} -+ - GST_START_TEST (test_scte_sit) - { - GstMpegtsSCTESIT *sit; -@@ -397,11 +405,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != nit_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -- nit_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != nit_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -+ nit_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - nit_section->data[nit_section->section_length - 1]++; -@@ -486,11 +495,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != sdt_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -- sdt_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != sdt_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -+ sdt_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - sdt_section->data[sdt_section->section_length - 1]++; -@@ -594,14 +604,15 @@ - /* Check creation of descriptor */ - desc = gst_mpegts_descriptor_from_dvb_network_name ("Name"); - fail_if (desc == NULL); -- fail_unless (desc->length == 4); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 4); - fail_unless (desc->tag == 0x40); - -- for (i = 0; i < 6; i++) { -- if (desc->data[i] != network_name_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of network name descriptor", -- desc->data[i], network_name_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 6; i++) { -+ if (desc->data[i] != network_name_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of network name descriptor", -+ desc->data[i], network_name_descriptor[i], i); -+ } - - /* Check parsing of descriptor */ - ret = gst_mpegts_descriptor_parse_dvb_network_name (desc, &string); -@@ -623,14 +634,15 @@ - desc = gst_mpegts_descriptor_from_dvb_service - (GST_DVB_SERVICE_DIGITAL_TELEVISION, "Name", "Provider"); - fail_if (desc == NULL); -- fail_unless (desc->length == 15); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 15); - fail_unless (desc->tag == 0x48); - -- for (i = 0; i < 17; i++) { -- if (desc->data[i] != service_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of service descriptor", -- desc->data[i], service_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 17; i++) { -+ if (desc->data[i] != service_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of service descriptor", -+ desc->data[i], service_descriptor[i], i); -+ } - - /* Check parsing of descriptor with data */ - ret = gst_mpegts_descriptor_parse_dvb_service diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index bce787485..9aa2afd80 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,39 +1,43 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base -pkgver=1.20.1 +pkgver=1.26.1 pkgrel=0 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" -options="!check" # fails overlaycomposition on ppc64 license="GPL LGPL" depends="" makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev iso-codes-dev gobject-introspection-dev graphene-dev gstreamer-dev libdrm-dev - libjpeg-turbo-dev libogg-dev libpng-dev libtheora-dev libvorbis-dev - libx11-dev libxt-dev libxv-dev mesa-dev meson opus-dev orc-compiler - orc-dev pango-dev !gst-plugins-base" + libglvnd-dev libjpeg-turbo-dev libogg-dev libpng-dev libtheora-dev + libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev meson opus-dev + orc-compiler orc-dev pango-dev wayland-dev wayland-protocols + !gst-plugins-base" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" +source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz + endian.patch + " ldpath="/usr/lib/gstreamer-1.0" build() { - meson \ + meson setup \ + --wrap-mode=nofallback \ -Dprefix=/usr \ -Dintrospection=enabled \ -Dnls=enabled \ -Dpackage-name="GStreamer Base Plugins (${DISTRO_NAME:-Adélie Linux})" \ -Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541 gst-plugins-base-1.20.1.tar.xz" +sha512sums="b0c491755856af37fd8416af57b782ba04cfdf4298947a521ece90b4723fcf331199f428c74fafb37b3094a8172a0d409d20079544f7424fd6c089574313e296 gst-plugins-base-1.26.1.tar.xz +b44763d6b380bb51d246b64019078ee621a2d64a00f29f12039fd52aafd1c24e204350ea5c967c2fecb298075f6e45f62d16c3116d20aca8da557ace84ba0744 endian.patch" diff --git a/user/gst-plugins-base/endian.patch b/user/gst-plugins-base/endian.patch new file mode 100644 index 000000000..ed06e7c7f --- /dev/null +++ b/user/gst-plugins-base/endian.patch @@ -0,0 +1,40 @@ +--- gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c 2025-05-11 14:05:05.042191384 -0500 +@@ -1407,8 +1407,13 @@ + g_return_val_if_fail (gst_value_is_fixed (from_par), othercaps); + + gst_video_convert_scale_get_fraction (from_par, &from_par_n, &from_par_d); +- gst_structure_get (ins, +- "width", G_TYPE_INT, &from_w, "height", G_TYPE_INT, &from_h, NULL); ++ { ++ gint wi = 0, hi = 0; ++ gst_structure_get (ins, ++ "width", G_TYPE_INT, &wi, "height", G_TYPE_INT, &hi, NULL); ++ from_w = wi; ++ from_h = hi; ++ } + + { + gint wi = 0, hi = 0; +--- gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c 2025-05-11 14:06:12.944933423 -0500 +@@ -2125,12 +2125,18 @@ + gst_message_unref (msg); + } + ++#if G_BYTE_ORDER == G_LITTLE_ENDIAN ++#define AUDIO_FMT "S16LE" ++#else ++#define AUDIO_FMT "S16BE" ++#endif ++ + GST_START_TEST (test_qos_message_live) + { + GstBus *bus = gst_bus_new (); + GstHarness *h, *h2; + GstBuffer *b; +- static const char *caps_str = "audio/x-raw, format=(string)S16LE, " ++ static const char *caps_str = "audio/x-raw, format=(string)" AUDIO_FMT ", " + "rate=(int)1000, channels=(int)1, layout=(string)interleaved"; + GstMessage *msg; + GstPad *pad; diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD index bc8624aa0..2570bf9df 100644 --- a/user/gst-plugins-good/APKBUILD +++ b/user/gst-plugins-good/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-good -pkgver=1.20.2 -pkgrel=2 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Free, well-written plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" @@ -18,27 +18,26 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev subpackages="$pkgname-gtk $pkgname-lang" ldpath="/usr/lib/gstreamer-1.0" source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz - drop-messages-interval-type.patch - fix-arm-test-alignment.patch + flvmux-disable-flaky-test.patch " build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dnls=enabled \ -Dorc=disabled \ -Dpackage-name="GStreamer Good Plugins (${DISTRO_NAME:-Adélie Linux})" \ -Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } gtk() { @@ -51,6 +50,5 @@ gtk() { "$subpkgdir"/usr/lib/gstreamer-1.0/ } -sha512sums="a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933 gst-plugins-good-1.20.2.tar.xz -0f08a08d6f0e8303a9c899c5260f6ca2c0e0a41e1ca2a9c795c1cb1267a9003354cd0e5538022049a09784ba9000a4a60b7a0b07b38a18483ec30d9a86356e46 drop-messages-interval-type.patch -b08c5013100dff428125dca9075641a8c528ccdcdf005b66b286cfe3b8b6f80c4b04f41d768883e98112107b857e17af68e2864a331f379bd7ea5027adc641d8 fix-arm-test-alignment.patch" +sha512sums="ce096c912e6dfdec5c6e815b712e949296a18ea358cdb124997f256b1fbf8a68db9fc75c4e05a69a2cecd20de1a6bdb3fcfe4422f6d81b6f887ee484b5d1a556 gst-plugins-good-1.26.1.tar.xz +d31d0f70703efb13fbe919f008e1029a08649d3220f5689c7aa105cbbfe3c8cda4a2ae0b01bad32cb295ea202a965cb719776bd86f463a7b78d5b091b00e0348 flvmux-disable-flaky-test.patch" diff --git a/user/gst-plugins-good/drop-messages-interval-type.patch b/user/gst-plugins-good/drop-messages-interval-type.patch deleted file mode 100644 index ebf0c1e5a..000000000 --- a/user/gst-plugins-good/drop-messages-interval-type.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-URL: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3580 - -From e91ab24c5777986926bea5e9f0c832f606c9fb52 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 16 Dec 2022 01:00:46 -0600 -Subject: [PATCH] tests: Cast drop-messages-interval type properly - -The rtpjitterbuffer test drop_messages_interval uses a GstClockTime for -the message drop interval. This property is defined as a guint. On -systems with 64-bit time_t but 32-bit uint, this can cause the -g_object_set function to fail to read the arguments properly. - -Fixes: #1656 ---- - .../gst-plugins-good/tests/check/elements/rtpjitterbuffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - ---- gst-plugins-good-1.20.2/tests/check/elements/rtpjitterbuffer.c.old 2022-05-02 22:29:29.000000000 +0000 -+++ gst-plugins-good-1.20.2/tests/check/elements/rtpjitterbuffer.c 2022-12-16 07:04:53.663472650 +0000 -@@ -3097,7 +3097,7 @@ - guint num_sent_msg = 0; - - g_object_set (h->element, "post-drop-messages", TRUE, NULL); -- g_object_set (h->element, "drop-messages-interval", interval, NULL); -+ g_object_set (h->element, "drop-messages-interval", (guint)interval, NULL); - next_seqnum = construct_deterministic_initial_state (h, latency_ms); - - /* Create a bus to get the drop message on */ diff --git a/user/gst-plugins-good/fix-arm-test-alignment.patch b/user/gst-plugins-good/fix-arm-test-alignment.patch deleted file mode 100644 index 2b2a6a0c0..000000000 --- a/user/gst-plugins-good/fix-arm-test-alignment.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 57ced2fded938aa08d8727683a1823ae36170fc3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Mon, 12 Jun 2023 19:24:15 +0100 -Subject: [PATCH] tests: rtpbin_buffer_list: fix possible unaligned read on - 32-bit ARM - -Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/689 ---- - .../tests/check/elements/rtpbin_buffer_list.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/subprojects/gst-plugins-good/tests/check/elements/rtpbin_buffer_list.c b/subprojects/gst-plugins-good/tests/check/elements/rtpbin_buffer_list.c -index b804744352a..1c3d5cdd3a7 100644 ---- a/tests/check/elements/rtpbin_buffer_list.c -+++ b/tests/check/elements/rtpbin_buffer_list.c -@@ -25,6 +25,12 @@ - #include <gst/rtp/gstrtpbuffer.h> - #include <gst/rtp/gstrtcpbuffer.h> - -+#if G_BYTE_ORDER == G_BIG_ENDIAN -+#define READ_UINT64(mem) GST_READ_UINT64_BE(mem) -+#else -+#define READ_UINT64(mem) GST_READ_UINT64_LE(mem) -+#endif -+ - /* UDP/IP is assumed for bandwidth calculation */ - #define UDP_IP_HEADER_OVERHEAD 28 - -@@ -236,8 +242,8 @@ check_header (GstBuffer * buffer, guint index) - * most likely be changed in gstrtpbin. - */ - fail_unless (info.data != NULL); -- fail_unless_equals_uint64 (*(guint64 *) info.data, -- *(guint64 *) rtp_header[index]); -+ fail_unless_equals_uint64 (READ_UINT64 (info.data), -+ READ_UINT64 (rtp_header[index])); - fail_unless (*(guint16 *) (info.data + 12) == - *(guint16 *) (rtp_header[index] + 12)); - --- -GitLab - diff --git a/user/gst-plugins-good/flvmux-disable-flaky-test.patch b/user/gst-plugins-good/flvmux-disable-flaky-test.patch new file mode 100644 index 000000000..ef2d3feb3 --- /dev/null +++ b/user/gst-plugins-good/flvmux-disable-flaky-test.patch @@ -0,0 +1,15 @@ +This test is known flaky and causes a timeout every time on ppc64. + +Upstream-URL: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2803 + +--- gst-plugins-good-1.26.1/tests/check/elements/flvmux.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-good-1.26.1/tests/check/elements/flvmux.c 2025-05-17 17:53:27.568081593 -0500 +@@ -1162,7 +1162,7 @@ + + tcase_add_test (tc_chain, test_speex_streamable); + tcase_add_test (tc_chain, test_increasing_timestamp_when_pts_none); +- tcase_add_test (tc_chain, test_video_caps_late); ++ //tcase_add_test (tc_chain, test_video_caps_late); + tcase_add_test (tc_chain, test_audio_caps_change_streamable); + tcase_add_test (tc_chain, test_video_caps_change_streamable); + tcase_add_test (tc_chain, test_audio_caps_change_streamable_single); diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD index 94c5af1c9..7ee893c50 100644 --- a/user/gstreamer/APKBUILD +++ b/user/gstreamer/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gstreamer -pkgver=1.20.1 +pkgver=1.26.1 pkgrel=0 pkgdesc="GStreamer multimedia framework" url="https://gstreamer.freedesktop.org/" @@ -9,16 +9,12 @@ license="LGPL-2.0+" depends="" depends_dev="libxml2-dev" makedepends="$depends_dev bison flex gobject-introspection-dev glib-dev - meson ninja" + meson" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" -source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz - disable-tests.patch - test-deadlock.patch - time64.patch - " +source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz" build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dintrospection=enabled \ -Dpackage-name="GStreamer (${DISTRO_NAME:-Adélie Linux})" \ @@ -26,16 +22,16 @@ build() { -Dglib-asserts=disabled \ -Dnls=enabled \ -Dptp-helper-permissions=none \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } dev() { @@ -55,7 +51,4 @@ tools() { mv "$pkgdir"/usr/lib/libgstcheck-1.0.so.* "$subpkgdir"/usr/lib/ } -sha512sums="d6f67cce81ba15fba3fcf70850e3c84b25e8da3e53fd56e6f2c87c7ee1701071ea44deb754a0ea371b3cb17877f26aab94d9eccb6729cbb370d6d6d5c324aa1a gstreamer-1.20.1.tar.xz -39e6bfb52ebe85beefa2550eb404f83c5bbb3546cc1733b99e757401d2d182f95d829b90df99d5f43506d7c85d4f44ac797f35653cd42a935f1dc56d0b844c02 disable-tests.patch -d7e574e8715607d3103d46eb05388b781702a9e937d78f8cfab6d8d48d04baa7fbfe547bdeb816bbfddb5a333dd1862e460b057b12ea24704351ef5653f78491 test-deadlock.patch -977a9e689cce68b151a742ef67dbb60a10a55fcfae67f086909e1f0fc4a5998026acd03aeed32068fdb0485dd884c4313f39a63e3bab5baaafa878c439531bc3 time64.patch" +sha512sums="7a5da377fbfb25cacc2d9613a57210c00ca70ee00f3ef4d108a3c98bd6a2cb703b773ca6fd6d9ac7b59b60d0bf0573cff69bdea18e07159ac56ee992613d0a78 gstreamer-1.26.1.tar.xz" diff --git a/user/gstreamer/disable-tests.patch b/user/gstreamer/disable-tests.patch deleted file mode 100644 index 7fc78e9e4..000000000 --- a/user/gstreamer/disable-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -elements_leaks: - Fails due to heavy parallelisation on ppc64. - It always succeeds when run serially. - -elements_filesink: - Seems to be disabled on other musl distros as well. - Filed at: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1194 - ---- gstreamer-1.20.1/tests/check/meson.build.old 2022-03-14 06:33:40.000000000 -0500 -+++ gstreamer-1.20.1/tests/check/meson.build 2022-05-02 01:55:00.352168066 -0500 -@@ -84,11 +84,11 @@ - [ 'elements/fakesrc.c', not gst_registry ], - # FIXME: blocked forever on Windows due to missing fcntl (.. O_NONBLOCK) - [ 'elements/fdsrc.c', not gst_registry or host_system == 'windows' ], -- [ 'elements/filesink.c', not gst_registry ], -+ [ 'elements/filesink.c', true ], - [ 'elements/filesrc.c', not gst_registry ], - [ 'elements/funnel.c', not gst_registry ], - [ 'elements/identity.c', not gst_registry or not gst_parse ], -- [ 'elements/leaks.c', not tracer_hooks or not gst_debug ], -+ [ 'elements/leaks.c', true ], - [ 'elements/multiqueue.c', not gst_registry ], - [ 'elements/selector.c', not gst_registry ], - [ 'elements/streamiddemux.c', not gst_registry ], diff --git a/user/gstreamer/test-deadlock.patch b/user/gstreamer/test-deadlock.patch deleted file mode 100644 index b506ca19f..000000000 --- a/user/gstreamer/test-deadlock.patch +++ /dev/null @@ -1,140 +0,0 @@ -From f24595e9d7952e1e957c0973de62e6c3df031c08 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 20 Feb 2022 23:26:10 +0000 -Subject: [PATCH 1/3] gstreamer: tests: make the gstbin pop message more clear - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index e366d5fe20f..06be4c75fbb 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -38,7 +38,7 @@ pop_async_done (GstBus * bus) - == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); - - gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped async-done message"); - } - - static void -@@ -46,14 +46,14 @@ pop_latency (GstBus * bus) - { - GstMessage *message; - -- GST_DEBUG ("popping async-done message"); -+ GST_DEBUG ("popping latency message"); - message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); - - gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped latency message"); - } - - static void -@@ -63,7 +63,7 @@ pop_state_changed (GstBus * bus, int count) - - int i; - -- GST_DEBUG ("popping %d messages", count); -+ GST_DEBUG ("popping %d state-changed message", count); - for (i = 0; i < count; ++i) { - message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); - -@@ -72,7 +72,7 @@ pop_state_changed (GstBus * bus, int count) - - gst_message_unref (message); - } -- GST_DEBUG ("popped %d messages", count); -+ GST_DEBUG ("popped %d state-changed messages", count); - } - - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", --- -GitLab - - -From 2c47f61c69702572bf666ad9ecaf59710f4a342c Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 20 Feb 2022 23:28:00 +0000 -Subject: [PATCH 2/3] gstreamer: tests: add a timeout in gstbin pop functions - instaed of wait forever - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index 06be4c75fbb..c837d0e7e8a 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -32,7 +32,7 @@ pop_async_done (GstBus * bus) - GstMessage *message; - - GST_DEBUG ("popping async-done message"); -- message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); -@@ -47,7 +47,7 @@ pop_latency (GstBus * bus) - GstMessage *message; - - GST_DEBUG ("popping latency message"); -- message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); -@@ -65,7 +65,7 @@ pop_state_changed (GstBus * bus, int count) - - GST_DEBUG ("popping %d state-changed message", count); - for (i = 0; i < count; ++i) { -- message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_STATE_CHANGED, "did not get GST_MESSAGE_STATE_CHANGED"); --- -GitLab - - -From 686add28e21ae0031f9e3b07f9fb5cd4d5d19bc5 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Mon, 21 Feb 2022 23:06:07 +0000 -Subject: [PATCH 3/3] gstreamer: tests: fix gstbin deadlock - -this is a bit ugly but if the latency message is lost -the pop_latency will hang forever. - -Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778 - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index c837d0e7e8a..5d9a09171aa 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -741,7 +741,8 @@ GST_START_TEST (test_watch_for_state_change) - pop_state_changed (bus, 3); - if (ret == GST_STATE_CHANGE_ASYNC) { - pop_async_done (bus); -- pop_latency (bus); -+ if (gst_bus_have_pending (bus)) -+ pop_latency (bus); - } - - fail_unless (gst_bus_have_pending (bus) == FALSE, --- -GitLab - diff --git a/user/gstreamer/time64.patch b/user/gstreamer/time64.patch deleted file mode 100644 index 89c88c380..000000000 --- a/user/gstreamer/time64.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 664fc63a246cba97e202f712aa48105f46a9ff69 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> -Date: Mon, 12 Dec 2022 11:34:51 +0200 -Subject: [PATCH] systemclock: Use `futex_time64` syscall on x32 and other - platforms that always use a 32-bit `struct timespec` for the normal `futex` - syscall - -See also https://gitlab.gnome.org/GNOME/glib/-/issues/2634 ---- - gst/gstsystemclock.c | 26 +++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) - -diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c -index 6d0b6ec47b6..8c396d2c7b4 100644 ---- a/gst/gstsystemclock.c -+++ b/gst/gstsystemclock.c -@@ -130,7 +130,31 @@ gst_futex_cond_broadcast (guint * cond_val) - static gboolean - gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time) - { -+ /* On x32 (ILP32 ABI on x86_64) and potentially sparc64, the raw futex() -+ * syscall takes a 32-bit timespan argument *regardless* of whether userspace -+ * is using 32-bit or 64-bit `struct timespec`. This means that we can’t -+ * unconditionally pass a `struct timespec` pointer into the syscall. -+ * -+ * Assume that any such platform is new enough to define the -+ * `__NR_futex_time64` workaround syscall (which accepts 64-bit timespecs, -+ * introduced in kernel 5.1), and use that to pass a 64-bit timespec instead. -+ * -+ * `clock_gettime()` on such systems will either return a 32-bit `struct -+ * timespec`, in which case the values we will get passed in here are -+ * already not y2038-safe, or `struct timespec` is using 64-bit `time_t` and -+ * everything is fine. -+ */ -+#ifdef __NR_futex_time64 -+ struct -+ { -+ gint64 tv_sec; -+ gint64 tv_nsec; -+ } end; -+ const long int futex_syscall_id = __NR_futex_time64; -+#else - struct timespec end; -+ const long int futex_syscall_id = __NR_futex; -+#endif - guint sampled; - int res; - gboolean success; -@@ -146,7 +170,7 @@ gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time) - /* we use FUTEX_WAIT_BITSET_PRIVATE rather than FUTEX_WAIT_PRIVATE to be - * able to use absolute time */ - res = -- syscall (__NR_futex, cond_val, (gsize) FUTEX_WAIT_BITSET_PRIVATE, -+ syscall (futex_syscall_id, cond_val, (gsize) FUTEX_WAIT_BITSET_PRIVATE, - (gsize) sampled, &end, NULL, FUTEX_BITSET_MATCH_ANY); - success = (res < 0 && errno == ETIMEDOUT) ? FALSE : TRUE; - g_mutex_lock (mutex); --- -GitLab - diff --git a/user/gtk-layer-shell/APKBUILD b/user/gtk-layer-shell/APKBUILD new file mode 100644 index 000000000..040c27cf4 --- /dev/null +++ b/user/gtk-layer-shell/APKBUILD @@ -0,0 +1,34 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gtk-layer-shell +pkgver=0.9.0 +pkgrel=0 +pkgdesc="A library to create panels and other desktop components for Wayland using the Layer Shell protocol" +url=" " +arch="all" +license="LGPL-3.0+ AND MIT" +depends="" +checkdepends="ttf-liberation" # gtk needs fonts or gtklabel goes insane. +makedepends="gobject-introspection-dev gtk+3.0-dev gtk-doc meson python3 + vala-dev wayland-dev wayland-protocols" +subpackages="$pkgname-dev $pkgname-doc" +source="gtk-layer-shell-$pkgver.tar.gz::https://github.com/wmww/gtk-layer-shell/archive/refs/tags/v$pkgver.tar.gz" + +build() { + meson setup \ + -Dprefix=/usr \ + -Ddocs=true \ + -Dtests=true \ + -Dvapi=true \ + build + meson compile -C build +} + +check() { + meson test -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build +} + +sha512sums="38179dd83a0828740ca8e2cc27fe3708f61107e88246644745da6c300da03ce04b17dd7117087946a68401a43176a599bdb98ed50936602d2b2540449c0e9066 gtk-layer-shell-0.9.0.tar.gz" diff --git a/user/gtk4/APKBUILD b/user/gtk4/APKBUILD index 71c6b0a42..1795d2107 100644 --- a/user/gtk4/APKBUILD +++ b/user/gtk4/APKBUILD @@ -1,27 +1,29 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Sile Ekaterin Liszka <sheila@vulpine.house> pkgname=gtk4 -pkgver=4.8.3 +pkgver=4.18.5 pkgrel=0 pkgdesc="Version 4 of the GNOME graphics toolkit" url="https://www.gtk.org" arch="all" -options="!check" # Requires X11 +options="!check" # Requires Wayland environment running license="LGPL-2.0+ AND LGPL-2.1+ AND LGPL-2.0-only AND Expat" depends="" makedepends="cairo-dev cmake cups-dev ffmpeg-dev ffmpeg-libs gdk-pixbuf-dev gi-docgen glib-dev gobject-introspection-dev graphene-dev gstreamer-dev gst-plugins-bad-dev iso-codes-dev libepoxy-dev libexecinfo-dev - libxcursor-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev - meson ninja pango-dev>=1.50.0 py3-docutils py3-jinja2 py3-markdown - py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev + librsvg-dev libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev + libxkbcommon-dev libxrandr-dev meson pango-dev py3-docutils py3-jinja2 + py3-markdown py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev wayland-dev wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz + vulkan-nullref.patch + " builddir="$srcdir/gtk-$pkgver" build() { - meson \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -29,21 +31,21 @@ build() { --buildtype=release \ --wrap-mode=nofallback \ -Dc_link_args='-lexecinfo' \ - -Dgtk_doc=true \ -Dman-pages=true \ - -Ddemos=false \ -Dbuild-examples=false \ + -Dvulkan=disabled \ build - ninja -C build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754 gtk-4.8.3.tar.xz" +sha512sums="4a09188fdbeb532d8c2064199126eaf60d806118bb637d5182121f3d80d374acdf343568c3423effb9574c364279ded7d7cbd4e0331dc1fb647970f60c98bff0 gtk-4.18.5.tar.xz +1dca0747e2f572354c0d47e443270d64f5855d9fba592621d570be5eed49213ce8303e7d028bbe4d493cceebea9b3c90d6dc4f0671b1cae153a15384aa35d63e vulkan-nullref.patch" diff --git a/user/gtk4/vulkan-nullref.patch b/user/gtk4/vulkan-nullref.patch new file mode 100644 index 000000000..464415901 --- /dev/null +++ b/user/gtk4/vulkan-nullref.patch @@ -0,0 +1,69 @@ +From d4350c0fe535a759abd7898c7f251738242d1408 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Thu, 24 Apr 2025 03:36:15 +0200 +Subject: [PATCH] vulkan: Handle not being compiled against Vulkan + +The Vulkan renderer should work and just fail to realize. +Currently it SEGVs with a NULL function call. + +Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8506> +--- + gsk/gpu/gskvulkanrenderer.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/gsk/gpu/gskvulkanrenderer.c b/gsk/gpu/gskvulkanrenderer.c +index a5f827df839..6282c0b51c1 100644 +--- a/gsk/gpu/gskvulkanrenderer.c ++++ b/gsk/gpu/gskvulkanrenderer.c +@@ -4,6 +4,8 @@ + + #include "gskgpurendererprivate.h" + ++#include <glib/gi18n-lib.h> ++ + #ifdef GDK_RENDERING_VULKAN + + #include "gskvulkandeviceprivate.h" +@@ -143,14 +145,28 @@ gsk_vulkan_renderer_unrealize (GskRenderer *renderer) + + GSK_RENDERER_CLASS (gsk_vulkan_renderer_parent_class)->unrealize (renderer); + } +-#endif ++ ++#else /* !GDK_RENDERING_VULKAN */ ++ ++static gboolean ++gsk_vulkan_renderer_realize (GskRenderer *renderer, ++ GdkDisplay *display, ++ GdkSurface *surface, ++ GError **error) ++{ ++ g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE, ++ _("Vulkan support disabled during GTK build")); ++ ++ return FALSE; ++} ++#endif /* GDK_RENDERING_VULKAN */ + + static void + gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass) + { ++ GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass); + #ifdef GDK_RENDERING_VULKAN + GskGpuRendererClass *gpu_renderer_class = GSK_GPU_RENDERER_CLASS (klass); +- GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass); + + gpu_renderer_class->frame_type = GSK_TYPE_VULKAN_FRAME; + +@@ -162,6 +178,8 @@ gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass) + gpu_renderer_class->get_backbuffer = gsk_vulkan_renderer_get_backbuffer; + + renderer_class->unrealize = gsk_vulkan_renderer_unrealize; ++#else ++ renderer_class->realize = gsk_vulkan_renderer_realize; + #endif + } + +-- +GitLab + diff --git a/user/harfbuzz/APKBUILD b/user/harfbuzz/APKBUILD index 1172a14cd..be03db054 100644 --- a/user/harfbuzz/APKBUILD +++ b/user/harfbuzz/APKBUILD @@ -1,44 +1,44 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=harfbuzz -pkgver=2.6.8 +pkgver=11.2.0 pkgrel=0 pkgdesc="Text shaping library" url="https://www.freedesktop.org/wiki/Software/HarfBuzz" arch="all" -options="!check" # tests depend on certain freetype behaviours license="MIT" depends="" makedepends="cairo-dev freetype-dev glib-dev gobject-introspection-dev icu-dev - graphite2-dev" + graphite2-dev gtk-doc meson" checkdepends="python3" -subpackages="$pkgname-dev $pkgname-icu" +subpackages="$pkgname-dev $pkgname-doc $pkgname-icu" source="https://github.com/$pkgname/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --disable-static \ - --with-glib \ - --with-gobject \ - --with-graphite2 \ - --with-icu \ - --with-truetype - make + -Dcairo=enabled \ + -Ddocs=enabled \ + -Dfreetype=enabled \ + -Dglib=enabled \ + -Dgobject=enabled \ + -Dgraphite2=enabled \ + -Dicu=enabled \ + build + + meson compile -C build } check() { - make check + meson test -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } dev() { @@ -49,8 +49,9 @@ dev() { icu() { pkgdesc="Harfbuzz ICU support library" replaces="harfbuzz" + install_if="harfbuzz=$pkgver-r$pkgrel icu-libs" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/ } -sha512sums="651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d harfbuzz-2.6.8.tar.xz" +sha512sums="108a164e5277f76f535bbd1c3744b1f78897e714376c2f61c1171b95d5004a0ab99179efdd92063f7677b30d5c1ab4e0a40612bf60d672af9f03bdd24b1edefa harfbuzz-11.2.0.tar.xz" diff --git a/user/hfsutils/APKBUILD b/user/hfsutils/APKBUILD new file mode 100644 index 000000000..a459530da --- /dev/null +++ b/user/hfsutils/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Síle Ekaterin Liszka <sheila@adelielinux.org> +# Maintainer: Síle Ekaterin Liszka <sheila@adelielinux.org> +pkgname=hfsutils +pkgver=3.2.6 +pkgrel=0 +pkgdesc="Utilities for working with HFS(+) filesystems" +url="https://www.mars.org/home/rob/proj/hfs/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="ftp://ftp.mars.org/pub/hfs/${pkgname}-${pkgver}.tar.gz + fix-missing-header.patch + " + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + for i in hattrib hcd hcopy hdel hdir hformat hfsutil hls hmkdir hmount hpwd hrename hrmdir humount hvol; do + install -Dm755 "$i" "$pkgdir/usr/bin/$i" + done + find doc/man -name '*.1' | while read i; do + install -Dm644 "$i" "$pkgdir/usr/share/man/1/$i" + done +} + +sha512sums="0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173 hfsutils-3.2.6.tar.gz +44e8304d469104c8400f88d392a4e7ffec82c41919a08514233dbe7c6509077a76920738deabd6bc2622c5c8b200a29d5ca4b4bc109dee01a63cb405674c8502 fix-missing-header.patch" diff --git a/user/hfsutils/fix-missing-header.patch b/user/hfsutils/fix-missing-header.patch new file mode 100644 index 000000000..eb71bd351 --- /dev/null +++ b/user/hfsutils/fix-missing-header.patch @@ -0,0 +1,11 @@ +diff -ur a/hpwd.c b/hpwd.c +--- a/hpwd.c 2024-12-08 04:40:31.343764325 +0000 ++++ b/hpwd.c 2024-12-08 04:40:45.768172918 +0000 +@@ -24,6 +24,7 @@ + # endif + + # include <stdio.h> ++# include <string.h> + + # include "hfs.h" + # include "hcwd.h" diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD index 4ae0f4640..25cfc4d63 100644 --- a/user/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=horizon -pkgver=0.9.8.1 +pkgver=0.9.9.1 pkgrel=1 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" @@ -18,7 +18,7 @@ makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5 $pkgname-tools $pkgname-wizard $pkgname-boot" source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz - apm-disklabel.patch + ppc32-apm.patch " build() { @@ -30,7 +30,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DBUILD_TOOLS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-format-truncation -Wno-type-limits" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DUNSUPPORTED_NONFREE_FIRMWARE=ON \ -DINSTALL=ON \ @@ -86,7 +86,7 @@ qt5() { chmod 4755 "$subpkgdir"/usr/bin/horizon-run-qt5 chmod 1777 "$subpkgdir"/etc/horizon - /usr/sbin/setcap cap_sys_time+ep "$subpkgdir"/usr/bin/horizon-qt5 + /sbin/setcap cap_sys_time+ep "$subpkgdir"/usr/bin/horizon-qt5 } tools() { @@ -162,5 +162,5 @@ GLOBALS "$subpkgdir"/usr/share/xsessions/horizon.desktop } -sha512sums="3a34019d50cd711f868855b120a362ce67308e9eb9b32fab0a8936d393541f93beca76efe161c7d635f215445989176a7089d2df0d6fcb071428b4c1cf1ae252 horizon-0.9.8.1.tar.xz -1d92232b3118444973a0917777a1787e3e20b6d5a8da22f0031e37d94f6c1d9df0f05aa9228d3b24c414185f6a2c9c9401534f381b4195830cd5b1469cf23f46 apm-disklabel.patch" +sha512sums="270926f74450f3250ae168fd31fd897a0bf0e444d0fb9753ebdc571157c89e873e13ed80030d93f5b470cc1876d2f9f00527ad0df2a0d15798dc6fbd4fe0641d horizon-0.9.9.1.tar.xz +f3977cf247436301a2f8975859f888ee24ac305f7389317a4642f07d3dd6e30cea7f9076392f35187d034c6fcb7d5c4575ba007b50fc5e24577c0debd3c4a410 ppc32-apm.patch" diff --git a/user/horizon/apm-disklabel.patch b/user/horizon/apm-disklabel.patch deleted file mode 100644 index 368aa8b05..000000000 --- a/user/horizon/apm-disklabel.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5df1abdb743ac71986cabe8c76dcd9a0f75e44da Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 25 Apr 2024 23:27:30 -0500 -Subject: [PATCH] Qt UI: Fix partition count for APM disklabel - -The APM disklabel includes a meta partition for the partition map -itself. This is always counted by parted as a partition, and is *not* -considered to be a metadata partition. We therefore need to start our -partitioning at #2 on APM, not #1. - -Closes: #376 ---- - CHANGELOG.rst | 14 +++++++++++++- - ui/qt5/horizonwizard.cc | 6 ++++-- - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/CHANGELOG.rst b/CHANGELOG.rst -index 7afcb34..b944410 100644 ---- a/CHANGELOG.rst -+++ b/CHANGELOG.rst -@@ -5,7 +5,19 @@ - * **A. Wilcox**, documentation writer - * **Contributors**, code - :Copyright: -- © 2019-2023 Adélie Linux and contributors. -+ © 2019-2024 Adélie Linux and contributors. -+ -+ -+ -+0.9.9 (2024-??-??) -+================== -+ -+Qt UI -+----- -+ -+* The Qt UI now counts APM partition map partitions when creating APM -+ disklabels, fixing a long-standing bug when installing to an empty disk -+ on PowerPC Macintosh systems. - - - -diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc -index 298cd15..2872eb6 100644 ---- a/ui/qt5/horizonwizard.cc -+++ b/ui/qt5/horizonwizard.cc -@@ -400,7 +400,8 @@ QString nameForPartitionOnDisk(const std::string &dev, int part) { - /*! Determine the correct disk label based on the target platform. */ - QStringList eraseDiskForArch(const std::string &raw_disk, - HorizonWizard::Arch arch, -- HorizonWizard::Subarch subarch) { -+ HorizonWizard::Subarch subarch, -+ int *start) { - const auto disk = QString::fromStdString(raw_disk); - - switch(arch) { -@@ -412,6 +413,7 @@ QStringList eraseDiskForArch(const std::string &raw_disk, - case HorizonWizard::ppc64: /* Complicated */ - switch(subarch) { - case HorizonWizard::ppc64_PowerMac: -+ (*start)++; - return {QString{"disklabel %1 apm"}.arg(disk)}; - case HorizonWizard::ppc64_PowerNV: - return {QString{"disklabel %1 gpt"}.arg(disk)}; -@@ -620,7 +622,7 @@ QString HorizonWizard::toHScript() { - int start = 1; - - if(erase) { -- lines << eraseDiskForArch(chosen_disk, arch, subarch); -+ lines << eraseDiskForArch(chosen_disk, arch, subarch, &start); - } else { - /* This branch will be taken when "use available space" is back. */ - Q_ASSERT(false); --- -2.40.0 - diff --git a/user/horizon/ppc32-apm.patch b/user/horizon/ppc32-apm.patch new file mode 100644 index 000000000..caa5d3189 --- /dev/null +++ b/user/horizon/ppc32-apm.patch @@ -0,0 +1,29 @@ +From 02bab111a473e6bc45c4c95e8f17634b42e0fba9 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sat, 21 Dec 2024 19:18:53 -0600 +Subject: [PATCH] Qt UI: Count APM partitions correctly on PPC32 + +The fix we did in 5df1abdb74 is not complete; we use APM on 32-bit +PowerPC machines as well. We need to do the same workaround on PPC32 +that we do on PPC64 Power Macs. + +Fixes: 5df1abdb74 ("Qt UI: Fix partition count for APM disklabel") +--- + ui/qt5/horizonwizard.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc +index 81ddcdc..9cc0690 100644 +--- a/ui/qt5/horizonwizard.cc ++++ b/ui/qt5/horizonwizard.cc +@@ -409,6 +409,7 @@ QStringList eraseDiskForArch(const std::string &raw_disk, + case HorizonWizard::x86_64: /* 64-bit Intel uses GPT */ + return {QString{"disklabel %1 gpt"}.arg(disk)}; + case HorizonWizard::ppc: /* 32-bit PowerPC: we only support Power Mac */ ++ (*start)++; + return {QString{"disklabel %1 apm"}.arg(disk)}; + case HorizonWizard::ppc64: /* Complicated */ + switch(subarch) { +-- +2.40.0 + diff --git a/user/htop/APKBUILD b/user/htop/APKBUILD index 69994dfab..aba5d2c6b 100644 --- a/user/htop/APKBUILD +++ b/user/htop/APKBUILD @@ -1,20 +1,25 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=htop -pkgver=2.2.0 -pkgrel=1 +pkgver=3.4.0_git20240813 +_pkgcommit=59578afd5e5856e2b017d40e20ebe32102f123aa +pkgrel=0 pkgdesc="Interactive process viewer" -url="http://hisham.hm/htop" +url="https://htop.dev/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="libexecinfo-dev ncurses-dev python3" +makedepends="autoconf automake libexecinfo-dev ncurses-dev python3" subpackages="$pkgname-doc" -source="http://hisham.hm/htop/releases/$pkgver/$pkgname-$pkgver.tar.gz - correctness.patch - fix-python-path.patch - " +#source="https://github.com/htop-dev/htop/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" +source="${pkgname}-${_pkgcommit}.tar.gz::https://github.com/htop-dev/${pkgname}/archive/${_pkgcommit}.tar.gz" +builddir="$srcdir"/${pkgname}-${_pkgcommit} + +prepare() { + default_prepare + ./autogen.sh +} build() { LIBS="-lexecinfo" ./configure \ @@ -23,9 +28,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-cgroup \ - --enable-taskstats + --localstatedir=/var make } @@ -33,6 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e htop-2.2.0.tar.gz -010ca1d42caeea133ba3d0383373a8eca849c73c95bb98fe3222c458c44320d1e2a3aee9431213721f1ccfcbd5af54eb1e54fafd6e0e5ca3b87499ee6d04b49a correctness.patch -16358bcd6d83181cc04dd8a7971f7cc0804dc49995208bad2042bcca7962f562bbd008c2185f24aa6186c58896e94e4ec02e2053dc46ed14789889d64836b679 fix-python-path.patch" +sha512sums="0cca8d0947e45875d15a6a18b5959a37a76d4a14ff77ceb2840d446d2dd58814cc80bfa34da4f58949076980cd695a77ad9f12464964937b8f7bcc6328d3e551 htop-59578afd5e5856e2b017d40e20ebe32102f123aa.tar.gz" diff --git a/user/htop/correctness.patch b/user/htop/correctness.patch deleted file mode 100644 index 51a9848d2..000000000 --- a/user/htop/correctness.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: Jonathan Currier <dullfire@yahoo.com> - -diff --git a/MainPanel.h b/MainPanel.h -index 8849659..471870b 100644 ---- a/MainPanel.h -+++ b/MainPanel.h -@@ -12,6 +12,7 @@ in the source distribution for its full text. - #include "Panel.h" - #include "Action.h" - #include "Settings.h" -+#include "union-arg.h" - - typedef struct MainPanel_ { - Panel super; -@@ -21,11 +22,6 @@ typedef struct MainPanel_ { - pid_t pidSearch; - } MainPanel; - --typedef union { -- int i; -- void* v; --} Arg; -- - typedef bool(*MainPanel_ForeachProcessFn)(Process*, Arg); - - #define MainPanel_getFunctionBar(this_) (((Panel*)(this_))->defaultBar) -diff --git a/Process.c b/Process.c -index 471f529..ae617a6 100644 ---- a/Process.c -+++ b/Process.c -@@ -548,7 +548,9 @@ bool Process_changePriorityBy(Process* this, int delta) { - return Process_setPriority(this, this->nice + delta); - } - --void Process_sendSignal(Process* this, int sgn) { -+ -+void Process_sendSignal(Process* this, Arg arg) { -+ int sgn = arg.i; - CRT_dropPrivileges(); - kill(this->pid, (int) sgn); - CRT_restorePrivileges(); -diff --git a/Process.h b/Process.h -index f702ca0..3011845 100644 ---- a/Process.h -+++ b/Process.h -@@ -29,6 +29,7 @@ in the source distribution for its full text. - #include "Object.h" - - #include <sys/types.h> -+#include "union-arg.h" - - #define PROCESS_FLAG_IO 0x0001 - -@@ -199,7 +200,7 @@ bool Process_setPriority(Process* this, int priority); - - bool Process_changePriorityBy(Process* this, int delta); - --void Process_sendSignal(Process* this, int sgn); -+void Process_sendSignal(Process* this, Arg arg); - - long Process_pidCompare(const void* v1, const void* v2); - -diff --git a/union-arg.h b/union-arg.h -new file mode 100644 -index 0000000..5c8a094 ---- /dev/null -+++ b/union-arg.h -@@ -0,0 +1,9 @@ -+#ifndef UNION_ARG_HEADER -+#define UNION_ARG_HEADER -+ -+typedef union { -+ int i; -+ void* v; -+} Arg; -+ -+#endif - diff --git a/user/htop/fix-python-path.patch b/user/htop/fix-python-path.patch deleted file mode 100644 index 4d11bfb4a..000000000 --- a/user/htop/fix-python-path.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/scripts/MakeHeader.py -+++ b/scripts/MakeHeader.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import os, sys, string, io - try: - from StringIO import StringIO diff --git a/user/hwdata/APKBUILD b/user/hwdata/APKBUILD new file mode 100644 index 000000000..3fe37795a --- /dev/null +++ b/user/hwdata/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=hwdata +pkgver=0.385 +pkgrel=0 +pkgdesc="Databases of hardware identification and configuration data" +url="https://github.com/vcrhonek/hwdata" +arch="noarch" +options="!check" # running tests creates dependency loop +license="GPL-2.0-only" +depends="" +checkdepends="pciutils python3" +makedepends="" +subpackages="" +source="hwdata-$pkgver.tar.gz::https://github.com/vcrhonek/hwdata/archive/refs/tags/v$pkgver.tar.gz" +replaces="hwids hwids-net hwids-pci hwids-udev hwids-usb" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + ln -s /usr/bin/python3 python + PATH="$PATH:." make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="713274b6e938383bb27fa20dcc9f77a73b462366f6ae33eaa6f7d2e089a69f0d9c03b90a59c1302fdffa642da953435f1f13e3eb21b6521c2cf304c701aa83a6 hwdata-0.385.tar.gz" diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD deleted file mode 100644 index 183bda57d..000000000 --- a/user/hwids/APKBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=hwids -pkgver=20200306 -pkgrel=0 -pkgdesc="Hardware identification databases" -url="https://github.com/gentoo/hwids/" -arch="noarch" -options="!check" # No test suite, just databases. -license="BSD-3-Clause OR GPL-2.0+" -subpackages="$pkgname-net $pkgname-pci $pkgname-udev $pkgname-usb" -depends="$subpackages" -makedepends="eudev-dev" -subpackages="$subpackages $pkgname-doc" -source="https://github.com/gentoo/hwids/archive/hwids-$pkgver.tar.gz" -builddir="$srcdir/hwids-hwids-$pkgver" - -build() { - make UDEV=yes -} - -package() { - make DESTDIR="$pkgdir" DOCDIR="/usr/share/doc/$pkgname-$pkgver" \ - MISCDIR="/usr/share/hwdata" UDEV=yes install -} - -_mv() { - pkgdesc="$pkgdesc ($1)" - shift - depends="" - mkdir -p "$subpkgdir"/usr/share/hwdata - for _file in $*; do - mv "$pkgdir"/usr/share/hwdata/$_file "$subpkgdir"/usr/share/hwdata - done -} - -usb() { - replaces="hwdata-usb" - provides="hwdata-usb=$pkgver-r$pkgrel" - _mv "USB IDs" usb.ids -} - -pci() { - replaces="hwdata-pci" - provides="hwdata-pci=$pkgver-r$pkgrel" - _mv "PCI IDs" pci.ids -} - -net() { - replaces="hwdata-oui" - provides="hwdata-oui=$pkgver-r$pkgrel" - license="Public-Domain" - _mv "Networking OUIs" oui.txt iab.txt -} - -udev() { - install_if="hwids=$pkgver-r$pkgrel eudev" - install_if="hwids-pci=$pkgver-r$pkgrel eudev" - install_if="hwids-usb=$pkgver-r$pkgrel eudev" - pkgdesc="$pkgdesc (udev integration)" - - mkdir -p "$subpkgdir"/ - mv "$pkgdir"/lib "$subpkgdir"/ - mv "$pkgdir"/etc "$subpkgdir"/ -} - -sha512sums="eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250 hwids-20200306.tar.gz" diff --git a/user/hyperfine/APKBUILD b/user/hyperfine/APKBUILD new file mode 100644 index 000000000..ee21cbd2a --- /dev/null +++ b/user/hyperfine/APKBUILD @@ -0,0 +1,376 @@ +# Contributor: Zach van Rijn <me@zv.io> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=hyperfine +pkgver=1.19.0 +pkgrel=0 +pkgdesc="A command-line benchmarking tool" +url="https://github.com/sharkdp/hyperfine" +arch="all" +license="Apache-2.0 OR MIT" +depends="" +makedepends="cargo" +subpackages="" +source="hyperfine-$pkgver.tar.gz::https://github.com/sharkdp/hyperfine/archive/refs/tags/v$pkgver.tar.gz" + +# dependencies taken from Cargo.lock +cargo_deps=" +ahash 0.7.8 +aho-corasick 1.1.3 +anstream 0.6.18 +anstyle 1.0.10 +anstyle-parse 0.2.6 +anstyle-query 1.1.2 +anstyle-wincon 3.0.6 +anyhow 1.0.93 +approx 0.5.1 +arrayvec 0.7.6 +assert_cmd 2.0.16 +autocfg 0.1.8 +autocfg 1.4.0 +bitflags 1.3.2 +bitflags 2.6.0 +bitvec 1.0.1 +borsh 1.5.2 +borsh-derive 1.5.2 +bstr 1.10.0 +bytecheck 0.6.12 +bytecheck_derive 0.6.12 +byteorder 1.5.0 +bytes 1.8.0 +cfg-if 1.0.0 +cfg_aliases 0.2.1 +clap 4.5.20 +clap_builder 4.5.20 +clap_complete 4.5.37 +clap_lex 0.7.2 +cloudabi 0.0.3 +colorchoice 1.0.3 +colored 2.1.0 +console 0.15.8 +csv 1.3.1 +csv-core 0.1.11 +difflib 0.4.0 +doc-comment 0.3.3 +encode_unicode 0.3.6 +equivalent 1.0.1 +errno 0.3.9 +fastrand 2.2.0 +float-cmp 0.9.0 +fuchsia-cprng 0.1.1 +funty 2.0.0 +getrandom 0.2.15 +hashbrown 0.12.3 +hashbrown 0.15.1 +indexmap 2.6.0 +indicatif 0.17.4 +instant 0.1.13 +is_terminal_polyfill 1.70.1 +itoa 1.0.11 +lazy_static 1.5.0 +libc 0.2.162 +linux-raw-sys 0.4.14 +memchr 2.7.4 +nix 0.29.0 +normalize-line-endings 0.3.0 +num 0.2.1 +num-bigint 0.2.6 +num-complex 0.2.4 +num-integer 0.1.46 +num-iter 0.1.45 +num-rational 0.2.4 +num-traits 0.2.19 +number_prefix 0.4.0 +once_cell 1.20.2 +portable-atomic 1.9.0 +ppv-lite86 0.2.20 +predicates 3.1.2 +predicates-core 1.0.8 +predicates-tree 1.0.11 +proc-macro-crate 3.2.0 +proc-macro2 1.0.89 +ptr_meta 0.1.4 +ptr_meta_derive 0.1.4 +quote 1.0.37 +radium 0.7.0 +rand 0.6.5 +rand 0.8.5 +rand_chacha 0.1.1 +rand_chacha 0.3.1 +rand_core 0.3.1 +rand_core 0.4.2 +rand_core 0.6.4 +rand_hc 0.1.0 +rand_isaac 0.1.1 +rand_jitter 0.1.4 +rand_os 0.1.3 +rand_pcg 0.1.2 +rand_xorshift 0.1.1 +rdrand 0.4.0 +regex 1.11.1 +regex-automata 0.4.8 +regex-syntax 0.8.5 +rend 0.4.2 +rkyv 0.7.45 +rkyv_derive 0.7.45 +rust_decimal 1.36.0 +rustix 0.38.40 +ryu 1.0.18 +seahash 4.1.0 +serde 1.0.214 +serde_derive 1.0.214 +serde_json 1.0.132 +shell-words 1.1.0 +simdutf8 0.1.5 +statistical 1.0.0 +strsim 0.11.1 +syn 1.0.109 +syn 2.0.87 +tap 1.0.1 +tempfile 3.14.0 +terminal_size 0.4.0 +termtree 0.4.1 +thiserror 2.0.3 +thiserror-impl 2.0.3 +tinyvec 1.8.0 +tinyvec_macros 0.1.1 +toml_datetime 0.6.8 +toml_edit 0.22.22 +unicode-ident 1.0.13 +unicode-width 0.1.14 +utf8parse 0.2.2 +uuid 1.11.0 +version_check 0.9.5 +wait-timeout 0.2.0 +wasi 0.11.0+wasi-snapshot-preview1 +winapi 0.3.9 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-x86_64-pc-windows-gnu 0.4.0 +windows-sys 0.48.0 +windows-sys 0.52.0 +windows-sys 0.59.0 +windows-targets 0.48.5 +windows-targets 0.52.6 +windows_aarch64_gnullvm 0.48.5 +windows_aarch64_gnullvm 0.52.6 +windows_aarch64_msvc 0.48.5 +windows_aarch64_msvc 0.52.6 +windows_i686_gnu 0.48.5 +windows_i686_gnu 0.52.6 +windows_i686_gnullvm 0.52.6 +windows_i686_msvc 0.48.5 +windows_i686_msvc 0.52.6 +windows_x86_64_gnu 0.48.5 +windows_x86_64_gnu 0.52.6 +windows_x86_64_gnullvm 0.48.5 +windows_x86_64_gnullvm 0.52.6 +windows_x86_64_msvc 0.48.5 +windows_x86_64_msvc 0.52.6 +winnow 0.6.20 +wyz 0.5.1 +zerocopy 0.7.35 +zerocopy-derive 0.7.35 +" + +source="$source $(echo "$cargo_deps" | sed -E 's#^([^ ]+) ([^ ]+)$#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + echo "$cargo_deps" | while read -r _dep _ver; do + [ -n "$_dep" ] || continue + _dep="$_dep-$_ver" + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + cargo build --release -j $JOBS +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + export PATH="$PATH:$srcdir/$pkgname-$pkgver/hyperfine/target/release" + cargo test -j $JOBS --release +} + +package() { + install -Dm755 target/release/hyperfine -t "$pkgdir"/usr/bin/ +} + +sha512sums="91e3b497844944bc11afaba07488dac9803b145d69259064c9a510cf76039baa2e025751743bf3230d114b31d7eb46e017c99d38506f0b6fcf2b9a3623352e8e hyperfine-1.19.0.tar.gz +63677b2001d633ecabb36c08bd92e00b5fa71f24aed1c4601d12d846ea06aeaf093c37cfe1f6642147800caa6c749e9a202aa21f9ab4799efa379ad0d952a2ee ahash-0.7.8.tar.gz +ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 aho-corasick-1.1.3.tar.gz +5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963 anstream-0.6.18.tar.gz +621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea anstyle-1.0.10.tar.gz +e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396 anstyle-parse-0.2.6.tar.gz +26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837 anstyle-query-1.1.2.tar.gz +59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5 anstyle-wincon-3.0.6.tar.gz +237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc anyhow-1.0.93.tar.gz +c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407 approx-0.5.1.tar.gz +b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8 arrayvec-0.7.6.tar.gz +0b9167282d75169b0b1fad0b1401b42884185976ae0dd690851671aedbc1a9af26dd33f3047400eb4a1b5070216acc293aade149aded7e4f86dd5c0ef0e9a6a9 assert_cmd-2.0.16.tar.gz +d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5 autocfg-0.1.8.tar.gz +3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c autocfg-1.4.0.tar.gz +3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz +f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf bitflags-2.6.0.tar.gz +83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e bitvec-1.0.1.tar.gz +3500f00806cd26cd7431f9a3d097cb0f30fb4b0fe1bf0346978cfbdd07915e31cb8bc6721426bb365351a9e89ec8b7c6397c87c966852c8f4d00862fc7b4a7ce borsh-1.5.2.tar.gz +f3a9b1d588eb7e6147a63560d71557622f6b947728b926a25aa85bd56c26a4648dc96bf60875531fffee23c13235b6b412f3386f0ab9e454f4915af7ce66773a borsh-derive-1.5.2.tar.gz +823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2 bstr-1.10.0.tar.gz +49a85f9bbfe8bccceffcd94e3eac1f4407d93159358428ea07652714e06e97fbcb41f22f72d9d10318bc9a019be8afc99727764162f18e8de01ea4069f44dda6 bytecheck-0.6.12.tar.gz +57f8480ddb76d8620095962acd203231fb7938c0caf9c216d89466f22464a6970f13adca5f4d5b10c9e1ec99d6e0b260ba7586c2bb895fad0380f8f9ac9a4fc8 bytecheck_derive-0.6.12.tar.gz +96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f byteorder-1.5.0.tar.gz +a721724e5cbfc73b79102a9c4a00fc9da520417819ca5c82b798c8cfb45af3d77b33f7035ad33d6187399c613cc2e83644236ac772aec934f521f87d4680059a bytes-1.8.0.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c cfg_aliases-0.2.1.tar.gz +e432a118a2ec15b273a404c3cb75bbe579b11034ba55def1823d4670c6553e3d8611074a24f50a0f4adc8bda184213b06106c44c68a19d267342c53e345351d4 clap-4.5.20.tar.gz +e914c8b6592f9d230b4f4290cf4b4d73d0160c12a1fa3976c74bad21ff16da532d6af792f0a33fa472166f1cd551291b5d1d71fe8b359040040418694ec52000 clap_builder-4.5.20.tar.gz +5c864ea85f0823ec91a1c9693720853dd5bc5804daee9a0607bf14e9f5fe40b536bdb3b935d1e96e535d896a272d7fa1f99eba6983ec94bb630ab0c36cefbabb clap_complete-4.5.37.tar.gz +a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380 clap_lex-0.7.2.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14 colorchoice-1.0.3.tar.gz +fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e colored-2.1.0.tar.gz +b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 console-0.15.8.tar.gz +6b0be5e017b2b2cb926d11d7a36cdae1bf0ddb56165127f25f6fd55956f95a572ed7e054f863610e91c9c2329f5af0eee9678f9020644800587d6daa5a94755b csv-1.3.1.tar.gz +0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee csv-core-0.1.11.tar.gz +fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 difflib-0.4.0.tar.gz +e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba doc-comment-0.3.3.tar.gz +64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 encode_unicode-0.3.6.tar.gz +b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 equivalent-1.0.1.tar.gz +777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a errno-0.3.9.tar.gz +de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4 fastrand-2.2.0.tar.gz +f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8 float-cmp-0.9.0.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155 funty-2.0.0.tar.gz +04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb getrandom-0.2.15.tar.gz +b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 hashbrown-0.12.3.tar.gz +8bdd4966b336f5d5b184cf14d4a7e625d184d8f3f0782845c746f374f92425055def71e64087fb3a3770fd9b2d9ed40310fa45f60e56d298accaf9c500add841 hashbrown-0.15.1.tar.gz +c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca indexmap-2.6.0.tar.gz +54c92f028dc5aded5e1a947afc09c33930f0439d7ee55e9dca66ccc2af6860e7b67cd8153bbdb33dff962ffd03dc0004eace2e69135c11a867331f0ef3e9bf6d indicatif-0.17.4.tar.gz +b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9 instant-0.1.13.tar.gz +4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 is_terminal_polyfill-1.70.1.tar.gz +7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 itoa-1.0.11.tar.gz +6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f lazy_static-1.5.0.tar.gz +f43e294d587e7cd9c2da9b67be83fc70801ea66c318342cf1e11556566ecc1c8a612925770d85c75af1e887b425f326fac59229b78877d2377092243ea8e6a99 libc-0.2.162.tar.gz +28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7 linux-raw-sys-0.4.14.tar.gz +8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 memchr-2.7.4.tar.gz +86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f nix-0.29.0.tar.gz +f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea normalize-line-endings-0.3.0.tar.gz +9d094e0a29b2bb42d382d5167150418bc2ed81e8deb3c6636c99c86ca14abf5f69b82a49f1678dd110119eeaec2f476fe7a5d57e60558473a6b7c710dec7f778 num-0.2.1.tar.gz +19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8 num-bigint-0.2.6.tar.gz +53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea num-complex-0.2.4.tar.gz +e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae num-integer-0.1.46.tar.gz +6195c7bd5f904e9f0aeee3ce17b42c0383d053f9d37954a9ce3b4ff0a048afa121c9a37aa9c74b9ace7353d7fd9f57a7d04c7a18e1456fc2c4c298d8ecfd0172 num-iter-0.1.45.tar.gz +06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93 num-rational-0.2.4.tar.gz +180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 num-traits-0.2.19.tar.gz +a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df number_prefix-0.4.0.tar.gz +bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 once_cell-1.20.2.tar.gz +1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb portable-atomic-1.9.0.tar.gz +6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1 ppv-lite86-0.2.20.tar.gz +50896189f39842ef424aebc12c2633112fda83eba1bdeaa3e6f398db1e28dca0cc7838948f25e67f6fceede1a91a1b0ede5d4dc4edac6da752e48c7a07bbe3ae predicates-3.1.2.tar.gz +8cfd010b70aa694620d6c573bd8ddc50ea16ba08f6c737902ba6697307af4510b9298ffcc3068b45bdc6430103db6fb4499783c64044d87d023bea46d45d0f7c predicates-core-1.0.8.tar.gz +e1b08010f9cab65c75d82cc44cfdf64d92127acf6a72ee0ce1533e5d7d8027ccab912e1c499b7b78508b5e3cb20dc03df94de3dd520ae13736906a5f374b10cd predicates-tree-1.0.11.tar.gz +41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863 proc-macro-crate-3.2.0.tar.gz +488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f proc-macro2-1.0.89.tar.gz +9936264dd52ae40e6afc8cef8914dbdc5767f397b91ea965d65275fe547a2d9cde7ccdcf908f787e25f84fbc23a2e30df895793fca308e09f48f2adf2e30d2bf ptr_meta-0.1.4.tar.gz +15a72b2c36e9d1761c4dd42cee1623c2d85c52eadc3c3102c8334c14c9c5db9a43d74dbbab1d14a2600d789917fcb5bc2652877b172aaa02c37a6868462ff20e ptr_meta_derive-0.1.4.tar.gz +c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05 quote-1.0.37.tar.gz +51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0 radium-0.7.0.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 rand-0.8.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 rand_chacha-0.3.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 rand_core-0.4.2.tar.gz +36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 rand_core-0.6.4.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8 regex-1.11.1.tar.gz +278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f regex-automata-0.4.8.tar.gz +549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 regex-syntax-0.8.5.tar.gz +2df17191ce710e09927f6d17fa5e3432a154d605cf3b58bdd6a3037d69cc0b017007e23c16526a8879a89cc49e3a47d38ae5f6aca8b42cd05624fd15c9dc3529 rend-0.4.2.tar.gz +bac10c6e7e7f797e505cc8103c55ae2fd4b04a76631e085fcf1c8f2b05e52c064cb14145479dadc292995b7ca5bbab5235d54d8e651bf47623a0228f936f73c9 rkyv-0.7.45.tar.gz +ec48c62251a8c2b97de67da56cf6abff15cff1a329d7f8dd3e45e1175616f0dd1b32c2a9c0998086fc57d0084e7908cfd6000fff3eaa30a1776f8abd9cb00564 rkyv_derive-0.7.45.tar.gz +9dc8dbca6249991e4b8b2179f41bb51f2513bcf6f29490351989f04aeb7f1d15b88a8f13f7cdb666761c585d5e86397150c660883a334b9d4fdd96a08fdb5526 rust_decimal-1.36.0.tar.gz +a7482682e2f0321318c08cf17f69815779515c197815a2a9f228c728af4cff3684101b4a13656a1ff98933ee492e4a847a03b7f46d697f9c71552931734b2449 rustix-0.38.40.tar.gz +a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 ryu-1.0.18.tar.gz +4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b seahash-4.1.0.tar.gz +100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee serde-1.0.214.tar.gz +70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0 serde_derive-1.0.214.tar.gz +9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e serde_json-1.0.132.tar.gz +05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00 shell-words-1.1.0.tar.gz +139668c7232f533d3439986474da5036efa32d4e0d21fa72e1283e27dbd0670984283d91c238e445be61317426f67cdb8d3f13738b2fb657563f866c8b6d89d6 simdutf8-0.1.5.tar.gz +00f58a7e1b8c818336fdf55def5a46b1347c5961b4fc27d156fc03f5c197af6f53f23485eea80b2b3ca6ce2acfb304fa4846904d85c6290d1750ad4b5a635c22 statistical-1.0.0.tar.gz +0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c strsim-0.11.1.tar.gz +12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d syn-1.0.109.tar.gz +bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2 syn-2.0.87.tar.gz +d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995 tap-1.0.1.tar.gz +98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15 tempfile-3.14.0.tar.gz +b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897 terminal_size-0.4.0.tar.gz +ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 termtree-0.4.1.tar.gz +f6a8e8e1bb6d6e10edc07c35f3141b4b3ecb46b943b4879dd8f8bef0306feaa5446d8e47b24cffeb4cd6c57b4715b86b2bc0716b4ef7dfdaeb080ecd29646c9a thiserror-2.0.3.tar.gz +50bb722db6bff4f18975312be61fbf201b8edb29a2c6420d8a2a1f2817403aa09c6de1269e7f952c4d4583f0dd2ab1eec45b26e5391b6bd69c6450c8e42019c1 thiserror-impl-2.0.3.tar.gz +b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df tinyvec-1.8.0.tar.gz +10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e tinyvec_macros-0.1.1.tar.gz +d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f toml_datetime-0.6.8.tar.gz +0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d toml_edit-0.22.22.tar.gz +5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51 unicode-ident-1.0.13.tar.gz +3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb unicode-width-0.1.14.tar.gz +f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 utf8parse-0.2.2.tar.gz +0cd1b95fc2247bf4e627de6abb41e332ebaf39e5720640e52b9f235f7a0e2d451e7a486efdabb616ce00e47832d21919611683d0e6a71c86a86f290940cfda32 uuid-1.11.0.tar.gz +d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db version_check-0.9.5.tar.gz +db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 wait-timeout-0.2.0.tar.gz +043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f wasi-0.11.0+wasi-snapshot-preview1.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed windows-sys-0.48.0.tar.gz +24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 windows-sys-0.52.0.tar.gz +d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061 windows-sys-0.59.0.tar.gz +e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 windows-targets-0.48.5.tar.gz +d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f windows-targets-0.52.6.tar.gz +20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 windows_aarch64_gnullvm-0.48.5.tar.gz +f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5 windows_aarch64_gnullvm-0.52.6.tar.gz +223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff windows_aarch64_msvc-0.48.5.tar.gz +a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b windows_aarch64_msvc-0.52.6.tar.gz +931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a windows_i686_gnu-0.48.5.tar.gz +a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822 windows_i686_gnu-0.52.6.tar.gz +95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f windows_i686_gnullvm-0.52.6.tar.gz +70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e windows_i686_msvc-0.48.5.tar.gz +ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96 windows_i686_msvc-0.52.6.tar.gz +1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 windows_x86_64_gnu-0.48.5.tar.gz +c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb windows_x86_64_gnu-0.52.6.tar.gz +c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa windows_x86_64_gnullvm-0.48.5.tar.gz +67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd windows_x86_64_gnullvm-0.52.6.tar.gz +fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 windows_x86_64_msvc-0.48.5.tar.gz +21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 windows_x86_64_msvc-0.52.6.tar.gz +3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8 winnow-0.6.20.tar.gz +15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9 wyz-0.5.1.tar.gz +17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c zerocopy-0.7.35.tar.gz +dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb zerocopy-derive-0.7.35.tar.gz" diff --git a/user/i3lock/APKBUILD b/user/i3lock/APKBUILD index a84c7b712..098767d75 100644 --- a/user/i3lock/APKBUILD +++ b/user/i3lock/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Max Rees <maxcrees@me.com> pkgname=i3lock -pkgver=2.12 +pkgver=2.15 pkgrel=0 pkgdesc="Simple X11 screen locker" url="https://i3wm.org/i3lock/" @@ -9,33 +9,18 @@ arch="all" options="!check" # No test suite. license="MIT" depends="xkeyboard-config" -makedepends="cairo-dev libev-dev libxkbcommon-dev linux-pam-dev cmd:which +makedepends="cairo-dev libev-dev libxkbcommon-dev linux-pam-dev meson xcb-util-image-dev xcb-util-xrm-dev" subpackages="$pkgname-doc" -source="$url/$pkgname-$pkgver.tar.bz2" - -prepare() { - default_prepare - # At present, this has no functional difference. - # But when we start developing our PAM stack into something more - # mature, this will be important, because i3lock runs unprivileged. - sed -i -e 's:login:base-auth:g' pam/i3lock -} +source="$url/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - - make + meson setup -Dprefix=/usr build + meson compile -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="84f1558368381bcad9a64f41ab6134a6614dea453d1ee5ecfe886185b9e1baebeeca446c4635158deb8dae5b25c09d47d3990239d76c44e5325ca5bfaad9b2ad i3lock-2.12.tar.bz2" +sha512sums="6079f5233c0820c6e38f3cd8f3732d585e95e7d670408e4fb18ab580a2e1face8f3d6ea13eaaeedc8671f74def917183667e736b35306bf7c630d40625b41ac2 i3lock-2.15.tar.xz" diff --git a/user/iceauth/APKBUILD b/user/iceauth/APKBUILD index d388784b0..b01bdbd92 100644 --- a/user/iceauth/APKBUILD +++ b/user/iceauth/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iceauth -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=0 pkgdesc="X.Org ICE authority file utility" url="https://www.X.org/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="16b2f58008587cf1544037ca8b1c76dbb75eb043b3048b3064e66ba6b147962233f1453c2cf18bfb136dd6dd21d3e27b5219e17e1ab7b81dbe93fb6aff801a72 iceauth-1.0.9.tar.xz" +sha512sums="cfadac03a3f72f3c0bb58f67984a033847c76e7e3fdd9ebce583c0554d7f9484faf5053d878f5a82a543cdcc8e2ef8acecadb8830bd3c53584d7ec950cb51cc3 iceauth-1.0.10.tar.xz" diff --git a/user/ifupdown-ng/APKBUILD b/user/ifupdown-ng/APKBUILD new file mode 100644 index 000000000..8ac58f0e1 --- /dev/null +++ b/user/ifupdown-ng/APKBUILD @@ -0,0 +1,110 @@ +# Contributor: Ermine <mustela@erminea.space> +# Contributor: Ariadne Conill <ariadne@dereferenced.org> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=ifupdown-ng +pkgver=0.12.1 +pkgrel=0 +pkgdesc="Tools for managing network configuration" +url="https://github.com/ifupdown-ng/ifupdown-ng" +arch="all" +license="ISC AND BSD-2-Clause" +depends="kyua atf" +makedepends="scdoc" +subpackages="$pkgname-doc $pkgname-openrc $pkgname-iproute2 $pkgname-ppp + $pkgname-wireguard $pkgname-ethtool $pkgname-wifi" +source="https://distfiles.ariadne.space/ifupdown-ng/ifupdown-ng-$pkgver.tar.xz + ifupdown-ng.initd + " + +# We only install the core executors right now. The other executors are +# still being ported to run under ifupdown-ng natively, and so we will +# use the ifupdown scripts for now for those cases. However, it is nice +# to make the automatic dependency resolution work, and ifupdown-ng +# provides some stubs to enable that. +_executor_stubs="bridge bond" + +# These are optional executors which do not conflict with what we are +# presently shipping. These executors require iproute2. +_executor_iproute2="vrf gre vxlan mpls" + +# These are all optional executors we plan to use. +_executor_opt="ppp wireguard wireguard-quick ethtool wifi $_executor_iproute2" + +build() { + make + make docs +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" EXECUTOR_SCRIPTS_OPT="$_executor_opt" \ + EXECUTOR_SCRIPTS_STUB="$_executor_stubs" install install_docs + install -Dm755 "$srcdir"/ifupdown-ng.initd "$pkgdir"/etc/init.d/ifupdown-ng +} + +iproute2() { + pkgdesc="ifupdown-ng integration for iproute2" + depends="iproute2" + install_if="$pkgname=$pkgver-r$pkgrel $depends" + + mkdir -p "$subpkgdir"/usr/libexec/ifupdown-ng + for exec in $_executor_iproute2; do + mv "$pkgdir"/usr/libexec/ifupdown-ng/$exec \ + "$subpkgdir"/usr/libexec/ifupdown-ng/$exec + done +} + +ppp() { + pkgdesc="ifupdown-ng integration for ppp" + depends="ppp" + install_if="$pkgname=$pkgver-r$pkgrel $depends" + + mkdir -p "$subpkgdir"/usr/libexec/ifupdown-ng + mv "$pkgdir"/usr/libexec/ifupdown-ng/ppp \ + "$subpkgdir"/usr/libexec/ifupdown-ng/ppp +} + +wireguard() { + pkgdesc="ifupdown-ng integration for wireguard" + depends="wireguard-tools" + install_if="$pkgname=$pkgver-r$pkgrel $depends" + + mkdir -p "$subpkgdir"/usr/libexec/ifupdown-ng + mv "$pkgdir"/usr/libexec/ifupdown-ng/wireguard \ + "$subpkgdir"/usr/libexec/ifupdown-ng/wireguard + mv "$pkgdir"/usr/libexec/ifupdown-ng/wireguard-quick \ + "$subpkgdir"/usr/libexec/ifupdown-ng/wireguard-quick +} + +ethtool() { + pkgdesc="ifupdown-ng integration for ethtool" + depends="ethtool" + install_if="$pkgname=$pkgver-r$pkgrel $depends" + + mkdir -p "$subpkgdir"/usr/libexec/ifupdown-ng + mv "$pkgdir"/usr/libexec/ifupdown-ng/ethtool \ + "$subpkgdir"/usr/libexec/ifupdown-ng/ethtool +} + +wifi() { + pkgdesc="ifupdown-ng integration for wifi" + depends="wpa_supplicant" + install_if="$pkgname=$pkgver-r$pkgrel $depends" + + mkdir -p "$subpkgdir"/usr/libexec/ifupdown-ng + mv "$pkgdir"/usr/libexec/ifupdown-ng/wifi \ + "$subpkgdir"/usr/libexec/ifupdown-ng/wifi +} + +doc() { + default_doc + + mkdir -p "$subpkgdir"/etc/network + mv "$pkgdir"/etc/network/ifupdown-ng.conf.example \ + "$subpkgdir"/etc/network/ifupdown-ng.conf.example +} +sha512sums="c2c1e27fbd53eeb4150e544a893352f13845b491850e982a5880160c3be03b628794f7989c802ff823ac3e8c6c34dc4ab97c0abcefdda85f06fcd64ced8ac60c ifupdown-ng-0.12.1.tar.xz +aa1dd3d31872d7ec308b534044e490136de47a3e72575a96522f60c5740ee3b953a17e05013359d27985ac16b048ff8fff76e8ac1103802a4fb75a31d2185d45 ifupdown-ng.initd" diff --git a/user/ifupdown-ng/ifupdown-ng.initd b/user/ifupdown-ng/ifupdown-ng.initd new file mode 100644 index 000000000..adae1b66c --- /dev/null +++ b/user/ifupdown-ng/ifupdown-ng.initd @@ -0,0 +1,91 @@ +#!/sbin/openrc-run + +# Copyright (c) Natanael Copa +# This code is licensed under BSD-2-Clause +# +# note that the spoofprotect, syncoockies and ip_forward options are set in +# /etc/sysctl.conf + +: ${cfgfile:="/etc/network/interfaces"} +: ${ifquery:="ifquery"} +: ${ifstate:="/run/ifstate"} + +single_iface="${RC_SVCNAME#*.}" +if [ "$single_iface" = "$RC_SVCNAME" ]; then + single_iface= +fi + +depend() { + need localmount hostname + want dev-settle + after bootmisc hwdrivers modules + provide net + keyword -jail -prefix -vserver -docker +} + +# find interfaces we want to start +find_ifaces() { + if [ -n "$single_iface" ]; then + echo $single_iface + return 0 + fi + + if command -v "$ifquery" >/dev/null; then + $ifquery -i "$cfgfile" --list -a + return + fi + + # fallback in case ifquery does not exist + awk '$1 == "auto" {for (i = 2; i <= NF; i = i + 1) printf("%s ", $i)}' "$cfgfile" +} + +# return the list of interfaces we should try stop +find_running_ifaces() { + if [ -n "$single_iface" ]; then + echo $single_iface + return 0 + fi + + if command -v "$ifquery" >/dev/null; then + $ifquery --state-file $ifstate -i "$cfgfile" --running + return + fi + + # fallback + awk -F= '{print $2}' $ifstate +} + +start() { + local iface= ret=1 + ebegin "Starting networking" + eindent + for iface in $(find_ifaces); do + local r=0 + ebegin "$iface" + if ! ifup -i "$cfgfile" $iface >/dev/null; then + ifdown -i "$cfgfile" $iface >/dev/null 2>&1 + r=1 + fi + # atleast one interface needs to be started for action + # to be success + eend $r && ret=0 + done + eoutdent + return $ret +} + +stop() { + local iface= + # Don't stop the network at shutdown. + yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0 + + ebegin "Stopping networking" + eindent + for iface in $(find_running_ifaces); do + ebegin "$iface" + ifdown -i "$cfgfile" -f $iface >/dev/null + eend $? + done + eoutdent + return 0 +} diff --git a/user/ikona/APKBUILD b/user/ikona/APKBUILD deleted file mode 100644 index c70ad2e59..000000000 --- a/user/ikona/APKBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=ikona -pkgver=1.0 -pkgrel=0 -pkgdesc="Icon preview utility" -url="https://kde.org/applications/graphics/org.kde.Ikona" -arch="all" -license="GPL-2.0+" -depends="" -makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules - kconfigwidgets-dev ki18n-dev kirigami2-dev rust cargo - cairo-dev gdk-pixbuf-dev pango-dev" -subpackages="$pkgname-lang $pkgname-bash-completion:bashcomp:noarch - $pkgname-fish-completion:fishcomp:noarch - $pkgname-zsh-completion:zshcomp:noarch" -source="https://download.kde.org/stable/ikona/$pkgver/ikona-$pkgver.tar.xz - https://download.kde.org/stable/ikona/1.0/ikona-1.0.cargo.vendor.tar.xz - " - -unpack() { - default_unpack - mv "$srcdir"/ikona-1.0.cargo.vendor.tar.xz \ - "$builddir"/ikona.cargo.vendor.tar.xz -} - -build() { - if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" - fi - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} \ - . - make -} - -check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -} - -package() { - make DESTDIR="$pkgdir" install -} - -bashcomp() { - pkgdesc="$pkgdesc (Bash completions)" - mkdir -p "$subpkgdir"/etc - mv "$pkgdir"/etc/bash_completion.d "$subpkgdir"/etc/ -} - -fishcomp() { - pkgdesc="$pkgdesc (Fish completions)" - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/fish "$subpkgdir"/usr/share/ -} - -zshcomp() { - pkgdesc="$pkgdesc (Z shell completions)" - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share/ -} - -sha512sums="30bde3f3b062ccf661ee8950c762412a6b9eebff625216641607cbae7f7f8123702c231cbce82acfb666a8b69c863e4b22e8daf79d1541b7c70781189ffee144 ikona-1.0.tar.xz -3bca0c7b66e603e7e06e0ac30c0cdb3d8c3baa812e600f322ef56a0be1692e57cc39348f1c40fdcfe07da6d4b624604cec0003f0d7e1be419462fff5832cd301 ikona-1.0.cargo.vendor.tar.xz" diff --git a/user/inih/APKBUILD b/user/inih/APKBUILD new file mode 100644 index 000000000..9d701cd95 --- /dev/null +++ b/user/inih/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=inih +pkgver=58 +pkgrel=0 +pkgdesc="Simple .INI file parser in C" +url=" " +arch="all" +license="BSD-3-Clause" +depends="" +makedepends="meson" +subpackages="$pkgname-dev" +source="https://github.com/benhoyt/inih/archive/r58/$pkgname-$pkgver.tar.gz + testrun.patch + " +builddir="$srcdir/inih-r58" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="d69f488299c1896e87ddd3dd20cd9db5848da7afa4c6159b8a99ba9a5d33f35cadfdb9f65d6f2fe31decdbadb8b43bf610ff2699df475e1f9ff045e343ac26ae inih-58.tar.gz +88f38fa41efa91a3eeef065251a6424fdfbb6d4ed975dfcce4730374f61f328ca2b13f3db123eed2c5ade9e54c1f797481dbcb284b22554dd89068053ead1035 testrun.patch" diff --git a/user/inih/testrun.patch b/user/inih/testrun.patch new file mode 100644 index 000000000..987712773 --- /dev/null +++ b/user/inih/testrun.patch @@ -0,0 +1,185 @@ +From 59461b32ee99e1573ecee98c1122815187ef6e82 Mon Sep 17 00:00:00 2001 +From: matoro <matoro@users.noreply.github.com> +Date: Tue, 7 May 2024 15:41:36 -0400 +Subject: [PATCH] Add meson support for tests + +Allows tests to use "meson test" instead of a shell script. This also +means that they now fully respect user-specified toolchain (e.g. clang +compiler, custom CFLAGS, etc). Running C++ test is conditional on +enabling INIReader support in the build. + +``` + 1/16 test_multi OK 0.05s + 2/16 test_multi_max_line OK 0.04s + 3/16 test_single OK 0.04s + 4/16 test_disallow_inline_comments OK 0.03s + 5/16 test_stop_on_first_error OK 0.03s + 6/16 test_handler_lineno OK 0.02s + 7/16 test_heap OK 0.06s + 8/16 test_string OK 0.06s + 9/16 test_heap_max_line OK 0.05s +10/16 test_heap_realloc OK 0.05s +11/16 test_heap_realloc_max_line OK 0.05s +12/16 test_heap_string OK 0.04s +13/16 test_call_handler_on_new_section OK 0.04s +14/16 test_allow_no_value OK 0.03s +15/16 test_alloc OK 0.02s +16/16 test_INIReaderExample OK 0.02s + +Ok: 16 +Expected Fail: 0 +Fail: 0 +Unexpected Pass: 0 +Skipped: 0 +Timeout: 0 +``` +--- + .github/workflows/tests.yml | 13 ++++++++++++- + examples/meson.build | 10 ++++++++++ + meson.build | 15 ++++++++++++--- + tests/meson.build | 25 +++++++++++++++++++++++++ + tests/runtest.sh | 6 ++++++ + 5 files changed, 65 insertions(+), 4 deletions(-) + create mode 100644 examples/meson.build + create mode 100644 tests/meson.build + create mode 100755 tests/runtest.sh + +diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml +index 4971e43..b34ab59 100644 +--- a/.github/workflows/tests.yml ++++ b/.github/workflows/tests.yml +@@ -11,7 +11,7 @@ jobs: + runs-on: ubuntu-latest + + steps: +- - uses: actions/checkout@v2 ++ - uses: actions/checkout@v4 + + - name: Run Diff Tests + run: | +@@ -20,3 +20,14 @@ jobs: + cd ../examples + ./cpptest.sh + git diff --exit-code ++ ++ build-meson: ++ runs-on: ubuntu-latest ++ ++ steps: ++ - uses: actions/checkout@v4 ++ - uses: actions/setup-python@v5 ++ - uses: BSFishy/meson-build@v1.0.3 ++ with: ++ action: test ++ meson-version: 1.4.1 +diff --git a/examples/meson.build b/examples/meson.build +new file mode 100644 +index 0000000..bb1979e +--- /dev/null ++++ b/examples/meson.build +@@ -0,0 +1,10 @@ ++runtest = files(join_paths(meson.project_source_root(), 'tests', 'runtest.sh')) ++ ++tests = { ++ 'INIReaderExample': { 'args': [] }, ++} ++ ++foreach name, properties : tests ++ exe = executable('unittest_' + name, src_inih, src_INIReader, 'INIReaderExample.cpp', cpp_args : ['-Wall', properties['args']]) ++ test('test_' + name, runtest, depends : [exe], args : [files('cpptest.txt'), exe.full_path()]) ++endforeach +diff --git a/meson.build b/meson.build +index d440cbc..4e4fe4b 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,8 @@ project('inih', + ['c'], + license : 'BSD-3-Clause', + version : '58', +- default_options : ['cpp_std=c++11'] ++ default_options : ['cpp_std=c++11'], ++ meson_version: '>=0.56.0' + ) + + #### options #### +@@ -71,8 +72,10 @@ endif + #### inih #### + inc_inih = include_directories('.') + ++src_inih = files('ini.c') ++ + lib_inih = library('inih', +- ['ini.c'], ++ [src_inih], + include_directories : inc_inih, + c_args : [arg_static, extra_args], + install : distro_install, +@@ -96,13 +99,17 @@ inih_dep = declare_dependency( + include_directories : inc_inih + ) + ++subdir('tests') ++ + #### INIReader #### + if get_option('with_INIReader') + add_languages('cpp') + inc_INIReader = include_directories('cpp') + ++ src_INIReader = files(join_paths('cpp', 'INIReader.cpp')) ++ + lib_INIReader = library('INIReader', +- ['cpp/INIReader.cpp'], ++ src_INIReader, + cpp_args : extra_args, + include_directories : inc_INIReader, + dependencies : inih_dep, +@@ -126,4 +133,6 @@ if get_option('with_INIReader') + include_directories : inc_INIReader, + compile_args : extra_args + ) ++ ++ subdir('examples') + endif +diff --git a/tests/meson.build b/tests/meson.build +new file mode 100644 +index 0000000..d0a2c52 +--- /dev/null ++++ b/tests/meson.build +@@ -0,0 +1,25 @@ ++runtest = files(join_paths(meson.project_source_root(), 'tests', 'runtest.sh')) ++ ++tests = { ++ 'multi': { 'args': [] }, ++ 'multi_max_line': { 'args': ['-DINI_MAX_LINE=20'] }, ++ 'single': { 'args': ['-DINI_ALLOW_MULTILINE=0'] }, ++ 'disallow_inline_comments': { 'args': ['-DINI_ALLOW_INLINE_COMMENTS=0'] }, ++ 'stop_on_first_error': { 'args': ['-DINI_STOP_ON_FIRST_ERROR=1'] }, ++ 'handler_lineno': { 'args': ['-DINI_HANDLER_LINENO=1'] }, ++ 'string': { 'src': 'unittest_string.c', 'args': ['-DINI_MAX_LINE=20'] }, ++ 'heap': { 'args': ['-DINI_USE_STACK=0'] }, ++ 'heap_max_line': { 'args': ['-DINI_USE_STACK=0', '-DINI_MAX_LINE=20', '-DINI_INITIAL_ALLOC=20'] }, ++ 'heap_realloc': { 'args': ['-DINI_USE_STACK=0', '-DINI_ALLOW_REALLOC=1', '-DINI_INITIAL_ALLOC=5'] }, ++ 'heap_realloc_max_line': { 'args': ['-DINI_USE_STACK=0', '-DINI_MAX_LINE=20', '-DINI_ALLOW_REALLOC=1', '-DINI_INITIAL_ALLOC=5'] }, ++ 'heap_string': { 'src': 'unittest_string.c', 'args': ['-DINI_USE_STACK=0', '-DINI_MAX_LINE=20', '-DINI_INITIAL_ALLOC=20'] }, ++ 'call_handler_on_new_section': { 'args': ['-DINI_CALL_HANDLER_ON_NEW_SECTION=1'] }, ++ 'allow_no_value': { 'args': ['-DINI_ALLOW_NO_VALUE=1'] }, ++ 'alloc': { 'src': 'unittest_alloc.c', 'args': ['-DINI_CUSTOM_ALLOCATOR=1', '-DINI_USE_STACK=0', '-DINI_ALLOW_REALLOC=1', '-DINI_INITIAL_ALLOC=12'] } ++} ++ ++foreach name, properties : tests ++ test_src = 'src' in properties ? properties['src'] : 'unittest.c' ++ exe = executable('unittest_' + name, src_inih, test_src, c_args : ['-Wall', properties['args']]) ++ test('test_' + name, runtest, depends : [exe], args : [files('baseline_' + name + '.txt'), exe.full_path()]) ++endforeach +diff --git a/tests/runtest.sh b/tests/runtest.sh +new file mode 100755 +index 0000000..9db945b +--- /dev/null ++++ b/tests/runtest.sh +@@ -0,0 +1,6 @@ ++#!/usr/bin/env bash ++ ++set -euo pipefail ++ ++cd "$(dirname "${1}")" ++diff "${1}" <("${2}") diff --git a/user/inotify-tools/APKBUILD b/user/inotify-tools/APKBUILD new file mode 100644 index 000000000..86545ea28 --- /dev/null +++ b/user/inotify-tools/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Leonardo Arena <rnalrd@alpinelinux.org> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=inotify-tools +pkgver=4.23.9.0 +pkgrel=0 +pkgdesc="C library and a command-line programs to interface with inotify" +url="https://github.com/inotify-tools/inotify-tools" +arch="all" +license="GPL-2.0-only" +makedepends="automake autoconf libtool" +subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/inotify-tools/inotify-tools/archive/$pkgver.tar.gz" + +prepare() { + default_prepare + autoreconf -fiv +} + +build() { + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="8f44037a482fa39978b845b4989834e8c897ad872913c6cb8c4a987e0d13f9177b05f593332b859d7adde228fdc3512fd45d66cab65368c38926f41d57e22d13 inotify-tools-4.23.9.0.tar.gz" diff --git a/user/jq/APKBUILD b/user/jq/APKBUILD new file mode 100644 index 000000000..1e1baef17 --- /dev/null +++ b/user/jq/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Zach van Rijn <me@zv.io> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=jq +pkgver=1.7.1 +pkgrel=0 +pkgdesc="A lightweight and flexible command-line JSON processor" +url="https://jqlang.github.io/jq/" +arch="all" +license="MIT" +makedepends="" +subpackages="$pkgname-doc $pkgname-dev" +source="jq-$pkgver.tar.gz::https://github.com/jqlang/${pkgname}/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-docs + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" prefix=/usr install +} + +sha512sums="464861fb2e0d6934b616f1dc7f8002d7dae727c8c0c07b385b813e7522ba1ada8ead4165e1d99c892e3ea76e238c55a15b718c738805419721920f88f8d8478c jq-1.7.1.tar.gz" diff --git a/user/json/APKBUILD b/user/json/APKBUILD new file mode 100644 index 000000000..750f3fbd1 --- /dev/null +++ b/user/json/APKBUILD @@ -0,0 +1,36 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=json +pkgver=3.11.3 +pkgrel=0 +pkgdesc="JSON for Modern C++" +url="https://json.nlohmann.me/" +arch="noarch" +license="MIT" +depends="" +makedepends="cmake" +subpackages="" +source="json-$pkgver.tar.gz::https://github.com/nlohmann/json/archive/refs/tags/v$pkgver.tar.gz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild + make DESTDIR="$pkgdir" -C build +} + +check() { + cd build + CTEST_OUTPUT_ON_FAILURE=true ctest -E '(cmake_fetch*|test-unicode*)' -j${JOBS} +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="7df19b621de34f08d5d5c0a25e8225975980841ef2e48536abcf22526ed7fb99f88ad954a2cb823115db59ccc88d1dbe74fe6c281b5644b976b33fb78db9d717 json-3.11.3.tar.gz" diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD index 40c15bb0a..bcc1faa94 100644 --- a/user/kaffeine/APKBUILD +++ b/user/kaffeine/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kaffeine pkgver=2.0.18 -pkgrel=0 +pkgrel=1 pkgdesc="Media player with a focus on Digital TV (DVB)" url="https://www.kde.org/applications/multimedia/kaffeine/" arch="all" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 45c8beed9..655d7276a 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics pkgver=22.04.2 -pkgrel=0 +pkgrel=1 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" ### FIXME: add karbon when calligra is packaged -depends="digikam gwenview ikona kcolorchooser kgraphviewer kolourpaint +depends="digikam gwenview kcolorchooser kgraphviewer kolourpaint kphotoalbum krita kruler kxstitch okular skanlite spectacle symboleditor" makedepends="" diff --git a/user/kdevelop/APKBUILD b/user/kdevelop/APKBUILD index 0f0cb3da3..92e0c29fd 100644 --- a/user/kdevelop/APKBUILD +++ b/user/kdevelop/APKBUILD @@ -2,7 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdevelop pkgver=5.6.2 -pkgrel=0 +_llvmver=18 +pkgrel=1 pkgdesc="KDE Integrated Development Environment (IDE)" url="https://www.kdevelop.org/" arch="all" @@ -18,9 +19,9 @@ makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev cmake extra-cmake-modules knotifications-dev knotifyconfig-dev kparts-dev kservice-dev ktexteditor-dev kwindowsystem-dev kxmlgui-dev threadweaver-dev libksysguard-dev grantlee-dev qt5-qttools-dev boost-dev clang-dev - qt5-qtwebkit-dev purpose-dev llvm-dev plasma-framework-dev okteta-dev - apr-dev astyle-dev krunner-dev subversion-dev libkomparediff2-dev - kdevelop-pg-qt-dev" + qt5-qtwebkit-dev purpose-dev llvm$_llvmver-dev plasma-framework-dev + okteta-dev apr-dev astyle-dev krunner-dev subversion-dev + libkomparediff2-dev kdevelop-pg-qt-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kdevelop/$pkgver/src/kdevelop-$pkgver.tar.xz libarchive-tar.patch diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD index 524b56159..33f6087bd 100644 --- a/user/kgamma5/APKBUILD +++ b/user/kgamma5/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev - kconfigwidgets-dev kdoctools-dev ki18n-dev" + kconfigwidgets-dev kdoctools-dev ki18n-dev libxxf86vm-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$pkgver.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index 064573f8d..4a3fe271f 100644 --- a/user/kjs/APKBUILD +++ b/user/kjs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjs pkgver=5.94.0 -pkgrel=0 +pkgrel=1 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" arch="all" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 670ae15d4..be6c35cc7 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars pkgver=3.5.9 -pkgrel=0 +pkgrel=1 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" arch="all" @@ -12,7 +12,7 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev knotifyconfig-dev kauth-dev kconfig-dev kcrash-dev kdoctools-dev kwidgetsaddons-dev knewstuff-dev ki18n-dev kio-dev - kxmlgui-dev kplotting-dev knotifications-dev eigen-dev mesa-dev + kxmlgui-dev kplotting-dev knotifications-dev eigen-dev libglvnd-dev qt5-qtwebsockets-dev libraw-dev qtkeychain-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kstars/kstars-$pkgver.tar.xz" diff --git a/user/kwayland-server/APKBUILD b/user/kwayland-server/APKBUILD index 981cc0fe0..79bdeab8c 100644 --- a/user/kwayland-server/APKBUILD +++ b/user/kwayland-server/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kwayland-server pkgver=5.24.5 -pkgrel=0 +pkgrel=1 pkgdesc="KDE Wayland server component" url="https://www.kde.org/" arch="all" @@ -9,7 +9,7 @@ options="!check" # Requires D-Bus. license="LGPL-2.1+ AND LGPL-2.1-only AND LGPL-3.0-only AND BSD-3-Clause AND MIT AND MIT-CMU" depends="plasma-wayland-protocols" docdepends="kwayland-doc" -makedepends="cmake extra-cmake-modules kwayland-dev mesa-dev qt5-qtbase-dev +makedepends="cmake extra-cmake-modules kwayland-dev libglvnd-dev qt5-qtbase-dev qt5-qtwayland-dev qt5-qtwayland-tools wayland-dev wayland-protocols qt5-qttools-dev doxygen $docdepends" subpackages="$pkgname-dev $pkgname-doc" diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD index 5db783436..2be15a607 100644 --- a/user/kwin/APKBUILD +++ b/user/kwin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=kwin pkgver=5.24.5 -pkgrel=0 +pkgrel=1 pkgdesc="Modern, stylish window manager (requires OpenGL)" url="https://www.kde.org/" arch="all" @@ -16,7 +16,7 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3 qt5-qtmultimedia-dev qt5-qtx11extras-dev fontconfig-dev freetype-dev libdrm-dev libinput-dev libx11-dev libxi-dev libxkbcommon-dev mesa-dev wayland-dev xcb-util-cursor-dev xcb-util-image-dev xcb-util-wm-dev - lcms2-dev libcap-dev libqaccessibilityclient-dev xorg-server-xwayland + lcms2-dev libcap-dev libqaccessibilityclient-dev xwayland libglvnd-dev breeze breeze-dev kactivities-dev kcompletion-dev kconfigwidgets-dev kcmutils-dev kcrash-dev kdeclarative-dev kdecoration-dev kirigami2-dev @@ -55,7 +55,7 @@ package() { wayland() { pkgdesc="$pkgdesc (Wayland server)" - depends="$pkgname=$pkgver-r$pkgrel xorg-server-xwayland" + depends="$pkgname=$pkgver-r$pkgrel xwayland" mkdir -p "$subpkgdir"/usr/lib/qt5/plugins mv "$pkgdir"/usr/lib/qt5/plugins/org.kde.kwin.waylandbackends \ diff --git a/user/libavc1394/APKBUILD b/user/libavc1394/APKBUILD index a76d47301..100aa176d 100644 --- a/user/libavc1394/APKBUILD +++ b/user/libavc1394/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=libavc1394 pkgver=0.5.4 -pkgrel=3 +pkgrel=4 pkgdesc="Audio/Video control library for FireWire devices" url="https://sourceforge.net/projects/libavc1394/" arch="all" license="LGPL-2.1+" depends="" -makedepends="libraw1394-dev libtool automake autoconf argp-standalone" +makedepends="libraw1394-dev libtool automake autoconf argp-standalone-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/libavc1394/libavc1394-$pkgver.tar.gz automake.patch @@ -43,4 +43,4 @@ package() { sha512sums="ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a libavc1394-0.5.4.tar.gz 8854bed6b9efa4b2bb56762614bcbceadb5cb1cdd393fd676476d40672cc3965962da764543f8628f51567a32ecf5035edb35b883b8963f94bce034ff4793c11 automake.patch -77bf60530b6b81f6bd3c69a11de7ac015f1182fcd8c2586d0fd9605818c3ccde310c386f30c00166853a405f60c13bf6b2d304327ec181de28609c58b215ab31 argp.patch" +f71c498aa1ad6889ce66db194ceb94d8559fe9a26739bcffa8d9cb1e910f40b9cb8613db8a71cf46f0bd61c77f2e48dddbdcafb5f7d9483b2200470a1c6cd2ea argp.patch" diff --git a/user/libavc1394/argp.patch b/user/libavc1394/argp.patch index 9c86a625e..ec1401976 100644 --- a/user/libavc1394/argp.patch +++ b/user/libavc1394/argp.patch @@ -4,7 +4,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS(sys/time.h sys/types.h unistd.h string.h netinet/in.h stdio.h) -+AC_SEARCH_LIBS([argp_usage], [argp], [], ++AC_SEARCH_LIBS([argp_help], [argp], [], + [AC_MSG_ERROR([argp not found. Consider installing argp-standalone])]) PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0) diff --git a/user/libbsd/APKBUILD b/user/libbsd/APKBUILD deleted file mode 100644 index 66270a012..000000000 --- a/user/libbsd/APKBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Ariadne Conill <ariadne@dereferenced.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=libbsd -pkgver=0.10.0 -pkgrel=0 -pkgdesc="Commonly used BSD functions not implemented by all libcs" -url="https://libbsd.freedesktop.org/" -arch="all" -license="BSD-2-Clause-NetBSD AND BSD-3-Clause AND BSD-4-Clause AND BSD-5-Clause AND Expat AND ISC AND Public-Domain AND Beerware" -depends="musl>=1.1.16-r22" -depends_dev="bsd-compat-headers linux-headers" -makedepends="$depends_dev autoconf automake libtool" -subpackages="$pkgname-dev $pkgname-doc" -source="https://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz - disable-fpurge-test.patch - " - -prepare() { - default_prepare - autoreconf -fi -} - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9 libbsd-0.10.0.tar.xz -424828e759420afbf2d4b97f5d402be9b3d51cb90241da1f047517bb75048255ea6cbbbc1e98bffa67449a7f48efe00d8f99b38bdaac9e8c461d1e989e9697b7 disable-fpurge-test.patch" diff --git a/user/libbsd/disable-fpurge-test.patch b/user/libbsd/disable-fpurge-test.patch deleted file mode 100644 index ef6241f62..000000000 --- a/user/libbsd/disable-fpurge-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libbsd-0.8.3/test/Makefile.am.old 2017-08-17 02:42:30.045825258 +0000 -+++ libbsd-0.8.3/test/Makefile.am 2017-08-17 03:49:17.928202106 +0000 -@@ -38,7 +38,6 @@ - humanize \ - fgetln \ - fparseln \ -- fpurge \ - md5 \ - proctitle-init \ - strmode \ diff --git a/user/libcdr/APKBUILD b/user/libcdr/APKBUILD index 645930ea0..d1ce625fa 100644 --- a/user/libcdr/APKBUILD +++ b/user/libcdr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libcdr pkgver=0.1.7 -pkgrel=0 +pkgrel=1 pkgdesc="Import filter and tools for Corel DRAW files" url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" arch="all" diff --git a/user/libdbusmenu/APKBUILD b/user/libdbusmenu/APKBUILD new file mode 100644 index 000000000..0c1b9f693 --- /dev/null +++ b/user/libdbusmenu/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libdbusmenu +pkgver=16.04.0 +pkgrel=0 +pkgdesc="Library for passing menus over D-Bus" +url="https://launchpad.net/libdbusmenu" +arch="all" +options="!check" # Requires Python 2. +license="(LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0-only" +depends="" +makedepends="atk-dev glib-dev gobject-introspection-dev gtk-doc gtk+3.0-dev + intltool json-glib-dev libx11-dev libxslt-dev vala-dev" +subpackages="$pkgname-doc $pkgname-dev" +source="https://launchpad.net/libdbusmenu/16.04/$pkgver/+download/libdbusmenu-$pkgver.tar.gz" + +build() { + export CFLAGS="$CFLAGS -Wno-error" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-static \ + --enable-introspection + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241 libdbusmenu-16.04.0.tar.gz" diff --git a/user/libdisplay-info/APKBUILD b/user/libdisplay-info/APKBUILD new file mode 100644 index 000000000..c2599774e --- /dev/null +++ b/user/libdisplay-info/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=libdisplay-info +pkgver=0.2.0 +pkgrel=0 +pkgdesc="Library for obtaining display information" +url="https://gitlab.freedesktop.org/emersion/libdisplay-info/" +arch="all" +license="MIT" +depends="hwdata" +checkdepends="edid-decode" +makedepends="meson" +subpackages="$pkgname-dev" +source="https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$pkgver/downloads/libdisplay-info-$pkgver.tar.xz" + +prepare() { + default_prepare + rm -r subprojects # attempts to checkout/build edid-decode itself +} + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="6e910b832860d920a4be298a2b6925f701654bd7cdd8b3457e64663c25caa20a74b81b91f71878b9e7f5f70c5c067235f0c99293650231920c67d1241a61e1fb libdisplay-info-0.2.0.tar.xz" diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index e4b35ef51..78e867d8a 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.114 +pkgver=2.4.123 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -44,4 +44,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644 libdrm-2.4.114.tar.xz" +sha512sums="d3e6ba26bbd609fd87ca131690547eeb6a903c0a8c28b7f5cd5d0947619da09f31daf7bf4b6c38bf5e5dc173e2ccba476338ef682d8cf06d6b71ba73fc9b948d libdrm-2.4.123.tar.xz" diff --git a/user/libe-book/APKBUILD b/user/libe-book/APKBUILD index 27e03700f..b9fbff257 100644 --- a/user/libe-book/APKBUILD +++ b/user/libe-book/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libe-book pkgver=0.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="Import filter and tools for various ebook formats" url="https://sourceforge.net/projects/libebook/" arch="all" diff --git a/user/libepoxy/APKBUILD b/user/libepoxy/APKBUILD index 99b1484b4..23d4bef2e 100644 --- a/user/libepoxy/APKBUILD +++ b/user/libepoxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libepoxy -pkgver=1.5.4 +pkgver=1.5.9 pkgrel=0 pkgdesc="Direct Rendering Manager runtime library" url="https://github.com/anholt/libepoxy" @@ -10,21 +10,23 @@ options="!check" # Requires X11 and appropriate mesa-dri-* package license="MIT" depends="" depends_dev="libx11-dev" -makedepends="$depends_dev mesa-dev meson ninja" +makedepends="$depends_dev libglvnd-dev meson" subpackages="$pkgname-dev" source="https://github.com/anholt/libepoxy/releases/download/$pkgver/libepoxy-$pkgver.tar.xz" build() { - meson -Dprefix=/usr build - ninja -C build + meson \ + -Dprefix=/usr \ + build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="7bde6fe7164aaa88b6e476dafb13391c551c530267936a1456e242d2bf648117f319788ba089100b3f773444098a894db6d27326b47dc4ae26db4766308d7510 libepoxy-1.5.4.tar.xz" +sha512sums="eebaae4b8ff5014a8c90bf63fd9626424f472f99a7dbb81273a45b06c854e57f7d1b2d0fb44847221173c4f92d659fcec8a848a3b32f07225cd0ba35a2fad135 libepoxy-1.5.9.tar.xz" diff --git a/user/libetonyek/APKBUILD b/user/libetonyek/APKBUILD index feada550a..3b40c1484 100644 --- a/user/libetonyek/APKBUILD +++ b/user/libetonyek/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libetonyek pkgver=0.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="Import filter and tools for Apple iWork documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" arch="all" @@ -13,7 +13,7 @@ checkdepends="cppunit-dev" makedepends="$depends_dev librevenge-dev liblangtag-dev zlib-dev libxml2-dev gperf doxygen mdds" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" +source="https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -26,7 +26,7 @@ build() { --localstatedir=/var \ --disable-werror \ --disable-static \ - --with-mdds=2.0 + --with-mdds=2.1 make } diff --git a/user/libfontenc/APKBUILD b/user/libfontenc/APKBUILD index 288fe82ad..de282a9a5 100644 --- a/user/libfontenc/APKBUILD +++ b/user/libfontenc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfontenc -pkgver=1.1.6 +pkgver=1.1.8 pkgrel=0 pkgdesc="X11 font encoding library" url="https://www.X.Org/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="524247caf035e5d69280575c79ec5a3259c4cd0a4afa375b01985fedf800b42ecd75102e38f85cdce5591d020d361ffa9390adcb7906e939df289e5131088683 libfontenc-1.1.6.tar.xz" +sha512sums="c9ddea9c0c6c6f4933b5b8ed2044e3dc259a9edbb3070a32f0335a6ad4d47b1858cefc01fa2dff9f29808bee311e9c677b05861200d2f2c4552c92b33fe027e2 libfontenc-1.1.8.tar.xz" diff --git a/user/libfreehand/APKBUILD b/user/libfreehand/APKBUILD index fc9354ab4..aee38d8e0 100644 --- a/user/libfreehand/APKBUILD +++ b/user/libfreehand/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libfreehand pkgver=0.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Import filter and tools for Adobe FreeHand documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand" arch="all" diff --git a/user/libfs/APKBUILD b/user/libfs/APKBUILD index 61b162660..eaf750d95 100644 --- a/user/libfs/APKBUILD +++ b/user/libfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfs -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=0 pkgdesc="X11 Font Server client library" url="https://www.X.Org/" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8 libFS-1.0.9.tar.xz" +sha512sums="f4dc361b7e1dcc1f348ea86e96c5a60ff40c5168b6097f00d8a5db2b86d089cfca12ac13dbde5ce3b53279b7eb8773ed6dcd9c678c2e95363ffa5127ecaacee7 libFS-1.0.10.tar.xz" diff --git a/user/libglvnd/APKBUILD b/user/libglvnd/APKBUILD new file mode 100644 index 000000000..82323eed5 --- /dev/null +++ b/user/libglvnd/APKBUILD @@ -0,0 +1,42 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libglvnd +pkgver=1.7.0 +pkgrel=0 +pkgdesc="The GL Vendor-Neutral Dispatch library" +url=" " +arch="all" +license="MIT AND BSD-1-Clause" +options="!check checkx11" +depends="" +makedepends="libx11-dev libxext-dev meson xorgproto-dev" +replaces="mesa-gl mesa-egl mesa-gles" +subpackages="$pkgname-dev" +source="https://gitlab.freedesktop.org/glvnd/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2" +builddir="$srcdir/$pkgname-v$pkgver" + +build() { + meson setup \ + --wrap-mode=nofallback \ + -Dprefix=/usr \ + -Dx11=enabled \ + -Dglx=enabled \ + -Dtls=false \ + build + + meson compile -C build +} + +check() { + meson test -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build +} + +dev() { + default_dev + replaces="mesa-dev" +} + +sha512sums="7caef0a129527bb968bf1ced64082a56cdde881f013f5ba54c51c09989e7d559dba3071c8fdc04e535e62609d68e7622197445152f655e0afbe06890c0b7a69b libglvnd-v1.7.0.tar.bz2" diff --git a/user/libgnt/APKBUILD b/user/libgnt/APKBUILD index bd4b921c4..55703f4e8 100644 --- a/user/libgnt/APKBUILD +++ b/user/libgnt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgnt -pkgver=2.14.0 +pkgver=2.14.3 pkgrel=0 pkgdesc="Glib Ncurses Toolkit" url="https://pidgin.im/" @@ -12,6 +12,7 @@ makedepends="glib-dev gtk-doc meson ncurses-dev ninja" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/pidgin/libgnt-$pkgver.tar.xz tinfo.patch + ncurses.patch " build() { @@ -20,7 +21,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --buildtype=release \ + -Dpython2=false \ . output ninja -C output } @@ -33,5 +34,6 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38 libgnt-2.14.0.tar.xz -56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416 tinfo.patch" +sha512sums="7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8 libgnt-2.14.3.tar.xz +56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416 tinfo.patch +cfdd0667238948ac45ce992c3b0ef7aa90fc9c8a06ee695d5b516deac17e3e57460dbb3072ee0248ada3bf5d24d2a75736259dd873a6c72483a1040259831b49 ncurses.patch" diff --git a/user/libgnt/ncurses.patch b/user/libgnt/ncurses.patch new file mode 100644 index 000000000..0d91c2dbf --- /dev/null +++ b/user/libgnt/ncurses.patch @@ -0,0 +1,62 @@ +# HG changeset patch +# Node ID 7c4e8ad1e3c7 +# Parent 73d8724225e7 +diff --git a/gntwm.c b/gntwm.c +--- a/gntwm.c ++++ b/gntwm.c +@@ -166,38 +166,40 @@ + int sx, ex, sy, ey, w, y; + cchar_t ch; + PANEL *below = panel; ++ WINDOW *window = panel_window(panel); + +- sx = getbegx(panel->win); +- ex = getmaxx(panel->win) + sx; +- sy = getbegy(panel->win); +- ey = getmaxy(panel->win) + sy; ++ sx = getbegx(window); ++ ex = getmaxx(window) + sx; ++ sy = getbegy(window); ++ ey = getmaxy(window) + sy; + + while ((below = panel_below(below)) != NULL) { +- if (sy > getbegy(below->win) + getmaxy(below->win) || +- ey < getbegy(below->win)) ++ window = panel_window(below); ++ if (sy > getbegy(window) + getmaxy(window) || ++ ey < getbegy(window)) + continue; +- if (sx > getbegx(below->win) + getmaxx(below->win) || +- ex < getbegx(below->win)) ++ if (sx > getbegx(window) + getmaxx(window) || ++ ex < getbegx(window)) + continue; +- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) { +- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK) ++ for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) { ++ if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK) + goto right; + w = widestringwidth(ch.chars); + if (w > 1 && (ch.attr & 1)) { + ch.chars[0] = ' '; + ch.attr &= ~ A_CHARTEXT; +- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch); +- touchline(below->win, y - getbegy(below->win), 1); ++ mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch); ++ touchline(window, y - getbegy(window), 1); + } + right: +- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK) ++ if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK) + continue; + w = widestringwidth(ch.chars); + if (w > 1 && !(ch.attr & 1)) { + ch.chars[0] = ' '; + ch.attr &= ~ A_CHARTEXT; +- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch); +- touchline(below->win, y - getbegy(below->win), 1); ++ mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch); ++ touchline(window, y - getbegy(window), 1); + } + } + } diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index e152d5e7b..ce6ffa88c 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libgphoto2 pkgver=2.5.25 -pkgrel=0 +pkgrel=1 pkgdesc="Digital camera library" url="http://www.gphoto.org" arch="all" @@ -9,7 +9,7 @@ options="libtool" license="LGPL-2.1+" depends="" depends_dev="libexif-dev libusb-dev" -makedepends="$depends_dev libjpeg-turbo-dev libtool" +makedepends="$depends_dev libjpeg-turbo-dev libtool libxml2-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://downloads.sourceforge.net/gphoto/libgphoto2-$pkgver.tar.bz2" diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD index 5ad06e158..f44ee309a 100644 --- a/user/libgsf/APKBUILD +++ b/user/libgsf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgsf -pkgver=1.14.47 +pkgver=1.14.53 pkgrel=0 pkgdesc="Library for manipulating structured files" url="https://www.gnome.org/" @@ -42,4 +42,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -sha512sums="143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b libgsf-1.14.47.tar.xz" +sha512sums="f2f8fa0806bf2edae271b3503cc311bd7ba32c145530afce382305cacfaae624edbc8298bd8766364e94804e71b1b8d0aac8383ae514aad646f2a926727cf727 libgsf-1.14.53.tar.xz" diff --git a/user/libical/APKBUILD b/user/libical/APKBUILD index 6b51d3b78..68a0e7c77 100644 --- a/user/libical/APKBUILD +++ b/user/libical/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=libical -pkgver=3.0.14 +pkgver=3.0.18 pkgrel=0 pkgdesc="Reference implementation of the iCalendar format" url="https://libical.github.io/libical/" @@ -10,7 +10,9 @@ depends="" depends_dev="db-dev" makedepends="$depends_dev cmake glib-dev icu-dev libxml2-dev perl" subpackages="$pkgname-dev" -source="https://github.com/libical/libical/releases/download/v$pkgver/libical-$pkgver.tar.gz" +source="https://github.com/libical/libical/releases/download/v$pkgver/libical-$pkgver.tar.gz + icu75.patch + " build() { cmake \ @@ -29,4 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8 libical-3.0.14.tar.gz" +sha512sums="53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5 libical-3.0.18.tar.gz +d6f4082a6b3a3ad6a2b2aae92696446be6260fa99152fe6e09dad2d7942f8495698cc218f2feee542da4021a03dca0006167d6bc46a7dd3d8103e1998092d3fb icu75.patch" diff --git a/user/libical/icu75.patch b/user/libical/icu75.patch new file mode 100644 index 000000000..321c02aba --- /dev/null +++ b/user/libical/icu75.patch @@ -0,0 +1,31 @@ +From ec62c552df8e1fcc187855bb342c082e22a08edc Mon Sep 17 00:00:00 2001 +From: Lukas Fleischer <lfleischer@lfos.de> +Date: Wed, 15 May 2024 12:28:38 +0700 +Subject: [PATCH] Fix build with ICU 75 + +--- + src/libical/icalrecur.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c +index 3c1789480..1907a3636 100644 +--- a/src/libical/icalrecur.c ++++ b/src/libical/icalrecur.c +@@ -1125,7 +1125,7 @@ icalarray *icalrecurrencetype_rscale_supported_calendars(void) + + calendars = icalarray_new(sizeof(const char **), 20); + +- en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); ++ en = ucal_getKeywordValuesForLocale("calendar", "", false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + cal = icalmemory_tmp_copy(cal); + icalarray_append(calendars, &cal); +@@ -1526,7 +1526,7 @@ static int initialize_rscale(icalrecur_iterator *impl) + } + + /* Check if specified calendar is supported */ +- en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); ++ en = ucal_getKeywordValuesForLocale("calendar", "", false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + if (!strcmp(cal, rule.rscale)) { + is_hebrew = !strcmp(rule.rscale, "hebrew"); diff --git a/user/libice/APKBUILD b/user/libice/APKBUILD index 1cd3f5fe8..37509f984 100644 --- a/user/libice/APKBUILD +++ b/user/libice/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libice -pkgver=1.0.10 +pkgver=1.1.1 pkgrel=0 pkgdesc="X11 Inter-Client Exchange library" url="https://www.X.Org/" @@ -10,7 +10,7 @@ depends="" makedepends="libbsd-dev util-macros xmlto xorgproto-dev xtrans" checkdepends="check-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libICE-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libICE-$pkgver.tar.xz" builddir="$srcdir/libICE-$pkgver" # secfixes: @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468 libICE-1.0.10.tar.bz2" +sha512sums="2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3 libICE-1.1.1.tar.xz" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 2c37a75b3..d1ea54a43 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.20.1 +pkgver=1.28.0 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -32,4 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="d981bf90980c2f609393da998926bc4018599dddbb86c272dfb77bab1b2d5f35c6070f96bcfe5ef0032bd6c957b13f64ed32025d9f04fb413268571b2ee79cd1 libinput-1.20.1.tar.bz2" +sha512sums="2665fbfbf47f8ef329e387841ff9542b6191925d2fb46a19be64ef0b2e274db3b9ce8b42652ccdeb18c66e3a3c748ff576b313ecb8f7f6b4a01102bfb3e999e3 libinput-1.28.0.tar.bz2" diff --git a/user/libixion/APKBUILD b/user/libixion/APKBUILD index 3cc3e2659..d262e50e6 100644 --- a/user/libixion/APKBUILD +++ b/user/libixion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libixion -pkgver=0.17.0 +pkgver=0.19.0 pkgrel=0 pkgdesc="A general purpose formula parser & interpreter" url="https://gitlab.com/ixion/ixion" @@ -9,14 +9,15 @@ arch="all" license="MPL-2.0" depends="" depends_dev="mdds" -makedepends="$depends_dev boost-dev spdlog autoconf automake libtool cmd:which" +makedepends="$depends_dev boost-dev spdlog" subpackages="$pkgname-dev" -source="https://gitlab.com/ixion/ixion/-/archive/$pkgver/ixion-$pkgver.tar.bz2" - -builddir="$srcdir/ixion-$pkgver" +source="https://gitlab.com/api/v4/projects/ixion%2Fixion/packages/generic/source/$pkgver/$pkgname-$pkgver.tar.xz" build() { - ./autogen.sh \ + # GCC 13 changed default fp precision behavior. (#1193, #1214) + export CXXFLAGS="${CXXFLAGS} -fexcess-precision=fast" + + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -41,4 +42,4 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="f6216b06342c43ddf937bcc7eb3104e500bc10d6798f9b24c92c423bda575ac3f7bdae68bb81b2826c164e7dd19bbef940a3848581c5f9e969a6e70934e58d0a ixion-0.17.0.tar.bz2" +sha512sums="f06edbcf5ae7459a46e01273952ce6fbc4e8f2b7782c7e07645dc30e102f20f542e449acafc26484765207b10656e0b350f4108cbf1e03947ee7267254cf6f97 libixion-0.19.0.tar.xz" diff --git a/user/liblangtag/APKBUILD b/user/liblangtag/APKBUILD index 674f39560..a7628f9e6 100644 --- a/user/liblangtag/APKBUILD +++ b/user/liblangtag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liblangtag -pkgver=0.6.3 +pkgver=0.6.7 pkgrel=0 pkgdesc="Interface library to access tags for identifying languages" url="https://bitbucket.org/tagoh/liblangtag" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf liblangtag-0.6.3.tar.bz2" +sha512sums="3628728f46865507d8794c1e7286c6ca04fc49f905594ab76db7bd2c8d8f9fac1e33693314d56bca6fdd8f99b8d207e6e6d2f751474832ceb60a4cdbf10fed68 liblangtag-0.6.7.tar.bz2" diff --git a/user/liblbxutil/APKBUILD b/user/liblbxutil/APKBUILD index 2c7f03f5d..1e3c56c36 100644 --- a/user/liblbxutil/APKBUILD +++ b/user/liblbxutil/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=liblbxutil pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Utility library for X11 Low Bandwidth extension" url="https://www.X.Org/" arch="all" @@ -10,7 +10,9 @@ license="MIT" depends="" makedepends="xorgproto-dev zlib-dev" subpackages="$pkgname-dev" -source="https://www.x.org/releases/individual/lib/liblbxutil-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/lib/liblbxutil-$pkgver.tar.bz2 + gcc10.patch + " prepare() { default_prepare @@ -37,4 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="93bdefef297d46a301dd1cab35ad186438e340822ba5aac20e9d8f4c51cd66e4118b0d9f4afc48ef33a67c6e413f551bcb59089d01597ed175b400902b9f23f4 liblbxutil-1.1.0.tar.bz2" +sha512sums="93bdefef297d46a301dd1cab35ad186438e340822ba5aac20e9d8f4c51cd66e4118b0d9f4afc48ef33a67c6e413f551bcb59089d01597ed175b400902b9f23f4 liblbxutil-1.1.0.tar.bz2 +c1abd8d42e11d84019f5bc3e93774a1b65201c9e08b70a5cf0b78680bdc9d6a49043908510c2dccdf1b53dc6b434261377b0330ab603c8d4929cf001b802f44c gcc10.patch" diff --git a/user/liblbxutil/gcc10.patch b/user/liblbxutil/gcc10.patch new file mode 100644 index 000000000..5e9b99d91 --- /dev/null +++ b/user/liblbxutil/gcc10.patch @@ -0,0 +1,18 @@ +--- liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.h.old 2009-11-02 23:52:21.000000000 -0600 ++++ liblbxutil-1.1.0/src/lbx_zlib/lbx_zlib.h 2024-05-29 21:33:09.169332780 -0500 +@@ -136,9 +136,9 @@ + #endif + + /* lbx_zlib.c */ +-unsigned long stream_out_compressed; +-unsigned long stream_out_uncompressed; +-unsigned long stream_out_plain; +-unsigned long stream_in_compressed; +-unsigned long stream_in_uncompressed; +-unsigned long stream_in_plain; ++extern unsigned long stream_out_compressed; ++extern unsigned long stream_out_uncompressed; ++extern unsigned long stream_out_plain; ++extern unsigned long stream_in_compressed; ++extern unsigned long stream_in_uncompressed; ++extern unsigned long stream_in_plain; diff --git a/user/libliftoff/APKBUILD b/user/libliftoff/APKBUILD new file mode 100644 index 000000000..f20afd85f --- /dev/null +++ b/user/libliftoff/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=libliftoff +pkgver=0.5.0 +pkgrel=0 +pkgdesc="A lightweight KMS plane library" +url="https://gitlab.freedesktop.org/emersion/libliftoff" +arch="all" +license="MIT" +depends="" +makedepends="meson libdrm-dev" +subpackages="$pkgname-dev" +source="https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v$pkgver/downloads/libliftoff-$pkgver.tar.gz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="ce808f6a087f1f629cfebef95bfc7e216a09fb409b96b3c9f6b84d9d986ce50c5d7bf5b45c68e8baa99566b3627d754c269855b6f4ec3be63ae7b9f5109d5f08 libliftoff-0.5.0.tar.gz" diff --git a/user/libmspub/APKBUILD b/user/libmspub/APKBUILD index 0d528f945..f7cfa3558 100644 --- a/user/libmspub/APKBUILD +++ b/user/libmspub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libmspub pkgver=0.1.4 -pkgrel=1 +pkgrel=3 pkgdesc="Import filter and tools for Microsoft Publisher files" url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub" arch="all" @@ -12,7 +12,9 @@ depends="" depends_dev="boost-dev" makedepends="$depends_dev doxygen icu-dev librevenge-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" +source="https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz + missing-header.patch + " build() { ./configure \ @@ -35,4 +37,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31 libmspub-0.1.4.tar.xz" +sha512sums="7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31 libmspub-0.1.4.tar.xz +3293b4e10f91e2df7aa1817709c7370aa3d68dccbd3ad68c2e52add5b8caf8dded36e6778dea5c24a0cc3f40d9b6c0a00e0b62d1e8264c6b085a9f6e773d2cb2 missing-header.patch" diff --git a/user/libmspub/missing-header.patch b/user/libmspub/missing-header.patch new file mode 100644 index 000000000..83b8ef473 --- /dev/null +++ b/user/libmspub/missing-header.patch @@ -0,0 +1,10 @@ +--- libmspub-0.1.4/src/lib/MSPUBMetaData.h.old 2018-02-28 05:54:49.000000000 -0600 ++++ libmspub-0.1.4/src/lib/MSPUBMetaData.h 2024-05-29 21:40:50.140097148 -0500 +@@ -13,6 +13,7 @@ + #include <map> + #include <utility> + #include <vector> ++#include <cstdint> + + #include <librevenge/librevenge.h> + diff --git a/user/libnatpmp/APKBUILD b/user/libnatpmp/APKBUILD index bd2facd27..05f8eaa80 100644 --- a/user/libnatpmp/APKBUILD +++ b/user/libnatpmp/APKBUILD @@ -4,14 +4,14 @@ pkgname=libnatpmp pkgver=20150609 pkgrel=0 pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" -url="https://miniupnp.tuxfamily.org/libnatpmp.html" +url="http://miniupnp.free.fr/libnatpmp.html" arch="all" options="!check" license="BSD-3-Clause" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz" +source="http://miniupnp.free.fr/files/libnatpmp-$pkgver.tar.gz" build() { make diff --git a/user/libnih/APKBUILD b/user/libnih/APKBUILD index a1bd5883e..523b8a1a9 100644 --- a/user/libnih/APKBUILD +++ b/user/libnih/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnih pkgver=1.0.3 -pkgrel=6 +pkgrel=7 pkgdesc="GLib-like library for embedded use" url="https://launchpad.net/libnih" arch="all" @@ -18,6 +18,7 @@ source="https://launchpad.net/libnih/${pkgver%.*}/${pkgver}/+download/${pkgname} disable-broken-test.patch musl-enomem-message.patch parse-test-fix.patch + gcc10.patch " prepare() { @@ -48,4 +49,5 @@ sha512sums="fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d6 77a979b3076c4e4229359f28c2e9d4fb66d799a66d60391ab6fd7e0dfe2a615b88330a979877b105293a95ed147546596eca174f52b75beca0457c49a017d040 musl-fix-signals.patch b5b77b1f18d7aa5d603a0d312b785c28200c38b7bbe5c384ee576c762bd9e3163682c29dd5410baf18c5c3734f0b719602caa1de096f1758d624d94b7753066a disable-broken-test.patch b800c99153ad66c9d7399bc7544a0237de0c7a4ddac129509f13eb1c31805fcac31c93bbf2945da557dfc900c9ec837ec0fded1c3f9887095dae52ff6fc046ec musl-enomem-message.patch -3f24f648c27e9b5a6872859fe97b34055b0f43b11f0321508852b20b6dd94de5c8d24a6dbaab9d49e7004bf0c571c11ebf520d49630d8a89bceeb7783de7dcd2 parse-test-fix.patch" +3f24f648c27e9b5a6872859fe97b34055b0f43b11f0321508852b20b6dd94de5c8d24a6dbaab9d49e7004bf0c571c11ebf520d49630d8a89bceeb7783de7dcd2 parse-test-fix.patch +e2fc351e68ab194723b95a37b4b78c726ef9d7bda173ae51816f979f2f1385f1e776052b75b949cdd794da0cdb53e270fb7a950dc68f2d818ccb1f0013664e0c gcc10.patch" diff --git a/user/libnih/gcc10.patch b/user/libnih/gcc10.patch new file mode 100644 index 000000000..a118b1f53 --- /dev/null +++ b/user/libnih/gcc10.patch @@ -0,0 +1,15 @@ +GCC 10+ use -fno-common by default, which means we need to declare this 'extern'. + +There is no upstream to send this to. + +--- libnih-1.0.3/nih-dbus-tool/output.h.old 2010-09-20 18:17:01.000000000 -0500 ++++ libnih-1.0.3/nih-dbus-tool/output.h 2024-05-28 13:22:58.501847205 -0500 +@@ -27,7 +27,7 @@ + + NIH_BEGIN_EXTERN + +-char *output_package; ++extern char *output_package; + + int output (const char *source_path, int source_fd, + const char *header_path, int header_fd, diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD index 173452d65..59c3bc2e7 100644 --- a/user/liborcus/APKBUILD +++ b/user/liborcus/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liborcus -pkgver=0.17.2 +pkgver=0.19.2 pkgrel=0 pkgdesc="Library for processing spreadsheet documents" url="https://gitlab.com/orcus/orcus" @@ -9,16 +9,15 @@ arch="all" license="MPL-2.0 AND MIT" depends="" depends_dev="boost-dev mdds libixion-dev" -makedepends="$depends_dev zlib-dev autoconf automake libtool cmd:which" +makedepends="$depends_dev zlib-dev" subpackages="$pkgname-dev" -source="https://gitlab.com/orcus/orcus/-/archive/$pkgver/orcus-$pkgver.tar.bz2" - -builddir="$srcdir/orcus-$pkgver" +source="https://gitlab.com/api/v4/projects/orcus%2Forcus/packages/generic/source/$pkgver/liborcus-$pkgver.tar.xz" build() { - export LDFLAGS="-lstdc++fs" #826 + # GCC 13 changed default fp precision behavior. (#1193, #1215) + export CXXFLAGS="${CXXFLAGS} -fexcess-precision=fast" - ./autogen.sh \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -37,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="76ec54dc8ee63e2b6487c865483b7c4eb67b47ac5e9be03dd1ad67705659f640b0cb58cc2dc6fef68210879509d1b53fa460c35f3c3c2900d05d1ca9c0d6cfbd orcus-0.17.2.tar.bz2" +sha512sums="c955490f57e91615278a83bb48726025cd5f8059b97ed5532f770199e134ca511c7ee6b0cd0a9d3a2d54208a5fdd19117054e95e818162ea568052fa11b21d4e liborcus-0.19.2.tar.xz" diff --git a/user/libpciaccess/APKBUILD b/user/libpciaccess/APKBUILD index b6c8ef8ec..974b4b7df 100644 --- a/user/libpciaccess/APKBUILD +++ b/user/libpciaccess/APKBUILD @@ -1,32 +1,26 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpciaccess -pkgver=0.17 +pkgver=0.18.1 pkgrel=0 pkgdesc="X11 PCI access library" url="https://www.X.Org/" arch="all" +options="!check" # no test suite license="MIT AND X11" -depends="" -makedepends="util-macros" +depends="hwdata" +makedepends="meson" subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.xz limits_h.patch" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make -} - -check() { - make check + meson setup --prefix=/usr build + meson compile -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47 libpciaccess-0.17.tar.xz +sha512sums="ef27999446e735df2331e94219ee3dafe9198a2472bb452f63ef9c9c446d5431f9e231e224cfabdeba1402974a5a0064546f9abced4d1770f994f5fc0c2b3310 libpciaccess-0.18.1.tar.xz 331a498059d8b2bfd0a7da0ced3616266ebc129b785090ef1dc19cd645b013428c60d5678fc080bd15ecaf7598ec8b1084509d6bea5d563101169a449b6fe75b limits_h.patch" diff --git a/user/libpfm/APKBUILD b/user/libpfm/APKBUILD index d2c501363..063b041d4 100644 --- a/user/libpfm/APKBUILD +++ b/user/libpfm/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpfm -pkgver=4.11.0 +pkgver=4.13.0 pkgrel=0 pkgdesc="Performance monitoring library" -url="http://perfmon2.sourceforge.net/" +url="https://perfmon2.sourceforge.net/" arch="all" options="!check" # No test suite. license="MIT" @@ -21,4 +21,4 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7 libpfm-4.11.0.tar.gz" +sha512sums="e61b210aa2ce80f0e47603c88eee2e4f2fe30ca2c0e194a5472b6a8de3bf9dc1085e5261bbb9ddbe5b6531c4b391fb34f20d038e5ebd8e6f4c14c2112aee508f libpfm-4.13.0.tar.gz" diff --git a/user/libplist/APKBUILD b/user/libplist/APKBUILD index 4e20b3bc0..5df5484de 100644 --- a/user/libplist/APKBUILD +++ b/user/libplist/APKBUILD @@ -24,7 +24,8 @@ build() { } check() { - make check + # -j1 for #1175 + make -j1 check } package() { diff --git a/user/libpthread-stubs/APKBUILD b/user/libpthread-stubs/APKBUILD index 13ce0a53a..eacd771e6 100644 --- a/user/libpthread-stubs/APKBUILD +++ b/user/libpthread-stubs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpthread-stubs -pkgver=0.4 +pkgver=0.5 pkgrel=0 pkgdesc="POSIX threading functions stubs for platforms missing them" url="https://cgit.freedesktop.org/xcb/pthread-stubs" @@ -9,7 +9,7 @@ options="!dbg" license="X11" depends="" makedepends="" -source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" +source="http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -27,4 +27,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954 libpthread-stubs-0.4.tar.bz2" +sha512sums="a24f7c40dcaf5f6ca0085972117fed5ad0851f6fc1972fdab799d27236afaaa4f7baa93e40532f93984d313d94456819aaf4ec8f8d1bbb2e5c4fc76c31891d82 libpthread-stubs-0.5.tar.xz" diff --git a/user/libptytty/APKBUILD b/user/libptytty/APKBUILD new file mode 100644 index 000000000..d12a73c33 --- /dev/null +++ b/user/libptytty/APKBUILD @@ -0,0 +1,43 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libptytty +pkgver=2.0 +pkgrel=0 +pkgdesc="OS independent and secure pty/tty and utmp/wtmp/lastlog handling" +url="http://software.schmorp.de/pkg/libptytty.html" +arch="all" +options="!check" # No test suite. +license="GPL-2.0+" +depends="" +makedepends="cmake utmps-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="http://dist.schmorp.de/libptytty/libptytty-$pkgver.tar.gz + force-utmps.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + export LDFLAGS="$LDFLAGS -Bdynamic" + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + -Bbuild + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test +} + +package() { + make DESTDIR="$pkgdir" -C build install +} + +sha512sums="9cca5fddbcc4025c2bbe043e3367ac902d0024a34301258dafcf0de70935c055279d88227168d112d0e4c0dc37f1f49e1ea587bd6bddf0b9d92400657bc7be08 libptytty-2.0.tar.gz +34155b4c06bb8dc8f78777fd3a9e749b1c3c056bd073fd7a0c85404f1dfe29dae6b2513a1ed8093fd528d0eb30cd463a5896c0d05203f47bb4f9cad8067bec26 force-utmps.patch" diff --git a/user/libptytty/force-utmps.patch b/user/libptytty/force-utmps.patch new file mode 100644 index 000000000..ce9c34d6d --- /dev/null +++ b/user/libptytty/force-utmps.patch @@ -0,0 +1,12 @@ +We need to ensure linkage to utmps, or utmpx won't work. + +--- libptytty-2.0/CMakeLists.txt.old 2021-08-04 09:07:44.000000000 -0500 ++++ libptytty-2.0/CMakeLists.txt 2024-05-30 19:50:40.078963587 -0500 +@@ -318,6 +318,7 @@ + target_link_libraries(ptytty PRIVATE util) + list(APPEND LIBS -lutil) + endif() ++target_link_libraries(ptytty PRIVATE :libutmps.so.0.1) + + configure_file( + libptytty.pc.in diff --git a/user/libqalculate/APKBUILD b/user/libqalculate/APKBUILD index 6ec80b85b..85c26c019 100644 --- a/user/libqalculate/APKBUILD +++ b/user/libqalculate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqalculate pkgver=3.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="Library implementing a powerful, versatile desktop calculator" url="https://qalculate.github.io/" arch="all" diff --git a/user/libqxp/APKBUILD b/user/libqxp/APKBUILD index 7876ab2c9..940d74333 100644 --- a/user/libqxp/APKBUILD +++ b/user/libqxp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libqxp pkgver=0.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Import filter and tools for QuarkXPress documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp" arch="all" diff --git a/user/librsvg/APKBUILD b/user/librsvg/APKBUILD index 3fa19b15b..0058e06a6 100644 --- a/user/librsvg/APKBUILD +++ b/user/librsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=librsvg pkgver=2.40.21 -pkgrel=0 +pkgrel=1 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="https://wiki.gnome.org/action/show/Projects/LibRsvg" arch="all" @@ -19,6 +19,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # - CVE-2019-20446 build() { + export CFLAGS="$CFLAGS -fno-tree-vrp" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/libsm/APKBUILD b/user/libsm/APKBUILD index 04a84270e..58ef7d632 100644 --- a/user/libsm/APKBUILD +++ b/user/libsm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsm -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="X11 session management library" url="https://www.X.Org/" @@ -10,7 +10,7 @@ depends="" makedepends="libice-dev util-linux-dev util-macros xmlto xorgproto-dev xtrans" checkdepends="check-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libSM-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libSM-$pkgver.tar.xz" builddir="$srcdir"/libSM-$pkgver build() { @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 libSM-1.2.3.tar.bz2" +sha512sums="7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86 libSM-1.2.4.tar.xz" diff --git a/user/libstaroffice/APKBUILD b/user/libstaroffice/APKBUILD index 6f4829b12..dcbe9de45 100644 --- a/user/libstaroffice/APKBUILD +++ b/user/libstaroffice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libstaroffice -pkgver=0.0.6 +pkgver=0.0.7 pkgrel=0 pkgdesc="Import filter for StarOffice documents" url="https://github.com/fosnola/libstaroffice" @@ -11,7 +11,9 @@ license="MPL-2.0 OR LGPL-2.0+" depends="" makedepends="boost-dev doxygen librevenge-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" +source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz + mistake.patch + " build() { ./configure \ @@ -33,4 +35,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324 libstaroffice-0.0.6.tar.xz" +sha512sums="fae873457a8018c1613667aa92771981503585513ab01bdbd2dd6d506ed4f72a7a8fdcfcb8953a46dfcb8fd902d2c9ef8ccd1a5ff15c83990a89847fb98009f8 libstaroffice-0.0.7.tar.xz +f7260246b0fa3005425ed4bab110cb80a499027b54f386307a2d9c8d5609a82f007c7d9196827888631404dfa034ef8709a6a090d62476f3517238ffb3f97128 mistake.patch" diff --git a/user/libstaroffice/mistake.patch b/user/libstaroffice/mistake.patch new file mode 100644 index 000000000..11c558c34 --- /dev/null +++ b/user/libstaroffice/mistake.patch @@ -0,0 +1,22 @@ +From ef427988dd95203938c2f2e8f212347a8c0c678a Mon Sep 17 00:00:00 2001 +From: ALONSO Laurent <laurent.alonso@inria.fr> +Date: Mon, 17 Apr 2023 12:21:36 +0200 +Subject: [PATCH] STOFFStarMathToMMLConverter.cxx: correct a mistake... + +--- + src/lib/STOFFStarMathToMMLConverter.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/STOFFStarMathToMMLConverter.cxx b/src/lib/STOFFStarMathToMMLConverter.cxx +index 99abb73..9457815 100644 +--- a/src/lib/STOFFStarMathToMMLConverter.cxx ++++ b/src/lib/STOFFStarMathToMMLConverter.cxx +@@ -2044,7 +2044,7 @@ bool Parser::convert(librevenge::RVNGString const &starMath, std::vector<LexerDa + done=true; + } + else if (len>=2 && c=='>' && dataList.back().m_string=="?" && +- dataList[len-2].LexerData::Special && dataList[len-2].m_string=="<") { ++ dataList[len-2].m_type==LexerData::Special && dataList[len-2].m_string=="<") { + dataList[len-2].m_type=LexerData::PlaceHolder; + dataList[len-2].m_string="<?>"; + dataList.resize(len-1); diff --git a/user/libva/APKBUILD b/user/libva/APKBUILD index e3316c58e..c1bcd1705 100644 --- a/user/libva/APKBUILD +++ b/user/libva/APKBUILD @@ -2,15 +2,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libva pkgver=2.14.0 -pkgrel=0 +pkgrel=2 pkgdesc="Video Acceleration (VA) API for Linux" url="https://github.com/intel/libva" arch="all" options="!check" # No test suite. license="MIT" depends="" -makedepends="libdrm-dev libx11-dev libxext-dev libxfixes-dev cmd:which" -subpackages="$pkgname-dev" +makedepends="libdrm-dev libglvnd-dev libx11-dev libxext-dev libxfixes-dev + cmd:which wayland-dev wayland-protocols" +subpackages="$pkgname-dev $pkgname-wayland $pkgname-x11" source="https://github.com/intel/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2" build() { @@ -23,7 +24,7 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ --enable-x11 \ - --disable-wayland \ + --enable-wayland \ --disable-static \ --enable-shared make @@ -33,4 +34,19 @@ package() { make DESTDIR="$pkgdir" install } +wayland() { + pkgdesc="$pkgdesc (Wayland library)" + install_if="$pkgname=$pkgver-r$pkgrel wayland" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libva-wayland.so* "$subpkgdir"/usr/lib/ +} + +x11() { + pkgdesc="$pkgdesc (X11 library)" + install_if="$pkgname=$pkgver-r$pkgrel libx11" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libva-glx.so* "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/libva-x11.so* "$subpkgdir"/usr/lib/ +} + sha512sums="7ee6f0711929d1c6f6436b69ad0fedcee7e8a450be907d90a7c9741d55de824de471efbc20a398a47af03f5bbacb927daa1f2f780fce6ddfe6bbee21729c95ca libva-2.14.0.tar.bz2" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index b5239001a..8e5d96c78 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,29 +1,30 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.4 +pkgver=1.5 pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" arch="all" license="MIT" depends="" -makedepends="libx11-dev libxext-dev meson ninja xorgproto-dev" +makedepends="libx11-dev libxext-dev meson xorgproto-dev" subpackages="$pkgname-dev" source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$pkgver/libvdpau-$pkgver.tar.bz2" build() { - meson -Dprefix=/usr \ + meson \ + -Dprefix=/usr \ build - ninja -C build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="68f502f53f4a95c9af571bd5a3f5048dd1afe30d7576f7e80751c7f29450ef8cb226c1281562b616079d6c177830ec67391d0fae33348a4627ca8c113990cd01 libvdpau-1.4.tar.bz2" +sha512sums="7affb14874431eba1be6e8634fcbb6247cbf6956fb88116e06e60de30a7852a407e8598176a369c2ba4bfaef4be58727e51d4bc390f705991ac83d660f611ff5 libvdpau-1.5.tar.bz2" diff --git a/user/libvisio/APKBUILD b/user/libvisio/APKBUILD index e9cf48128..e000d71ea 100644 --- a/user/libvisio/APKBUILD +++ b/user/libvisio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libvisio pkgver=0.1.7 -pkgrel=0 +pkgrel=1 pkgdesc="Import filter and tools for MS Visio diagrams" url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio" arch="all" diff --git a/user/libx11/APKBUILD b/user/libx11/APKBUILD index eae22e047..21d3ae8d4 100644 --- a/user/libx11/APKBUILD +++ b/user/libx11/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libx11 -pkgver=1.8.2 +pkgver=1.8.10 pkgrel=0 pkgdesc="X11 client-side library" url="https://www.X.Org/" @@ -15,6 +15,10 @@ source="https://www.X.Org/releases/individual/lib/libX11-$pkgver.tar.xz" builddir="$srcdir"/libX11-$pkgver # secfixes: +# 1.8.10-r0: +# - CVE-2023-43785 +# - CVE-2023-43786 +# - CVE-2023-43787 # 1.8.2-r0: # - CVE-2021-31535 # 1.6.12-r0: @@ -39,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d libX11-1.8.2.tar.xz" +sha512sums="f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1 libX11-1.8.10.tar.xz" diff --git a/user/libxau/APKBUILD b/user/libxau/APKBUILD index 0cce6002e..f1117ade4 100644 --- a/user/libxau/APKBUILD +++ b/user/libxau/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxau -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=0 pkgdesc="X11 authorisation library" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="e56a862a7bbccb108c9683eeb8b643d2587a121dd96982e1e7edc5bd0b676302d244bfaa750afc7fb2ad31df8b825095d779b6e2ab2c76f94e47095d90071ebb libXau-1.0.10.tar.xz" +sha512sums="f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd libXau-1.0.11.tar.xz" diff --git a/user/libxaw/APKBUILD b/user/libxaw/APKBUILD index 69e0f4ddc..420054604 100644 --- a/user/libxaw/APKBUILD +++ b/user/libxaw/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxaw -pkgver=1.0.14 +pkgver=1.0.16 pkgrel=0 pkgdesc="X11 Athena widget set" url="https://www.X.Org" @@ -10,7 +10,7 @@ depends="" makedepends="libx11-dev libxext-dev libxmu-dev libxpm-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXaw-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXaw-$pkgver.tar.xz" builddir="$srcdir"/libXaw-$pkgver build() { @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4 libXaw-1.0.14.tar.bz2" +sha512sums="1cabad1a9b06dec7de601b977e844536823ee1a0045244acc42ca6b6107da9b4953736d94898a96cab40845eab77dae21e20e1fa66a3dfc4dedf575dfbca04aa libXaw-1.0.16.tar.xz" diff --git a/user/libxaw3d/APKBUILD b/user/libxaw3d/APKBUILD index 922a6f670..a2b12e77d 100644 --- a/user/libxaw3d/APKBUILD +++ b/user/libxaw3d/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxaw3d -pkgver=1.6.4 +pkgver=1.6.6 pkgrel=0 pkgdesc="X11 Athena widget set, with 3D look and feel" url="https://www.X.Org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="388e905871a823d0f87fbc29e9ea2de95ac13ccaf50e031a01602d8d388d61bcf1823b4ded8c1a06bdce382e8ddcbc1b0182ccef00cde8064b09176163283dba libXaw3d-1.6.4.tar.xz" +sha512sums="f324ddb1117ae6f8d50137390b2e82b638b53a6b170cce8f7bd8108fd98ce956badc7dede6b49065419f1565f9f4304571880842e799f7f48fb36bebe3dc3603 libXaw3d-1.6.6.tar.xz" diff --git a/user/libxcb/APKBUILD b/user/libxcb/APKBUILD index 68bcd89fa..32b9425ca 100644 --- a/user/libxcb/APKBUILD +++ b/user/libxcb/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcb -pkgver=1.15 +pkgver=1.17.0 pkgrel=0 pkgdesc="X11 C language Binding" url="https://xcb.freedesktop.org/" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9 libxcb-1.15.tar.xz" +sha512sums="945b1f28e8b407a4d0ebf88c99ef3cbef763fd75e6eaa8e971946e44ce8dbe9b478c56ae85aaaadab7fdb25987e88570d9d4fb9ad2febd6d6bf21d644a0e10d0 libxcb-1.17.0.tar.xz" diff --git a/user/libxcomposite/APKBUILD b/user/libxcomposite/APKBUILD index f390a1204..1e5294342 100644 --- a/user/libxcomposite/APKBUILD +++ b/user/libxcomposite/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcomposite -pkgver=0.4.5 +pkgver=0.4.6 pkgrel=0 pkgdesc="X11 Composite extension library" url="https://www.X.Org/" @@ -10,7 +10,7 @@ depends="" depends_dev="libxext-dev" makedepends="libx11-dev libxext-dev libxfixes-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXcomposite-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXcomposite-$pkgver.tar.xz" builddir="$srcdir"/libXcomposite-$pkgver build() { @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2" +sha512sums="f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b libXcomposite-0.4.6.tar.xz" diff --git a/user/libxcursor/APKBUILD b/user/libxcursor/APKBUILD index 8b34f5a02..7f59ad38d 100644 --- a/user/libxcursor/APKBUILD +++ b/user/libxcursor/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcursor -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=0 pkgdesc="X cursor management library" url="https://www.X.Org/" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ebb42a39855aab86d0c11fe6ad33d011cf56a6dc5c309bef643460319c03df239b7e09fe88777bb25c0e9ff8aceac6bf66e51cc04a2d5ee463b3bc3bbf1674e3 libXcursor-1.2.1.tar.xz" +sha512sums="6550ce1e69b35ef3356f25e31aa2779503d9cea780eff307cb646364993dfaa971304085d32677e68996bd3b8e067436c8fc89aeb4db07a12ce5bc93b735b5b0 libXcursor-1.2.2.tar.xz" diff --git a/user/libxcvt/APKBUILD b/user/libxcvt/APKBUILD new file mode 100644 index 000000000..1888d3ccc --- /dev/null +++ b/user/libxcvt/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Milan P. Stanić <mps@arvanta.net> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=libxcvt +pkgver=0.1.2 +pkgrel=0 +pkgdesc="VESA CVT standard timing modelines generator" +url="https://www.X.Org/" +arch="all" +license="MIT AND X11" +# older xorg-server versions included this package but it has since been split out +# make sure we can upgrade properly to xorg-server 21.1.1 and later +depends="" +makedepends="meson" +replaces="xorg-server<21.1.1" +subpackages="$pkgname-dev $pkgname-doc" +source="https://xorg.freedesktop.org/releases/individual/lib/libxcvt-$pkgver.tar.xz" + +build() { + meson setup --prefix=/usr output + meson compile -C output +} + +check() { + meson test --no-rebuild --print-errorlogs -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output +} + +doc() { + default_doc + + replaces="xorg-server-doc<21.1.1" +} + +sha512sums=" +3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0 libxcvt-0.1.2.tar.xz +" +sha512sums="3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0 libxcvt-0.1.2.tar.xz" diff --git a/user/libxdamage/APKBUILD b/user/libxdamage/APKBUILD index 5519f04e6..e9ab5d7b3 100644 --- a/user/libxdamage/APKBUILD +++ b/user/libxdamage/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxdamage -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=0 pkgdesc="X11 damaged region extension library" url="https://www.X.Org/" arch="all" license="MIT" +options="!check" # No test suite. depends="" makedepends="libx11-dev libxfixes-dev util-macros xorgproto-dev" subpackages="$pkgname-dev" -source="https://www.X.Org/releases/individual/lib/libXdamage-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXdamage-$pkgver.tar.xz" builddir="$srcdir"/libXdamage-$pkgver build() { @@ -21,12 +22,8 @@ build() { make } -check() { - make check -} - package() { make DESTDIR="$pkgdir" install } -sha512sums="a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2" +sha512sums="624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb libXdamage-1.1.6.tar.xz" diff --git a/user/libxdmcp/APKBUILD b/user/libxdmcp/APKBUILD index c94ccc3fe..5fd7db9fb 100644 --- a/user/libxdmcp/APKBUILD +++ b/user/libxdmcp/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxdmcp -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=0 pkgdesc="X11 Display Manager Control Protocol library" url="https://www.X.Org/" @@ -33,4 +33,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="83b384d43bfb034c395f83f97d1c6e73aa3d5faa8f8756b08e697c0b9c3c87189651b51e8213fbd1f5f9cbc2d8136cbf143627481744345d78cfe0ff2ad074a9 libXdmcp-1.1.4.tar.xz" +sha512sums="d7a1d70a58b7d34ddd01a91d3ccbc086a36626b7081cfcbb150d24288c6adad612b042ba7ea63a218595afb2ee04384c0f8ba84ee3c6bd29913724b54e898d83 libXdmcp-1.1.5.tar.xz" diff --git a/user/libxext/APKBUILD b/user/libxext/APKBUILD index cd808007e..508f5544d 100644 --- a/user/libxext/APKBUILD +++ b/user/libxext/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxext -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=0 pkgdesc="X11 miscellaneous extensions library" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd9805982dabfb14b1526c0cb71f94508003fa3fcd60560d387465afd891c1dca61927ae86278436d53f4b840cacd1f412071fdc3dce1d6f730610a9c163d59b libXext-1.3.5.tar.xz" +sha512sums="fd7693b5698cc4f5e80002a2cd4bd88e5d52c755c19a0417ee73029bd65f9d77b0969e765a1febc4d8fce1ba5dfb7278717f47be742e33d8fc5eb941e769792e libXext-1.3.6.tar.xz" diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index ebe00d722..832b51741 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=libxfce4ui -pkgver=4.18.6 +pkgver=4.20.0 pkgrel=0 pkgdesc="UI library for the XFCE desktop environment" url="https://xfce.org" @@ -35,4 +35,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="1c704dd26793a304fef98c48bc3ca860248e746e9e5c39f22e984439e1a20209763e80e40e6bffcf8f0d773b323b825ebd5da4d88352582e56dfeb7c9b2ca47c libxfce4ui-4.18.6.tar.bz2" +sha512sums="33d44e57784542278941803026c9730c7fc680e3bfdebf8656fcd55fcdad3e75846c7aedc940540d8c6c6e88a00c5caec279527dd1db13731c679aa1b9cd7138 libxfce4ui-4.20.0.tar.bz2" diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 6e18b282b..d52dbc1ee 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=libxfce4util -pkgver=4.18.2 +pkgver=4.20.0 pkgrel=0 pkgdesc="Utility library for the XFCE desktop environment" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94c7371bcfd4ea8dca68a2dc2fe029ce8b232b2b906247bb45a830f13a27833e80831bb6df029d634e6cd8496d4cdcbb9691b6c4344aa51292477f2ebf56bac0 libxfce4util-4.18.2.tar.bz2" +sha512sums="07edc4c8645b3418a659ebb688a48cd1de00d12d06521d30ccfa10b16c4525ce5a869f4b890c9da9b297c44c249a8a091ea1143c72c5f74702cd90337a124ca5 libxfce4util-4.20.0.tar.bz2" diff --git a/user/libxfce4windowing/APKBUILD b/user/libxfce4windowing/APKBUILD new file mode 100644 index 000000000..54dcba827 --- /dev/null +++ b/user/libxfce4windowing/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=libxfce4windowing +pkgver=4.20.0 +pkgrel=0 +pkgdesc="Windowing abstraction library for XFCE" +url="https://xfce.org" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="glib-dev gobject-introspection-dev gtk+3.0-dev gtk-doc + libdisplay-info-dev libwnck-dev xfce4-dev-tools>=${pkgver%.*}" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://archive.xfce.org/src/xfce/libxfce4windowing/4.20/libxfce4windowing-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-gtk-doc + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="4db76eacd25200a50619839eb7b0f7fbfc901b8641b40acfc2aa34b88b449212e13b8946a8f5fd43ab89f021ba5bab67384e616163efb06b11603faf6913ba90 libxfce4windowing-4.20.0.tar.bz2" diff --git a/user/libxfixes/APKBUILD b/user/libxfixes/APKBUILD index 91a7ac18c..62dde09a4 100644 --- a/user/libxfixes/APKBUILD +++ b/user/libxfixes/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxfixes -pkgver=6.0.0 +pkgver=6.0.1 pkgrel=0 pkgdesc="X11 fixes extension library" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="libx11-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="http://www.x.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2" +source="http://www.x.org/releases/individual/lib/libXfixes-$pkgver.tar.xz" builddir="$srcdir"/libXfixes-$pkgver build() { @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d libXfixes-6.0.0.tar.bz2" +sha512sums="b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe libXfixes-6.0.1.tar.xz" diff --git a/user/libxfont2/APKBUILD b/user/libxfont2/APKBUILD index 54cf2e6ad..d6693c9f8 100644 --- a/user/libxfont2/APKBUILD +++ b/user/libxfont2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxfont2 -pkgver=2.0.6 +pkgver=2.0.7 pkgrel=0 pkgdesc="X11 font library from X.Org" url="https://www.X.Org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd libXfont2-2.0.6.tar.xz" +sha512sums="f703127df5d5b1093c9b73e019153ed7799523573d52e61d344209f0acfd4df42e11be12bdd1880479c47c2b70de581a4f2ef74e199e9b1ac438f426593d56b0 libXfont2-2.0.7.tar.xz" diff --git a/user/libxft/APKBUILD b/user/libxft/APKBUILD index 5cfeea49b..4201c0aae 100644 --- a/user/libxft/APKBUILD +++ b/user/libxft/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxft -pkgver=2.3.6 +pkgver=2.3.8 pkgrel=0 pkgdesc="FreeType-based font drawing library for X11" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90 libXft-2.3.6.tar.xz" +sha512sums="fc385d73e1acb701942c154ffb5a283d17891f21d3ac598c4a3fb375a7d6082734593062368c15cad67c1a94177dd15deed878ec5ea852188393b52e92c372c8 libXft-2.3.8.tar.xz" diff --git a/user/libxi/APKBUILD b/user/libxi/APKBUILD index 2e7dcdcd2..7f31b1f1b 100644 --- a/user/libxi/APKBUILD +++ b/user/libxi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxi -pkgver=1.8 +pkgver=1.8.1 pkgrel=0 pkgdesc="X11 input extension library" url="https://www.X.Org/" @@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxext-dev libxfixes-dev util-macros xmlto xorgproto-dev" -source="https://www.X.Org/releases/individual/lib/libXi-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXi-$pkgver.tar.xz" builddir="$srcdir"/libXi-$pkgver build() { @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba libXi-1.8.tar.bz2" +sha512sums="a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 libXi-1.8.1.tar.xz" diff --git a/user/libxkbcommon/APKBUILD b/user/libxkbcommon/APKBUILD index a4be5d572..a667c3ab7 100644 --- a/user/libxkbcommon/APKBUILD +++ b/user/libxkbcommon/APKBUILD @@ -1,33 +1,72 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbcommon -pkgver=0.10.0 +pkgver=1.8.1 pkgrel=0 pkgdesc="Keyboard handling library" -url="https://www.xkbcommon.org/" +url="https://xkbcommon.org/" arch="all" license="MIT AND X11" +options="checkx11" depends="xkeyboard-config" -checkdepends="bash" -makedepends="bison doxygen flex libxcb-dev meson ninja util-macros - xorgproto-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="https://www.xkbcommon.org/download/libxkbcommon-$pkgver.tar.xz" +checkdepends="bash xvfb" +makedepends="bison doxygen libxcb-dev meson libxml2-dev wayland-dev + graphviz wayland-protocols" +subpackages="$pkgname-dev $pkgname-doc $pkgname-tools + $pkgname-tools-doc:xkbcli_doc $pkgname-tools-bash-completion:bashcomp" +source="https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-$pkgver.tar.gz" +builddir="$srcdir/libxkbcommon-xkbcommon-$pkgver" build() { - meson \ + meson setup \ -Dprefix=/usr \ - -Denable-wayland=false \ + -Denable-docs=true \ build - ninja -C build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79 libxkbcommon-0.10.0.tar.xz" +doc() { + pkgdesc="Keyboard handling library (documentation)" + install_if="docs $pkgname=$pkgver-r$pkgrel" + # Library docs are in HTML in /usr/share/doc, while xkbcli + # docs are man pages. So we move doc directory to the subpackage... + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/doc "$subpkgdir"/usr/share +} + +tools() { + pkgdesc="xkb command-line tool with interactive debugger" + + mkdir -p "$subpkgdir"/usr/bin + mkdir -p "$subpkgdir"/usr/libexec/xkbcommon + + mv "$pkgdir"/usr/bin/xkbcli "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/libexec/xkbcommon "$subpkgdir"/usr/libexec/ +} + +xkbcli_doc() { + # ...and run default_doc here to let abuild process man pages properly + default_doc + pkgdesc="xkb command-line tool with interactive debugger (doc)" + install_if="docs $pkgname-tools=$pkgver-r$pkgrel" +} + +bashcomp() { + pkgdesc="xkb command-line tool with interactive debugger (bash completions)" + depends="" + install_if="$pkgname-tools=$pkgver-r$pkgrel bash-completion" + + mkdir -p "$subpkgdir"/usr/share/bash-completion/completions + mv "$pkgdir"/usr/share/bash-completion/completions/xkbcli \ + "$subpkgdir"/usr/share/bash-completion/completions/ +} + +sha512sums="a11b8563b11bd085b909753fa99e5b2129343363a05d4fac44a46b334b644dbdd57c356021926e9fdcc2bf6855b90283af93e74c471c3d5677c2ed1bf19427c2 xkbcommon-1.8.1.tar.gz" diff --git a/user/libxkbfile/APKBUILD b/user/libxkbfile/APKBUILD index 1cc6feb63..ea8d2e240 100644 --- a/user/libxkbfile/APKBUILD +++ b/user/libxkbfile/APKBUILD @@ -1,31 +1,27 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbfile -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=0 pkgdesc="X11 keyboard file manipulation library" url="https://www.X.Org/" arch="all" +options="!check" # no test suite license="MIT AND X11" depends="" -makedepends="libx11-dev util-macros" +makedepends="libx11-dev meson" subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ - --sysconfdir=/etc - make -} - -check() { - make check + --sysconfdir=/etc \ + build + meson compile -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="2902d21860e27a27159123a19f7d4e0cf9cf8933685f1d2477e69ec647f0f8629b58bbfc391ed45e8b51a10033f18a9d0f16f7f519da9923cd7ed3bd497cf1a2 libxkbfile-1.1.1.tar.xz" +sha512sums="d80ac41f6fa3a1ffad77ea1f8f9d9542f0bd210d74b263802bc6e6c1594fe325b27f42b5454aeeb36352518963b1ed1fdbbad95d7db3690b2e36d54742b7c236 libxkbfile-1.1.3.tar.xz" diff --git a/user/libxmu/APKBUILD b/user/libxmu/APKBUILD index c025dd9c9..357321e28 100644 --- a/user/libxmu/APKBUILD +++ b/user/libxmu/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxmu -pkgver=1.1.4 +pkgver=1.2.1 pkgrel=0 pkgdesc="X11 miscellaneous micro-utility library" url="https://www.X.Org/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1 libXmu-1.1.4.tar.xz" +sha512sums="05a30e5961e00e940ad7ec4eb94ec482b5cbe808585972bf70c849333af3fddf4ae4bd87895d706507fb3a94ed0fb73ea161e0e27dc2840323a1a1af49c0e8a3 libXmu-1.2.1.tar.xz" diff --git a/user/libxp/APKBUILD b/user/libxp/APKBUILD index 25953833a..3280d3d6f 100644 --- a/user/libxp/APKBUILD +++ b/user/libxp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxp -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="X11 print client library" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libx11-dev libxau-dev libxext-dev xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.x.org/releases/individual/lib/libXp-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/lib/libXp-$pkgver.tar.xz" builddir="$srcdir/libXp-$pkgver" build() { @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="502a2500ec0f519dae69ac035bf93c65c47e3bc301604aacb350e90043455f3485626194db45208e5521300b282843825e08b7f7c412a7497ffa02f5f1560c8d libXp-1.0.3.tar.bz2" +sha512sums="50e82e7ee7222db13a04f6223ae8653eb783593c3b28825d7fc233af188960bec53d2b11ced281e01140d283d840d0e3822d71f95f5045d594fb704485fd0f89 libXp-1.0.4.tar.xz" diff --git a/user/libxpm/APKBUILD b/user/libxpm/APKBUILD index f017ddb7a..1e01a37df 100644 --- a/user/libxpm/APKBUILD +++ b/user/libxpm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxpm -pkgver=3.5.14 +pkgver=3.5.17 pkgrel=0 pkgdesc="X11 pixmap library" url="https://www.X.Org/" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b libXpm-3.5.14.tar.xz" +sha512sums="52f9d2664a47a26c1a6ad65d18867de870b66947b0b0d99cca3512756a0aaa6ce2a245c0b49f20b70c3ce48bf04c47c333e8119a147465c277bca727f6ab017e libXpm-3.5.17.tar.xz" diff --git a/user/libxpresent/APKBUILD b/user/libxpresent/APKBUILD new file mode 100644 index 000000000..3dc280ea0 --- /dev/null +++ b/user/libxpresent/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=libxpresent +pkgver=1.0.1 +pkgrel=0 +pkgdesc="Library for the X Present extension" +url="https://www.x.org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxfixes-dev libxrandr-dev xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://xorg.freedesktop.org/releases/individual/lib/libXpresent-$pkgver.tar.xz" +builddir="$srcdir/libXpresent-$pkgver" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25 libXpresent-1.0.1.tar.xz" diff --git a/user/libxrandr/APKBUILD b/user/libxrandr/APKBUILD index 9316676d5..d77690639 100644 --- a/user/libxrandr/APKBUILD +++ b/user/libxrandr/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxrandr -pkgver=1.5.2 +pkgver=1.5.4 pkgrel=0 pkgdesc="X11 RandR extension library" url="https://www.X.Org/" @@ -10,7 +10,7 @@ depends="" depends_dev="libxext-dev" makedepends="$depends_dev libx11-dev libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXrandr-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXrandr-$pkgver.tar.xz" builddir="$srcdir"/libXrandr-$pkgver build() { @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 libXrandr-1.5.2.tar.bz2" +sha512sums="f7c0b083943e11b4cc3c97e10e2cbbc3920fe0c9c5031ef86fca2eb5df413d767caf53dca266abf65395eb10e55354c8fe59ed6b3265402ffccb919a813bc781 libXrandr-1.5.4.tar.xz" diff --git a/user/libxres/APKBUILD b/user/libxres/APKBUILD index 294597fd0..df8b54d6b 100644 --- a/user/libxres/APKBUILD +++ b/user/libxres/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxres -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=0 pkgdesc="X11 X-Resource extension library" url="https://www.X.Org/" @@ -9,7 +9,7 @@ license="MIT AND X11" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXres-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXres-$pkgver.tar.xz" builddir="$srcdir"/libXres-$pkgver build() { @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1 libXres-1.2.1.tar.bz2" +sha512sums="897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810 libXres-1.2.2.tar.xz" diff --git a/user/libxscrnsaver/APKBUILD b/user/libxscrnsaver/APKBUILD index 2bdfb8a3d..35c9cb9bf 100644 --- a/user/libxscrnsaver/APKBUILD +++ b/user/libxscrnsaver/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxscrnsaver -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="X.Org screen saver extension" url="https://cgit.freedesktop.org/xorg/lib/libXScrnSaver/" @@ -10,7 +10,7 @@ depends="" depends_dev="libxext-dev" makedepends="$depends_dev libx11-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXScrnSaver-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXScrnSaver-$pkgver.tar.xz" builddir="$srcdir"/libXScrnSaver-$pkgver build() { @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a libXScrnSaver-1.2.3.tar.bz2" +sha512sums="e4395af85f8496618afb23ffdaca1a75f5e3d213478d8dc73249cbc9840d7b993ba7513dbf6015cb38b48fe3f2223496365158a148dd5e1ac7475c5ee569e28c libXScrnSaver-1.2.4.tar.xz" diff --git a/user/libxshmfence/APKBUILD b/user/libxshmfence/APKBUILD index f401d3849..239e8695e 100644 --- a/user/libxshmfence/APKBUILD +++ b/user/libxshmfence/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxshmfence -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=0 pkgdesc="X11 shared memory fences" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0c33b97204d62dc8352e2728ce12694bdb83ccbd1fd11c19db17246cd62bcd3e675f5b5b88a4e14bda59b4174003c758c24a3d93abc4bf574fdadc3bf07da71 libxshmfence-1.3.1.tar.xz" +sha512sums="e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c libxshmfence-1.3.2.tar.xz" diff --git a/user/libxt/APKBUILD b/user/libxt/APKBUILD index 595ccf9a7..2540bf649 100644 --- a/user/libxt/APKBUILD +++ b/user/libxt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxt -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=0 pkgdesc="X11 toolkit intrinsics library" url="https://www.X.Org/" @@ -11,7 +11,7 @@ depends_dev="libsm-dev" checkdepends="glib-dev" makedepends="$depends_dev libice-dev libx11-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXt-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXt-$pkgver.tar.xz" builddir="$srcdir"/libXt-$pkgver build() { @@ -31,4 +31,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c libXt-1.2.1.tar.bz2" +sha512sums="64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 libXt-1.3.0.tar.xz" diff --git a/user/libxtst/APKBUILD b/user/libxtst/APKBUILD index 5b1b63f8c..95c5d8a6f 100644 --- a/user/libxtst/APKBUILD +++ b/user/libxtst/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxtst -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=0 pkgdesc="X11 Testing Resource extension library" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d libXtst-1.2.4.tar.xz" +sha512sums="848fa580d7abccd48c9ca3440f92e299839ada0912ed60d38d4d4f5bf37431cd02d7059265ab4e524c3e2cb9c368b9b90b863d1ed97d74979ef8811fc5e635a9 libXtst-1.2.5.tar.xz" diff --git a/user/libxv/APKBUILD b/user/libxv/APKBUILD index d17cb97ba..5312c357b 100644 --- a/user/libxv/APKBUILD +++ b/user/libxv/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxv -pkgver=1.0.11 -pkgrel=2 +pkgver=1.0.12 +pkgrel=0 pkgdesc="X11 Video extension library" url="https://www.X.Org/" arch="all" @@ -9,7 +9,7 @@ license="MIT" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXv-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXv-$pkgver.tar.xz" builddir="$srcdir"/libXv-$pkgver build() { @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58 libXv-1.0.11.tar.bz2" +sha512sums="bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e libXv-1.0.12.tar.xz" diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index fb2dd1e9b..daa1e6264 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxvmc -pkgver=1.0.13 +pkgver=1.0.14 pkgrel=0 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c9d0f73884a586efb9ea4f77fc8555f60d940077d7dff8eaa765b86345c8b4e3d80b860f68191d2830c272b9e464c08450fbb51bb64819753a6f4228c71861ac libXvMC-1.0.13.tar.xz" +sha512sums="fc76c6d591780f3481f5032d1f956f2043f3dc7655a4b776dfda4bae55d4424a36d1a3c63dafe2a851908f33159297c0b038a41329d7a137ca7ea73d3db3eedf libXvMC-1.0.14.tar.xz" diff --git a/user/libxxf86dga/APKBUILD b/user/libxxf86dga/APKBUILD index 5de299edc..cd1e70a9e 100644 --- a/user/libxxf86dga/APKBUILD +++ b/user/libxxf86dga/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxxf86dga -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=0 pkgdesc="X11 Direct Graphics Access extension library" url="https://www.X.Org/" @@ -9,7 +9,7 @@ license="X11" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXxf86dga-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libXxf86dga-$pkgver.tar.xz" builddir="$srcdir"/libXxf86dga-$pkgver build() { @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 libXxf86dga-1.1.5.tar.bz2" +sha512sums="61f7954471df63840ffb5e82347018e285d30d64d4d0a97770ca031c8554a0f52d1b007ab8342a283cd2f0d534f564fb59f57ec92515714f20a7d145912c65d9 libXxf86dga-1.1.6.tar.xz" diff --git a/user/libzmf/APKBUILD b/user/libzmf/APKBUILD index c81460caa..3df4b8bad 100644 --- a/user/libzmf/APKBUILD +++ b/user/libzmf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=libzmf pkgver=0.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Import filter and tools for Zoner Callisto/Draw documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libzmf" arch="all" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 70692ad68..73e9cdb1b 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.76 +pkgver=1.4.79 pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="https://www.lighttpd.net" @@ -36,7 +36,6 @@ source="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$pkgver.t $pkgname.confd $pkgname.logrotate lighttpd.conf - mime-types.conf mod_cgi.conf mod_fastcgi.conf mod_fastcgi_fpm.conf @@ -81,7 +80,7 @@ package() { "$pkgdir"/etc/logrotate.d/lighttpd # config files - local i; for i in lighttpd.conf mime-types.conf mod_cgi.conf \ + local i; for i in lighttpd.conf mod_cgi.conf \ mod_fastcgi.conf mod_fastcgi_fpm.conf do install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i @@ -108,12 +107,11 @@ mod_webdav() { } sha512sums=" -940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782 lighttpd-1.4.76.tar.xz +e0f1bb2cfca5e81001ea30d13f088425dfc7acbec924ecddf438eb6326ab3158a61c6c4aaee0b68a90666d1cb987ce94b1f6a48afd92485cc995db5b58265f83 lighttpd-1.4.79.tar.xz a74fb8394fb77fca2a08bdcfc79d4e13de6aca7bc4ed842b7e05f7f3a9cc85dccaa4971ba8fd0edfaa19da8d3870a743b713d9e51f1cbfe5b8e2843bb7fe5346 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate -f99f109178bc8e60859b01ae7ebaaa63090849fe27f203780bf1e860c2bce997a1b8e6cf4e2a40b5c2f998aac13888aa693dfbfcc8e1bd9be4442a31bcf124d0 lighttpd.conf -a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf mime-types.conf +ba622693023f38b7ecb6234e29494cbec9cc94786a4d9d544a293e08208aaebb038bf443e205f7c5b8780c6c723a800b7f4d6ec7aaad75ebc65ac9b4f1cf064f lighttpd.conf 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5 mod_cgi.conf 1d15b84c03fb648a0e67ab5c5411b85478b4454c44bc2959cc96d1700eeadd7ff429520a5f1550db6527267646622dccd3d47d3fd1258869fccaf5c22d4ad4b2 mod_fastcgi.conf f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b mod_fastcgi_fpm.conf diff --git a/user/lighttpd/lighttpd.conf b/user/lighttpd/lighttpd.conf index 9c9b89c7b..e8807efaf 100644 --- a/user/lighttpd/lighttpd.conf +++ b/user/lighttpd/lighttpd.conf @@ -35,7 +35,6 @@ server.modules = ( ######## Inclusions ######## -include "mime-types.conf" # uncomment for cgi support # include "mod_cgi.conf" # uncomment for php/fastcgi support diff --git a/user/lighttpd/mime-types.conf b/user/lighttpd/mime-types.conf deleted file mode 100644 index f24d4d858..000000000 --- a/user/lighttpd/mime-types.conf +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# Default mime-types.conf for Gentoo. -# include'd from lighttpd.conf. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.4 2010/03/14 21:45:18 bangert Exp $ -############################################################################### - -# {{{ mime types -mimetype.assign = ( - ".svg" => "image/svg+xml", - ".svgz" => "image/svg+xml", - ".pdf" => "application/pdf", - ".sig" => "application/pgp-signature", - ".spl" => "application/futuresplash", - ".class" => "application/octet-stream", - ".ps" => "application/postscript", - ".torrent" => "application/x-bittorrent", - ".dvi" => "application/x-dvi", - ".gz" => "application/x-gzip", - ".pac" => "application/x-ns-proxy-autoconfig", - ".swf" => "application/x-shockwave-flash", - ".tar.gz" => "application/x-tgz", - ".tgz" => "application/x-tgz", - ".tar" => "application/x-tar", - ".zip" => "application/zip", - ".dmg" => "application/x-apple-diskimage", - ".mp3" => "audio/mpeg", - ".m3u" => "audio/x-mpegurl", - ".wma" => "audio/x-ms-wma", - ".wax" => "audio/x-ms-wax", - ".ogg" => "application/ogg", - ".wav" => "audio/x-wav", - ".gif" => "image/gif", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".png" => "image/png", - ".xbm" => "image/x-xbitmap", - ".xpm" => "image/x-xpixmap", - ".xwd" => "image/x-xwindowdump", - ".css" => "text/css", - ".html" => "text/html", - ".htm" => "text/html", - ".js" => "text/javascript", - ".asc" => "text/plain", - ".c" => "text/plain", - ".h" => "text/plain", - ".cc" => "text/plain", - ".cpp" => "text/plain", - ".hh" => "text/plain", - ".hpp" => "text/plain", - ".conf" => "text/plain", - ".log" => "text/plain", - ".text" => "text/plain", - ".txt" => "text/plain", - ".diff" => "text/plain", - ".patch" => "text/plain", - ".ebuild" => "text/plain", - ".eclass" => "text/plain", - ".rtf" => "application/rtf", - ".bmp" => "image/bmp", - ".tif" => "image/tiff", - ".tiff" => "image/tiff", - ".ico" => "image/x-icon", - ".dtd" => "text/xml", - ".xml" => "text/xml", - ".mpeg" => "video/mpeg", - ".mpg" => "video/mpeg", - ".mov" => "video/quicktime", - ".qt" => "video/quicktime", - ".avi" => "video/x-msvideo", - ".asf" => "video/x-ms-asf", - ".asx" => "video/x-ms-asf", - ".wmv" => "video/x-ms-wmv", - ".bz2" => "application/x-bzip", - ".tbz" => "application/x-bzip-compressed-tar", - ".tar.bz2" => "application/x-bzip-compressed-tar" - ) -# }}} - -# vim: set ft=conf foldmethod=marker et : diff --git a/user/lilo/APKBUILD b/user/lilo/APKBUILD index 6282c211c..4e29aa282 100644 --- a/user/lilo/APKBUILD +++ b/user/lilo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=lilo pkgver=24.2 -pkgrel=1 +pkgrel=2 pkgdesc="Minimal BIOS bootloader for x86 systems" url="https://www.joonet.de/lilo/" arch="pmmx x86 x86_64" @@ -11,6 +11,7 @@ depends="perl" makedepends="dev86 linux-headers lvm2-dev sharutils" subpackages="$pkgname-doc" source="https://www.joonet.de/lilo/ftp/sources/lilo-$pkgver.tar.gz + gcc10.patch adelie.patch cflags.patch initramfs.patch @@ -48,6 +49,7 @@ package() { } sha512sums="4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 lilo-24.2.tar.gz +0ef0ab379e787767bcee2c77eeb7bc5acce908850077dcc14a1d71f3a78761946e8e252089fecb441c26cbbee66c868021d42a300d05579d083e654026cf8682 gcc10.patch cf8dab563e88cc7b280f5740c3b0f25049b9ce27c77a67e7b0c55dc21a158f8b2998f0c7743f11bcc4ae893697e6b6cc56054a40919899bf2d6d79b4e1a59190 adelie.patch ed1ffb03dbbbf6fe6974d045005f72b3657d470cd3f3556d582e09a38836090c3e75a684a1dcfbe7ade91e5ada3706b712ae7111460df85454518a746c60bde4 cflags.patch 98e26319a747e6cc7e9d7c695d20e511ef9d196dfc312403c7171380e75edbbdec6af39c0f1670956bcd7ec9ff203505c4001962c767f651b730da31830ed35f initramfs.patch diff --git a/user/lilo/gcc10.patch b/user/lilo/gcc10.patch new file mode 100644 index 000000000..c46b9eebd --- /dev/null +++ b/user/lilo/gcc10.patch @@ -0,0 +1,51 @@ +Description: Fix ftbfs with GCC-10 + +Author: Ryan Finnie <ryan@finnie.org> +Bug-Debian: https://bugs.debian.org/957490 +Forwarded: no + +--- + +--- a/src/raid.h ++++ b/src/raid.h +@@ -8,7 +8,7 @@ + * in the source directory. + */ + +-int do_md_install, ndisk, md_bios; ++extern int ndisk, md_bios; + + int raid_setup(void); + void raid_final(void); +--- a/src/bsect.c ++++ b/src/bsect.c +@@ -54,8 +54,6 @@ + #endif + + +-int boot_dev_nr; +- + static BOOT_SECTOR bsect,bsect_orig; + static MENUTABLE menuparams; + static DESCR_SECTORS descrs; +--- a/src/identify.c ++++ b/src/identify.c +@@ -19,7 +19,6 @@ + #include "common.h" + #include "cfg.h" + +-char *identify; + static char *opt; + static char *first, *dflt; + static int idefault; +--- a/src/raid.c ++++ b/src/raid.c +@@ -41,7 +41,7 @@ + static int raid_bios[MAX_RAID+1]; + static int device; + enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED}; +-int do_md_install, ndisk, md_bios; ++int ndisk, md_bios; + static char *raid_list[MAX_RAID]; + static int list_index[MAX_RAID]; + static int nlist, faulty; diff --git a/user/linux-firmware/APKBUILD b/user/linux-firmware/APKBUILD new file mode 100644 index 000000000..e0b9c54d2 --- /dev/null +++ b/user/linux-firmware/APKBUILD @@ -0,0 +1,77 @@ +# Contributor: Ariadne Conill <nenolod@dereferenced.org> +# Contributor: Oliver Smith <ollieparanoid@bitmessage.ch> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=linux-firmware +pkgver=20241210 +pkgrel=2 +pkgdesc="firmware files for linux" +url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" +arch="all" +options="!strip !check !dbg" +license="custom:multiple" +depends="" +makedepends="rdfind" +source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$pkgname-$pkgver.tar.gz" +# Put /lib/firmware/* folders in subpackages +_folders="3com acenic adaptec advansys airoha amd amd-ucode amdgpu amdnpu +amdtee amlogic amphion ar3k arm ath10k ath11k ath12k ath6k ath9k_htc atmel +atusb av7110 bnx2 bnx2x brcm cadence cavium cirrus cis cnm cpia2 cxgb3 cxgb4 +cypress dabusb dpaa2 dsp56k e100 edgeport emi26 emi62 ene-ub6250 ess go7007 +i915 imx inside-secure intel isci ixp4xx kaweth keyspan keyspan_pda korg +libertas liquidio matrox mediatek mellanox meson microchip moxa mrvl mwl8k +mwlwifi myricom netronome nvidia nxp ositech powervr qca qcom qed qlogic r128 +radeon realtek rockchip rsi rtl_bt rtl_nic rtlwifi rtw88 rtw89 sb16 slicoss sun +sxg tehuti ti ti-connectivity ti-keystone tigon ttusb-budget ueagle-atm vicam +vxge wfx xe yam yamaha" +subpackages="$pkgname-other" +depends="linux-firmware-other" +for i in $_folders; do + subpackages="$pkgname-$i:folder $subpackages" + depends="$pkgname-$i $depends" +done + +package() { + make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install-zst + make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" dedup + rm -f "${pkgdir}/usr/lib/firmware/{Makefile,README,configure,GPL-3}" +} + +folder() { + folder=${subpkgname##linux-firmware-} + pkgdesc="firmware files for linux ($folder folder)" + depends="" + + # Move /lib/firmware/$folder (case insensitive) + mkdir -p "$subpkgdir/lib/firmware" + mv "$(find "$pkgdir/lib/firmware" -iname "$folder" -type d)" \ + "$subpkgdir/lib/firmware" + + # Move related symlinks so they do not get in -other + find "$pkgdir/lib/firmware" -maxdepth 1 -ilname "$folder"/\* \ + -exec mv -- '{}' "$subpkgdir/lib/firmware" \; +} + +other() { + # Requires subfolders to be split in subpackages + leftover="" + for i in "$pkgdir"/lib/firmware/*; do + [ -d "$i" ] && leftover="$leftover $(basename $i)" + done + if [ "$leftover" != "" ]; then + error "Not all subfolders have been moved to subpackages!" + error "Fix this by adjusting _folders as follows:" + fixed="$(echo $_folders$leftover | tr " " "\n" | tr '[A-Z]' '[a-z]' | sort)" + echo "_folders=\"$(printf "$fixed" | tr "\n" " ")\"" | fold -s + return 1 + fi + + # Move /lib/firmware (which doesn't have subfolders now) + pkgdesc="firmware files for linux (uncategorized)" + depends="" + install="$subpkgname.post-upgrade" + mkdir -p "$subpkgdir"/ + mv "$pkgdir"/lib "$subpkgdir"/ +} + +sha512sums="75e2d7383e209c2f787a4369e171e2d9bd16dc9cc1cd74920874d1dc56a950df95981be942fd7aa95620ef18da3e50d0fd95886c1497c91c4e54f564fe381fc3 linux-firmware-20241210.tar.gz" diff --git a/user/linux-firmware/linux-firmware-other.post-upgrade b/user/linux-firmware/linux-firmware-other.post-upgrade new file mode 100644 index 000000000..e821b1015 --- /dev/null +++ b/user/linux-firmware/linux-firmware-other.post-upgrade @@ -0,0 +1,16 @@ +#!/bin/sh -e + +vnew="$1" +vold="$2" + +if test `apk version -t $vnew 20241210-r0` = '>' && test `apk version -t $vold 20241210-r0` != '>' ; then + echo + echo '***' + echo 'The linux-firmware package was repartitioned. Due to this, firmware' + echo 'files from go7007, mediatek, ath10k, qcom and ti folders might have' + echo 'been removed. If your hardware needs these files, please install' + echo 'relevant linux-firmware subpackage.' + echo 'If unsure, install the whole linux-firmware package.' + echo '***' + echo +fi diff --git a/user/listres/APKBUILD b/user/listres/APKBUILD index bea03f148..908115f1e 100644 --- a/user/listres/APKBUILD +++ b/user/listres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=listres -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Tool to list Xt resources" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="caa3626773031fbf6d8bcc1f697afe6add64fe4a8d1d766c42d5c2346050869dd23a26a1718411134ab05c75835facf0786cab5595721a16df423cdc54dd813d listres-1.0.5.tar.xz" +sha512sums="182919c8ba5569af3dbf59421de2dfd3e755b3bd2d6d548c6d2664c20b73f937e64dc73811821c19af93fffbc2d5c8d2db8d9cdd9bf1b93b0f29cb683e13ebe7 listres-1.0.6.tar.xz" diff --git a/user/llvm14/disable-dlclose-test.patch b/user/llvm14/disable-dlclose-test.patch deleted file mode 100644 index b70cd4d4d..000000000 --- a/user/llvm14/disable-dlclose-test.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- llvm-6.0.1.src/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp.old 2017-07-12 21:22:45.000000000 +0000 -+++ llvm-6.0.1.src/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp 2018-09-13 04:43:37.240000000 +0000 -@@ -107,6 +107,7 @@ - EXPECT_TRUE(DynamicLibrary::SearchOrder == DynamicLibrary::SO_Linker); - } - -+#if 0 - TEST(DynamicLibrary, Shutdown) { - std::string A("PipSqueak"), B, C("SecondLib"); - std::vector<std::string> Order; -@@ -162,6 +163,7 @@ - EXPECT_EQ(Order.front(), "SecondLib"); - EXPECT_EQ(Order.back(), "PipSqueak"); - } -+#endif - - #else - diff --git a/user/llvm14/ppc-test.patch b/user/llvm14/ppc-test.patch deleted file mode 100644 index 46ed8fbf0..000000000 --- a/user/llvm14/ppc-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -The ifdef tree uses __powerpc__ so 32-bit PPC is supported as well. - ---- llvm-14.0.6.src/unittests/Support/Host.cpp.old 2022-06-22 16:46:24.000000000 +0000 -+++ llvm-14.0.6.src/unittests/Support/Host.cpp 2022-11-28 02:15:41.512865406 +0000 -@@ -40,7 +40,7 @@ - // some systems. - return (Host.isOSWindows() && llvm_is_multithreaded()) || - Host.isOSDarwin() || (Host.isX86() && Host.isOSLinux()) || -- (Host.isPPC64() && Host.isOSLinux()) || -+ (Host.isPPC() && Host.isOSLinux()) || - (Host.isSystemZ() && (Host.isOSLinux() || Host.isOSzOS())); - } - diff --git a/user/llvm14/APKBUILD b/user/llvm18/APKBUILD index cd8d6d7a0..bc5bb0c83 100644 --- a/user/llvm14/APKBUILD +++ b/user/llvm18/APKBUILD @@ -3,10 +3,10 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> _pkgname=llvm -pkgver=14.0.6 +pkgver=18.1.8 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" url="https://llvm.org/" arch="all" @@ -19,20 +19,21 @@ makedepends="binutils-dev chelf chrpath cmake file libexecinfo-dev libffi-dev libxml2-dev python3 zlib-dev" subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils" -source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz +source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz llvm-fix-build-with-musl-libc.patch disable-FileSystemTest.CreateDir-perms-assert.patch - disable-dlclose-test.patch - dwarf-info.patch dyld-elf-ppc32.patch + dyld-elf-ppc32-2.patch hexagon.patch + i586-json-test.patch + m68k-endianness.patch macho32.patch musl-ppc64-elfv2.patch - ppc-test.patch + ppc-gcc-bug.patch python3-test.patch roundeven.patch " -builddir="$srcdir/$_pkgname-$pkgver.src" +builddir="$srcdir/$_pkgname-project-$pkgver.src/llvm" # ARM has few failures in test suite that we don't care about currently and # also it takes forever to run them on the builder. @@ -72,29 +73,74 @@ prepare() { default_prepare # https://bugs.llvm.org//show_bug.cgi?id=31870 - rm test/tools/llvm-symbolizer/print_context.c + rm -v test/tools/llvm-symbolizer/print_context.c case $CARCH in pmmx|x86|ppc|armhf|armv7) # Appears to not work when building 32-bit code on 64-bit host. - rm test/tools/llvm-size/radix.test;; + rm -v test/tools/llvm-size/radix.test;; esac - # appears to be an issue on musl and glibc, but only fails on musl: - # https://github.com/NixOS/nixpkgs/blob/bb7e9e46/pkgs/development/compilers/llvm/8/llvm.nix#L74 - rm -f test/CodeGen/AArch64/wineh4.mir + case $CARCH in + ppc64|ppc|mips64|mips) + # Appears to be a endianness issue. + for _broken in eh_frame linker-llvm-union-fwd-decl; do + rm -v test/tools/dsymutil/X86/$_broken.test; + done + esac + + case $CTARGET_ARCH in + pmmx) + # Broken by fast precision method. + rm -v test/tools/llvm-cov/mcdc-export-json.test; + rm -v test/tools/llvm-xray/X86/graph-diff-simple.txt; + ;; + ppc) + # RISC-V issues are uninvestigated as of yet. #1233 + rm -v test/CodeGen/RISCV/rvv/combine-store-extract-crash.ll + rm -v test/CodeGen/RISCV/xtheadmempair.ll + esac #1053 - rm -fr \ + rm -vfr \ test/tools/UpdateTestChecks \ test/ExecutionEngine/MCJIT/load-object-a.ll \ ; + + #1250 + rm -v \ + test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test \ + test/tools/dsymutil/X86/DWARFLinkerParallel/odr-member-functions.cpp \ + test/tools/dsymutil/X86/DWARFLinkerParallel/odr-parents.test \ + test/tools/dsymutil/X86/DWARFLinkerParallel/odr-predictable-output2.test \ + test/tools/dsymutil/X86/DWARFLinkerParallel/odr-string.test \ + test/tools/dsymutil/X86/DWARFLinkerParallel/odr-uniquing.cpp } build() { # Auto-detect it by guessing either. ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')" + arch_config="" + case $CTARGET_ARCH in + aarch64) + # libexecinfo does not work on AArch64 because the GCC port + # does not implement RETURN_ADDR_RTX with frame > 0. + arch_config="-DLLVM_ENABLE_BACKTRACES=OFF";; + pmmx) + # The standard precision breaks more than it fixes; there are + # 12 failures in standard mode and only (different) 3 in fast. + export CXXFLAGS="$CXXFLAGS -fexcess-precision=fast";; + esac + + case $CTARGET_ARCH in + pmmx|x86|ppc|armhf|armv7) + # 32-bit 2GB memory ceiling + # 'ld' chokes on 2GB .debug_info, 'scanelf' on binary size + # see also: #1251, #1253, abuild#20 + export CXXFLAGS="$CXXFLAGS -ggdb1";; + esac + cmake -G "Unix Makefiles" -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/$_prefix \ @@ -118,16 +164,25 @@ build() { -DLLVM_HOST_TRIPLE="$CHOST" \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_INSTALL_GTEST=ON \ -DLLVM_INSTALL_UTILS=ON \ -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Hexagon;Lanai;Mips;MSP430;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86;XCore' \ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='M68k' \ + $arch_config \ -Bbuild . make -C build llvm-tblgen make -C build python3 utils/lit/setup.py build + + # Thread 3 requires a lot of stack space to LTO when targeting ARM. + # Note that this occurs even when crossing (on a ppc64 host). + chelf -s 1048576 build/bin/llvm-lto2 + # Needed for parallel-linker support (pthread stack size). + chelf -s 1048576 build/bin/dsymutil + chelf -s 1048576 build/bin/llvm-dwarfutil } check() { @@ -144,10 +199,6 @@ package() { | awk -F: '$2~/ELF/{print $1}' \ | xargs -r chrpath -d - # Thread 3 requires a lot of stack space to LTO when targeting ARM. - # Note that this occurs even when crossing (on a ppc64 host). - chelf -s 1048576 bin/llvm-lto2 - # Symlink files from /usr/lib/llvm*/bin to /usr/bin. mkdir -p "$pkgdir"/usr/bin for full_name in bin/*; do @@ -176,6 +227,13 @@ package() { ln -s ../../include/$pkgname include ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm + + # Thread 3 requires a lot of stack space to LTO when targeting ARM. + # Note that this occurs even when crossing (on a ppc64 host). + chelf -s 1048576 bin/llvm-lto2 + # Needed for parallel-linker support (pthread stack size). + chelf -s 1048576 bin/dsymutil + chelf -s 1048576 bin/llvm-dwarfutil } static() { @@ -197,13 +255,22 @@ libs() { # dynamically linked with libLLVM, so they can find it on default path. mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/$_prefix/lib/$main_soname "$subpkgdir"/usr/lib/ + _solinks=$(ls "$pkgdir"/$_prefix/lib/libLLVM.so.$_majorver*) + for link in $_solinks; do + _real_link=$(basename $link) + mv "$pkgdir"/$_prefix/lib/$_real_link "$subpkgdir"/usr/lib/ + done ln -s $main_soname "$subpkgdir"/usr/lib/$ver_soname - strip "$subpkgdir"/usr/lib/$ver_soname #797 # And also symlink it back to the LLVM prefix. mkdir -p "$subpkgdir"/$_prefix/lib ln -s ../../$main_soname "$subpkgdir"/$_prefix/lib/$main_soname ln -s ../../$main_soname "$subpkgdir"/$_prefix/lib/$ver_soname + ln -s ../../$main_soname "$subpkgdir"/$_prefix/lib/libLLVM.so + for link in $_solinks; do + _real_link=$(basename $link) + ln -s ../../$main_soname "$subpkgdir"/$_prefix/lib/$_real_link + done } dev() { @@ -246,15 +313,16 @@ _common_subpkg() { fi } -sha512sums="6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d llvm-14.0.6.src.tar.xz +sha512sums="25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db llvm-project-18.1.8.src.tar.xz f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch -49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSystemTest.CreateDir-perms-assert.patch -caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60cc2eca59e4c5b2a61d29827a2f3362ee7c5f74f11d9ace200 disable-dlclose-test.patch -2842bcef71fb962cb49717fa9ba3e7318400c4a9175284a39ae3ff13a00260556794d0d63341430b2c64a0bca1ac76186e02c92e444a737a5dec1b6de27bbc60 dwarf-info.patch -5fa36157f7a76ca70d22af7bd96850db454d6add3a19cc3272962633c453087015755ca9df0de29cc40359e89279e470e91ff1a69d1453596a73291b36f39b23 dyld-elf-ppc32.patch -9abe376068801a09b2af01eef0cd319f48862b5ff7cce62af3cf4e7597a0898842125ae574577b545734ec1381f192b924b4f717a9c094f119e32ada81a2b9a2 hexagon.patch -de9791cc476817782b553c4edab696132da4ed2b9a3d80dbf1b85b7dc7a8c5e4caf14f2f26e33c27cd80a91b36709d3b24caea910c0a6315ffbb297cb748468d macho32.patch -e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch -62de403e4cfd58d9f33f8b35ff31f66c906fd39c667fbcfa394d03f636fb10977c2f53c3a780d0c8e099f9a081951402757e12842d82a7cbd1aef4158f51d5c2 ppc-test.patch +d56945bb0476561028616222846257f990d66e68b4458894f8791252411038b269831f9400ed9df3b99f571a82443caaac347a8b38a5516c77c3583469118309 disable-FileSystemTest.CreateDir-perms-assert.patch +94099a2001d38d935ece69943971e7943691e8a5471b31ae2169e1f2f2e60de8a9fe8ba718dfa942c84d22fced7492bc9b87bce84a3e801a46e549c4657f9eb5 dyld-elf-ppc32.patch +23cd4c38899bf001f6e27db9a21dfb9fa1264a81993ef423535ff3132d2a258b4706d201ff15a96624db82540ee09c14810af0392f0786262699dfdbcb47b9ba dyld-elf-ppc32-2.patch +807587a0c897d47a01a846c5c4f7cbf1f2d16437a163b66ee2381a7147e9d04b0141b2c76d022db61903d0d2841ddb267ba98c66c9e41501ca41837659743df8 hexagon.patch +22dedbbdc99ab4df6c64921186803552fc61cfc00a5cd052295a5450809e7205ac21dd07df158b7e99b960084b2ec3d8832480a8cd073fe1c2d613cd21c90b60 i586-json-test.patch +b186ce027dca389cfd23dc91b03e023e688c7610745cf62d0b277b6178972bcf55abf0df08453f2a6b85dc61dba929cb565cb30633a2fe0f193a443f54025bf7 m68k-endianness.patch +64a28241b9ea87cfc4313440bf53b1c85dff9a1c84846f5b7619b67842acd68da878a1196baccb1e28f44a1484c09d5bffd4cf14341ed2b24642006e6d87b90a macho32.patch +bec1fe4761dae33a8012a54b7bbdd179cac82febcd46ace1844772c06f207661c903f05fcb7a5ebbbece3e33a88b20a5d9b31b40e8a8cd5c626aec04cb6735be musl-ppc64-elfv2.patch +bda83678acb97be4d4236179792b3555b8000242fa6bd9e2e78dcd4f6182395df7fa9b8742fde946f19b668615ab37db8670340d43683787d36c540937bca523 ppc-gcc-bug.patch 89ef5fbab039b017a5652656adf17b680525f1c5dd0b1afc8034fe0b34a2ca196d87640f54cc826356cfcd88c6e5f10754b7e38f04ca49ede4f3864080b787bd python3-test.patch -dca77af49ea181ab8d41630b8e7575b83aac22686a1119479abf8fe22d8f13032d69ef83a9635b9ad9b935cd3b51251d939e05967ad40db43abf69ac40e0eccd roundeven.patch" +3dc797036dd976db76c774c4b87609d8548cfcd6575dd1e5322a2170fca4419b6934e12874f1c6650d73b858527d22d70e7abe5270dff79c190feeeb1d965d0a roundeven.patch" diff --git a/user/llvm14/disable-FileSystemTest.CreateDir-perms-assert.patch b/user/llvm18/disable-FileSystemTest.CreateDir-perms-assert.patch index e73ce9b6f..64f13db73 100644 --- a/user/llvm14/disable-FileSystemTest.CreateDir-perms-assert.patch +++ b/user/llvm18/disable-FileSystemTest.CreateDir-perms-assert.patch @@ -18,7 +18,7 @@ on build servers. --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp -@@ -579,23 +579,23 @@ +@@ -1004,23 +1004,23 @@ ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "foo")); #ifdef LLVM_ON_UNIX @@ -58,4 +58,4 @@ on build servers. +// ::umask(OldUmask); #endif - #ifdef LLVM_ON_WIN32 + #ifdef _WIN32 diff --git a/user/llvm14/dwarf-info.patch b/user/llvm18/dwarf-info.patch index 9357c6519..9357c6519 100644 --- a/user/llvm14/dwarf-info.patch +++ b/user/llvm18/dwarf-info.patch diff --git a/user/llvm18/dyld-elf-ppc32-2.patch b/user/llvm18/dyld-elf-ppc32-2.patch new file mode 100644 index 000000000..d424554e2 --- /dev/null +++ b/user/llvm18/dyld-elf-ppc32-2.patch @@ -0,0 +1,176 @@ +Author: Ash Logan <ash@heyquark.com> + +adds a whole bunch of ppc32 relocation types - probably only REL32 and REL24 are actually needed, or +indeed tested. +mostly copypasted from the ppc64 code with ELFv2 ABI removed. No attempt is made to support GOT/PLT +relocations, since the JIT doesn't seem to generate these. + +makes clang-repl and the ExecutionEngine testsuites pass, and allows llvmpipe to run + +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp 2025-02-26 00:10:04.114888980 +1100 +@@ -1029,6 +1029,14 @@ uint8_t *RuntimeDyldImpl::createStubFunc + writeBytesUnaligned(JrT9Instr, Addr + 24, 4); + writeBytesUnaligned(NopInstr, Addr + 28, 4); + return Addr; ++ } else if (Arch == Triple::ppc || Arch == Triple::ppcle) { ++ // The ABI docs talk endlessly of PLTs and GOTs which have special relocation types. ++ // For the generic types, just do a generic jump. ++ writeInt32BE(Addr, 0x3D800000); // lis r12, h(addr) ++ writeInt32BE(Addr+4, 0x618C0000); // ori r12, l(addr) ++ writeInt32BE(Addr+8, 0x7D8903A6); // mtctr r12 ++ writeInt32BE(Addr+12, 0x4E800420); // bctr ++ return Addr; + } else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) { + // Depending on which version of the ELF ABI is in use, we need to + // generate one of two variants of the stub. They both start with +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2025-02-26 00:32:57.021079997 +1100 +@@ -819,7 +819,7 @@ void RuntimeDyldELF::resolvePPC32Relocat + uint8_t *LocalAddress = Section.getAddressWithOffset(Offset); + switch (Type) { + default: +- report_fatal_error("Relocation type not implemented yet!"); ++ report_fatal_error("Relocation type " + Twine(Type) + " not implemented yet!"); + break; + case ELF::R_PPC_ADDR16_LO: + writeInt16BE(LocalAddress, applyPPClo(Value + Addend)); +@@ -835,6 +835,37 @@ void RuntimeDyldELF::resolvePPC32Relocat + int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); + writeInt32BE(LocalAddress, delta); + } break; ++ case ELF::R_PPC_REL24: { ++ uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); ++ int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); ++ if (SignExtend64<26>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_REL24 overflow"); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0xFC000003) | (delta & 0x03FFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR32: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ writeInt32BE(LocalAddress, delta); ++ } break; ++ case ELF::R_PPC_ADDR30: { ++ uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); ++ int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0x00000003) | (delta & 0xFFFFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR24: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ if (SignExtend64<26>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_ADDR24 overflow"); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0xFC000003) | (delta & 0x03FFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR16: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ if (SignExtend64<16>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_ADDR16 overflow"); ++ writeInt16BE(LocalAddress, delta); ++ } break; + } + } + +@@ -1551,6 +1587,76 @@ RuntimeDyldELF::processRelocationRef( + processSimpleRelocation(SectionID, Offset, RelType, Value); + } + ++ } else if (Arch == Triple::ppc || Arch == Triple::ppcle) { ++ if (RelType == ELF::R_PPC_REL24) { ++ // A PPC branch relocation will need a stub function if the target is ++ // an external symbol (either Value.SymbolName is set, or SymType is ++ // Symbol::ST_Unknown) or if the target address is not within the ++ // signed 24-bits branch address. ++ SectionEntry &Section = Sections[SectionID]; ++ uint8_t *Target = Section.getAddressWithOffset(Offset); ++ bool RangeOverflow = false; ++ bool IsExtern = Value.SymbolName || SymType == SymbolRef::ST_Unknown; ++ if (!IsExtern) { ++ uint8_t *RelocTarget = ++ Sections[Value.SectionID].getAddressWithOffset(Value.Addend); ++ int64_t delta = static_cast<int64_t>(Target - RelocTarget); ++ // If it is within 26-bits branch range, just set the branch target ++ if (SignExtend64<26>(delta) != delta) { ++ RangeOverflow = true; ++ } else { ++ RelocationEntry RE(SectionID, Offset, RelType, Value.Addend); ++ addRelocationForSection(RE, Value.SectionID); ++ } ++ } ++ if (IsExtern || RangeOverflow) { ++ // It is an external symbol (either Value.SymbolName is set, or ++ // SymType is SymbolRef::ST_Unknown) or out of range. ++ StubMap::const_iterator i = Stubs.find(Value); ++ if (i != Stubs.end()) { ++ // Symbol function stub already created, just relocate to it ++ resolveRelocation(Section, Offset, ++ reinterpret_cast<uint64_t>( ++ Section.getAddressWithOffset(i->second)), ++ RelType, 0); ++ LLVM_DEBUG(dbgs() << " Stub function found\n"); ++ } else { ++ // Create a new stub function. ++ LLVM_DEBUG(dbgs() << " Create a new stub function\n"); ++ Stubs[Value] = Section.getStubOffset(); ++ uint8_t *StubTargetAddr = createStubFunction( ++ Section.getAddressWithOffset(Section.getStubOffset())); ++ ++ // The PPC32 ELF ABI doesn't really provide any guidance on the no-PLT case so let's do ++ // our best ++ uint64_t StubRelocOffset = StubTargetAddr - Section.getAddress(); ++ if (!IsTargetLittleEndian) ++ StubRelocOffset += 2; ++ ++ RelocationEntry REh(SectionID, StubRelocOffset + 0, ++ ELF::R_PPC_ADDR16_HI, Value.Addend); ++ RelocationEntry REl(SectionID, StubRelocOffset + 4, ++ ELF::R_PPC_ADDR16_LO, Value.Addend); ++ ++ if (Value.SymbolName) { ++ addRelocationForSymbol(REh, Value.SymbolName); ++ addRelocationForSymbol(REl, Value.SymbolName); ++ } else { ++ addRelocationForSection(REh, Value.SectionID); ++ addRelocationForSection(REl, Value.SectionID); ++ } ++ ++ resolveRelocation(Section, Offset, reinterpret_cast<uint64_t>( ++ Section.getAddressWithOffset( ++ Section.getStubOffset())), ++ RelType, 0); ++ Section.advanceStubOffset(getMaxStubSize()); ++ } ++ } ++ } else { ++ // Normal relocations are fine as-is probs ++ processSimpleRelocation(SectionID, Offset, RelType, Value); ++ } + } else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) { + if (RelType == ELF::R_PPC64_REL24) { + // Determine ABI variant in use for this object. +@@ -2228,6 +2334,8 @@ size_t RuntimeDyldELF::getGOTEntrySize() + case Triple::x86: + case Triple::arm: + case Triple::thumb: ++ case Triple::ppc: ++ case Triple::ppcle: + Result = sizeof(uint32_t); + break; + case Triple::mips: +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h 2025-02-25 23:51:24.830956991 +1100 +@@ -69,6 +69,8 @@ class RuntimeDyldELF : public RuntimeDyl + return 16; + else if (IsMipsN64ABI) + return 32; ++ else if (Arch == Triple::ppc || Arch == Triple::ppcle) ++ return 16; + else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) + return 44; + else if (Arch == Triple::x86_64) + diff --git a/user/llvm14/dyld-elf-ppc32.patch b/user/llvm18/dyld-elf-ppc32.patch index badea265f..77ff8c644 100644 --- a/user/llvm14/dyld-elf-ppc32.patch +++ b/user/llvm18/dyld-elf-ppc32.patch @@ -8,17 +8,15 @@ Needs more tests before submitting upstream, but seems to DTRT. --- llvm-14.0.6.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp.old 2022-06-22 16:46:24.000000000 +0000 +++ llvm-14.0.6.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2022-11-28 06:33:12.239921624 +0000 -@@ -818,6 +818,13 @@ +@@ -830,6 +830,11 @@ case ELF::R_PPC_ADDR16_HA: writeInt16BE(LocalAddress, applyPPCha(Value + Addend)); break; -+ case ELF::R_PPC_REL32: ++ case ELF::R_PPC_REL32: { + uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); + int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); -+ if (SignExtend64<32>(delta) != delta) -+ llvm_unreachable("Relocation R_PPC_REL32 overflow"); + writeInt32BE(LocalAddress, delta); -+ break; ++ } break; } } diff --git a/user/llvm14/hexagon.patch b/user/llvm18/hexagon.patch index a67fd0dff..552079b80 100644 --- a/user/llvm14/hexagon.patch +++ b/user/llvm18/hexagon.patch @@ -25,7 +25,7 @@ index afbef217911a..d317d7eac800 100644 --- a/test/CodeGen/Hexagon/csr-stubs-spill-threshold.ll +++ b/test/CodeGen/Hexagon/csr-stubs-spill-threshold.ll @@ -1,4 +1,4 @@ --; RUN: llc -march=hexagon -O2 -spill-func-threshold=2 < %s | FileCheck %s +-; RUN: llc -mtriple=hexagon -O2 -spill-func-threshold=2 < %s | FileCheck %s +; RUN: llc -march=hexagon -mtriple=hexagon-unknown-linux-gnu -O2 -spill-func-threshold=2 < %s | FileCheck %s declare i32 @f0(i32, i32, i32, i32, i32, i32) @@ -35,7 +35,7 @@ index 628362783c9c..886405a2d91a 100644 --- a/test/CodeGen/Hexagon/long-calls.ll +++ b/test/CodeGen/Hexagon/long-calls.ll @@ -1,4 +1,4 @@ --; RUN: llc -march=hexagon -enable-save-restore-long -hexagon-initial-cfg-cleanup=0 < %s | FileCheck %s +-; RUN: llc -mtriple=hexagon -enable-save-restore-long -hexagon-initial-cfg-cleanup=0 < %s | FileCheck %s +; RUN: llc -march=hexagon -mtriple=hexagon-unknown-linux-gnu -enable-save-restore-long -hexagon-initial-cfg-cleanup=0 < %s | FileCheck %s ; Check that the -long-calls feature is supported by the backend. @@ -45,7 +45,7 @@ index d76b87f987fe..383486dfe63d 100644 --- a/test/CodeGen/Hexagon/mlong-calls.ll +++ b/test/CodeGen/Hexagon/mlong-calls.ll @@ -1,4 +1,4 @@ --; RUN: llc -hexagon-long-calls -march=hexagon -enable-save-restore-long=true < %s | FileCheck %s +-; RUN: llc -hexagon-long-calls -mtriple=hexagon -enable-save-restore-long=true < %s | FileCheck %s +; RUN: llc -hexagon-long-calls -march=hexagon -mtriple=hexagon-unknown-linux-gnu -enable-save-restore-long=true < %s | FileCheck %s ; CHECK: call ##f1 @@ -55,8 +55,8 @@ index 9d3b6cec39e3..077063e36550 100644 --- a/test/CodeGen/Hexagon/pic-regusage.ll +++ b/test/CodeGen/Hexagon/pic-regusage.ll @@ -1,4 +1,4 @@ --; RUN: llc -march=hexagon -relocation-model=pic < %s | FileCheck %s -+; RUN: llc -march=hexagon -mtriple=hexagon-unknown-linux-gnu -relocation-model=pic < %s | FileCheck %s +-; RUN: llc -mtriple=hexagon -relocation-model=pic < %s | FileCheck %s ++; RUN: llc -march=hexagon -mtriple=hexagon-unknown-linux-gnu -relocation-model=pic < %s | FileCheck %s ; Force the use of R14 (by clobbering everything else in the inline asm). ; Make sure that R14 is not set before the __save call (which will clobber @@ -65,7 +65,7 @@ index 66e93d02ef51..2f3f2ad10f6a 100644 --- a/test/CodeGen/Hexagon/runtime-stkchk.ll +++ b/test/CodeGen/Hexagon/runtime-stkchk.ll @@ -1,4 +1,4 @@ --; RUN: llc -march=hexagon -mcpu=hexagonv55 -enable-stackovf-sanitizer < %s | FileCheck %s +-; RUN: llc -mtriple=hexagon -mcpu=hexagonv55 -enable-stackovf-sanitizer < %s | FileCheck %s +; RUN: llc -march=hexagon -mcpu=hexagonv55 -mtriple=hexagon-unknown-linux-gnu -enable-stackovf-sanitizer < %s | FileCheck %s ; CHECK-LABEL: foo_1 diff --git a/user/llvm18/i586-json-test.patch b/user/llvm18/i586-json-test.patch new file mode 100644 index 000000000..e72763976 --- /dev/null +++ b/user/llvm18/i586-json-test.patch @@ -0,0 +1,19 @@ +--- llvm/unittests/Support/JSONTest.cpp.old 2024-06-15 12:21:32.000000000 -0500 ++++ llvm/unittests/Support/JSONTest.cpp 2024-07-08 21:09:43.106973458 -0500 +@@ -313,6 +313,8 @@ + 1.5, + }, + ++ // Broken by -fexcess-precision=fast. ++#ifndef __i586 + { + "Integer, not exact double. Stored as int64, convertible.", + int64_t{0x4000000000000001}, +@@ -328,6 +330,7 @@ + int64_t{-0x4000000000000001}, + double{-0x4000000000000000}, + }, ++#endif + + // PR46470, + // https://developercommunity.visualstudio.com/content/problem/1093399/incorrect-result-when-printing-6917529027641081856.html diff --git a/user/llvm14/llvm-fix-build-with-musl-libc.patch b/user/llvm18/llvm-fix-build-with-musl-libc.patch index 6ee91ea44..6ee91ea44 100644 --- a/user/llvm14/llvm-fix-build-with-musl-libc.patch +++ b/user/llvm18/llvm-fix-build-with-musl-libc.patch diff --git a/user/llvm18/m68k-endianness.patch b/user/llvm18/m68k-endianness.patch new file mode 100644 index 000000000..49e96a995 --- /dev/null +++ b/user/llvm18/m68k-endianness.patch @@ -0,0 +1,26 @@ +Upstream: https://github.com/llvm/llvm-project/issues/94726 + +diff --git a/lib/Target/M68k/MCTargetDesc/M68kBaseInfo.h b/lib/Target/M68k/MCTargetDesc/M68kBaseInfo.h +index 1376b06bef6f..62ea03cc9760 100644 +--- a/lib/Target/M68k/MCTargetDesc/M68kBaseInfo.h ++++ b/lib/Target/M68k/MCTargetDesc/M68kBaseInfo.h +@@ -85,9 +85,16 @@ template <typename value_t> value_t swapWord(value_t Val) { + Val = support::endian::byte_swap(Val, llvm::endianness::big); + value_t NewVal = 0; + for (unsigned i = 0U; i != NumWords; ++i) { +- uint16_t Part = (Val >> (i * 16)) & 0xFFFF; +- Part = support::endian::byte_swap(Part, llvm::endianness::big); +- NewVal |= (Part << (i * 16)); ++ if (llvm::endianness::native == llvm::endianness::big) { ++ uint16_t Lo = (Val >> (i * 16)) & 0xFFFF; ++ NewVal |= (Lo << (++i * 16)); ++ uint16_t Hi = (Val >> (++i * 16)) & 0xFFFF; ++ NewVal |= (Hi << ((i - 1) * 16)); ++ } else { ++ uint16_t Part = (Val >> (i * 16)) & 0xFFFF; ++ Part = support::endian::byte_swap(Part, llvm::endianness::big); ++ NewVal |= (Part << (i * 16)); ++ } + } + return NewVal; + } diff --git a/user/llvm14/macho32.patch b/user/llvm18/macho32.patch index 31279d502..e18098372 100644 --- a/user/llvm14/macho32.patch +++ b/user/llvm18/macho32.patch @@ -5,7 +5,7 @@ Upstream-URL: https://github.com/llvm/llvm-project/issues/56746 --- llvm-14.0.6.src/lib/Object/MachOObjectFile.cpp.old 2022-06-22 16:46:24.000000000 +0000 +++ llvm-14.0.6.src/lib/Object/MachOObjectFile.cpp 2022-11-28 04:21:02.730211841 +0000 -@@ -190,7 +190,8 @@ +@@ -192,7 +192,8 @@ getLoadCommandInfo(const MachOObjectFile &Obj, const char *Ptr, uint32_t LoadCommandIndex) { if (auto CmdOrErr = getStructOrErr<MachO::load_command>(Obj, Ptr)) { diff --git a/user/llvm14/musl-ppc64-elfv2.patch b/user/llvm18/musl-ppc64-elfv2.patch index 016be5dad..49f6e5702 100644 --- a/user/llvm14/musl-ppc64-elfv2.patch +++ b/user/llvm18/musl-ppc64-elfv2.patch @@ -11,21 +11,6 @@ musl. test/CodeGen/PowerPC/ppc64-elf-abi.ll | 1 + 2 files changed, 5 insertions(+) -diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp -index 34410393ef6..c583fba8cab 100644 ---- a/lib/Target/PowerPC/PPCTargetMachine.cpp -+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp -@@ -199,6 +199,10 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT, - case Triple::ppc64le: - return PPCTargetMachine::PPC_ABI_ELFv2; - case Triple::ppc64: -+ // musl uses ELFv2 ABI on both endians. -+ if (TT.getEnvironment() == Triple::Musl) -+ return PPCTargetMachine::PPC_ABI_ELFv2; -+ - return PPCTargetMachine::PPC_ABI_ELFv1; - default: - return PPCTargetMachine::PPC_ABI_UNKNOWN; diff --git a/test/CodeGen/PowerPC/ppc64-elf-abi.ll b/test/CodeGen/PowerPC/ppc64-elf-abi.ll index 1e17930304b..aa594b37b47 100644 --- a/test/CodeGen/PowerPC/ppc64-elf-abi.ll diff --git a/user/llvm18/ppc-gcc-bug.patch b/user/llvm18/ppc-gcc-bug.patch new file mode 100644 index 000000000..3c1371dc4 --- /dev/null +++ b/user/llvm18/ppc-gcc-bug.patch @@ -0,0 +1,22 @@ +Upstream: https://github.com/llvm/llvm-project/issues/95594 +Ref: #1204 + +--- llvm/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h.old 2024-06-15 12:21:32.000000000 -0500 ++++ llvm/include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h 2024-06-25 21:42:07.495284340 -0500 +@@ -390,6 +390,8 @@ + return Size; + } + ++#pragma GCC push_options ++#pragma GCC optimize("no-tree-ch") + static bool serialize(SPSOutputBuffer &OB, const SequenceT &S) { + if (!SPSArgList<uint64_t>::serialize(OB, static_cast<uint64_t>(S.size()))) + return false; +@@ -398,6 +400,7 @@ + return false; + return true; + } ++#pragma GCC pop_options + + static bool deserialize(SPSInputBuffer &IB, SequenceT &S) { + using TBSD = TrivialSPSSequenceDeserialization<SPSElementTagT, SequenceT>; diff --git a/user/llvm14/python3-test.patch b/user/llvm18/python3-test.patch index 76f13385d..76f13385d 100644 --- a/user/llvm14/python3-test.patch +++ b/user/llvm18/python3-test.patch diff --git a/user/llvm14/roundeven.patch b/user/llvm18/roundeven.patch index 04d741cdb..3747969c1 100644 --- a/user/llvm14/roundeven.patch +++ b/user/llvm18/roundeven.patch @@ -1,6 +1,6 @@ --- llvm-14.0.4.src/lib/Analysis/TargetLibraryInfo.cpp.old 2022-05-24 22:02:58.000000000 +0000 +++ llvm-14.0.4.src/lib/Analysis/TargetLibraryInfo.cpp 2022-07-06 01:38:22.016862561 +0000 -@@ -588,6 +588,13 @@ +@@ -634,6 +634,13 @@ TLI.setUnavailable(LibFunc_statvfs64); TLI.setUnavailable(LibFunc_tmpfile64); @@ -18,11 +18,11 @@ +++ llvm-14.0.4.src/test/Transforms/InstCombine/double-float-shrink-2.ll 2022-07-06 02:03:20.657791057 +0000 @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py --; RUN: opt < %s -instcombine -S -mtriple "i386-pc-linux" | FileCheck %s -+; RUN: opt < %s -instcombine -S -mtriple "i386-pc-linux-gnu" | FileCheck %s - ; RUN: opt < %s -instcombine -S -mtriple "i386-pc-win32" | FileCheck %s - ; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-win32" | FileCheck %s - ; RUN: opt < %s -instcombine -S -mtriple "i386-pc-mingw32" | FileCheck %s + ; REQUIRES: x86-registered-target,sparc-registered-target +-; RUN: opt < %s -passes=instcombine -S -mtriple "i386-pc-linux" | FileCheck %s --check-prefixes=CHECK,DOUBLE-4BYTE-ALIGN ++; RUN: opt < %s -passes=instcombine -S -mtriple "i386-pc-linux-gnu" | FileCheck %s --check-prefixes=CHECK,DOUBLE-4BYTE-ALIGN + ; RUN: opt < %s -passes=instcombine -S -mtriple "i386-pc-win32" | FileCheck %s --check-prefixes=CHECK,DOUBLE-8BYTE-ALIGN + ; RUN: opt < %s -passes=instcombine -S -mtriple "x86_64-pc-win32" | FileCheck %s --check-prefixes=CHECK,DOUBLE-8BYTE-ALIGN --- llvm-14.0.4.src/test/ExecutionEngine/Interpreter/intrinsics.ll.old 2022-05-24 22:02:58.000000000 +0000 +++ llvm-14.0.4.src/test/ExecutionEngine/Interpreter/intrinsics.ll 2022-07-23 06:50:59.336665672 +0000 @@ -13,8 +13,8 @@ diff --git a/user/mailcap/APKBUILD b/user/mailcap/APKBUILD new file mode 100644 index 000000000..91cc3598c --- /dev/null +++ b/user/mailcap/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=mailcap +pkgver=2.1.54 +pkgrel=0 +pkgdesc="Helper application and MIME type associations for file types" +url="https://pagure.io/mailcap" +arch="noarch" +license="Public-Domain" +options="!check" # No test suite. +subpackages="$pkgname-doc" +source="https://releases.pagure.org/mailcap/mailcap-$pkgver.tar.xz" + +package() { + make install DESTDIR="$pkgdir" + rm -Rf "$pkgdir"/etc/nginx +} + +sha512sums=" +a80caba013b644111f163d8ef74fe801d7266cf4edd38ca723f98fb12a103a24e84a8fca0c569beb05ca0f407437ed1282306b30303c38327b744194c6fe80b2 mailcap-2.1.54.tar.xz +" +sha512sums="a80caba013b644111f163d8ef74fe801d7266cf4edd38ca723f98fb12a103a24e84a8fca0c569beb05ca0f407437ed1282306b30303c38327b744194c6fe80b2 mailcap-2.1.54.tar.xz" diff --git a/user/makedepend/APKBUILD b/user/makedepend/APKBUILD index 19200ffb7..2f6c712b1 100644 --- a/user/makedepend/APKBUILD +++ b/user/makedepend/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=makedepend -pkgver=1.0.7 +pkgver=1.0.9 pkgrel=0 pkgdesc="Utility for making makefile dependencies" url="https://www.freedesktop.org/" @@ -28,4 +28,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db makedepend-1.0.7.tar.xz" +sha512sums="68d289656314dc9f12c792d0e394cfbc95404a0d01155dbcb38313d451b506da48a3d44183f568a2cbb2b1d1da9e26703a0d92f2bb658f72fc968eeb03bf2fe8 makedepend-1.0.9.tar.xz" diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 7c44f4c46..ee293e709 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb pkgver=10.6.4 -pkgrel=0 +pkgrel=1 pkgdesc="Open source database server" url="https://mariadb.org/" arch="all" @@ -26,6 +26,7 @@ subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded $pkgname-doc $pkgname-dev" source="https://archive.mariadb.org/$pkgname-$pkgver/source/$pkgname-$pkgver.tar.gz ppchax.patch + missing-header.patch mariadb.initd mariadb-server.limits " @@ -270,5 +271,6 @@ doc() { sha512sums="c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071 mariadb-10.6.4.tar.gz 0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch +6618ee5608b06941da08872ea7ea16149b72a0174b157f970c03a9a9110efe0704c72742e63181f8059244e89fe25d1b07f1c87fed72115d62f347f58fafccdd missing-header.patch 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" diff --git a/user/mariadb/missing-header.patch b/user/mariadb/missing-header.patch new file mode 100644 index 000000000..bdb89daa3 --- /dev/null +++ b/user/mariadb/missing-header.patch @@ -0,0 +1,12 @@ +Needed for compilation on GCC 13. + +--- mariadb-10.6.4/tpool/aio_linux.cc.old 2021-08-03 09:48:41.000000000 -0500 ++++ mariadb-10.6.4/tpool/aio_linux.cc 2024-05-28 18:55:26.914066003 -0500 +@@ -18,6 +18,7 @@ + + # include <thread> + # include <atomic> ++# include <cstdio> + # include <libaio.h> + # include <sys/syscall.h> + diff --git a/user/mbedtls/APKBUILD b/user/mbedtls/APKBUILD index 46d1d5461..912f1f57c 100644 --- a/user/mbedtls/APKBUILD +++ b/user/mbedtls/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=mbedtls -pkgver=3.4.1 +pkgver=3.6.0 pkgrel=0 pkgdesc="Lightweight TLS library" url="https://tls.mbed.org" @@ -11,9 +11,7 @@ depends="" checkdepends="python3" makedepends="cmake" subpackages="$pkgname-dev" -source="mbedtls-$pkgver.tar.gz::https://github.com/ARMmbed/mbedtls/archive/refs/tags/v$pkgver.tar.gz - fix-big-endian-alignment-tests.patch - " +source="https://github.com/ARMmbed/mbedtls/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" # secfixes: # 3.3.0-r0: @@ -51,5 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4aa322b55489bdc54f3b6f4e6175515ca22e74b2d3615334b32f89fb61ac13339e24a5c659bfae27dd948e4ac8783d7f2b3628418ac3df412dc5b5decceebc69 mbedtls-3.4.1.tar.gz -40a4aefd39b63babf1f54bb2ab655278aaca1482da6e0b8943751a55c067307f8a591217b0c3b546a8ae02f7eca72c22da9d74378a5c28e00f8ca97dbcf1b7f8 fix-big-endian-alignment-tests.patch" +sha512sums="5c395890d486144af882aa96c9430103f79df889139969a64a490c0cafbdd5631a72bb668aa59b062204f19a5bb36dfcc5a096b59d76c7ef27f2560cd2388682 mbedtls-3.6.0.tar.bz2" diff --git a/user/mbedtls/fix-big-endian-alignment-tests.patch b/user/mbedtls/fix-big-endian-alignment-tests.patch deleted file mode 100644 index c03fdb426..000000000 --- a/user/mbedtls/fix-big-endian-alignment-tests.patch +++ /dev/null @@ -1,313 +0,0 @@ -See also: - - * https://git.adelielinux.org/adelie/packages/-/issues/1002 - * https://github.com/Mbed-TLS/mbedtls/issues/7428 - * https://github.com/Mbed-TLS/mbedtls/pull/7440 - -From 9dc8b6a6a201ccdbfcbf0de8f76b8b0ddfc2f85c Mon Sep 17 00:00:00 2001 -From: Dave Rodgman <dave.rodgman@arm.com> -Date: Thu, 13 Apr 2023 12:53:35 +0100 -Subject: [PATCH 1/6] Test fixes for big-endian - -Signed-off-by: Dave Rodgman <dave.rodgman@arm.com> ---- - tests/suites/test_suite_alignment.function | 58 ++++++++++++---------- - 1 file changed, 31 insertions(+), 27 deletions(-) - -diff --git a/tests/suites/test_suite_alignment.function b/tests/suites/test_suite_alignment.function -index f6703318ce7..45080cc7b6a 100644 ---- a/tests/suites/test_suite_alignment.function -+++ b/tests/suites/test_suite_alignment.function -@@ -17,6 +17,20 @@ int parse_hex_string(char *hex_string, uint64_t *result) - if (mbedtls_test_unhexify(raw, sizeof(raw), hex_string, &olen) != 0) { - return 0; - } -+ -+ /* If < 8 bytes, shift right and pad with leading zeros for big-endian */ -+ if (MBEDTLS_IS_BIG_ENDIAN) { -+ if (olen < 8) { -+ int offset = 8 - olen; -+ for (int i = olen - 1; i >= 0; i--) { -+ raw[i + offset] = raw[i]; -+ } -+ for (int i = 0; i < offset; i++) { -+ raw[i] = 0; -+ } -+ } -+ } -+ - *result = 0; - for (size_t i = 0; i < olen; i++) { - if (MBEDTLS_IS_BIG_ENDIAN) { -@@ -57,38 +71,28 @@ void mbedtls_unaligned_access(int size, int offset) - break; - } - -- /* Generate expected result */ -- uint64_t expected = 0; -- for (uint8_t i = 0; i < 8; i++) { -- uint8_t shift; -- if (MBEDTLS_IS_BIG_ENDIAN) { -- /* -- * Similar to little-endian case described below, but the shift needs -- * to be inverted -- */ -- shift = 7 - (i * 8); -- } else { -- /* example for offset == 1: -- * expected = (( 1 + 0 ) << (0 * 8)) | (( 1 + 1 ) << (1 * 8)) | (( 1 + 2 ) << (2 * 8))) -- * = (1 << 0) | (2 << 8) | (3 << 16) ... -- * = 0x0807060504030201 -- * x = { 0, 1, 2, 3, ... } -- * ie expected is the value that would be read from x on a LE system, when -- * byte swapping is not performed -- */ -- shift = i * 8; -- } -- uint64_t b = offset + i; -- expected |= b << shift; -+ /* Define expected result by manually aligning the raw bytes, and -+ * reading back with a normal pointer access. */ -+ uint64_t raw_aligned = 0; -+ uint8_t *e8 = (uint8_t *) &raw_aligned; -+ uint8_t *r8 = ((uint8_t *) &raw) + offset; -+ /* Make aligned copy */ -+ for (int i = 0; i < size / 8; i++) { -+ e8[i] = r8[i]; - } -- -- /* Mask out excess bits from expected result */ -+ /* Make a 16/32/64 byte read from the aligned location, and copy to expected */ -+ uint64_t expected = 0; - switch (size) { - case 16: -- expected &= 0xffff; -+ uint16_t *e16 = (uint16_t *) &raw_aligned; -+ expected = *e16; - break; - case 32: -- expected &= 0xffffffff; -+ uint32_t *e32 = (uint32_t *) &raw_aligned; -+ expected = *e32; -+ break; -+ case 64: -+ expected = raw_aligned; - break; - } - - -From 0a05e703dbc303fc5e1154e926bc96cb312ace89 Mon Sep 17 00:00:00 2001 -From: Dave Rodgman <dave.rodgman@arm.com> -Date: Thu, 13 Apr 2023 13:01:34 +0100 -Subject: [PATCH 2/6] Tidy-up - -Signed-off-by: Dave Rodgman <dave.rodgman@arm.com> ---- - tests/suites/test_suite_alignment.function | 29 ++++++++-------------- - 1 file changed, 11 insertions(+), 18 deletions(-) - -diff --git a/tests/suites/test_suite_alignment.function b/tests/suites/test_suite_alignment.function -index 45080cc7b6a..cd4502005f0 100644 ---- a/tests/suites/test_suite_alignment.function -+++ b/tests/suites/test_suite_alignment.function -@@ -19,15 +19,13 @@ int parse_hex_string(char *hex_string, uint64_t *result) - } - - /* If < 8 bytes, shift right and pad with leading zeros for big-endian */ -- if (MBEDTLS_IS_BIG_ENDIAN) { -- if (olen < 8) { -- int offset = 8 - olen; -- for (int i = olen - 1; i >= 0; i--) { -- raw[i + offset] = raw[i]; -- } -- for (int i = 0; i < offset; i++) { -- raw[i] = 0; -- } -+ if (MBEDTLS_IS_BIG_ENDIAN && olen < 8) { -+ int offset = 8 - olen; -+ for (int i = olen - 1; i >= 0; i--) { -+ raw[i + offset] = raw[i]; -+ } -+ for (int i = 0; i < offset; i++) { -+ raw[i] = 0; - } - } - -@@ -73,13 +71,8 @@ void mbedtls_unaligned_access(int size, int offset) - - /* Define expected result by manually aligning the raw bytes, and - * reading back with a normal pointer access. */ -- uint64_t raw_aligned = 0; -- uint8_t *e8 = (uint8_t *) &raw_aligned; -- uint8_t *r8 = ((uint8_t *) &raw) + offset; -- /* Make aligned copy */ -- for (int i = 0; i < size / 8; i++) { -- e8[i] = r8[i]; -- } -+ uint64_t raw_aligned; -+ memcpy(&raw_aligned, ((uint8_t*)&raw) + offset, size / 8); - /* Make a 16/32/64 byte read from the aligned location, and copy to expected */ - uint64_t expected = 0; - switch (size) { -@@ -98,7 +91,7 @@ void mbedtls_unaligned_access(int size, int offset) - - TEST_EQUAL(r, expected); - -- /* Write sentinel to the part of the array we will testing writing to */ -+ /* Write sentinel to the part of the array we will test writing to */ - for (size_t i = 0; i < (size_t) (size / 8); i++) { - x[i + offset] = 0xff; - } -@@ -319,7 +312,7 @@ void unaligned_access_endian_aware(int size, int offset, int big_endian) - /* Verify read */ - TEST_EQUAL(read, expected); - -- /* Test writing back to memory. First write sentiel */ -+ /* Test writing back to memory. First write sentinel */ - for (size_t i = 0; i < (size_t) (size / 8); i++) { - x[i + offset] = 0xff; - } - -From df2d5b1ca1569f3a6e129e276756d9d15980f719 Mon Sep 17 00:00:00 2001 -From: Dave Rodgman <dave.rodgman@arm.com> -Date: Thu, 13 Apr 2023 13:41:09 +0100 -Subject: [PATCH 3/6] Fix compile error - -Signed-off-by: Dave Rodgman <dave.rodgman@arm.com> ---- - tests/suites/test_suite_alignment.function | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/suites/test_suite_alignment.function b/tests/suites/test_suite_alignment.function -index cd4502005f0..3a5038e98c2 100644 ---- a/tests/suites/test_suite_alignment.function -+++ b/tests/suites/test_suite_alignment.function -@@ -71,21 +71,21 @@ void mbedtls_unaligned_access(int size, int offset) - - /* Define expected result by manually aligning the raw bytes, and - * reading back with a normal pointer access. */ -- uint64_t raw_aligned; -- memcpy(&raw_aligned, ((uint8_t*)&raw) + offset, size / 8); -+ uint64_t raw_aligned_64; -+ uint16_t *raw_aligned_16 = (uint16_t *) &raw_aligned_64; -+ uint32_t *raw_aligned_32 = (uint32_t *) &raw_aligned_64; -+ memcpy(&raw_aligned_64, ((uint8_t *) &raw) + offset, size / 8); - /* Make a 16/32/64 byte read from the aligned location, and copy to expected */ - uint64_t expected = 0; - switch (size) { - case 16: -- uint16_t *e16 = (uint16_t *) &raw_aligned; -- expected = *e16; -+ expected = *raw_aligned_16; - break; - case 32: -- uint32_t *e32 = (uint32_t *) &raw_aligned; -- expected = *e32; -+ expected = *raw_aligned_32; - break; - case 64: -- expected = raw_aligned; -+ expected = raw_aligned_64; - break; - } - - -From b169671c50e7c1779763ac89d35af11dc0997477 Mon Sep 17 00:00:00 2001 -From: Dave Rodgman <dave.rodgman@arm.com> -Date: Thu, 13 Apr 2023 13:46:46 +0100 -Subject: [PATCH 4/6] Tidy-up - -Signed-off-by: Dave Rodgman <dave.rodgman@arm.com> ---- - tests/suites/test_suite_alignment.function | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/tests/suites/test_suite_alignment.function b/tests/suites/test_suite_alignment.function -index 3a5038e98c2..b027c4b1165 100644 ---- a/tests/suites/test_suite_alignment.function -+++ b/tests/suites/test_suite_alignment.function -@@ -20,13 +20,8 @@ int parse_hex_string(char *hex_string, uint64_t *result) - - /* If < 8 bytes, shift right and pad with leading zeros for big-endian */ - if (MBEDTLS_IS_BIG_ENDIAN && olen < 8) { -- int offset = 8 - olen; -- for (int i = olen - 1; i >= 0; i--) { -- raw[i + offset] = raw[i]; -- } -- for (int i = 0; i < offset; i++) { -- raw[i] = 0; -- } -+ memmove(raw + 8 - olen, raw, olen); -+ memset(raw, 0, 8 - olen); - } - - *result = 0; - -From c07df36f9e402ef8b97beb92b25556b04c10c77e Mon Sep 17 00:00:00 2001 -From: Dave Rodgman <dave.rodgman@arm.com> -Date: Thu, 13 Apr 2023 14:54:12 +0100 -Subject: [PATCH 5/6] More fixes for big-endian - -Signed-off-by: Dave Rodgman <dave.rodgman@arm.com> ---- - tests/suites/test_suite_alignment.function | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/tests/suites/test_suite_alignment.function b/tests/suites/test_suite_alignment.function -index b027c4b1165..717c51a6951 100644 ---- a/tests/suites/test_suite_alignment.function -+++ b/tests/suites/test_suite_alignment.function -@@ -18,19 +18,9 @@ int parse_hex_string(char *hex_string, uint64_t *result) - return 0; - } - -- /* If < 8 bytes, shift right and pad with leading zeros for big-endian */ -- if (MBEDTLS_IS_BIG_ENDIAN && olen < 8) { -- memmove(raw + 8 - olen, raw, olen); -- memset(raw, 0, 8 - olen); -- } -- - *result = 0; - for (size_t i = 0; i < olen; i++) { -- if (MBEDTLS_IS_BIG_ENDIAN) { -- *result |= ((uint64_t) raw[i]) << (i * 8); -- } else { -- *result |= ((uint64_t) raw[i]) << ((olen - i - 1) * 8); -- } -+ *result |= ((uint64_t) raw[i]) << ((olen - i - 1) * 8); - } - return 1; - } - -From 9145dc46ed98f0bc19e09d52486ba120c1f14589 Mon Sep 17 00:00:00 2001 -From: Dave Rodgman <dave.rodgman@arm.com> -Date: Thu, 13 Apr 2023 14:59:03 +0100 -Subject: [PATCH 6/6] Ensure variables initialised - -Signed-off-by: Dave Rodgman <dave.rodgman@arm.com> ---- - tests/suites/test_suite_alignment.function | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/suites/test_suite_alignment.function b/tests/suites/test_suite_alignment.function -index 717c51a6951..ed8f918d8c3 100644 ---- a/tests/suites/test_suite_alignment.function -+++ b/tests/suites/test_suite_alignment.function -@@ -12,7 +12,7 @@ - */ - int parse_hex_string(char *hex_string, uint64_t *result) - { -- uint8_t raw[8]; -+ uint8_t raw[8] = {0}; - size_t olen; - if (mbedtls_test_unhexify(raw, sizeof(raw), hex_string, &olen) != 0) { - return 0; -@@ -104,7 +104,7 @@ void mbedtls_unaligned_access(int size, int offset) - /* BEGIN_CASE */ - void mbedtls_byteswap(char *input_str, int size, char *expected_str) - { -- uint64_t input, expected; -+ uint64_t input = 0, expected = 0; - TEST_ASSERT(parse_hex_string(input_str, &input)); - TEST_ASSERT(parse_hex_string(expected_str, &expected)); - diff --git a/user/mdadm/0001-udev.c-Do-not-require-libudev.h-if-DNO_LIBUDEV.patch b/user/mdadm/0001-udev.c-Do-not-require-libudev.h-if-DNO_LIBUDEV.patch new file mode 100644 index 000000000..d0e63fc98 --- /dev/null +++ b/user/mdadm/0001-udev.c-Do-not-require-libudev.h-if-DNO_LIBUDEV.patch @@ -0,0 +1,28 @@ +From 1750758c7ff526e3560433f6235e5cfa35cf646a Mon Sep 17 00:00:00 2001 +From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> +Date: Wed, 6 Mar 2024 15:50:55 +0100 +Subject: [PATCH] udev.c: Do not require libudev.h if DNO_LIBUDEV + +libudev may not be presented at all, do not require it. + +Reported-by: Boian Bonev <bbonev@ipacct.com> +Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> + +diff --git a/udev.c b/udev.c +index bc4722b0..066e6ab1 100644 +--- a/udev.c ++++ b/udev.c +@@ -26,7 +26,10 @@ + #include <signal.h> + #include <limits.h> + #include <syslog.h> ++ ++#ifndef NO_LIBUDEV + #include <libudev.h> ++#endif + + static char *unblock_path; + +-- +2.43.4 + diff --git a/user/mdadm/APKBUILD b/user/mdadm/APKBUILD index 13adda8e2..c39bf46ba 100644 --- a/user/mdadm/APKBUILD +++ b/user/mdadm/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mdadm -pkgver=4.1 -pkgrel=2 +pkgver=4.3 +pkgrel=0 pkgdesc="Tool for managing Linux soft RAID arrays" url="http://neil.brown.name/blog/mdadm" arch="all" @@ -17,12 +17,14 @@ source="https://mirrors.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgve $pkgname.initd $pkgname.confd $pkgname-raid.initd - sysmacros.patch time64.patch + falloc.patch + missing-header.patch + 0001-udev.c-Do-not-require-libudev.h-if-DNO_LIBUDEV.patch " build() { - make + make CXFLAGS="${CFLAGS} -DNO_LIBUDEV" } package() { @@ -49,9 +51,11 @@ misc() { install -Dm755 "$builddir"/misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events } -sha512sums="f9bff760795ba7361f19fd1cbc02efedcdaa4b0125b99cf1369e78f30e5c128126751915fde41407d46c544514d864bf82b508419bc08f1db7aa447557e2ca9e mdadm-4.1.tar.gz +sha512sums="a77af2b371ed27b7bd89b7991302282f0fc77999eb93d7959446fc4b1c28388582d08ff0abfc470a9f9a8c8036acb0158edc44d9a8d406f807ca28111bf74459 mdadm-4.3.tar.gz ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4 mdadm.initd 7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9 mdadm.confd 37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd -47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6 sysmacros.patch -53c2fe442e8657a7a5a011eab1cd1bfcca6c315ee42e4148a50e1314d238f957e7e722e1264c64c548d398a2c6b10600cccf45a4fb69351d3d9ad403f90c1fde time64.patch" +cb21650ffb7f8bd1a7a72e27e48e5f18de7158cb8ba23315f9fc48ff5fa79662d0a64128d8b61eff76da7a41e0ccbc5be375a10c852823d489aa648baab76ba4 time64.patch +72544b173499c4ecbcf85284cd4ca5560c2e3548e319e8e7e99967e369f3334e7b77950ff7ed2ed61b6e3c338894595154b2a7c6ccb30b5be1bbd2b75756738c falloc.patch +669e0f14df7de0650eaa7a395167be3e12c08ed8c53ed0388d45be2a17c2e34dc08a2a77dc0d8692b2cd051154a644d6cc7cfcadbe58125dd4c09f9349bb2451 missing-header.patch +b8fdfad727872a0bfc9bc97024b0fb49d6d39ae6d9eac81c65adb0c524add014a27bd9157f2c47b14a54fbe30abf87b64fbeb9218f2bc5a0ada48d06e0e6ea66 0001-udev.c-Do-not-require-libudev.h-if-DNO_LIBUDEV.patch" diff --git a/user/mdadm/falloc.patch b/user/mdadm/falloc.patch new file mode 100644 index 000000000..9f8d4ddd9 --- /dev/null +++ b/user/mdadm/falloc.patch @@ -0,0 +1,41 @@ +From 52bead95d2957437c691891fcdc49bd6afccdd49 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Fri, 12 Apr 2024 18:45:13 +0200 +Subject: Create.c: fix uclibc build + +Define FALLOC_FL_ZERO_RANGE if needed as FALLOC_FL_ZERO_RANGE is only +defined for aarch64 on uclibc-ng resulting in the following or1k build +failure since commit 577fd10486d8d1472a6b559066f344ac30a3a391: + +Create.c: In function 'write_zeroes_fork': +Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) + 155 | if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/0e04bcdb591ca5642053e1f7e31384f06581e989 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> +--- + Create.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Create.c b/Create.c +index 4397ff49..d94253b1 100644 +--- a/Create.c ++++ b/Create.c +@@ -32,6 +32,10 @@ + #include <sys/signalfd.h> + #include <sys/wait.h> + ++#ifndef FALLOC_FL_ZERO_RANGE ++#define FALLOC_FL_ZERO_RANGE 16 ++#endif ++ + static int round_size_and_verify(unsigned long long *size, int chunk) + { + if (*size == 0) +-- +cgit 1.2.3-korg + diff --git a/user/mdadm/missing-header.patch b/user/mdadm/missing-header.patch new file mode 100644 index 000000000..85dea22a8 --- /dev/null +++ b/user/mdadm/missing-header.patch @@ -0,0 +1,29 @@ +From 8bda86099089b44129ef6206764f9de47a45f0db Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 12 Mar 2024 11:01:50 +0100 +Subject: util.c: add limits.h include for NAME_MAX definition + +Add limits.h include for NAME_MAX definition. + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> +--- + util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.c b/util.c +index 05ad3343..49a9c6e2 100644 +--- a/util.c ++++ b/util.c +@@ -36,7 +36,7 @@ + #include <ctype.h> + #include <dirent.h> + #include <dlfcn.h> +- ++#include <limits.h> + + /* + * following taken from linux/blkpg.h because they aren't +-- +cgit 1.2.3-korg + diff --git a/user/mdadm/sysmacros.patch b/user/mdadm/sysmacros.patch deleted file mode 100644 index 22a393447..000000000 --- a/user/mdadm/sysmacros.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/580188 - -From 5c97e465b33bf8fefb17da7f553a1c3812e508d5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 19 Apr 2016 18:10:54 -0400 -Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev prototypes - -These funcs are defined in sys/sysmacros.h, so include it for them. -It works today due to an implicit include by sys/types.h, but the -various Linux C libraries are moving away from that. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - mdadm.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mdadm.h b/mdadm.h -index d209488..b8767a7 100755 ---- a/mdadm.h -+++ b/mdadm.h -@@ -33,6 +33,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - # endif - #endif - -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <stdint.h> --- -2.7.4 - diff --git a/user/mdadm/time64.patch b/user/mdadm/time64.patch index fd05fcb2f..aff2af9cd 100644 --- a/user/mdadm/time64.patch +++ b/user/mdadm/time64.patch @@ -8,7 +8,7 @@ #include <sys/syscall.h> #include <sys/select.h> #include <signal.h> -@@ -447,7 +448,7 @@ +@@ -449,7 +450,7 @@ } gettimeofday(&tv, NULL); diff --git a/user/mdbook/APKBUILD b/user/mdbook/APKBUILD new file mode 100644 index 000000000..a45e4024c --- /dev/null +++ b/user/mdbook/APKBUILD @@ -0,0 +1,623 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mdbook +pkgver=0.4.47 +pkgrel=0 +pkgdesc="Create books from Markdown files" +url="https://rust-lang.github.io/mdBook/" +arch="all" +license="MPL-2.0" +depends="" +makedepends="cargo" +subpackages="" +source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/mdBook/archive/v$pkgver.tar.gz" + +# dependencies taken from Cargo.lock +cargo_deps=" +addr2line 0.24.2 +adler2 2.0.0 +aho-corasick 1.1.3 +ammonia 4.0.0 +android-tzdata 0.1.1 +android_system_properties 0.1.5 +anstream 0.6.18 +anstyle 1.0.10 +anstyle-parse 0.2.6 +anstyle-query 1.1.2 +anstyle-wincon 3.0.7 +anyhow 1.0.95 +assert_cmd 2.0.16 +autocfg 1.4.0 +backtrace 0.3.74 +base64 0.21.7 +bit-set 0.5.3 +bit-vec 0.6.3 +bitflags 1.3.2 +bitflags 2.8.0 +block-buffer 0.10.4 +bstr 1.11.3 +bumpalo 3.16.0 +byteorder 1.5.0 +bytes 1.9.0 +cc 1.2.10 +cfg-if 1.0.0 +chrono 0.4.39 +clap 4.5.27 +clap_builder 4.5.27 +clap_complete 4.5.43 +clap_lex 0.7.4 +colorchoice 1.0.3 +core-foundation-sys 0.8.7 +cpufeatures 0.2.17 +crossbeam-deque 0.8.6 +crossbeam-epoch 0.9.18 +crossbeam-utils 0.8.21 +crypto-common 0.1.6 +darling 0.20.10 +darling_core 0.20.10 +darling_macro 0.20.10 +data-encoding 2.7.0 +dbus 0.9.7 +derive_builder 0.20.2 +derive_builder_core 0.20.2 +derive_builder_macro 0.20.2 +diff 0.1.13 +difflib 0.4.0 +digest 0.10.7 +displaydoc 0.2.5 +doc-comment 0.3.3 +elasticlunr-rs 3.0.2 +env_filter 0.1.3 +env_logger 0.11.6 +equivalent 1.0.1 +errno 0.3.10 +fastrand 2.3.0 +filetime 0.2.25 +float-cmp 0.10.0 +fnv 1.0.7 +form_urlencoded 1.2.1 +fsevent-sys 4.1.0 +futf 0.1.5 +futures-channel 0.3.31 +futures-core 0.3.31 +futures-macro 0.3.31 +futures-sink 0.3.31 +futures-task 0.3.31 +futures-util 0.3.31 +generic-array 0.14.7 +getrandom 0.2.15 +gimli 0.31.1 +globset 0.4.15 +h2 0.3.26 +handlebars 6.3.0 +hashbrown 0.15.2 +headers 0.3.9 +headers-core 0.2.0 +hex 0.4.3 +html5ever 0.26.0 +html5ever 0.27.0 +http 0.2.12 +http 1.2.0 +http-body 0.4.6 +httparse 1.10.0 +httpdate 1.0.3 +humantime 2.1.0 +hyper 0.14.32 +iana-time-zone 0.1.61 +iana-time-zone-haiku 0.1.2 +icu_collections 1.5.0 +icu_locid 1.5.0 +icu_locid_transform 1.5.0 +icu_locid_transform_data 1.5.0 +icu_normalizer 1.5.0 +icu_normalizer_data 1.5.0 +icu_properties 1.5.1 +icu_properties_data 1.5.0 +icu_provider 1.5.0 +icu_provider_macros 1.5.0 +ident_case 1.0.1 +idna 1.0.3 +idna_adapter 1.2.0 +ignore 0.4.23 +indexmap 2.7.1 +inotify 0.11.0 +inotify-sys 0.1.5 +is_terminal_polyfill 1.70.1 +itoa 1.0.14 +js-sys 0.3.77 +kqueue 1.0.8 +kqueue-sys 1.0.4 +libc 0.2.169 +libdbus-sys 0.2.5 +libredox 0.1.3 +linux-raw-sys 0.4.15 +litemap 0.7.4 +lock_api 0.4.12 +log 0.4.25 +mac 0.1.1 +maplit 1.0.2 +markup5ever 0.11.0 +markup5ever 0.12.1 +markup5ever_rcdom 0.2.0 +memchr 2.7.4 +mime 0.3.17 +mime_guess 2.0.5 +miniz_oxide 0.8.3 +mio 1.0.3 +new_debug_unreachable 1.0.6 +normalize-line-endings 0.3.0 +normpath 1.3.0 +notify 8.0.0 +notify-debouncer-mini 0.6.0 +notify-types 2.0.0 +num-modular 0.6.1 +num-order 1.2.0 +num-traits 0.2.19 +object 0.36.7 +once_cell 1.20.2 +opener 0.7.2 +parking_lot 0.12.3 +parking_lot_core 0.9.10 +pathdiff 0.2.3 +percent-encoding 2.3.1 +pest 2.7.15 +pest_derive 2.7.15 +pest_generator 2.7.15 +pest_meta 2.7.15 +phf 0.10.1 +phf 0.11.3 +phf_codegen 0.10.0 +phf_codegen 0.11.3 +phf_generator 0.10.0 +phf_generator 0.11.3 +phf_shared 0.10.0 +phf_shared 0.11.3 +pin-project 1.1.8 +pin-project-internal 1.1.8 +pin-project-lite 0.2.16 +pin-utils 0.1.0 +pkg-config 0.3.31 +ppv-lite86 0.2.20 +precomputed-hash 0.1.1 +predicates 3.1.3 +predicates-core 1.0.9 +predicates-tree 1.0.12 +pretty_assertions 1.4.1 +proc-macro2 1.0.93 +pulldown-cmark 0.10.3 +pulldown-cmark 0.12.2 +pulldown-cmark-escape 0.10.1 +pulldown-cmark-to-cmark 18.0.0 +quote 1.0.38 +rand 0.8.5 +rand_chacha 0.3.1 +rand_core 0.6.4 +redox_syscall 0.5.8 +regex 1.11.1 +regex-automata 0.4.9 +regex-syntax 0.8.5 +rustc-demangle 0.1.24 +rustix 0.38.44 +rustversion 1.0.19 +ryu 1.0.19 +same-file 1.0.6 +scoped-tls 1.0.1 +scopeguard 1.2.0 +select 0.6.0 +semver 1.0.25 +serde 1.0.217 +serde_derive 1.0.217 +serde_json 1.0.137 +serde_urlencoded 0.7.1 +sha1 0.10.6 +sha2 0.10.8 +shlex 1.3.0 +siphasher 0.3.11 +siphasher 1.0.1 +slab 0.4.9 +smallvec 1.13.2 +socket2 0.5.8 +stable_deref_trait 1.2.0 +string_cache 0.8.7 +string_cache_codegen 0.5.2 +strsim 0.11.1 +syn 1.0.109 +syn 2.0.96 +synstructure 0.13.1 +tempfile 3.15.0 +tendril 0.4.3 +terminal_size 0.4.1 +termtree 0.5.1 +thiserror 1.0.69 +thiserror 2.0.11 +thiserror-impl 1.0.69 +thiserror-impl 2.0.11 +tinystr 0.7.6 +tokio 1.43.0 +tokio-macros 2.5.0 +tokio-tungstenite 0.21.0 +tokio-util 0.7.13 +toml 0.5.11 +topological-sort 0.2.2 +tower-service 0.3.3 +tracing 0.1.41 +tracing-core 0.1.33 +try-lock 0.2.5 +tungstenite 0.21.0 +typenum 1.17.0 +ucd-trie 0.1.7 +unicase 2.8.1 +unicode-ident 1.0.16 +url 2.5.4 +utf-8 0.7.6 +utf16_iter 1.0.5 +utf8_iter 1.0.4 +utf8parse 0.2.2 +version_check 0.9.5 +wait-timeout 0.2.0 +walkdir 2.5.0 +want 0.3.1 +warp 0.3.7 +wasi 0.11.0+wasi-snapshot-preview1 +wasm-bindgen 0.2.100 +wasm-bindgen-backend 0.2.100 +wasm-bindgen-macro 0.2.100 +wasm-bindgen-macro-support 0.2.100 +wasm-bindgen-shared 0.2.100 +winapi 0.3.9 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-util 0.1.9 +winapi-x86_64-pc-windows-gnu 0.4.0 +windows-core 0.52.0 +windows-sys 0.52.0 +windows-sys 0.59.0 +windows-targets 0.52.6 +windows_aarch64_gnullvm 0.52.6 +windows_aarch64_msvc 0.52.6 +windows_i686_gnu 0.52.6 +windows_i686_gnullvm 0.52.6 +windows_i686_msvc 0.52.6 +windows_x86_64_gnu 0.52.6 +windows_x86_64_gnullvm 0.52.6 +windows_x86_64_msvc 0.52.6 +write16 1.0.0 +writeable 0.5.5 +xml5ever 0.17.0 +yansi 1.0.1 +yoke 0.7.5 +yoke-derive 0.7.5 +zerocopy 0.7.35 +zerocopy-derive 0.7.35 +zerofrom 0.1.5 +zerofrom-derive 0.1.5 +zerovec 0.10.4 +zerovec-derive 0.10.3 +" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" +builddir="$srcdir/mdBook-$pkgver" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config.toml" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2#g'); do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + export PKG_CONFIG_ALL_DYNAMIC=1 + export RUSTONIG_SYSTEM_LIBONIG=1 + cargo build -j $JOBS --release +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + cargo test -j $JOBS --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --no-track --path . --root="$pkgdir"/usr +} + +sha512sums="76fbc342503baf4bb06b6411dbd086627743e55bcb83f1553cf055a4596a47dd6b5bbd08abd078a762a91a5b2e4c4ba84d13b5ddac1ac3135dd02c0765e64d42 mdbook-0.4.47.tar.gz +39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b addr2line-0.24.2.tar.gz +12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423 adler2-2.0.0.tar.gz +ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 aho-corasick-1.1.3.tar.gz +84f523eaf7db9d98e44c7d1198fae40e59e838dcc9fc256ca7ef3f3d243a767755f318e516411b4feba4ecb26e30e77d501e9163f996b4d113804e5f2c41a65e ammonia-4.0.0.tar.gz +4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 android-tzdata-0.1.1.tar.gz +b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 android_system_properties-0.1.5.tar.gz +5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963 anstream-0.6.18.tar.gz +621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea anstyle-1.0.10.tar.gz +e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396 anstyle-parse-0.2.6.tar.gz +26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837 anstyle-query-1.1.2.tar.gz +782440c1093235ad481f0b854f5a3d3acb7908d2e5ddbd4143139b8bfd0faaf2f9816c1034e760d9261a233e6d645098cd5a594064f190662908eaf79972c903 anstyle-wincon-3.0.7.tar.gz +8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa anyhow-1.0.95.tar.gz +0b9167282d75169b0b1fad0b1401b42884185976ae0dd690851671aedbc1a9af26dd33f3047400eb4a1b5070216acc293aade149aded7e4f86dd5c0ef0e9a6a9 assert_cmd-2.0.16.tar.gz +3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c autocfg-1.4.0.tar.gz +00cb2be0626f0bf6ec8b8f525bb129d3ac74c386c5e46ee0f343edb78c863222521f8132876057a5a1facacf40792dea51f2f20e986b35f3a85bca3dcf5c1520 backtrace-0.3.74.tar.gz +c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 base64-0.21.7.tar.gz +c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6 bit-set-0.5.3.tar.gz +b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8 bit-vec-0.6.3.tar.gz +3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz +f1bc02c858432b0e1fc3b10f239c5886e51d620d55a75521bdf35c8e8f6b6cf8db97e90e08eb2e96715a2c5b28858af305eb266f1ce0c90f9d3945d6d9bdda8b bitflags-2.8.0.tar.gz +b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb block-buffer-0.10.4.tar.gz +f1082ac8f121c6f9eab4b41c5f60aafe4623696c9f800f9d59f6726efc74f86071910f7749fbcdc8f1c20c83416d58f3ff507978775f602e18ae3d1bb027944d bstr-1.11.3.tar.gz +a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1 bumpalo-3.16.0.tar.gz +96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f byteorder-1.5.0.tar.gz +e6c0681c535db6035c1fb1c0481725bb8ab341b6324acde07ac4b60cc4f490ec6ff01478bc00fae00ade2bc5420f9d14cc44438e5d156bcce91cc0f06118296b bytes-1.9.0.tar.gz +bbd8755d390ca8fd209fb22a6b998250bc4765bc8339281498f0170afac7b1112ac5843bc4c604785e734030e2681f58bc5233ebce85e1d1392e3bfc1e654e5f cc-1.2.10.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571 chrono-0.4.39.tar.gz +e07ff5781679b1da62b0bdf25a674b3d48e1c2d2691ebb7c674562b83ec715b5fb0ece2df0867b0c0d833428d61ce1b3cca976fbeb4bb014273a007453391839 clap-4.5.27.tar.gz +77b0e968361bd348b95b5b2993d5d1a3a4f3dda5fa790598bcb5edd201e7ad487a9ed87f551d40c30343e3e0a30942273c07c7becc12b4b67ddf7395488d8265 clap_builder-4.5.27.tar.gz +0bca525e6be2a3dd95cc6587e057a724a9ac28e49183ffca13196b22ad293d80dbc52bb635cf4b90d882d94bf172479f90910a77601545bfeb701bb485ee9c48 clap_complete-4.5.43.tar.gz +a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e clap_lex-0.7.4.tar.gz +fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14 colorchoice-1.0.3.tar.gz +17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a core-foundation-sys-0.8.7.tar.gz +9ae64656a21cfdd0528d87ba95f6213860bf72ccdf866019e65ed6662633e73490f92c42c80125559b3dbb7822090b5faa8ea564c562e04041232809ec2f58a2 cpufeatures-0.2.17.tar.gz +9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989 crossbeam-deque-0.8.6.tar.gz +0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 crossbeam-epoch-0.9.18.tar.gz +6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8 crossbeam-utils-0.8.21.tar.gz +471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f crypto-common-0.1.6.tar.gz +7a14eebc20e48fd39ddf7b8376dc937a04f561d723aba864432cabd5ab46eb189706b43e5121a7f4fb0d68dbfd044353875bb479d4bd5cd96b76e3571733ce55 darling-0.20.10.tar.gz +2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d darling_core-0.20.10.tar.gz +565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52 darling_macro-0.20.10.tar.gz +4ea0901ba3b1b37006ff413b743ba56bbe73edcc0b8735ee14a7bb3e71b3f9bc42c473d17284d1efcd358264dd0518ad63926f6bf43a38e1a30ce1306ba80a8d data-encoding-2.7.0.tar.gz +c1557d8be0c5c5623ec6a3928de310c80eef2cdf976d9fcbcc00f08a532af5b8d530f8ee1eba4de12f2df0ff7cf4d21323dfad76be82eeee2f386173991681e5 dbus-0.9.7.tar.gz +75d08f4c106ee5df795ebc8be3dcf34dada037c7566b20bfb52243e16f288b440c723fd17343a654d2f170c056a4197704b9c6b69c8e0d1b250039bee43fd872 derive_builder-0.20.2.tar.gz +ab154b7f116a21984cf8c9cea538e8d33be1680663f4578af37f7d74696547431e9ded07bd8ab0265fd2c4aba5937b948f57d4f9b60b96c840f5150e8c10ce86 derive_builder_core-0.20.2.tar.gz +1a5cdd75bbd6326147f6ed726fdc21b2a4e44db9abe49576d4b1ed067b0e56871cae148ea982b647016240392194efa4eca157d615ab42248d798396612b3d9f derive_builder_macro-0.20.2.tar.gz +45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb diff-0.1.13.tar.gz +fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 difflib-0.4.0.tar.gz +0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c digest-0.10.7.tar.gz +5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948 displaydoc-0.2.5.tar.gz +e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba doc-comment-0.3.3.tar.gz +2f65cc09ac0a9a806fe36a617fe1fd8b6eddc2fa427012ed3fa2eee2f05743089820a801063d0fcd38bf5269b70b6b5f5ad0e6d706cfd461fcf4a62a9f956361 elasticlunr-rs-3.0.2.tar.gz +94db29f1639636655e05ab02611cf14d5c2c8778be6eddddf0b6b8c21f364a71909a2ecc3acf3f4062d5d3c79a6316e9ef30b2fe042f617108af8431e198d344 env_filter-0.1.3.tar.gz +1ec41e4c4eee4ea6bea38d40e739b1f324ef236fc786553fd77c6bacf6303f13d35c1626d3408a18346d42ebf5c896869deba133ef34b8cccf3729957c72de0e env_logger-0.11.6.tar.gz +b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 equivalent-1.0.1.tar.gz +fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f errno-0.3.10.tar.gz +267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947 fastrand-2.3.0.tar.gz +90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2 filetime-0.2.25.tar.gz +024d6cce0c16f56e4f42381fecff1f3c6b9f960d62e81cdd78b1c77103dc4bbac11c5d656d44ec5fcb644edcd7b9c1a905533df3d758470137e48e3dde4633c7 float-cmp-0.10.0.tar.gz +2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 fnv-1.0.7.tar.gz +c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 form_urlencoded-1.2.1.tar.gz +e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7 fsevent-sys-4.1.0.tar.gz +4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3 futf-0.1.5.tar.gz +87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69 futures-channel-0.3.31.tar.gz +d2f4c2476c4f480f724a880ee16566fcdd545579d3cacd2f16745812eed9ac4a7a88d59d4a38b163ef466c6f6b612b9cb06308a09d52256506a8a90e358db935 futures-core-0.3.31.tar.gz +26c45dd8c037831ce3c41a326ddfd581784c2e7aa2805ca4d93b91e439f4d8c078293cd328bcd66d0283cbd5a14724bc624ec607c343d15193b00bd644b86166 futures-macro-0.3.31.tar.gz +79a57dbee5cfe98f2c003bd463d252648743f70d13e2054af072978b758c7cb8e5fb652fd2f36c760df358ad23d2893cef24ca6ae3df44def28f1d39bcf348a9 futures-sink-0.3.31.tar.gz +4872fd2f24b07c626efc6fd76c01b44d56efecb9697f972d0877307b38d3ccb06277ff029df38981470ba1f8ac5f93086123ab3af44d3c49bd9c10b6c9158a81 futures-task-0.3.31.tar.gz +429b1de584546b931b17d475aacbdb0c14824a57d960c44e615aa808e8c0f9c126473e313a7150b3de87ea91b7eebebb1041509f61b3493fee8a9cd2c75c4df3 futures-util-0.3.31.tar.gz +363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d generic-array-0.14.7.tar.gz +04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb getrandom-0.2.15.tar.gz +b9c8c11547dc7420fe936b9f32a4f5ccf3bb68d1d9f39dedffd40d631360f6e032e719d858668826f1099b8a262e8096aa7ae1f6d7d3d7aaf47934d832715949 gimli-0.31.1.tar.gz +b9281b8bf48d2e297be533aa31c701c0115978b4e580b684b78a385eb2ecb4125187605368a6858311d6cdf5caae7d733cf1406c79241b7d19e7193f5a111dad globset-0.4.15.tar.gz +3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163 h2-0.3.26.tar.gz +63c80950581c99db0ae8c420c89799a41dedaac7dcc6b4de21ef79ae86a8063e8f2b73be4b82723b03d2210fd530aa4724682db4144c9c5a8b4006ee05d5cc8e handlebars-6.3.0.tar.gz +d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd hashbrown-0.15.2.tar.gz +d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1 headers-0.3.9.tar.gz +1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd headers-core-0.2.0.tar.gz +fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 hex-0.4.3.tar.gz +383a25421cddb0573e41ca93131d681cfbfaf551989337845a197e939a2580751ae90e96605bfc4e187dbd5189b6c014557cc69e3d7d2d2cdfb88eeca8896089 html5ever-0.26.0.tar.gz +8d736fc122da78e9ba8b546868d0770837ea0b4951ff027f1b5593dedeb9831c082dad1868659422fab5527711ffed18d4428d519a830a3434d4594a1af6c868 html5ever-0.27.0.tar.gz +e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58 http-0.2.12.tar.gz +2c8e7234ec3aa720c9dd762c0bb06367fbc39ea89446fc9d8d2e55052a4ac461559a20a8294c877879f3e94d5db06fe41e2cdbb9664ea7ab1bc8003abb038bb5 http-1.2.0.tar.gz +fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462 http-body-0.4.6.tar.gz +0ed43a15585b49064ae6b745b7c17775db1d849911115448239fa70a0b6f1d5a1fb09e654c4c04af8d533d74865966bfb215135a133aefec89eac81f136709d6 httparse-1.10.0.tar.gz +0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a httpdate-1.0.3.tar.gz +3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c humantime-2.1.0.tar.gz +d2b1d713a3ddc8a469ea344a5e7732da637bb644c2d999bed8e8b00b602742e193e553b9bc77eb58017ddccbc4217b20651e2b1698ac98568e780bfa3aa1a819 hyper-0.14.32.tar.gz +d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4 iana-time-zone-0.1.61.tar.gz +448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 iana-time-zone-haiku-0.1.2.tar.gz +127f1c91101ba69405b10a2590579606df766166fcf1fe6aa9a74c4900296425cba5c47a391a53a01b02026af5581f068fce4a7a400179809f7ed9922b94c0db icu_collections-1.5.0.tar.gz +4b85f0e7cc73166a542b2e502b3ffae1f30d2a9609ab83acf98e90b0edb37fa8ae4592f61ecf48a0ae0779fdd376abeff59e1d5cb97475012eda99ce2a97da57 icu_locid-1.5.0.tar.gz +1779078e2ef9859bee2bfd5414ad7e4b0f0a40e6813f4ccf8de2bbe8c764fac7f99ef001cce22332a8b3840af22e9c7fb7cc0341cf8ba61303794ebe87071e63 icu_locid_transform-1.5.0.tar.gz +1c00fb962eb4b8c759b1120313bb890f4388d579890d7450b798d6266a7d6adcbbebc8a8dad2f267668ca6f1c059d0bd2209eafbe2a72f4558c85258eba57405 icu_locid_transform_data-1.5.0.tar.gz +22612b86a24e3ea222469392763ae9d40dcbb37191dd8b9fa1c64332463a4299a53275a1cd3deb7e0f057d137f4312d990762f9925d0ceafbc8839d67c425a13 icu_normalizer-1.5.0.tar.gz +222fbb819791fb4ec7889e45ed3032ac8d4753e2e9cdce9d0b3f79128baca5ce64157a8a58ecdf39cfddb6c2395001e3cc8828ed51803e85cae133c247cb338f icu_normalizer_data-1.5.0.tar.gz +7e347c0a02a41a3add950290bee90a339091a713546d4369c2995022e64f127f54204b0d46cbb88f396b3bccbd4cf12720a93d8551b73926f78fd5ec01829cac icu_properties-1.5.1.tar.gz +c651d0a50c229acafa648ce234a73bc1d0a85a8bf2369fdadaa62badc741c35e8a7d5392fb1bdb7b720fe2e0f883d1309c78de4ba913691969e5367a4e8bafac icu_properties_data-1.5.0.tar.gz +6c11d89c7d2b788a44757f02b0e298b558ebe174fe917664401d91109cdc7bd1aba5526b3cdcee1f066018de1b775bc9dfc294bdfb40476c53d552bd6f29d6a1 icu_provider-1.5.0.tar.gz +a0dd58d731556a010428fe4aebbc9dbcd626b46d380cf28ba5236ec8824045a20f6f2ec986e0c1e791bc8bc2b692a10306f448279f079b4c37237e4a3c3cef63 icu_provider_macros-1.5.0.tar.gz +81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 ident_case-1.0.1.tar.gz +e75ab18297878df11d82bf3623b005a3dbf7a6fa38c8f78830c219adc7d6f4ac07dce24a5f1186de69035ec316421319e487396cfacb053674137342d72a4126 idna-1.0.3.tar.gz +1d8b54c19878645749a1bae768dacf353b07d266f2cb3bfa1071a7afb56ca68f534dc1d54cae277b777bc97e5986f297cbe2051a82e14f553ea73cd723d9da7e idna_adapter-1.2.0.tar.gz +ae354b00994ae8570751bc5c09167edd0e2891709d4c4878cf75b24619421d23a1b83e28886d54ed9d31aa427f49153e9a5fc42b5de7262abda20c1c0061b299 ignore-0.4.23.tar.gz +225703f74a734da1ad464895192f07c83068b36129f69a9e87608134f250d3a19b95fdb21dcda6c44cb0204bc4ad69bfbba24d94c83b439000ab4b9ffec74abe indexmap-2.7.1.tar.gz +bf1e133e0c3e9e4c31121b24163e5050a76408540235b9b0e9a9644871cc55aa922ccc48799f2f766a3c869ec7f9a1b2275cd8a19f33c47508dd7d061361158c inotify-0.11.0.tar.gz +dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da inotify-sys-0.1.5.tar.gz +4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 is_terminal_polyfill-1.70.1.tar.gz +ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987 itoa-1.0.14.tar.gz +d9370ed6ea892bd51ea181630ca661c348f82d575381aa4c8b529113dfcab6687f4d19bceecad7e1b28ebaca74d405862150a5b5ee2d5d55efdaf98eed1ab255 js-sys-0.3.77.tar.gz +c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3 kqueue-1.0.8.tar.gz +6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5 kqueue-sys-1.0.4.tar.gz +c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce libc-0.2.169.tar.gz +94ce1de7e1f1727e923b2042aed6652f9d0e68f27388c186c37f7aa2195fd71cb3c92a2bee7e8628c95f36ba2d2a38d25d9804900bf55eb13af31f790bca2847 libdbus-sys-0.2.5.tar.gz +c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49 libredox-0.1.3.tar.gz +b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309 linux-raw-sys-0.4.15.tar.gz +5009c486a87b2f52237e15e2e772365424e4780c146776656d8e1551e52bc8e06e5c1cee8db1c59ef20d0463962fc07ba5221a46020a82df17a2f623a175f58f litemap-0.7.4.tar.gz +525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7 lock_api-0.4.12.tar.gz +b420404c82aeb04219e9f63505d60b8853cad44d1de0bec0750715baae21afae806bd4f741bb8964dd39bb5d1e0f5be41bc38d76773bdfd5e920d30533146231 log-0.4.25.tar.gz +dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a mac-0.1.1.tar.gz +917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f maplit-1.0.2.tar.gz +c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e markup5ever-0.11.0.tar.gz +5063b6591c63897017d79f64d11cc13edce2e8e21462df8a00166d582e83af3132ea7f4e50af4f248b56b75cbd12c6f89b7433da14147c76004fb2ffeda02b92 markup5ever-0.12.1.tar.gz +bf21aee14ec41ea9ac5a5645285173394a561c34311f4b4a7f3c2e8fb32a54a777e4913c985daa2f693bb7b1aaf799d45ab9a6f359b900d2bb916b1ff376fbe4 markup5ever_rcdom-0.2.0.tar.gz +8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 memchr-2.7.4.tar.gz +e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 mime-0.3.17.tar.gz +433c876e28394282cfbe14bb9543616cd296879f253ed331c15ace8a7d9f3629f5b596c2d5a64823a97ca9b774acc711b65006c46d54d1e9ee0553cbf1f13b7c mime_guess-2.0.5.tar.gz +b79cd67a477851b18ed87c887bfd9f40f97059eb3fedbdc3a52eac66b5fcea42cae833eea39fd62becdb057b337f91d27f2087a407d02770feeaea934c0b1e1c miniz_oxide-0.8.3.tar.gz +2142edc7e9378fc3437110c85ba2cee9c9683e87034cd44275d2c389645979db53fbbc29fec304f1d8c8f0464ae17d2a5db1aa9215d696fa0282f5069700b1e2 mio-1.0.3.tar.gz +73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48 new_debug_unreachable-1.0.6.tar.gz +f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea normalize-line-endings-0.3.0.tar.gz +a3cd341d1b4ead252f25a77e42165cd5a6b1459946ef55a5319558b89301e01e445f7cdafa13231836d336284798e48cd4e17632cba53a17213badbad3ce7a6f normpath-1.3.0.tar.gz +0238ed072d632526ed6c464d69674f5f1d3744d878b59a9e1e6bc460000447c158a54a3c2504270807a68cd6a5f953deb56b05d80ae03486688d4a9153d14507 notify-8.0.0.tar.gz +f54f8e97bad11f2b278eb384dad75ac9c3dab3e7c8c9518a660e4c2b0ad12ccaf58895fda493b41862c75d14a2fca422d4036c04fc1bb657c4bba55ba7b98faf notify-debouncer-mini-0.6.0.tar.gz +2364311cb22104a661ee4f0b687777f5887c988a3760162a0b51cece66ce99838bc2224f346994687057fda1e19c01e6b1cf812eb1de8e3aad9667b229f9e5ec notify-types-2.0.0.tar.gz +33fd877231e2db400fef0367f7df3a5bfeeb74a9d801f22973501da0890590e929ae96c680dae7ad330e2fa87b80ef1844d87b5d7deec9d431be78120f9a2845 num-modular-0.6.1.tar.gz +befccdd1e2e6e7f969e8bb1274c80589ef4c41532791fc25d1c77f11c80b421406e22252cb2799547cffee7d876850cf6fe66d2f0dd32a4080982a887d3ea30d num-order-1.2.0.tar.gz +180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 num-traits-0.2.19.tar.gz +dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478 object-0.36.7.tar.gz +bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 once_cell-1.20.2.tar.gz +15e2c6262f887bc53e21f1ba1acf9d3a5c97f011e6b54084274f9f089e658fd747b2c16da0a55cd5f56e9b771306c8f56319939a9e503a6ab5c3b9475808191a opener-0.7.2.tar.gz +368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703 parking_lot-0.12.3.tar.gz +4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389 parking_lot_core-0.9.10.tar.gz +54938b311d4eeb49d1d7418d2ab7ffd19bd308c36419cf3ad3ae58785b971fbb2fd2d8f5907e0c47be7bf74ded98c62deeb90f509e6cb0edc6d3c1a69dce3bf7 pathdiff-0.2.3.tar.gz +5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 percent-encoding-2.3.1.tar.gz +a044c8e92bf63dca6522da1aecf714329278def96b037ebb38dd485d6063bb7b15ecf762fdfdecd2026136c42b6edd89702f624cde14b437161c372d6c3d87c3 pest-2.7.15.tar.gz +22cd53c1c9062db988dcf8645a6320f96219777fe35f9d8fe05f69df445d58a39157c029a93d5fc26781c5c44961afffb9bd959b3d4ecba2d4e17b23cc422250 pest_derive-2.7.15.tar.gz +98e0101900cb4fd0e22af2a214f380269de10b590078a7a9f03154ead159912abfec664e1f89c57aae38ca8b54a163da4302d2954713711bb133a9c2ced32f48 pest_generator-2.7.15.tar.gz +dac3e599b280f2ad9d3d6c1362ca18e27929f15047ed9195a3cea1e1ecc03bab98355cb39de1c793764affe41b24f0efcb6660ad0c81f7a6c5201f402e4c6a64 pest_meta-2.7.15.tar.gz +84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073 phf-0.10.1.tar.gz +20a834481bc43ac8c560b00e337294d3c14d1fe359e7f78ed08166b096305e40277f4cd3c179a740911b5c241aeb4e263afa1a50d37f383ef63da113bd6270a9 phf-0.11.3.tar.gz +dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1 phf_codegen-0.10.0.tar.gz +e86c3b73de198aa0ac67beb6eeebb88865f77d075b9d7f290eb9b73bfdd6728d9479f796d56e4f3358226ee88b877d848017cd951a14804534e4cb656eed209e phf_codegen-0.11.3.tar.gz +b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7 phf_generator-0.10.0.tar.gz +52998e20648b6ecd1eaafa407f7da4667fa829d48fe0c9f8f718377cc86a232a6261fc2f831ffc7051b62dbdb880654b1207ac314e57b23d2b70f634d07c2115 phf_generator-0.11.3.tar.gz +f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5 phf_shared-0.10.0.tar.gz +34bc3c0dff5568f0276777614d92d87882ca6be9e3d405c1e7de90ac16ec52a12acc30ea9ab2033074d0e988fa514247f37de1a21a3727de0ef43f42f477e27e phf_shared-0.11.3.tar.gz +c93706969cb1358d84a9eefea6de6ed732b87c0bd68cd5299f6874b8ec0ea16d65989f127b9ea06a766a5c0e299033a11dd9d83f361938c28e1658d546e3725c pin-project-1.1.8.tar.gz +9471d2c163bb6966203735f6815023a77c7b650adf6f0f03f439416af297e03ccab1772de040c0b2c7bf9f57b92ff6cb0dd50668f85d5a9fe766e24eab0cd1eb pin-project-internal-1.1.8.tar.gz +971adfe54cfed304647fd944c1c915e78b37eaf0de3a582fb984a5e91f1b7d4db2cf0f53a9a64b64427062d4b41c0a36baddef782411a76ae3be0f8ca45f0718 pin-project-lite-0.2.16.tar.gz +828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 pin-utils-0.1.0.tar.gz +ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 pkg-config-0.3.31.tar.gz +6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1 ppv-lite86-0.2.20.tar.gz +a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 precomputed-hash-0.1.1.tar.gz +0da703faeb708e3f9eb9bb8803dd8cf6a493b02d38b9b617fd1eed7ccb870ae96c5be6cfe63b7ea8855cb2a019a7ea59799faf2bd78fb490d62e640d1a7de1e2 predicates-3.1.3.tar.gz +618db56d417f44f5575159265f245fbb62399951824730546df735dd9bc9dba2200f58c0a7c7830040bf27954bb48e01fddb5fe0f4d4890d5e172cb1c586735b predicates-core-1.0.9.tar.gz +f5f6d7d0cba4ca7176a26d9adea5ded46f1a3361f9b6ceaa7dcf468ce616912cf3b764b8250f39a42a24eac71fb94e0d4d822c89361aae02472cf761ba55dfaa predicates-tree-1.0.12.tar.gz +474f77c61cc17bbe9914c56b98a80e5918450205827cd059d693c2d603ff61a0897cad25dde645cb495200e61ddc14333d15eb8bf2de090a2eb68deeb9aec8b0 pretty_assertions-1.4.1.tar.gz +1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c proc-macro2-1.0.93.tar.gz +ffa5d116bce2b480f495a0aeac106961c9c79a2127aaca9f75b759e2f2823d253d2bca0dcd5c1f095c16c8e952bdf421fa04a26af53d80095923a5804a274cb2 pulldown-cmark-0.10.3.tar.gz +7514c4282d3c4ef0b0f7ae65374a549c1a027d7fdd5eddad8a2de93dde49aee2e3a2eec2c5c598967b128c2edc6981fa6dc55972c8194206abc9e7a673eb9482 pulldown-cmark-0.12.2.tar.gz +4c60b4abcc385ba7c27210354769e63d5f7f387ce234d3078e7525b88cd2aecd2d62a7dfdc8a4cdde8ef10723a216ea5fb5214e96b5bf8d2fd84e28786b2b3aa pulldown-cmark-escape-0.10.1.tar.gz +04188d57ced101cb52bfc46ef5f2e2cd3b271bdb1f9f4160f9755555bcc430d3ef4534cb91495ea114a69e80867b31b025d16271e69f444e144058c7f2df70bb pulldown-cmark-to-cmark-18.0.0.tar.gz +530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af quote-1.0.38.tar.gz +8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 rand-0.8.5.tar.gz +8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 rand_chacha-0.3.1.tar.gz +36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 rand_core-0.6.4.tar.gz +5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348 redox_syscall-0.5.8.tar.gz +d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8 regex-1.11.1.tar.gz +40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2 regex-automata-0.4.9.tar.gz +549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 regex-syntax-0.8.5.tar.gz +eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8 rustc-demangle-0.1.24.tar.gz +b7e66a27c9188eff307aa9912852706f686864852a97af0696ac5fc5dccdf2e4d22a69266fa74ac71aa123e2831f24b898b7ee9121850d65cfb56e12bd647d8f rustix-0.38.44.tar.gz +45b959aea8155ee47c51aa1d87c6c344b5f4b20199a2646ca30bdabe1c2458b014be91fe0c48c29c2261ad9e5de6df7eef7ddead1682e584d4a906c17984baab rustversion-1.0.19.tar.gz +b80d07d609237e13ce1f8cbef5b16738308c540800c7ec18387aec876fb2204029754f20f1f273a0ea07f54dfbaa4595fd0a90044d09f124c1c99e46f1005a99 ryu-1.0.19.tar.gz +3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c same-file-1.0.6.tar.gz +342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25 scoped-tls-1.0.1.tar.gz +6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb scopeguard-1.2.0.tar.gz +8e5b14ee8cd2d88eb908fdf750cfd724741019ad4bbafa1fdeafde10db0b7cc6a86883d8aad7c1267e772dec63e2f138e57d52ab425b8c5a10faed9329dccdfe select-0.6.0.tar.gz +82b66a040a155ea2714a7b014840d55bb4c01fd4862b58519e5adaa5651343048e1f1b86213470cfe919290664de46ee548680bad93e9969fc44ed227c545374 semver-1.0.25.tar.gz +f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054 serde-1.0.217.tar.gz +31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76 serde_derive-1.0.217.tar.gz +25f2c1c31cf01212472f651625d9e4a1ea6bb31c79a74d85ab96dfb3ef4c052d3012a8ab8b6a261826afe90d891d35a2803b8459741d1e20ce8427807caec2a1 serde_json-1.0.137.tar.gz +b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 serde_urlencoded-0.7.1.tar.gz +fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f sha1-0.10.6.tar.gz +3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785 sha2-0.10.8.tar.gz +5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a shlex-1.3.0.tar.gz +601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b siphasher-0.3.11.tar.gz +d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28 siphasher-1.0.1.tar.gz +b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 slab-0.4.9.tar.gz +a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 smallvec-1.13.2.tar.gz +b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60 socket2-0.5.8.tar.gz +a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03 stable_deref_trait-1.2.0.tar.gz +03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479 string_cache-0.8.7.tar.gz +01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864 string_cache_codegen-0.5.2.tar.gz +0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c strsim-0.11.1.tar.gz +12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d syn-1.0.109.tar.gz +ec2e352a5b0b2aa619774c01d7a7767674a44ffe91dea45d3379bf172d13039c3d37f264e98e26b20fe1d86db6d5190f220831c842f3316469d4ae73c2bfddec syn-2.0.96.tar.gz +09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa synstructure-0.13.1.tar.gz +82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d tempfile-3.15.0.tar.gz +53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f tendril-0.4.3.tar.gz +e07bdbdf695bf9a607ea7c7c4c5b22a8637b0871877114aa305717a04d31a6b7670e2a79435810aefefe25db8c9a655e4c4ba6075d4ec76322a30cdf71ff03be terminal_size-0.4.1.tar.gz +43d92132cef6d352c6c0190ce4a688d7cffb61ee86dbc6b49ba1f4c404661f9b329331198063d913ae52b2d4c69e6a2d9f5cd62886894c468093abd8604f0125 termtree-0.5.1.tar.gz +ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899 thiserror-1.0.69.tar.gz +ba0c3c2615bb9bfb07affa66ffeb2eeda43b16a974dc9a0482165a4a5a502a376e2fd6b569a228a08647de23d291e2c301dedf89d8caa79833b965a184dd5904 thiserror-2.0.11.tar.gz +579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3 thiserror-impl-1.0.69.tar.gz +3fb76f16613064917d2b21f1bab06fd4dec9f40ad1f850aa78c5917854347cf9034a72d2091dc792ac06ce9ff9e29ed2bec3a4330b459abff379356e35c8f701 thiserror-impl-2.0.11.tar.gz +a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25 tinystr-0.7.6.tar.gz +8a2681829afc3ffa6446eaff7463d52aa3351598639ef5d9af0633dc5425e7ff222a7e661f519c3383377cb46b40969ae8c38bedc77a9da92a871ba7d1c18a63 tokio-1.43.0.tar.gz +c1d24cbb8b3f500357e39f93cf139790e4bd3ad1657dd5d695f5e4f9a2a460cd63e8c1c32a36b64d3cadd7b6467e59ee34cd5b1548a99449d8e46c2db83e9ec4 tokio-macros-2.5.0.tar.gz +2ed4baa38ed5f3e19250af71c9142412dd96d59c971f9813e9a633c9764c580f7ea2141719a82251c60c9d2a5fdb22b311fc0f7a297f9363585be4d140c1747b tokio-tungstenite-0.21.0.tar.gz +2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f tokio-util-0.7.13.tar.gz +eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 toml-0.5.11.tar.gz +1334300f1022126138355ce1c4b33f60297765f9dab6888242e78be76b0df9e83560be693eabaaf10f9aea2dfdb90e248b02b0cee89dca495a1e365d9b6e87dc topological-sort-0.2.2.tar.gz +770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd tower-service-0.3.3.tar.gz +dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c tracing-0.1.41.tar.gz +1c6f0cf3b7bd6c8f6316ed9ea0b315a619308de6cbf7e50e665a193cf8c3399b5227d4f145d83b10c7e01a2f9fbc83d16e108cf09b7fd6cef413aa5c1acf89ef tracing-core-0.1.33.tar.gz +433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 try-lock-0.2.5.tar.gz +44a9826d68b61ec4b65bf72a12800674edd1eff8e9fae3fcb272276f6f598edffc7e1b36f2564494520414b3b426a860a32c6543c07d9f1c1404490e1c0e431e tungstenite-0.21.0.tar.gz +99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 typenum-1.17.0.tar.gz +382a832e38654a9159ebb40a8e8bf6e7f2f3108940e5b9c388f3a1441848a241201e7e5cfb125e098f04f0b2893da231b8a0e5124270e774215374bff3c5445f ucd-trie-0.1.7.tar.gz +99a3944a5c987376bdea5fe6c0797e881bc8e6f629c56120ce811c8ebbed0a3ba24617decb74d6939699c8fc994c662eb292869ab407c0ba0ec460a32ede0190 unicase-2.8.1.tar.gz +9484a34a4e283f94e971fa9ec42528a62f2c056e702040da37dd9d9b794e16e14a408302d1ac26a850d0eadf0d0266d8ef5b80761490f7029240244a39878ec9 unicode-ident-1.0.16.tar.gz +8f1d62bfdd45f52fa12ad657a521a3478d0ab54d187346a29dd59cc66a0f140ca96d850948e09f6316f08b44b3fc68526c58bd620fed5d065b7e8528df3cd46d url-2.5.4.tar.gz +6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b utf-8-0.7.6.tar.gz +44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa utf16_iter-1.0.5.tar.gz +a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090 utf8_iter-1.0.4.tar.gz +f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 utf8parse-0.2.2.tar.gz +d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db version_check-0.9.5.tar.gz +db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 wait-timeout-0.2.0.tar.gz +da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad walkdir-2.5.0.tar.gz +f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 want-0.3.1.tar.gz +8dc2dcb5a64555caa5cf74617cc5fc4fe3874d55f4df1b455e6b68c855fe8791f979c622d64b7e357085e322a047cce411c4dc751ecb608c9832abf7550db5a0 warp-0.3.7.tar.gz +043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f wasi-0.11.0+wasi-snapshot-preview1.tar.gz +2a8ea7ec669efe10f5701dc3b2bf496e33afa70c31dbc65fda5191c9c28ddde54fa38bb168a41b0319a4ff0bb5ccd897ce51ccd7e523e647b3544fb390f8a4e3 wasm-bindgen-0.2.100.tar.gz +a2ee30c1185644f989af6be34e93149a791c05125de24c0ff91c320f683f6f5d939fe42b8ca09d629096388a39256469f8b96a6e35722ccfdbe8d978c9a51770 wasm-bindgen-backend-0.2.100.tar.gz +a1942f838eff5fd54406b573d81fe18f262df48a19535245b1a46cb31db2a022746e861d72e5286c632969d15d416655460d3865309c4947cd3d7965dead5c42 wasm-bindgen-macro-0.2.100.tar.gz +0d03eaeda37c9c6ae06c0fa96e872b54780c4cf545b621c730dcc113dd59a8cb6333c5e3818f51365f71913b9669d8a870a06e70729722d03c07a49cff8a4fdf wasm-bindgen-macro-support-0.2.100.tar.gz +3fca8ddd1c6b2f66f70f6608c9b341822603f1c0dd71d47d27c6be8fe3f2c88598619946627720734b48cf999cafd0c63a08af5db28ea78a1538d2165a5fba61 wasm-bindgen-shared-0.2.100.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9 winapi-util-0.1.9.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 windows-core-0.52.0.tar.gz +24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 windows-sys-0.52.0.tar.gz +d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061 windows-sys-0.59.0.tar.gz +d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f windows-targets-0.52.6.tar.gz +f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5 windows_aarch64_gnullvm-0.52.6.tar.gz +a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b windows_aarch64_msvc-0.52.6.tar.gz +a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822 windows_i686_gnu-0.52.6.tar.gz +95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f windows_i686_gnullvm-0.52.6.tar.gz +ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96 windows_i686_msvc-0.52.6.tar.gz +c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb windows_x86_64_gnu-0.52.6.tar.gz +67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd windows_x86_64_gnullvm-0.52.6.tar.gz +21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 windows_x86_64_msvc-0.52.6.tar.gz +655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1 write16-1.0.0.tar.gz +818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1 writeable-0.5.5.tar.gz +0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e xml5ever-0.17.0.tar.gz +182c8c6c60a30a727d8f8b90bbf0527d91fa8ae9d8eb20e5414614b43ee6dc532f4b19241adbfb9299cb0004b39fe627036269b60b0c3860d9e1ea4413aca541 yansi-1.0.1.tar.gz +6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef yoke-0.7.5.tar.gz +e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6 yoke-derive-0.7.5.tar.gz +17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c zerocopy-0.7.35.tar.gz +dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb zerocopy-derive-0.7.35.tar.gz +11f16a1003967b3f30d7b32ffc8541ec05fb335690b08cf4f7554c624ad4312ee0961c83390a997e2a73aee06d8bb09a0ff4e6a5e489f8fb925141e732006544 zerofrom-0.1.5.tar.gz +75098e0f1c690bd8476f819f4ea2a7645b88237042a8876259bf4e025b070a4b105caf16ca7a824c5dd6c4690b693fcc74bed9ac0b5e6fdab05a5bed1b5cb298 zerofrom-derive-0.1.5.tar.gz +db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0 zerovec-0.10.4.tar.gz +caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09 zerovec-derive-0.10.3.tar.gz" diff --git a/user/mdds/APKBUILD b/user/mdds/APKBUILD index 4b56cc780..c782a1649 100644 --- a/user/mdds/APKBUILD +++ b/user/mdds/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mdds -pkgver=2.0.3 +pkgver=2.1.1 pkgrel=0 pkgdesc="Multi-dimensional data index algorithms" url="https://gitlab.com/mdds/mdds" @@ -9,13 +9,16 @@ arch="noarch" license="MIT" depends="" checkdepends="boost-dev" -makedepends="autoconf automake libtool" +makedepends="" subpackages="$pkgname-doc" replaces="$pkgname-dev" -source="https://gitlab.com/mdds/mdds/-/archive/$pkgver/$pkgname-$pkgver.tar.bz2" +source="https://gitlab.com/api/v4/projects/mdds%2Fmdds/packages/generic/source/$pkgver/$pkgname-$pkgver.tar.xz" build() { - ./autogen.sh \ + # GCC 13 changed default fp precision behavior. (#1193, #1205) + export CXXFLAGS="${CXXFLAGS} -fexcess-precision=fast" + + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -36,4 +39,4 @@ package() { mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ } -sha512sums="6d069ce4d1a59f15a0aba02ecc7f2082486df734eb23f6e2f865be1dff7b22a023ec421b60b6cb13d1fbf803bf3f68964b83236481c3415e40dca66b217efca8 mdds-2.0.3.tar.bz2" +sha512sums="5fe345e7d84d2e290a519d65b27332f69001c01da961c05a30abfe2a17cb8545822490bcd63b320d49e1b26291a4a898f77495951919aece83208133027848ea mdds-2.1.1.tar.xz" diff --git a/user/menu-cache/APKBUILD b/user/menu-cache/APKBUILD index dd8b8a0f5..3c20b042c 100644 --- a/user/menu-cache/APKBUILD +++ b/user/menu-cache/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=menu-cache pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Caching mechanism for freedesktop.org menus" url="https://lxde.org/" arch="all" @@ -11,7 +11,9 @@ license="GPL-2.0+" depends="" makedepends="glib-dev libfm-extra-dev" subpackages="$pkgname-dev" -source="https://downloads.sourceforge.net/lxde/menu-cache/1.1/$pkgname-$pkgver.tar.xz" +source="https://downloads.sourceforge.net/lxde/menu-cache/1.1/$pkgname-$pkgver.tar.xz + gcc10.patch + " build() { ./configure \ @@ -26,4 +28,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e menu-cache-1.1.0.tar.xz" +sha512sums="e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e menu-cache-1.1.0.tar.xz +ce4aa02e56bca4af6e32ef7ce689c26387309ef6e1d9560f37d344bca6ef5aba6c3c8c9c3ea38127ca71f8aaff0cfbfed47775c7b2cbb9703deae99b6fc78645 gcc10.patch" diff --git a/user/menu-cache/gcc10.patch b/user/menu-cache/gcc10.patch new file mode 100644 index 000000000..9949d09a9 --- /dev/null +++ b/user/menu-cache/gcc10.patch @@ -0,0 +1,103 @@ +From 4a82095ca4a334ceaf306c128248eb020f11bef1 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Fri, 24 Jan 2020 13:33:00 +0900 +Subject: [PATCH] Support gcc10 compilation + +gcc10 now defaults to -fno-common. + +(original commit message cut by committer and supplemented below) + +Do not define variables in a header file. Declare globally used +variables as "extern" instead. +--- + menu-cache-gen/menu-tags.h | 55 ++++++++++++-------------------------- + 1 file changed, 17 insertions(+), 38 deletions(-) + +diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h +index f3fd7d3..f71c0bc 100644 +--- a/menu-cache-gen/menu-tags.h ++++ b/menu-cache-gen/menu-tags.h +@@ -22,38 +22,17 @@ + #include <libfm/fm-extra.h> + #include <menu-cache.h> + +-FmXmlFileTag menuTag_Menu; +-FmXmlFileTag menuTag_AppDir; +-FmXmlFileTag menuTag_DefaultAppDirs; +-FmXmlFileTag menuTag_DirectoryDir; +-FmXmlFileTag menuTag_DefaultDirectoryDirs; +-FmXmlFileTag menuTag_Include; +-FmXmlFileTag menuTag_Exclude; +-FmXmlFileTag menuTag_Filename; +-FmXmlFileTag menuTag_Or; +-FmXmlFileTag menuTag_And; +-FmXmlFileTag menuTag_Not; +-FmXmlFileTag menuTag_Category; +-FmXmlFileTag menuTag_MergeFile; +-FmXmlFileTag menuTag_MergeDir; +-FmXmlFileTag menuTag_DefaultMergeDirs; +-FmXmlFileTag menuTag_Directory; +-FmXmlFileTag menuTag_Name; +-FmXmlFileTag menuTag_Deleted; +-FmXmlFileTag menuTag_NotDeleted; +-FmXmlFileTag menuTag_OnlyUnallocated; +-FmXmlFileTag menuTag_NotOnlyUnallocated; +-FmXmlFileTag menuTag_All; +-FmXmlFileTag menuTag_LegacyDir; +-FmXmlFileTag menuTag_KDELegacyDirs; +-FmXmlFileTag menuTag_Move; +-FmXmlFileTag menuTag_Old; +-FmXmlFileTag menuTag_New; +-FmXmlFileTag menuTag_Layout; +-FmXmlFileTag menuTag_DefaultLayout; +-FmXmlFileTag menuTag_Menuname; +-FmXmlFileTag menuTag_Separator; +-FmXmlFileTag menuTag_Merge; ++extern FmXmlFileTag menuTag_AppDir; ++extern FmXmlFileTag menuTag_DirectoryDir; ++extern FmXmlFileTag menuTag_Include; ++extern FmXmlFileTag menuTag_Exclude; ++extern FmXmlFileTag menuTag_Filename; ++extern FmXmlFileTag menuTag_Or; ++extern FmXmlFileTag menuTag_And; ++extern FmXmlFileTag menuTag_Not; ++extern FmXmlFileTag menuTag_Category; ++extern FmXmlFileTag menuTag_All; ++extern FmXmlFileTag menuTag_LegacyDir; + + typedef enum { + MERGE_NONE, /* starting value */ +@@ -152,19 +131,19 @@ typedef struct { + } MenuRule; + + /* requested language(s) */ +-char **languages; ++extern char **languages; + + /* list of menu files to monitor */ +-GSList *MenuFiles; ++extern GSList *MenuFiles; + + /* list of menu dirs to monitor */ +-GSList *MenuDirs; ++extern GSList *MenuDirs; + + /* list of available app dirs */ +-GSList *AppDirs; ++extern GSList *AppDirs; + + /* list of available dir dirs */ +-GSList *DirDirs; ++extern GSList *DirDirs; + + /* parse and merge menu files */ + MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error); +@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil + void _free_layout_items(GList *data); + + /* verbosity level */ +-gint verbose; ++extern gint verbose; + + #define DBG if (verbose) g_debug + #define VDBG if (verbose > 1) g_debug diff --git a/user/mesa-amber/APKBUILD b/user/mesa-amber/APKBUILD new file mode 100644 index 000000000..94a85b521 --- /dev/null +++ b/user/mesa-amber/APKBUILD @@ -0,0 +1,78 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mesa-amber +pkgver=21.3.9 +pkgrel=0 +pkgdesc="Mesa DRI OpenGL library" +url="https://www.mesa3d.org" +arch="all" +options="!check" # No test suite. +license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0 AND LGPL-2.1+" +depends="" +makedepends="bison expat-dev flex libdrm-dev libglvnd-dev libx11-dev libxcb-dev + libxdamage-dev libxext-dev libxfixes-dev libxrandr-dev libxshmfence-dev + libxxf86vm-dev meson python3 py3-libxml2 py3-mako py3-pygments + py3-markupsafe wayland-dev wayland-protocols xorgproto-dev zlib-dev + zstd-dev" +subpackages="" +source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz + big-endian-flipping.patch + mesa-amber-i915c.patch + no-tls.patch + nouveau-flush-fix.patch + " +builddir="$srcdir"/mesa-$pkgver + +_dri_driverdir=/usr/lib/xorg/modules/dri +_dri_drivers="r100,r200,nouveau" + +case "$CARCH" in +x86* | pmmx) + _dri_drivers="${_dri_drivers},i915,i965" + _arch_conf="-Dsse2=false" + ;; +armhf) + CFLAGS="$CFLAGS -mfpu=neon" + ;; +ppc64) + _arch_conf="-Dpower8=disabled" + ;; +esac + +build() { + meson \ + -Dprefix=/usr \ + -Damber=true \ + -Ddri-drivers=$_dri_drivers \ + -Ddri-drivers-path=$_dri_driverdir \ + -Ddri3=enabled \ + -Dgbm=disabled \ + -Dglvnd=true \ + -Dllvm=disabled \ + -Dosmesa=false \ + -Dplatforms=x11,wayland \ + -Dgallium-drivers='' \ + -Dvulkan-drivers='' \ + $_arch_conf \ + build + + meson compile -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build + if [ -f "$pkgdir"/usr/lib/xorg/modules/dri/i915_dri.so ]; then + # Prevent file conflict with mesa-dri. + mv "$pkgdir"/usr/lib/xorg/modules/dri/i915_dri.so \ + "$pkgdir"/usr/lib/xorg/modules/dri/i915c_dri.so + fi + rm -rf "$pkgdir"/usr/include + rm -rf "$pkgdir"/usr/lib/libglapi.so* + rm -rf "$pkgdir"/usr/lib/pkgconfig + rm -rf "$pkgdir"/usr/share/drirc.d +} + +sha512sums="4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684 mesa-21.3.9.tar.xz +3417e5c6d7ec564178e1d72431042b0a6ba659321f13a3dda81eda5fa0f2c8bc7c6972cb8266aea84ab05976ffb161659e9988c50ecc418e8bc1e1ce8f93a65f big-endian-flipping.patch +163e80342f6df7706d7db4defc0c5814db92e03fcec675e6729a05ba1b3907e3233a9bd6f40629bde5dcf7afbf397e40f774c2298ad2f9b3948a6db63f801893 mesa-amber-i915c.patch +076bb17d85235f3c833af8f1641f3556e406ad187b7ae1ebacced5f57b8832243a878678de4e50880c9a50b2aae3c42ad2342ed8c3e18d881edb7dd5018a710e no-tls.patch +7283dc0e86e1ddaf4590008db57dd591921f47928945782afaa283f3b87770c731bab19d3d8879b4bf8b785f8886b9b46c576ca735296123f8afff29655abaeb nouveau-flush-fix.patch" diff --git a/user/mesa/big-endian-flipping.patch b/user/mesa-amber/big-endian-flipping.patch index 154a83108..154a83108 100644 --- a/user/mesa/big-endian-flipping.patch +++ b/user/mesa-amber/big-endian-flipping.patch diff --git a/user/mesa-amber/mesa-amber-i915c.patch b/user/mesa-amber/mesa-amber-i915c.patch new file mode 100644 index 000000000..826f8cb3c --- /dev/null +++ b/user/mesa-amber/mesa-amber-i915c.patch @@ -0,0 +1,46 @@ + +This patch is fixed the issue created when /usr/lib/dri/i915_dri.so is renamed to /usr/lib/dri/i915c_dri.so +by mesa-amber/mesa-amber-21.3.9.ebuild + +Without this patch the driver cannot be loaded using the environment variable MESA_LOADER_DRIVER_OVERRIDE="i915c" +as that mechanism expects to find the __driDriverGetExtensions_i915c: + +MESA-LOADER: dlopen(/usr/lib/dri/i915c_dri.so) +MESA-LOADER: driver does not expose __driDriverGetExtensions_i915c(): /usr/lib/dri/i915c_dri.so: undefined symbol: __driDriverGetExtensions_i915c +MESA-LOADER: dlopen(/usr/lib/dri/swrast_dri.so) + +This patch adds the __driDriverGetExtensions_i915c symbol by simply cloning the code for the original +__driDriverGetExtensions_i915 symbol. + +Allan Mondor +bugs.gentoo@acmondor.ca + + +diff -w -ruN mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.c mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.c +--- mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.c 2022-06-08 12:13:35.000000000 -0600 ++++ mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.c 2022-08-23 11:32:19.151578025 -0600 +@@ -1290,6 +1290,13 @@ + return i915_driver_extensions; + } + ++PUBLIC const __DRIextension **__driDriverGetExtensions_i915c(void) ++{ ++ globalDriverAPI = &i915_driver_api; ++ ++ return i915_driver_extensions; ++} ++ + PUBLIC const __DRIextension **__driDriverGetExtensions_i830(void) + { + globalDriverAPI = &i915_driver_api; +diff -w -ruN mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.h mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.h +--- mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.h 2022-06-08 12:13:35.000000000 -0600 ++++ mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.h 2022-08-23 11:31:54.047576393 -0600 +@@ -160,6 +160,7 @@ + + const __DRIextension **__driDriverGetExtensions_i830(void); + const __DRIextension **__driDriverGetExtensions_i915(void); ++const __DRIextension **__driDriverGetExtensions_i915c(void); + extern const __DRI2fenceExtension intelFenceExtension; + + extern GLboolean diff --git a/user/mesa/no-tls.patch b/user/mesa-amber/no-tls.patch index 803fa3707..803fa3707 100644 --- a/user/mesa/no-tls.patch +++ b/user/mesa-amber/no-tls.patch diff --git a/user/mesa/nouveau-flush-fix.patch b/user/mesa-amber/nouveau-flush-fix.patch index 97512d01a..97512d01a 100644 --- a/user/mesa/nouveau-flush-fix.patch +++ b/user/mesa-amber/nouveau-flush-fix.patch diff --git a/user/mesa-be/APKBUILD b/user/mesa-be/APKBUILD new file mode 100644 index 000000000..edb7383f8 --- /dev/null +++ b/user/mesa-be/APKBUILD @@ -0,0 +1,136 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mesa +pkgver=24.1.7 +_llvmver=18 +pkgrel=0 +pkgdesc="Mesa DRI OpenGL library" +url="https://www.mesa3d.org" +arch="ppc ppc64" +options="!check" # No test suite. +license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0 AND LGPL-2.1+" +depends="" +depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev + xorgproto-dev" +makedepends="$depends_dev bison eudev-dev expat-dev flex libelf-dev libglvnd-dev + libva-dev libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev + libxv-dev libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend meson + ninja python3 py3-libxml2 py3-mako py3-pygments py3-markupsafe + py3-pyyaml rust wayland-dev wayland-protocols glslang-dev + zlib-dev zstd-dev bindgen-cli cbindgen clang-dev" +replaces="mesa-egl mesa-gl mesa-glapi mesa-gles" +subpackages="$pkgname-dev $pkgname-dri $pkgname-vulkan-overlay $pkgname-gbm + $pkgname-d3d $pkgname-xatracker $pkgname-osmesa" +source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz" + +_dri_driverdir=/usr/lib/xorg/modules/dri +_gallium_drivers="kmsro,r300,r600,radeonsi,nouveau,swrast,virgl,zink" +_vulkan_drivers="amd,nouveau,swrast,virtio" + +case "$CARCH" in +ppc64) + _arch_conf="-Dpower8=disabled" + ;; +esac + +build() { + # This is to fix #796, and is derived from: + # https://gitlab.freedesktop.org/mesa/mesa/-/commit/cc2b3a99ccf035a084d768e5c5ffa81478d685c1 + cat > native.file <<EOF +[binaries] +llvm-config = '$(command -v llvm${_llvmver}-config)' +rust = ['rustc', '--target=${CHOST}'] +EOF + + meson \ + --native-file=native.file \ + -Dprefix=/usr \ + -Ddri-drivers-path=$_dri_driverdir \ + -Dgallium-drivers=$_gallium_drivers \ + -Dgallium-nine=true \ + -Dgallium-opencl=disabled \ + -Dgallium-rusticl=false \ + -Dgallium-va=enabled \ + -Dgallium-vdpau=enabled \ + -Dgallium-xa=enabled \ + -Dglvnd=enabled \ + -Dglx=dri \ + -Dmicrosoft-clc=disabled \ + -Dopencl-spirv=false \ + -Dosmesa=true \ + -Dplatforms=x11,wayland \ + -Dvideo-codecs=all_free \ + -Dvulkan-drivers=$_vulkan_drivers \ + -Dvulkan-layers=device-select,overlay \ + $_arch_conf \ + build + + ninja -C build +} + +package() { + DESTDIR="$pkgdir" ninja -C build install +} + +d3d() { + replaces="mesa" + pkgdesc="Mesa Direct3D adaptor libraries" + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/d3d \ + "$subpkgdir"/usr/lib/ +} + +xatracker() { + pkgdesc="Mesa XA state tracker for VMware" + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libxatracker*.so.* \ + "$subpkgdir"/usr/lib/ +} + +osmesa() { + pkgdesc="Mesa offscreen rendering libraries" + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libOSMesa.so.* \ + "$subpkgdir"/usr/lib/ +} + +gbm() { + pkgdesc="Mesa GBM library" + replaces="mesa" + install -d "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libgbm.so.* \ + "$subpkgdir"/usr/lib/ +} + +overlay() { + pkgdesc="Vulkan overlays to display information" + install -d "$subpkgdir"/usr/bin + install -d "$subpkgdir"/usr/lib + install -d "$subpkgdir"/usr/share + mv "$pkgdir"/usr/lib/libVkLayer_MESA_*.so \ + "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/share/vulkan \ + "$subpkgdir"/usr/share/vulkan + mv "$pkgdir"/usr/bin/mesa-overlay-control.py "$subpkgdir"/usr/bin +} + +dri() { + pkgdesc="Mesa DRI drivers" + replaces="mesa-dri-ati mesa-dri-freedreno mesa-dri-intel + mesa-dri-nouveau mesa-dri-swrast mesa-dri-tegra mesa-dri-vc4 + mesa-dri-virtio mesa-dri-vmwgfx" + depends="mesa=$pkgver-r$pkgrel" + provides="$replaces" + install -d "$subpkgdir"/usr/lib/xorg/modules + install -d "$subpkgdir"/usr/share/vulkan + mv "$pkgdir"/usr/lib/dri "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/xorg/modules/dri "$subpkgdir"/usr/lib/xorg/modules/ + mv "$pkgdir"/usr/share/drirc.d "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/share/glvnd "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/lib/libgallium*.so* "$subpkgdir"/usr/lib/ || true + # support non-Vulkan arches + mv "$pkgdir"/usr/lib/libvulkan*.so* "$subpkgdir"/usr/lib/ || true + mv "$pkgdir"/usr/lib/vdpau "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/ +} + +sha512sums="890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01 mesa-24.1.7.tar.xz" diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD index 31c298de0..9b2b5e93d 100644 --- a/user/mesa-demos/APKBUILD +++ b/user/mesa-demos/APKBUILD @@ -3,14 +3,15 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mesa-demos pkgver=8.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Mesa demos and utils" url="https://mesa3d.org" arch="all" options="!check" # No test suite. license="X11" depends="" -makedepends="mesa-dev glew-dev glu-dev freeglut-dev freetype-dev libtool" +makedepends="mesa-dev glew-dev glu-dev freeglut-dev freetype-dev libtool + libglvnd-dev" source="https://mesa.freedesktop.org/archive/demos/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index d5f828129..2bc34d02d 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=21.3.9 -_llvmver=14 +pkgver=24.3.0 +_llvmver=18 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" @@ -11,36 +11,34 @@ license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0 AND LGPL-2.1+" depends="" depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev xorgproto-dev" -makedepends="$depends_dev bison eudev-dev expat-dev flex libelf-dev +makedepends="$depends_dev bison eudev-dev expat-dev flex libelf-dev libglvnd-dev libva-dev libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev libxv-dev libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend meson ninja python3 py3-libxml2 py3-mako py3-pygments py3-markupsafe - wayland-dev wayland-protocols - zlib-dev zstd-dev" -subpackages="$pkgname-dev $pkgname-dri - $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles - $pkgname-xatracker $pkgname-osmesa $pkgname-gbm" -# requires glslang: $pkgname-vulkan-overlay -source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz - big-endian-flipping.patch - musl-fixes.patch - no-tls.patch - nouveau-flush-fix.patch - " + py3-cparser py3-pyyaml rust wayland-dev wayland-protocols glslang-dev + zlib-dev zstd-dev bindgen-cli cbindgen clang-dev libarchive-dev" +replaces="mesa-egl mesa-gl mesa-glapi mesa-gles" +subpackages="$pkgname-dev $pkgname-dri $pkgname-vulkan-overlay $pkgname-gbm + $pkgname-d3d $pkgname-xatracker $pkgname-osmesa" +source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz" _dri_driverdir=/usr/lib/xorg/modules/dri -_dri_drivers="r200,nouveau" -_gallium_drivers="r300,r600,radeonsi,nouveau,swrast,virgl" -_vulkan_drivers="amd" +_gallium_drivers="r300,r600,radeonsi,nouveau,softpipe,llvmpipe,virgl,zink,svga" +_vulkan_drivers="amd,nouveau,swrast,virtio" case "$CARCH" in +x86_64) + _gallium_drivers="${_gallium_drivers},i915,svga,crocus" + _vulkan_drivers="${_vulkan_drivers},microsoft-experimental" + _arch_conf="-Dintel-rt=enabled" + ;; x86* | pmmx) - _dri_drivers="${_dri_drivers},i965" - _gallium_drivers="${_gallium_drivers},i915,svga,iris" - _vulkan_drivers="${_vulkan_drivers},intel" + _gallium_drivers="${_gallium_drivers},i915,svga,crocus" + _arch_conf="-Dsse2=false" ;; aarch64 | arm*) - _gallium_drivers="${_gallium_drivers},vc4,freedreno,tegra,kmsro,v3d,lima,panfrost,etnaviv" + _gallium_drivers="${_gallium_drivers},vc4,freedreno,tegra,v3d,lima,panfrost,etnaviv" + _vulkan_drivers="${_vulkan_drivers},freedreno,panfrost,broadcom" case "$CARCH" in armhf) CFLAGS="$CFLAGS -mfpu=neon";; esac @@ -51,14 +49,34 @@ ppc64) esac build() { + # This is to fix #796, and is derived from: + # https://gitlab.freedesktop.org/mesa/mesa/-/commit/cc2b3a99ccf035a084d768e5c5ffa81478d685c1 + cat > native.file <<EOF +[binaries] +llvm-config = '$(command -v llvm${_llvmver}-config)' +rust = ['rustc', '--target=${CHOST}'] +EOF + meson \ + --native-file=native.file \ -Dprefix=/usr \ -Ddri-drivers-path=$_dri_driverdir \ - -Dplatforms=x11,wayland \ - -Ddri-drivers=$_dri_drivers \ -Dgallium-drivers=$_gallium_drivers \ - -Dvulkan-drivers=$_vulkan_drivers \ + -Dgallium-nine=true \ + -Dgallium-opencl=disabled \ + -Dgallium-rusticl=false \ + -Dgallium-va=enabled \ + -Dgallium-vdpau=enabled \ + -Dgallium-xa=enabled \ + -Dglvnd=enabled \ + -Dglx=dri \ + -Dmicrosoft-clc=disabled \ + -Dopencl-spirv=false \ -Dosmesa=true \ + -Dplatforms=x11,wayland \ + -Dvideo-codecs=all_free \ + -Dvulkan-drivers=$_vulkan_drivers \ + -Dvulkan-layers=device-select,overlay \ $_arch_conf \ build @@ -69,35 +87,11 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -egl() { - replaces="mesa" - pkgdesc="Mesa libEGL runtime libraries" - install -d "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libEGL.so* \ - "$subpkgdir"/usr/lib/ -} - -gl() { - replaces="mesa" - pkgdesc="Mesa libGL runtime libraries" - install -d "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libGL.so* \ - "$subpkgdir"/usr/lib/ -} - -glapi() { - replaces="$pkgname-gles" - pkgdesc="Mesa OpenGL API" - install -d "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libglapi.so.* \ - "$subpkgdir"/usr/lib/ -} - -gles() { +d3d() { replaces="mesa" - pkgdesc="Mesa libGLESv2 runtime libraries" + pkgdesc="Mesa Direct3D adaptor libraries" install -d "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libGLES*.so* \ + mv "$pkgdir"/usr/lib/d3d \ "$subpkgdir"/usr/lib/ } @@ -123,14 +117,16 @@ gbm() { "$subpkgdir"/usr/lib/ } -vulkan_overlay() { - pkgdesc="Vulkan layer to display information about the current window" +overlay() { + pkgdesc="Vulkan overlays to display information" + install -d "$subpkgdir"/usr/bin install -d "$subpkgdir"/usr/lib - install -d "$subpkgdir"/usr/share/vulkan/explicit_layer.d - mv "$pkgdir"/usr/lib/libVkLayer_MESA_overlay.so \ + install -d "$subpkgdir"/usr/share + mv "$pkgdir"/usr/lib/libVkLayer_MESA_*.so \ "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json \ - "$subpkgdir"/usr/share/vulkan/explicit_layer.d/ + mv "$pkgdir"/usr/share/vulkan \ + "$subpkgdir"/usr/share/vulkan + mv "$pkgdir"/usr/bin/mesa-overlay-control.py "$subpkgdir"/usr/bin } dri() { @@ -138,22 +134,19 @@ dri() { replaces="mesa-dri-ati mesa-dri-freedreno mesa-dri-intel mesa-dri-nouveau mesa-dri-swrast mesa-dri-tegra mesa-dri-vc4 mesa-dri-virtio mesa-dri-vmwgfx" + depends="mesa=$pkgver-r$pkgrel" provides="$replaces" install -d "$subpkgdir"/usr/lib/xorg/modules install -d "$subpkgdir"/usr/share/vulkan mv "$pkgdir"/usr/lib/dri "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/xorg/modules/dri "$subpkgdir"/usr/lib/xorg/modules/ mv "$pkgdir"/usr/share/drirc.d "$subpkgdir"/usr/share/ - # XvMC drivers - mv "$pkgdir"/usr/lib/libXvMC*.so* "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/share/glvnd "$subpkgdir"/usr/share/ + mv "$pkgdir"/usr/lib/libgallium*.so* "$subpkgdir"/usr/lib/ || true # support non-Vulkan arches mv "$pkgdir"/usr/lib/libvulkan*.so* "$subpkgdir"/usr/lib/ || true mv "$pkgdir"/usr/lib/vdpau "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/ } -sha512sums="4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684 mesa-21.3.9.tar.xz -3417e5c6d7ec564178e1d72431042b0a6ba659321f13a3dda81eda5fa0f2c8bc7c6972cb8266aea84ab05976ffb161659e9988c50ecc418e8bc1e1ce8f93a65f big-endian-flipping.patch -9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch -076bb17d85235f3c833af8f1641f3556e406ad187b7ae1ebacced5f57b8832243a878678de4e50880c9a50b2aae3c42ad2342ed8c3e18d881edb7dd5018a710e no-tls.patch -7283dc0e86e1ddaf4590008db57dd591921f47928945782afaa283f3b87770c731bab19d3d8879b4bf8b785f8886b9b46c576ca735296123f8afff29655abaeb nouveau-flush-fix.patch" +sha512sums="20168ae4c278776a60d5febf53b3367cf08bffffb40ef2054821e68d7a8c37a07871d097ab17555f41a4fe716f0de7df95ad7d452b1ed57db6527838eb839ba4 mesa-24.3.0.tar.xz" diff --git a/user/mesa/musl-fixes.patch b/user/mesa/musl-fixes.patch deleted file mode 100644 index dd3e6bb64..000000000 --- a/user/mesa/musl-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include <sys/stat.h> - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 60146659f..e1cf9aeac 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=meson -pkgver=1.2.3 +pkgver=1.4.0 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="https://mesonbuild.com/" @@ -24,4 +24,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc meson-1.2.3.tar.gz" +sha512sums="2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd meson-1.4.0.tar.gz" diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD index e4861c278..40ce81de3 100644 --- a/user/mimetic/APKBUILD +++ b/user/mimetic/APKBUILD @@ -2,17 +2,18 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=mimetic pkgver=0.9.8 -pkgrel=0 +pkgrel=1 pkgdesc="C++ library for processing MIME" -url="http://www.codesink.org/mimetic_mime_library.html" +url="https://www.codesink.org/mimetic_mime_library.html" arch="all" license="MIT" depends="" makedepends="doxygen" subpackages="$pkgname-dev" -source="http://www.codesink.org/download/mimetic-$pkgver.tar.gz +source="https://www.codesink.org/download/mimetic-$pkgver.tar.gz fix-compile.patch signedness.patch + nullptr.patch " prepare() { @@ -41,4 +42,5 @@ package() { sha512sums="4157eecb3e26af314d475c91192a357d6da35271a07a07b037d5037e9af84952ce2636874e86df0e94e8887dcfdb8f594a1ba04e6448181e436b0e2675f48f58 mimetic-0.9.8.tar.gz 26badbaea0e9392080ece1cfda41d16a4fa87850e92edb4120e0a080fcebeeebaf28adb0fc73ba56ecacfc670bc315b2255c9c101471beb09068b1b4c4c8c473 fix-compile.patch -d92c719134064e545e7b63f56bfc6b2898c82766a4540230ac5273b1380ef4546d220d95faa99d7b9c01508650a361b7473ad74c9a79262cb423277ca83a36b2 signedness.patch" +d92c719134064e545e7b63f56bfc6b2898c82766a4540230ac5273b1380ef4546d220d95faa99d7b9c01508650a361b7473ad74c9a79262cb423277ca83a36b2 signedness.patch +716d5b15e4e7734fc63b3bbdb0651fa45f2a89d745084788b4db7cf46a17ba30dc5d1290f8c514089dce12376e51110b8b0850bb3a87e06d024c93145fd2d5fc nullptr.patch" diff --git a/user/mimetic/nullptr.patch b/user/mimetic/nullptr.patch new file mode 100644 index 000000000..340ae37d6 --- /dev/null +++ b/user/mimetic/nullptr.patch @@ -0,0 +1,11 @@ +--- mimetic-0.9.8/mimetic/os/mmfile.cxx.old 2014-06-17 03:12:00.000000000 -0500 ++++ mimetic-0.9.8/mimetic/os/mmfile.cxx 2024-05-30 03:23:16.247921514 -0500 +@@ -57,7 +57,7 @@ + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) ++ if(m_beg != nullptr) + { + m_end = m_beg + m_st.st_size; + #if HAVE_MADVISE diff --git a/user/minicom/APKBUILD b/user/minicom/APKBUILD index a7ebc7b94..5c578c46e 100644 --- a/user/minicom/APKBUILD +++ b/user/minicom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=minicom -pkgver=2.8 +pkgver=2.9 pkgrel=0 pkgdesc="Menu-driven communications program for terminals" url="https://fossies.org/linux/minicom/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="535e0df37d8679ff08959b14f1f494a4d632af5a481e49873dd33a6c601de3ce20193ee6314d6c3282775f5adb906521a237bf8ac4b32e2751c754a91d99853f minicom-2.8.tar.bz2" +sha512sums="2ee4e585b180683b50b257ad768d903b3030f9b528f3bef5cb9c146b53c5bc39c724b69945edc7e72490b145bc12c6c568014a5a778aecac05917bd8d3d31663 minicom-2.9.tar.bz2" diff --git a/user/miniupnpc/APKBUILD b/user/miniupnpc/APKBUILD index c1445066a..ba9d46079 100644 --- a/user/miniupnpc/APKBUILD +++ b/user/miniupnpc/APKBUILD @@ -4,14 +4,14 @@ pkgname=miniupnpc pkgver=2.2.3 pkgrel=0 pkgdesc="A lightweight UPNP client enabling applications to control UPnP gateways" -url="https://miniupnp.tuxfamily.org/" +url="http://miniupnp.free.fr" arch="all" options="!check" # no tests license="BSD-3-Clause" depends="" makedepends="cmake" subpackages="$pkgname-dev $pkgname-doc" -source="http://miniupnp.tuxfamily.org/files/miniupnpc-$pkgver.tar.gz +source="http://miniupnp.free.fr/files/miniupnpc-$pkgver.tar.gz fix-cmake-include-install.patch " diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD index de114f254..01bd8c2bc 100644 --- a/user/mkfontscale/APKBUILD +++ b/user/mkfontscale/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkfontscale -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="Scalable font file creator for X.Org" url="https://www.X.Org/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3 mkfontscale-1.2.2.tar.xz" +sha512sums="816e7b2885bb7a4b2eb0e506b659600011bfa4ec1a3010243c2cc2241fa0b792f3c8de1dec1855a4d13de89405973967074e379b0d01dcf9de8a1277a2fc4296 mkfontscale-1.2.3.tar.xz" diff --git a/user/mosh/APKBUILD b/user/mosh/APKBUILD index d138bd4f3..728719767 100644 --- a/user/mosh/APKBUILD +++ b/user/mosh/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mosh -pkgver=1.3.2 -pkgrel=2 +pkgver=1.4.0 +pkgrel=0 pkgdesc="Mobile shell surviving disconnects with local echo and line editing" url="https://mosh.org" arch="all" @@ -13,8 +13,7 @@ makedepends="ncurses-dev zlib-dev openssl-dev perl-dev perl-io-tty protobuf-dev automake autoconf libtool gzip" subpackages="$pkgname-doc $pkgname-client $pkgname-server $pkgname-bash-completion:bashcomp:noarch" -source="https://mosh.org/$pkgname-$pkgver.tar.gz - fix-ppc64le-build-with-musl.patch" +source="https://github.com/mobile-shell/mosh/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz" prepare() { default_prepare @@ -70,5 +69,4 @@ client() { "$subpkgdir"/usr/bin/ } -sha512sums="f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 mosh-1.3.2.tar.gz -a276dde98a2dab63ad9c9c05468c55983a95f482878c5694713810b561eae1ea5618efc72431a17ee5b5014b12ee9709c6a8cbf582620294e7888cc837cd073c fix-ppc64le-build-with-musl.patch" +sha512sums="38c11f52ff1e42965b50a22bf6de80b0fa8ebbff841d825e760abf69c788a2bf5f34e6f7fc047574d595118334eef9edf8da5520b52cdde3ac1a79d7ad70312e mosh-1.4.0.tar.gz" diff --git a/user/mosh/fix-ppc64le-build-with-musl.patch b/user/mosh/fix-ppc64le-build-with-musl.patch deleted file mode 100644 index 8d918a963..000000000 --- a/user/mosh/fix-ppc64le-build-with-musl.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Roberto Oliveira <robertoguimaraes8@gmail.com> -Date: Tue, 4 Apr 2017 16:46:50 +0000 -Subject: [PATCH] Fix build with musl on ppc64le - -mosh was breaking when building in ppc64le using musl, because ioctl() is defined -as ioctl(int, int) in musl and mosh is using TIOCSWINSZ macro as parameter. This was -triggering a gcc warning and make the build fail. - -This patch does an explicit integer conversion in TIOCSWINSZ, as no bits get -lost. - ---- a/src/frontend/mosh-server.cc -+++ b/src/frontend/mosh-server.cc -@@ -714,7 +714,12 @@ - } - window_size.ws_col = res->width; - window_size.ws_row = res->height; -- if ( ioctl( host_fd, TIOCSWINSZ, &window_size ) < 0 ) { -+ -+ #if defined(__powerpc64__) && (!defined(__GLIBC__) && !defined(__UCLIBC__)) -+ if ( ioctl( host_fd, (int) TIOCSWINSZ, &window_size ) < 0 ) { -+ #else -+ if ( ioctl( host_fd, TIOCSWINSZ, &window_size ) < 0 ) { -+ #endif - perror( "ioctl TIOCSWINSZ" ); - network.start_shutdown(); - } ---- a/src/examples/termemu.cc -+++ a/src/examples/termemu.cc -@@ -226,7 +226,11 @@ - } - - /* tell child process */ -+ #if defined(__powerpc64__) && (!defined(__GLIBC__) && !defined(__UCLIBC__)) -+ if ( ioctl( fd, (int) TIOCSWINSZ, &window_size ) < 0 ) { -+ #else - if ( ioctl( fd, TIOCSWINSZ, &window_size ) < 0 ) { -+ #endif - perror( "ioctl TIOCSWINSZ" ); - return; - } -@@ -306,7 +310,11 @@ - complete.act( &r ); - - /* tell child process */ -+ #if defined(__powerpc64__) && (!defined(__GLIBC__) && !defined(__UCLIBC__)) -+ if ( ioctl( fd, (int) TIOCSWINSZ, &window_size ) < 0 ) { -+ #else - if ( ioctl( fd, TIOCSWINSZ, &window_size ) < 0 ) { -+ #endif - perror( "ioctl TIOCSWINSZ" ); - return; - } diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index ff1a44642..a42d7d874 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=mousepad -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="Simple text editor for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="dbus-glib-dev glib-dev gtk+3.0-dev gtksourceview4-dev intltool - xfconf-dev" +makedepends="dbus-glib-dev glib-dev gspell-dev gtk+3.0-dev gtksourceview4-dev + intltool libxfce4ui-dev polkit-dev xfconf-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/apps/mousepad/${pkgver%.*}/mousepad-$pkgver.tar.bz2" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="086f60f6f405290ed76366f4c5195e9c8f9c5058d1892200a73e48d6378428efe47f2038e3eddb81186e22dd87d57580559a556b1b22f202b6f056c7f90b64ea mousepad-0.6.2.tar.bz2" +sha512sums="a47e9c0d5b039444ee455e80d0ab4642d5c29d6e5632ec4fccfcef061b4bf40a1709ea73b092b02e915e1796d1593ede68e59b9fe373e127302d34f82c9beae3 mousepad-0.6.3.tar.bz2" diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD index 5edde3639..eff357445 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=mpv pkgver=0.34.1 -pkgrel=0 +pkgrel=1 pkgdesc="An improved fork of mplayer" url="https://mpv.io" arch="all" @@ -15,7 +15,8 @@ makedepends="python3 alsa-lib-dev pulseaudio-dev libx11-dev libxext-dev libxinerama-dev libxrandr-dev libxscrnsaver-dev - mesa-dev libva-dev lcms2-dev libvdpau-dev + libglvnd-dev libva-dev lcms2-dev libvdpau-dev mesa-dev wayland-dev + wayland-protocols libxkbcommon-dev ffmpeg-dev libbluray-dev v4l-utils-dev libass-dev libdvdread-dev libdvdnav-dev libcdio-dev libcdio-paranoia-dev rubberband-dev @@ -35,8 +36,6 @@ build() { --destdir="$pkgdir" \ --disable-lua \ --disable-javascript \ - --disable-wayland \ - --disable-gl-wayland \ --enable-dvdnav \ --enable-cdda python3 ./waf build diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD deleted file mode 100644 index faf1eb689..000000000 --- a/user/musl-obstack/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=musl-obstack -pkgver=1.2.3 -pkgrel=0 -pkgdesc="Standalone library to implement obstack functionality" -url=" " -arch="all" -license="GPL-2.0+" -depends="" -makedepends="autoconf automake libtool" -subpackages="$pkgname-dev" -source="musl-obstack-$pkgver.tar.gz::https://github.com/void-linux/musl-obstack/archive/v$pkgver.tar.gz" - -build() { - export CFLAGS="$CFLAGS -fPIC" - ./bootstrap.sh - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="b2bbed19c4ab2714ca794bdcb1a84fad1af964e884d4f3bbe91c9937ca089d92b8472cb05ebe998a9f5c85cb922b9b458db91eff29077bd099942e1ce18e16cc musl-obstack-1.2.3.tar.gz" diff --git a/user/ncftp/APKBUILD b/user/ncftp/APKBUILD index dd1a31d21..d23b85b37 100644 --- a/user/ncftp/APKBUILD +++ b/user/ncftp/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ncftp -pkgver=3.2.6 +pkgver=3.2.7 pkgrel=0 pkgdesc="A set of free application programs implementing FTP" -url="http://www.ncftp.com/" +url="https://www.ncftp.com/" arch="all" options="!check" # No test suite. license="ClArtistic" depends="" makedepends="ncurses-dev" subpackages="$pkgname-doc $pkgname-bookmarks" -source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz" +source="https://www.ncftp.com/downloads/ncftp/$pkgname-$pkgver-src.tar.xz" build() { LIBS="-ltinfo" ./configure \ @@ -38,4 +38,4 @@ bookmarks() { "$subpkgdir"/usr/bin/ } -sha512sums="a2f8ac555bee8af4be1aa745ce5838beee99cd2253c1fe701b710ec135d7c47e2bf8b22ec928975ec2460919977d45a07fb12185ab58a2e96e3092039ffd3303 ncftp-3.2.6-src.tar.gz" +sha512sums="b755385a57ac2487625c15985f091d9e1b71073b2593faffe1f2bbba34e691cfff9ffd8448b048f223ea08428e890f30c49a903e4f938393e3c0e4ae03ddab37 ncftp-3.2.7-src.tar.xz" diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD index d0a7bcd2e..431d1aa91 100644 --- a/user/netqmail/APKBUILD +++ b/user/netqmail/APKBUILD @@ -2,19 +2,30 @@ # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=netqmail pkgver=1.06 -pkgrel=10 -pkgdesc="The qmail mail transfer agent (community version)" -url="http://www.netqmail.org/" +pkgrel=12 +pkgdesc="The qmail mail transfer agent (community/sagredo version)" +# fkn djb's original page lived longer than all the derived products +url="https://cr.yp.to/qmail.html" arch="all" license="Public-Domain" options="suid !check" # suid programs (qmail-queue); no test suite -depends="execline s6 s6-networking smtpd-starttls-proxy ca-certificates !ssmtp" -makedepends="groff utmps-dev" +_utmps_version=0.1.2 +_execline_version=2.9.6 +_s6_version=2.13.1 +_s6net_version=2.7.0 +_smtpd_starttls_proxy_version=0.0.1 +depends="execline>=$_execline_version + s6>=$_s6_version + s6-networking>=$_s6net_version + smtpd-starttls-proxy>=$_smtpd_starttls_proxy_version + ca-certificates + !ssmtp" +makedepends="groff utmps-dev>=$_utmps_version" subpackages="$pkgname-doc $pkgname-openrc" provider_priority=1 provides=/usr/sbin/sendmail install="$pkgname.post-install $pkgname.pre-deinstall" -source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz +source="https://skarnet.org/archive/$pkgname-$pkgver.tar.gz 0001-DESTDIR.patch 0002-qbiffutmpx-20170820.patch 0003-qmailremote-20170716.patch @@ -105,7 +116,7 @@ package() { makeservicedir "$pkgdir"/etc/qmail/services/smtpd-skeleton-notls 3 "$srcdir"/smtpd-notls.run '/var/log/smtpd-$IP' 4 false } -sha512sums="de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b netqmail-1.06.tar.gz +sha512sums="c08828d8e569cd06c3d44e8c48a5e859fbf95ede272f24dfc1bc756c7bf74358fd8d547040eba294e4152257c1ae27d2b217ffb1bef25b5b48a9c37f478d1cbf netqmail-1.06.tar.gz ad126cad5c0d35351919ad87022fd94b910519d91cf82f38c158f423bbfc1b82455844a791ba0c69d347af1a20a86b095bed571f75365a86ea786cbc9c626487 0001-DESTDIR.patch b3af9c29e6d46daa2a1b9f677c6f32892d5f8c9b8d5c2bdd6f34b106dd5ad41394c05a5ebe145c6e29b4ced4482f08b2d09e7818fd309123c0d087600500e336 0002-qbiffutmpx-20170820.patch cbebdc72c7cc5c437531c9277534ae552c6d044a83b36e3f3ce60ab5563c55eb814d6c543cc0997abab73075d1b517cc0929dd65674d468d517b0ca38196e2b4 0003-qmailremote-20170716.patch diff --git a/user/node/APKBUILD b/user/node/APKBUILD index 11570595d..1c0cbe5a8 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=node pkgver=18.15.0 -pkgrel=0 +pkgrel=1 pkgdesc="JavaScript runtime" url="https://nodejs.org/" arch="all !ppc" # #837 @@ -16,6 +16,7 @@ source="https://nodejs.org/download/release/v$pkgver/node-v$pkgver.tar.xz pmmx-test.patch pmmx-time64.patch zlib-version-regex.patch + ppc-fixes-for-older-models-18.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -68,4 +69,5 @@ package() { sha512sums="e41fcda469809186fd724ef4691e25f4a5bd81357ee99acf3d7faa1190a69c19cb62bd14aea199ca6f8b5cf9687af7d898cdf605ea2414d2c04db87ddb3b4dc8 node-v18.15.0.tar.xz 277e226f3906f791bae6aedd0b74b0e2c52b6154eb2dc0c568417ad94a0722078e4fbbbe15c59d4ba0b59cdb4ad45b5e9620f14d75694a15531857cd29aa044a pmmx-test.patch bf78e52c60b4567854eaa9d9433ade8a318a356cb326dded99e800df35a9f475390a0cf8b0c8e595bbdb3702838eafe91801cd646576aa7fa7966b37d794e380 pmmx-time64.patch -45d899bd62e39762fde7e9743efcc6dc032161ae087099da8eecebc84f3eaab87eecf00cbc5861f686a45332224025af172ab00ce966771dccf2e925ca48bc6a zlib-version-regex.patch" +45d899bd62e39762fde7e9743efcc6dc032161ae087099da8eecebc84f3eaab87eecf00cbc5861f686a45332224025af172ab00ce966771dccf2e925ca48bc6a zlib-version-regex.patch +64cffa3cfdced1152a41d77c344370d0077d046ccf20fb618cad7396bcb37290c14a8180b713a7e554e3b09042e481d6aa4a5f97a0a93ceb4090d0f2a510b052 ppc-fixes-for-older-models-18.patch" diff --git a/user/node/ppc-fixes-for-older-models-18.patch b/user/node/ppc-fixes-for-older-models-18.patch new file mode 100644 index 000000000..88d5bd1a0 --- /dev/null +++ b/user/node/ppc-fixes-for-older-models-18.patch @@ -0,0 +1,918 @@ +Fix PowerPC CPU detection and codegen to work with more processors. + +This patch defines the correct optional Power ISA features that the +PPC code generator needs in order to run without crashing on v2.01 +and older CPUs such as PPC 970 (G5) or NXP e6500, and to run more +efficiently on CPUs with features that weren't being used before. + +PowerPC ISA v2.01 and older CPUs don't have FP round to int instructions, +and PowerPC ISA v2.06 and older are missing support for unsigned 64-bit +to/from double, as well as integer to/from single-precision float. + +Use the current PPC_5_PLUS CPU feature to determine whether to generate +FP round to int, and use the PPC_7_PLUS feature to determine whether +to use the v2.06 ISA instructions or whether to generate an alternate +generic PPC sequence to handle the cases of 64-bit unsigned integer +to/from floating point, integers to single-precision floating point, +and loading and storing 64-bit integers with byte reversal. + +Add a new PPC_7_PLUS_NXP feature for the popcnt and ldbrx/stdbrx +opcodes added in Power ISA v2.06, which are also present in the NXP +e5500 and e6500 cores, which are otherwise missing many of the +features added since v2.01. This enables NXP cores to use a few +more features. Additionally, bring back the ISELECT feature flag, +which is also supported by NXP cores, including older ones, and +has its own AT_HWCAP2 feature flag in Linux. + +By defining a new ICACHE_SNOOP feature bit to replace the use of +PPC_6_PLUS, the meaning of the instruction cache flushing fast path, +and the CPUs that can use it, is more clearly defined. In addition, +for the other PowerPC chips, the loop to flush the data and instruction +cache blocks has been split into two loops, with a single "sync" and +"isync" after each loop, which should be more efficient, and also handles +the few CPUs with differing data and instruction cache line sizes. + +In the macro assembler methods, in addition to providing an alternate +path for FP conversion opcodes added in POWER7 (ISA v2.06), unnecessary +instructions to move sp down and then immediately back up were replaced +with negative offsets from the current sp. This should be faster, and also +sp is supposed to point to a back chain at all times (V8 may not do this). + +--- a/deps/v8/src/base/cpu.cc 2022-02-08 04:37:48.000000000 -0800 ++++ b/deps/v8/src/base/cpu.cc 2022-02-19 14:38:37.997161835 -0800 +@@ -14,15 +14,16 @@ + #if V8_OS_LINUX + #include <linux/auxvec.h> // AT_HWCAP + #endif +-#if V8_GLIBC_PREREQ(2, 16) ++#if V8_GLIBC_PREREQ(2, 16) || \ ++ (V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64)) + #include <sys/auxv.h> // getauxval() ++#if defined(PPC_FEATURE2_HAS_ISEL) && !defined(PPC_FEATURE2_ISEL) ++#define PPC_FEATURE2_ISEL PPC_FEATURE2_HAS_ISEL ++#endif + #endif + #if V8_OS_QNX + #include <sys/syspage.h> // cpuinfo + #endif +-#if V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) +-#include <elf.h> +-#endif + #if V8_OS_AIX + #include <sys/systemcfg.h> // _system_configuration + #ifndef POWER_8 +@@ -772,56 +773,55 @@ + + #ifndef USE_SIMULATOR + #if V8_OS_LINUX +- // Read processor info from /proc/self/auxv. +- char* auxv_cpu_type = nullptr; +- FILE* fp = base::Fopen("/proc/self/auxv", "r"); +- if (fp != nullptr) { +-#if V8_TARGET_ARCH_PPC64 +- Elf64_auxv_t entry; +-#else +- Elf32_auxv_t entry; +-#endif +- for (;;) { +- size_t n = fread(&entry, sizeof(entry), 1, fp); +- if (n == 0 || entry.a_type == AT_NULL) { +- break; +- } +- switch (entry.a_type) { +- case AT_PLATFORM: +- auxv_cpu_type = reinterpret_cast<char*>(entry.a_un.a_val); +- break; +- case AT_ICACHEBSIZE: +- icache_line_size_ = entry.a_un.a_val; +- break; +- case AT_DCACHEBSIZE: +- dcache_line_size_ = entry.a_un.a_val; +- break; +- } +- } +- base::Fclose(fp); +- } +- +- part_ = -1; +- if (auxv_cpu_type) { +- if (strcmp(auxv_cpu_type, "power10") == 0) { +- part_ = kPPCPower10; +- } else if (strcmp(auxv_cpu_type, "power9") == 0) { +- part_ = kPPCPower9; +- } else if (strcmp(auxv_cpu_type, "power8") == 0) { +- part_ = kPPCPower8; +- } else if (strcmp(auxv_cpu_type, "power7") == 0) { +- part_ = kPPCPower7; +- } else if (strcmp(auxv_cpu_type, "power6") == 0) { +- part_ = kPPCPower6; +- } else if (strcmp(auxv_cpu_type, "power5") == 0) { +- part_ = kPPCPower5; +- } else if (strcmp(auxv_cpu_type, "ppc970") == 0) { +- part_ = kPPCG5; +- } else if (strcmp(auxv_cpu_type, "ppc7450") == 0) { +- part_ = kPPCG4; +- } else if (strcmp(auxv_cpu_type, "pa6t") == 0) { +- part_ = kPPCPA6T; +- } ++ // Read processor info from getauxval() (needs at least glibc 2.18 or musl). ++ icache_line_size_ = static_cast<int>(getauxval(AT_ICACHEBSIZE)); ++ dcache_line_size_ = static_cast<int>(getauxval(AT_DCACHEBSIZE)); ++ const unsigned long hwcap = getauxval(AT_HWCAP); ++ const unsigned long hwcap2 = getauxval(AT_HWCAP2); ++ const char* platform = reinterpret_cast<const char*>(getauxval(AT_PLATFORM)); ++ ++ // NOTE: AT_HWCAP ISA version bits aren't cumulative, so it's necessary ++ // to compare against a mask of all supported versions and CPUs, up to ++ // ISA v2.06, which *is* set for later CPUs. In contrast, the AT_HWCAP2 ++ // ISA version bits from v2.07 onward are set cumulatively, so POWER10 ++ // will set the ISA version bits from v2.06 (in AT_HWCAP) through v3.1. ++ ++ // i-cache coherency requires Power ISA v2.02 or later; has its own flag. ++ has_icache_snoop_ = (hwcap & PPC_FEATURE_ICACHE_SNOOP); ++ ++ // requires Power ISA v2.03 or later, or the ISEL bit (e.g. e6500). ++ has_isel_ = (hwcap & (PPC_FEATURE_POWER5_PLUS | PPC_FEATURE_ARCH_2_05 | ++ PPC_FEATURE_PA6T | PPC_FEATURE_POWER6_EXT | PPC_FEATURE_ARCH_2_06)) || ++ (hwcap2 & PPC_FEATURE2_ISEL); ++ ++ // hwcap mask for older 64-bit PPC CPUs with Altivec, e.g. G5, Cell. ++ static const unsigned long kHwcapMaskPPCG5 = ++ (PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC); ++ ++ if (hwcap2 & PPC_FEATURE2_ARCH_3_1) { ++ part_ = kPPCPower10; ++ } else if (hwcap2 & PPC_FEATURE2_ARCH_3_00) { ++ part_ = kPPCPower9; ++ } else if (hwcap2 & PPC_FEATURE2_ARCH_2_07) { ++ part_ = kPPCPower8; ++ } else if (hwcap & PPC_FEATURE_ARCH_2_06) { ++ part_ = kPPCPower7; ++ } else if (hwcap & PPC_FEATURE_ARCH_2_05) { ++ part_ = kPPCPower6; ++ } else if (hwcap & (PPC_FEATURE_POWER5 | PPC_FEATURE_POWER5_PLUS)) { ++ part_ = kPPCPower5; ++ } else if (hwcap & PPC_FEATURE_PA6T) { ++ part_ = kPPCPA6T; ++ } else if (strcmp(platform, "ppce6500") == 0) { ++ part_ = kPPCE6500; ++ } else if (strcmp(platform, "ppce5500") == 0) { ++ part_ = kPPCE5500; ++ } else if ((hwcap & kHwcapMaskPPCG5) == kHwcapMaskPPCG5) { ++ part_ = kPPCG5; ++ } else if (hwcap & PPC_FEATURE_HAS_ALTIVEC) { ++ part_ = kPPCG4; ++ } else { ++ part_ = kPPCG3; + } + + #elif V8_OS_AIX +@@ -842,9 +842,13 @@ + part_ = kPPCPower6; + break; + case POWER_5: ++ default: + part_ = kPPCPower5; + break; + } ++ ++ has_icache_snoop_ = true; ++ has_isel_ = (part_ != kPPCPower5); // isel was added in POWER5+ (v2.03) + #endif // V8_OS_AIX + #endif // !USE_SIMULATOR + #endif // V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64 +--- a/deps/v8/src/base/cpu.h 2023-03-05 09:42:53.000000000 +0300 ++++ b/deps/v8/src/base/cpu.h 2024-12-30 04:02:27.901400946 +0300 +@@ -71,9 +71,12 @@ + kPPCPower8, + kPPCPower9, + kPPCPower10, ++ kPPCG3, + kPPCG4, + kPPCG5, +- kPPCPA6T ++ kPPCPA6T, ++ kPPCE5500, ++ kPPCE6500 + }; + + // General features +@@ -127,6 +130,10 @@ + // mips features + bool is_fp64_mode() const { return is_fp64_mode_; } + bool has_msa() const { return has_msa_; } ++ ++ // PowerPC features ++ bool has_icache_snoop() const { return has_icache_snoop_; } ++ bool has_isel() const { return has_isel_; } + + // riscv features + bool has_rvv() const { return has_rvv_; } +@@ -180,6 +187,8 @@ + bool has_non_stop_time_stamp_counter_; + bool is_running_in_vm_; + bool has_msa_; ++ bool has_icache_snoop_; ++ bool has_isel_; + bool has_rvv_; + }; + +--- a/deps/v8/src/builtins/ppc/builtins-ppc.cc 2022-02-08 04:37:48.000000000 -0800 ++++ b/deps/v8/src/builtins/ppc/builtins-ppc.cc 2022-02-19 15:18:36.373031457 -0800 +@@ -2823,7 +2823,7 @@ + __ lbz(scratch, MemOperand(scratch, 0)); + __ cmpi(scratch, Operand::Zero()); + +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + __ Move(scratch, thunk_ref); + __ isel(eq, scratch, function_address, scratch); + } else { +--- a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc 2023-03-05 09:42:53.000000000 +0300 ++++ b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc 2025-01-02 18:47:19.405199075 +0300 +@@ -906,13 +906,25 @@ + + void TurboAssembler::ConvertIntToFloat(Register src, DoubleRegister dst) { + MovIntToDouble(dst, src, r0); +- fcfids(dst, dst); ++ ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ fcfids(dst, dst); ++ } else { ++ fcfid(dst, dst); ++ frsp(dst, dst); ++ } + } + + void TurboAssembler::ConvertUnsignedIntToFloat(Register src, + DoubleRegister dst) { + MovUnsignedIntToDouble(dst, src, r0); +- fcfids(dst, dst); ++ ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ fcfids(dst, dst); ++ } else { ++ fcfid(dst, dst); ++ frsp(dst, dst); ++ } + } + + #if V8_TARGET_ARCH_PPC64 +@@ -924,20 +936,52 @@ + + void TurboAssembler::ConvertUnsignedInt64ToFloat(Register src, + DoubleRegister double_dst) { +- MovInt64ToDouble(double_dst, src); +- fcfidus(double_dst, double_dst); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ MovInt64ToDouble(double_dst, src); ++ fcfidus(double_dst, double_dst); ++ } else { ++ ConvertUnsignedInt64ToDouble(src, double_dst); ++ frsp(double_dst, double_dst); ++ } + } + + void TurboAssembler::ConvertUnsignedInt64ToDouble(Register src, + DoubleRegister double_dst) { +- MovInt64ToDouble(double_dst, src); +- fcfidu(double_dst, double_dst); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ MovInt64ToDouble(double_dst, src); ++ fcfidu(double_dst, double_dst); ++ } else { ++ Label negative; ++ Label done; ++ cmpi(src, Operand::Zero()); ++ blt(&negative); ++ std(src, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ lfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ fcfid(double_dst, double_dst); ++ b(&done); ++ bind(&negative); ++ // Note: GCC saves the lowest bit, then ORs it after shifting right 1 bit, ++ // presumably for better rounding. This version only shifts right 1 bit. ++ srdi(r0, src, Operand(1)); ++ std(r0, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ lfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ fcfid(double_dst, double_dst); ++ fadd(double_dst, double_dst, double_dst); ++ bind(&done); ++ } + } + + void TurboAssembler::ConvertInt64ToFloat(Register src, + DoubleRegister double_dst) { + MovInt64ToDouble(double_dst, src); +- fcfids(double_dst, double_dst); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ fcfids(double_dst, double_dst); ++ } else { ++ fcfid(double_dst, double_dst); ++ frsp(double_dst, double_dst); ++ } + } + #endif + +@@ -967,15 +1011,56 @@ + void TurboAssembler::ConvertDoubleToUnsignedInt64( + const DoubleRegister double_input, const Register dst, + const DoubleRegister double_dst, FPRoundingMode rounding_mode) { +- if (rounding_mode == kRoundToZero) { +- fctiduz(double_dst, double_input); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (rounding_mode == kRoundToZero) { ++ fctiduz(double_dst, double_input); ++ } else { ++ SetRoundingMode(rounding_mode); ++ fctidu(double_dst, double_input); ++ ResetRoundingMode(); ++ } ++ ++ MovDoubleToInt64(dst, double_dst); + } else { +- SetRoundingMode(rounding_mode); +- fctidu(double_dst, double_input); +- ResetRoundingMode(); ++ Label safe_size; ++ Label done; ++ mov(dst, Operand(1593835520)); // bit pattern for 2^63 as a float ++ stw(dst, MemOperand(sp, -kFloatSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ lfs(double_dst, MemOperand(sp, -kFloatSize)); ++ fcmpu(double_input, double_dst); ++ blt(&safe_size); ++ // Subtract 2^63, then OR the top bit of the uint64 to add back ++ fsub(double_dst, double_input, double_dst); ++ if (rounding_mode == kRoundToZero) { ++ fctidz(double_dst, double_dst); ++ } else { ++ SetRoundingMode(rounding_mode); ++ fctid(double_dst, double_dst); ++ ResetRoundingMode(); ++ } ++ // set r0 to -1, then clear all but the MSB. ++ mov(r0, Operand(-1)); ++ rldicr(r0, r0, 0, 0); ++ stfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ ld(dst, MemOperand(sp, -kDoubleSize)); ++ orx(dst, dst, r0); ++ b(&done); ++ // Handling for values smaller than 2^63. ++ bind(&safe_size); ++ if (rounding_mode == kRoundToZero) { ++ fctidz(double_dst, double_input); ++ } else { ++ SetRoundingMode(rounding_mode); ++ fctid(double_dst, double_input); ++ ResetRoundingMode(); ++ } ++ stfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ ld(dst, MemOperand(sp, -kDoubleSize)); ++ bind(&done); + } +- +- MovDoubleToInt64(dst, double_dst); + } + #endif + +@@ -2466,19 +2551,17 @@ + } + #endif + +- addi(sp, sp, Operand(-kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 + mov(scratch, Operand(litVal.ival)); +- std(scratch, MemOperand(sp)); ++ std(scratch, MemOperand(sp, -kDoubleSize)); + #else + LoadIntLiteral(scratch, litVal.ival[0]); +- stw(scratch, MemOperand(sp, 0)); ++ stw(scratch, MemOperand(sp, -kDoubleSize)); + LoadIntLiteral(scratch, litVal.ival[1]); +- stw(scratch, MemOperand(sp, 4)); ++ stw(scratch, MemOperand(sp, -kDoubleSize + 4)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(result, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(result, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovIntToDouble(DoubleRegister dst, Register src, +@@ -2492,18 +2575,16 @@ + #endif + + DCHECK(src != scratch); +- subi(sp, sp, Operand(kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 + extsw(scratch, src); +- std(scratch, MemOperand(sp, 0)); ++ std(scratch, MemOperand(sp, -kDoubleSize)); + #else + srawi(scratch, src, 31); +- stw(scratch, MemOperand(sp, Register::kExponentOffset)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovUnsignedIntToDouble(DoubleRegister dst, Register src, +@@ -2517,18 +2598,16 @@ + #endif + + DCHECK(src != scratch); +- subi(sp, sp, Operand(kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 + clrldi(scratch, src, Operand(32)); +- std(scratch, MemOperand(sp, 0)); ++ std(scratch, MemOperand(sp, -kDoubleSize)); + #else + li(scratch, Operand::Zero()); +- stw(scratch, MemOperand(sp, Register::kExponentOffset)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovInt64ToDouble(DoubleRegister dst, +@@ -2543,16 +2622,14 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 +- std(src, MemOperand(sp, 0)); ++ std(src, MemOperand(sp, -kDoubleSize)); + #else +- stw(src_hi, MemOperand(sp, Register::kExponentOffset)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + #if V8_TARGET_ARCH_PPC64 +@@ -2567,12 +2644,10 @@ + return; + } + +- subi(sp, sp, Operand(kDoubleSize)); +- stw(src_hi, MemOperand(sp, Register::kExponentOffset)); +- stw(src_lo, MemOperand(sp, Register::kMantissaOffset)); ++ stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src_lo, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + #endif + +@@ -2587,12 +2662,10 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(dst, MemOperand(sp)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stfd(dst, MemOperand(sp, -kDoubleSize)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::InsertDoubleHigh(DoubleRegister dst, Register src, +@@ -2606,12 +2679,10 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(dst, MemOperand(sp)); +- stw(src, MemOperand(sp, Register::kExponentOffset)); ++ stfd(dst, MemOperand(sp, -kDoubleSize)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovDoubleLowToInt(Register dst, DoubleRegister src) { +@@ -2622,11 +2693,9 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(src, MemOperand(sp)); ++ stfd(src, MemOperand(sp, -kDoubleSize)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lwz(dst, MemOperand(sp, Register::kMantissaOffset)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + } + + void TurboAssembler::MovDoubleHighToInt(Register dst, DoubleRegister src) { +@@ -2638,13 +2707,10 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(src, MemOperand(sp)); ++ stfd(src, MemOperand(sp, -kDoubleSize)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lwz(dst, MemOperand(sp, Register::kExponentOffset)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lwz(dst, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); + } +- + void TurboAssembler::MovDoubleToInt64( + #if !V8_TARGET_ARCH_PPC64 + Register dst_hi, +@@ -2657,16 +2723,14 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(src, MemOperand(sp)); ++ stfd(src, MemOperand(sp, -kDoubleSize)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization + #if V8_TARGET_ARCH_PPC64 +- ld(dst, MemOperand(sp, 0)); ++ ld(dst, MemOperand(sp, -kDoubleSize)); + #else +- lwz(dst_hi, MemOperand(sp, Register::kExponentOffset)); +- lwz(dst, MemOperand(sp, Register::kMantissaOffset)); ++ lwz(dst_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif +- addi(sp, sp, Operand(kDoubleSize)); + } + + void TurboAssembler::MovIntToFloat(DoubleRegister dst, Register src, +@@ -3291,10 +3355,8 @@ + } + + #define MEM_LE_OP_LIST(V) \ +- V(LoadU64, ldbrx) \ + V(LoadU32, lwbrx) \ + V(LoadU16, lhbrx) \ +- V(StoreU64, stdbrx) \ + V(StoreU32, stwbrx) \ + V(StoreU16, sthbrx) + +@@ -3316,6 +3378,37 @@ + #undef MEM_LE_OP_FUNCTION + #undef MEM_LE_OP_LIST + ++void TurboAssembler::LoadU64LE(Register dst, const MemOperand& mem, ++ Register scratch) { ++#ifdef V8_TARGET_BIG_ENDIAN ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ GenerateMemoryLEOperation(dst, mem, ldbrx); ++ } else { ++ lwbrx(dst, mem); ++ lwbrx(scratch, MemOperand(mem.ra(), mem.rb(), mem.offset() + 4)); ++ rldicr(scratch, scratch, 32, 31); ++ orx(dst, dst, scratch); ++ } ++#else ++ LoadU64(dst, mem, scratch); ++#endif ++} ++ ++void TurboAssembler::StoreU64LE(Register src, const MemOperand& mem, ++ Register scratch) { ++#ifdef V8_TARGET_BIG_ENDIAN ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ GenerateMemoryLEOperation(src, mem, stdbrx); ++ } else { ++ stwbrx(src, mem); ++ rldicl(scratch, src, 32, 32); ++ stwbrx(scratch, MemOperand(mem.ra(), mem.rb(), mem.offset() + 4)); ++ } ++#else ++ StoreU64(src, mem, scratch); ++#endif ++} ++ + void TurboAssembler::LoadS32LE(Register dst, const MemOperand& mem, + Register scratch) { + #ifdef V8_TARGET_BIG_ENDIAN +--- a/deps/v8/src/codegen/cpu-features.h 2022-02-19 21:19:15.982288690 -0800 ++++ b/deps/v8/src/codegen/cpu-features.h 2022-02-19 21:22:43.071487369 -0800 +@@ -52,11 +52,15 @@ + MIPS_SIMD, // MSA instructions + + #elif V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64 ++ PPC_5_PLUS, + PPC_6_PLUS, + PPC_7_PLUS, + PPC_8_PLUS, + PPC_9_PLUS, + PPC_10_PLUS, ++ ICACHE_SNOOP, // ISA v2.02 (POWER5) ++ ISELECT, // ISA v2.03 (POWER5+ and some NXP cores) ++ PPC_7_PLUS_NXP, // ISA v2.06 (POWER7 and NXP e5500/e6500) + + #elif V8_TARGET_ARCH_S390X + FPU, +--- a/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc 2022-02-20 23:35:21.212337639 -0800 ++++ b/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc 2022-02-20 23:36:20.925858840 -0800 +@@ -2702,16 +2702,26 @@ + // static + MachineOperatorBuilder::Flags + InstructionSelector::SupportedMachineOperatorFlags() { +- return MachineOperatorBuilder::kFloat32RoundDown | +- MachineOperatorBuilder::kFloat64RoundDown | +- MachineOperatorBuilder::kFloat32RoundUp | +- MachineOperatorBuilder::kFloat64RoundUp | +- MachineOperatorBuilder::kFloat32RoundTruncate | +- MachineOperatorBuilder::kFloat64RoundTruncate | +- MachineOperatorBuilder::kFloat64RoundTiesAway | +- MachineOperatorBuilder::kWord32Popcnt | +- MachineOperatorBuilder::kWord64Popcnt; ++ MachineOperatorBuilder::Flags flags = MachineOperatorBuilder::Flag::kNoFlags; ++ // FP rounding to integer instructions require Power ISA v2.02 or later. ++ if (CpuFeatures::IsSupported(PPC_5_PLUS)) { ++ flags |= MachineOperatorBuilder::kFloat32RoundDown | ++ MachineOperatorBuilder::kFloat64RoundDown | ++ MachineOperatorBuilder::kFloat32RoundUp | ++ MachineOperatorBuilder::kFloat64RoundUp | ++ MachineOperatorBuilder::kFloat32RoundTruncate | ++ MachineOperatorBuilder::kFloat64RoundTruncate | ++ MachineOperatorBuilder::kFloat64RoundTiesAway; ++ } ++ // Population count requires Power ISA v2.06, or NXP e5500/e6500. ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ flags |= MachineOperatorBuilder::kWord32Popcnt; ++#if V8_TARGET_ARCH_PPC64 ++ flags |= MachineOperatorBuilder::kWord64Popcnt; ++#endif ++ } + // We omit kWord32ShiftIsSafe as s[rl]w use 0x3F as a mask rather than 0x1F. ++ return flags; + } + + // static +--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc 2023-03-05 09:42:53.000000000 +0300 ++++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc 2025-01-02 22:32:18.475188958 +0300 +@@ -1859,7 +1859,7 @@ + cr, static_cast<CRBit>(VXCVI % CRWIDTH)); + __ mcrfs(cr, VXCVI); // extract FPSCR field containing VXCVI into cr7 + // Handle conversion failures (such as overflow). +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + if (check_conversion) { + __ li(i.OutputRegister(1), Operand(1)); + __ isel(i.OutputRegister(1), r0, i.OutputRegister(1), crbit); +@@ -1896,7 +1896,7 @@ + int crbit = v8::internal::Assembler::encode_crbit( + cr, static_cast<CRBit>(VXCVI % CRWIDTH)); + __ mcrfs(cr, VXCVI); // extract FPSCR field containing VXCVI into cr7 +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + __ li(i.OutputRegister(1), Operand(1)); + __ isel(i.OutputRegister(1), r0, i.OutputRegister(1), crbit); + } else { +@@ -2173,11 +2173,66 @@ + break; + } + case kPPC_LoadByteRev64: { +- ASSEMBLE_LOAD_INTEGER_RR(ldbrx); ++ // inlined version of ASSEMBLE_LOAD_INTEGER_RR() ++ Register result = i.OutputRegister(); ++ AddressingMode mode = kMode_None; ++ MemOperand operand = i.MemoryOperand(&mode); ++ DCHECK_EQ(mode, kMode_MRR); ++ bool is_atomic = i.InputInt32(2); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ __ ldbrx(result, operand); ++ } else { ++#ifdef V8_TARGET_BIG_ENDIAN ++ // low and high words from reversed perspective ++ MemOperand op_low = operand; ++ MemOperand op_high = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#else ++ // low and high words from reversed perspective ++ MemOperand op_high = operand; ++ MemOperand op_low = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#endif ++ Register temp1 = r0; ++ __ lwbrx(result, op_low); ++ __ lwbrx(temp1, op_high); ++ __ rldicr(temp1, temp1, 32, 31); ++ __ orx(result, result, temp1); ++ } ++ if (is_atomic) __ lwsync(); ++ DCHECK_EQ(LeaveRC, i.OutputRCBit()); + break; + } + case kPPC_StoreByteRev64: { +- ASSEMBLE_STORE_INTEGER_RR(stdbrx); ++ // inlined version of ASSEMBLE_STORE_INTEGER_RR() ++ size_t index = 0; ++ AddressingMode mode = kMode_None; ++ MemOperand operand = i.MemoryOperand(&mode, &index); ++ DCHECK_EQ(mode, kMode_MRR); ++ Register value = i.InputRegister(index); ++ bool is_atomic = i.InputInt32(3); ++ if (is_atomic) __ lwsync(); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ __ stdbrx(value, operand); ++ } else { ++#ifdef V8_TARGET_BIG_ENDIAN ++ // low and high words from reversed perspective ++ MemOperand op_low = operand; ++ MemOperand op_high = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#else ++ // low and high words from reversed perspective ++ MemOperand op_high = operand; ++ MemOperand op_low = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#endif ++ Register temp1 = r0; ++ __ stwbrx(value, op_low); ++ __ rldicl(temp1, value, 32, 32); ++ __ stwbrx(temp1, op_high); ++ } ++ if (is_atomic) __ sync(); ++ DCHECK_EQ(LeaveRC, i.OutputRCBit()); + break; + } + case kPPC_F64x2Splat: { +@@ -3936,7 +3991,7 @@ + // Unnecessary for eq/lt & ne/ge since only FU bit will be set. + } + +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + switch (cond) { + case eq: + case lt: +@@ -3954,6 +4009,7 @@ + break; + default: + UNREACHABLE(); ++ break; + } + } else { + if (reg_value != 0) __ li(reg, Operand::Zero()); +--- a/deps/v8/src/codegen/ppc/cpu-ppc.cc 2022-02-08 04:37:48.000000000 -0800 ++++ b/deps/v8/src/codegen/ppc/cpu-ppc.cc 2022-02-20 17:02:17.900000785 -0800 +@@ -8,14 +8,12 @@ + + #include "src/codegen/cpu-features.h" + +-#define INSTR_AND_DATA_CACHE_COHERENCY PPC_6_PLUS +- + namespace v8 { + namespace internal { + + void CpuFeatures::FlushICache(void* buffer, size_t size) { + #if !defined(USE_SIMULATOR) +- if (CpuFeatures::IsSupported(INSTR_AND_DATA_CACHE_COHERENCY)) { ++ if (CpuFeatures::IsSupported(ICACHE_SNOOP)) { + __asm__ __volatile__( + "sync \n" + "icbi 0, %0 \n" +@@ -26,25 +24,33 @@ + return; + } + +- const int kCacheLineSize = CpuFeatures::icache_line_size(); +- intptr_t mask = kCacheLineSize - 1; ++ const int kInstrCacheLineSize = CpuFeatures::icache_line_size(); ++ const int kDataCacheLineSize = CpuFeatures::dcache_line_size(); ++ intptr_t ic_mask = kInstrCacheLineSize - 1; ++ intptr_t dc_mask = kDataCacheLineSize - 1; + byte* start = +- reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~mask); ++ reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~dc_mask); + byte* end = static_cast<byte*>(buffer) + size; +- for (byte* pointer = start; pointer < end; pointer += kCacheLineSize) { +- __asm__( ++ for (byte* pointer = start; pointer < end; pointer += kDataCacheLineSize) { ++ __asm__ __volatile__( + "dcbf 0, %0 \n" +- "sync \n" +- "icbi 0, %0 \n" +- "isync \n" + : /* no output */ + : "r"(pointer)); + } ++ __asm__ __volatile__("sync"); + ++ start = ++ reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~ic_mask); ++ for (byte* pointer = start; pointer < end; pointer += kInstrCacheLineSize) { ++ __asm__ __volatile__( ++ "icbi 0, %0 \n" ++ : /* no output */ ++ : "r"(pointer)); ++ } ++ __asm__ __volatile__("isync"); + #endif // !USE_SIMULATOR + } + } // namespace internal + } // namespace v8 + +-#undef INSTR_AND_DATA_CACHE_COHERENCY + #endif // V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64 +--- ./deps/v8/src/codegen/ppc/assembler-ppc.cc.orig 2022-02-08 04:37:48.000000000 -0800 ++++ ./deps/v8/src/codegen/ppc/assembler-ppc.cc 2022-02-20 17:20:25.019591225 -0800 +@@ -65,6 +65,7 @@ + void CpuFeatures::ProbeImpl(bool cross_compile) { + supported_ |= CpuFeaturesImpliedByCompiler(); + icache_line_size_ = 128; ++ dcache_line_size_ = 128; + + // Only use statically determined features for cross compile (snapshot). + if (cross_compile) return; +@@ -73,6 +74,8 @@ + #ifdef USE_SIMULATOR + // Simulator + supported_ |= (1u << PPC_10_PLUS); ++ supported_ |= (1u << ICACHE_SNOOP); ++ supported_ |= (1u << ISELECT); + #else + base::CPU cpu; + if (cpu.part() == base::CPU::kPPCPower10) { +@@ -85,17 +88,37 @@ + supported_ |= (1u << PPC_7_PLUS); + } else if (cpu.part() == base::CPU::kPPCPower6) { + supported_ |= (1u << PPC_6_PLUS); ++ } else if (cpu.part() == base::CPU::kPPCPower5 || ++ cpu.part() == base::CPU::kPPCPA6T) { ++ supported_ |= (1u << PPC_5_PLUS); ++ } else if (cpu.part() == base::CPU::kPPCE6500 || ++ cpu.part() == base::CPU::kPPCE5500) { ++ supported_ |= (1u << PPC_7_PLUS_NXP); // NXP-supported v2.06 features ++ } ++ ++ if (cpu.has_icache_snoop()) { ++ supported_ |= (1u << ICACHE_SNOOP); ++ } ++ if (cpu.has_isel()) { ++ supported_ |= (1u << ISELECT); + } + #if V8_OS_LINUX + if (cpu.icache_line_size() != base::CPU::kUnknownCacheLineSize) { + icache_line_size_ = cpu.icache_line_size(); + } ++ if (cpu.dcache_line_size() != base::CPU::kUnknownCacheLineSize) { ++ dcache_line_size_ = cpu.dcache_line_size(); ++ } + #endif + #endif + if (supported_ & (1u << PPC_10_PLUS)) supported_ |= (1u << PPC_9_PLUS); + if (supported_ & (1u << PPC_9_PLUS)) supported_ |= (1u << PPC_8_PLUS); + if (supported_ & (1u << PPC_8_PLUS)) supported_ |= (1u << PPC_7_PLUS); +- if (supported_ & (1u << PPC_7_PLUS)) supported_ |= (1u << PPC_6_PLUS); ++ if (supported_ & (1u << PPC_7_PLUS)) { ++ supported_ |= (1u << PPC_7_PLUS_NXP); // NXP-supported v2.06 features ++ supported_ |= (1u << PPC_6_PLUS); ++ } ++ if (supported_ & (1u << PPC_6_PLUS)) supported_ |= (1u << PPC_5_PLUS); + + // Set a static value on whether Simd is supported. + // This variable is only used for certain archs to query SupportWasmSimd128() +@@ -117,11 +140,15 @@ + } + + void CpuFeatures::PrintFeatures() { ++ printf("PPC_5_PLUS=%d\n", CpuFeatures::IsSupported(PPC_5_PLUS)); + printf("PPC_6_PLUS=%d\n", CpuFeatures::IsSupported(PPC_6_PLUS)); + printf("PPC_7_PLUS=%d\n", CpuFeatures::IsSupported(PPC_7_PLUS)); + printf("PPC_8_PLUS=%d\n", CpuFeatures::IsSupported(PPC_8_PLUS)); + printf("PPC_9_PLUS=%d\n", CpuFeatures::IsSupported(PPC_9_PLUS)); + printf("PPC_10_PLUS=%d\n", CpuFeatures::IsSupported(PPC_10_PLUS)); ++ printf("ICACHE_SNOOP=%d\n", CpuFeatures::IsSupported(ICACHE_SNOOP)); ++ printf("ISELECT=%d\n", CpuFeatures::IsSupported(ISELECT)); ++ printf("PPC_7_PLUS_NXP=%d\n", CpuFeatures::IsSupported(PPC_7_PLUS_NXP)); + } + + Register ToRegister(int num) { diff --git a/user/ol/APKBUILD b/user/ol/APKBUILD index 12d08f6d9..ea9eac61e 100644 --- a/user/ol/APKBUILD +++ b/user/ol/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Yuriy Chumak <yuriy.chumak@mail.com> # Maintainer: Yuriy Chumak <yuriy.chumak@mail.com> pkgname=ol -pkgver=2.4 +pkgver=2.6 pkgrel=0 pkgdesc="Purely functional dialect of Lisp" url="https://yuriy-chumak.github.io/ol/" @@ -11,20 +11,29 @@ depends="" makedepends="vim" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/yuriy-chumak/$pkgname/archive/$pkgver.tar.gz - fix-cdefs-test.patch + require-explicit-cdefs.patch " +_HAS_32CDEFS=0 +_HAS_64CDEFS=0 +case "$CARCH" in + armel | armhf | armv7) _HAS_32CDEFS=1 ;; + x86 | pmmx) _HAS_32CDEFS=1 ;; + x86_64 | mips64* | aarch64* | ppc64*) _HAS_64CDEFS=1 ;; + mips* | ppc | s390*) _HAS_32CDEFS=1 ;; +esac + build() { - make + make HAS_32CDEFS="${_HAS_32CDEFS}" HAS_64CDEFS="${_HAS_64CDEFS}" } check() { - make check + make HAS_32CDEFS="${_HAS_32CDEFS}" HAS_64CDEFS="${_HAS_64CDEFS}" check } package() { - make DESTDIR="$pkgdir" install + make HAS_32CDEFS="${_HAS_32CDEFS}" HAS_64CDEFS="${_HAS_64CDEFS}" DESTDIR="$pkgdir" install } -sha512sums="c280da70f04637e1c822ab5a4b6eda3a1e1602b4c1fbd59731be2619fb09b0acb079841ba142f9b7b80cbf7539b1c7bd15603311b2ae4a30636f174a1ba2499b ol-2.4.tar.gz -b00c230aaec767b7ef8970813d47222088fd67545a8acebc66208ca7c795392b1db04a6a754ab53a2c0e9f222bf10fc47e082d0965a4253a7053dff1e5cd27f2 fix-cdefs-test.patch" +sha512sums="22e61379d97e52e8f780213780d7f29a93e4846d158629e554f404a1c39e86daef9ce2a1b27d608c40c40850eaff4c2715bdfcb66af6b81cd906f0bcd43bf450 ol-2.6.tar.gz +3b8d5b984b6cb483a51389905648119c3d1de568d13ded6f5606163f8538f9426078357f8494a752af4ee80809fce6fe587f308be9ab010fe19d6eded688ed5a require-explicit-cdefs.patch" diff --git a/user/ol/fix-cdefs-test.patch b/user/ol/fix-cdefs-test.patch deleted file mode 100644 index 41578836c..000000000 --- a/user/ol/fix-cdefs-test.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur a/tests/Makefile b/tests/Makefile ---- a/tests/Makefile 2023-03-23 06:59:27.672116150 -0500 -+++ b/tests/Makefile 2023-03-23 06:59:48.224536016 -0500 -@@ -17,8 +17,8 @@ - failed:="\033[1;31mfailed\033[0m" - - # 32-/64-bit test environment setup --HAS_32CDEFS ?= $(call exists,-m32,sys/cdefs.h,exit) --HAS_64CDEFS ?= $(call exists,-m64,sys/cdefs.h,exit) -+HAS_32CDEFS ?= 0 -+HAS_64CDEFS ?= 0 - - ifeq ($(HAS_64CDEFS),1) - vm64 = printf "64 " && ./vm64 repl <$$F | diff - $$F.ok -@@ -425,4 +425,4 @@ - @if [ -e $(FAILED) ] ;then rm -f $(FAILED); exit 1 ;fi - @echo "\033[1;32mpassed!\033[0m" - --endif -\ No newline at end of file -+endif diff --git a/user/ol/require-explicit-cdefs.patch b/user/ol/require-explicit-cdefs.patch new file mode 100644 index 000000000..fd4a70ad0 --- /dev/null +++ b/user/ol/require-explicit-cdefs.patch @@ -0,0 +1,28 @@ +diff -ur a/tests/Makefile b/tests/Makefile +--- a/tests/Makefile 2024-11-25 18:28:34.957193217 +0000 ++++ b/tests/Makefile 2024-11-25 18:30:17.261515826 +0000 +@@ -53,20 +53,11 @@ + + # special case, test 64- and 32-bit both + # (maximal testings under main development platform) +-ifeq ($(UNAME)-$(MACHINE),Linux-x86_64) +-HAS_64CDEFS ?= $(call exists,-m64,sys/cdefs.h,exit) +-ifeq ($(HAS_64CDEFS),1) +-DEV_MACHINE ?= 1 ++ifndef HAS_32CDEFS ++$(error HAS_32CDEFS is not set) + endif +-# sudo apt-get install gcc-multilib +-HAS_32CDEFS ?= $(call exists,-m32,sys/cdefs.h,exit) +-ifeq ($(HAS_32CDEFS),1) +-DEV_MACHINE ?= 1 +-endif +-else +-DEV_MACHINE ?= 0 +-HAS_64CDEFS ?= 0 +-HAS_32CDEFS ?= 0 ++ifndef HAS_64CDEFS ++$(error HAS_64CDEFS is not set) + endif + + # ------------- diff --git a/user/olm/APKBUILD b/user/olm/APKBUILD index 335484639..bc832ae94 100644 --- a/user/olm/APKBUILD +++ b/user/olm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=olm -pkgver=3.2.6 +pkgver=3.2.16 pkgrel=0 pkgdesc="Implementation of the olm and megolm cryptographic ratchets" url="https://gitlab.matrix.org/matrix-org/olm/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e22af4e7791962978ea4c39b9bebf807a864ca52b329f032e5e398864cd142c1f166aadbce74cb85f776cb0b8352754151f64c60dac2ce1858def73d684fd44a olm-3.2.6.tar.bz2" +sha512sums="504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581 olm-3.2.16.tar.bz2" diff --git a/user/open-vm-tools/APKBUILD b/user/open-vm-tools/APKBUILD index 883b7d306..4bdc9c0ad 100644 --- a/user/open-vm-tools/APKBUILD +++ b/user/open-vm-tools/APKBUILD @@ -3,7 +3,7 @@ pkgname=open-vm-tools pkgver=12.4.0 _buildver=23259341 -pkgrel=0 +pkgrel=2 pkgdesc="Guest additions for VMware hypervisors" url=" " arch="x86 pmmx i528 x86_64 aarch64" @@ -19,6 +19,7 @@ subpackages="$pkgname-dev $pkgname-desktop $pkgname-openrc" source="https://github.com/vmware/open-vm-tools/releases/download/stable-$pkgver/open-vm-tools-$pkgver-$_buildver.tar.gz disable-werror.patch dndcp-portability.patch + time64.patch hgfs-portability.patch loff_t.patch poll-header.patch @@ -95,6 +96,7 @@ desktop() { sha512sums="11ea43c64ec534922145f83e2b7ef9254437f80656ad03b596340a78c3698adcc7d84adade9c5d8e1c83b5ebc3bd086601b1d104e0f070274dc2b6bc1f64fb17 open-vm-tools-12.4.0-23259341.tar.gz 1966f6f31ed531829a40cd3e5c8352ea25cac0535a24f62aecf37e2018adbeb33cd214a43d4acc57766c8795d1849e1241c8777bbf96ad447f0c7baa41a555ed disable-werror.patch 987a65c77a462520430d157212fbd23381af301a0e5b02410750f4ac844bad903a92c62f743ea2880b9bca939696edd6c8f92b3f4fc01daafd46b5455f7b9666 dndcp-portability.patch +6167f412598bd70c7a66831a3fb870514da17461494210c2466af35748e3452702573203ca503906f30864a51436a3e296ee5fc25a7283f51ba06a542ed7f177 time64.patch 656585c7b087dd1b7539bcd362bb80faa48b7354819636061c2c92569bcd537804daf15b76f6bad0b7229af9d24462de4e630256ac7059941bf8cd115ae9a39c hgfs-portability.patch 6edb41bb9658271c6a214230c88526c4fccc4c6b3299bb67691f6f917e1e695a20dd09692c9a64d36d46a35cbecb975dcaf7062c0d7fccd2d9011cc17130072d loff_t.patch 2b623a9901851ba9b1652c117ee2a2ebb8e4cea7a01e2ffe6553cf6d929a86921f4e206278fd19fbab4effc0cc9051848e5254ca35ecfb3a006783e915cd5c5e poll-header.patch diff --git a/user/open-vm-tools/time64.patch b/user/open-vm-tools/time64.patch new file mode 100644 index 000000000..bc6bbb091 --- /dev/null +++ b/user/open-vm-tools/time64.patch @@ -0,0 +1,58 @@ +diff --git a/open-vm-tools/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp b/open-vm-tools/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp +index 0311a4e7..4a231a4d 100644 +--- a/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp ++++ b/services/plugins/dndcp/fakeMouseWayland/fakeMouseWayland.cpp +@@ -249,11 +249,14 @@ FakeMouse_Move(int x, // IN + + bool retValue = true; + struct input_event event; ++ struct timeval tv; + + event.type = EV_ABS; + event.code = ABS_X; + event.value = x; +- gettimeofday(&event.time, NULL); ++ gettimeofday(&tv, NULL); ++ event.input_event_sec = tv.tv_sec; ++ event.input_event_usec = tv.tv_usec; + if (write(uinput_fd, &event, sizeof(event)) < 0) { + g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__); + retValue = false; +@@ -262,7 +265,9 @@ FakeMouse_Move(int x, // IN + event.type = EV_ABS; + event.code = ABS_Y; + event.value = y; +- gettimeofday(&event.time, NULL); ++ gettimeofday(&tv, NULL); ++ event.input_event_sec = tv.tv_sec; ++ event.input_event_usec = tv.tv_usec; + if (write(uinput_fd, &event, sizeof(event)) < 0) { + g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__); + retValue = false; +@@ -271,7 +276,9 @@ FakeMouse_Move(int x, // IN + event.type = EV_SYN; + event.code = SYN_REPORT; + event.value = 0; +- gettimeofday(&event.time, NULL); ++ gettimeofday(&tv, NULL); ++ event.input_event_sec = tv.tv_sec; ++ event.input_event_usec = tv.tv_usec; + if (write(uinput_fd, &event, sizeof(event)) < 0) { + g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__); + retValue = false; +@@ -306,11 +313,14 @@ FakeMouse_Click(bool down) // IN + + bool retValue = true; + struct input_event event; ++ struct timeval tv; + + event.type = EV_KEY; + event.code = BTN_LEFT; + event.value = down; +- gettimeofday(&event.time, NULL); ++ gettimeofday(&tv, NULL); ++ event.input_event_sec = tv.tv_sec; ++ event.input_event_usec = tv.tv_usec; + if (write(uinput_fd, &event, sizeof(event)) < 0) { + g_debug("Line:%d. Function:%s. Failed to write\n", __LINE__, __FUNCTION__); + retValue = false; diff --git a/user/openal-soft/APKBUILD b/user/openal-soft/APKBUILD index 9b0a4c7ff..be2110585 100644 --- a/user/openal-soft/APKBUILD +++ b/user/openal-soft/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: Zach van Rijn <me@zv.io> pkgname=openal-soft -pkgver=1.19.1 +pkgver=1.23.1 pkgrel=0 pkgdesc="Software implementation of OpenAL API" -url="https://kcat.strangesoft.net/openal.html" +url="https://openal-soft.org/" arch="all" options="!check" # No test suite. license="LGPL-2.0+" @@ -15,7 +15,7 @@ subpackages="$pkgname-dev" source="https://openal-soft.org/openal-releases/${pkgname}-${pkgver}.tar.bz2" build() { - local _cpuext_neon="" + _cpuext_neon="" case "$CARCH" in armhf) _cpuext_neon="-DALSOFT_CPUEXT_NEON=OFF" ;; esac @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 openal-soft-1.19.1.tar.bz2" +sha512sums="0d40577cd27040dc8814c15bacc310a0ce1c98e084f0a37db9f66899265df42ea61ac672efba7445e495849c25b9ba5b086f43320a38965f6ee74081b2896819 openal-soft-1.23.1.tar.bz2" diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD index 759f20e0b..9bd859b92 100644 --- a/user/opencv/APKBUILD +++ b/user/opencv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=opencv pkgver=4.6.0 -pkgrel=0 +pkgrel=1 pkgdesc="Computer vision and machine learning software library" url="https://opencv.org" arch="all" @@ -17,6 +17,7 @@ subpackages="$pkgname-dev $pkgname-libs" source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz ade-0.1.1f.zip::https://github.com/opencv/ade/archive/v0.1.1f.zip cmake-license.patch + fix-headers.manual-patch " # secfixes: @@ -24,13 +25,13 @@ source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver. # - CVE-2019-16249 prepare() { - default_prepare # purge 3rd party except carotene for i in 3rdparty/*; do case $i in */carotene*) continue;; */ittnotify) continue;; # Else FTBFS on x86_64 */quirc) continue;; + */include) continue;; esac rm -rf "$i" done @@ -65,6 +66,7 @@ build() { -DWITH_IPP=OFF \ $_sse \ -Bbuild + patch -Np1 < "$srcdir"/fix-headers.manual-patch make -C build } @@ -74,4 +76,5 @@ package() { sha512sums="93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 opencv-4.6.0.tar.gz f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836 ade-0.1.1f.zip -ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch" +ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch +c1ba6c7b66edc747a2bddd622787f75eb5edd9ef65a2da9a1bbf432fad97fdfe293f0b16631085006299e7e74468d601b942ecdc389997e9e64dee16c082648f fix-headers.manual-patch" diff --git a/user/opencv/fix-headers.manual-patch b/user/opencv/fix-headers.manual-patch new file mode 100644 index 000000000..9a3eb8542 --- /dev/null +++ b/user/opencv/fix-headers.manual-patch @@ -0,0 +1,12 @@ +Required header for GCC 13. + +--- opencv-4.6.0/build/3rdparty/ade/ade-0.1.1f/sources/ade/include/ade/typed_graph.hpp.old 2019-08-07 03:55:16.000000000 -0500 ++++ opencv-4.6.0/build/3rdparty/ade/ade-0.1.1f/sources/ade/include/ade/typed_graph.hpp 2024-05-28 16:39:53.217246004 -0500 +@@ -11,6 +11,7 @@ + + #include <unordered_set> + #include <string> ++#include <cstdint> + + #include <array> + diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD index 60c5cdd44..1612ced28 100644 --- a/user/opengfx/APKBUILD +++ b/user/opengfx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opengfx -pkgver=0.6.0 +pkgver=7.1 pkgrel=0 pkgdesc="Graphics files for OpenTTD" url="https://www.openttd.org/en/" @@ -25,4 +25,4 @@ package() { done } -sha512sums="275b9040e6938bdd5bee2d39361e0b78f447a8e497cc8ff018c7874dc16a357870f8b560999ebb2f2f0b275644c7c9ce85c964875f5a798e2ec45e62a8bc768f opengfx-0.6.0-source.tar.xz" +sha512sums="55079babcd78d4a36279cb7610b6800308aca8409ed3b9fa33cd4993b0c1f988d7afe270b17930b97609c4fdf8cf4e362e17c11bd85d2ef136d042256c98483f opengfx-7.1-source.tar.xz" diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 18e8c6fbc..0aef3baa7 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -14,7 +14,7 @@ # pkgname=openldap pkgver=2.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="LDAP Server" url="https://www.openldap.org/" arch="all" diff --git a/user/openmsx/APKBUILD b/user/openmsx/APKBUILD index c3aedd777..7bc33e5df 100644 --- a/user/openmsx/APKBUILD +++ b/user/openmsx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openmsx -pkgver=0.3.1 +pkgver=0.4.2 pkgrel=0 pkgdesc="Music files for OpenTTD" url="https://www.openttd.org/en/" @@ -11,8 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="python3" subpackages="" -source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.gz - python3.patch +source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz python3-bang.patch " builddir="$srcdir/$pkgname-$pkgver-source" @@ -22,13 +21,11 @@ build() { } package() { - cd "$builddir"/$pkgname-$pkgver - for _file in *.mid openmsx.obm; do + for _file in src/*.mid openmsx.obm; do install -D -m644 -g games $_file \ "$pkgdir"/usr/share/games/openttd/gm/$_file done } -sha512sums="e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e openmsx-0.3.1-source.tar.gz -b6690158831cb3da9e0e65a523529ee0bb694a4a8b23c89f615b2481601a71fd84caecf29430054e69afa3ffcb53cf8dd5826358d7ef89429c661dd4d47bbb74 python3.patch +sha512sums="65a06792032d0a7f6db5c9495bf5b382fdc29ca84db0535b61ea95b57e8ef961820e75dad2f8dc74de0608502839bea7af28fd342756ebfcc12ee8ac1f5553ab openmsx-0.4.2-source.tar.xz f981aff74f9cd33650641badd977f38c1cbbc749198a45ca016de3be83d8bec6c4f82c0614340a11f7bda7b4b98d48e26fd03a74bbf233af6deb588874d34145 python3-bang.patch" diff --git a/user/openmsx/python3.patch b/user/openmsx/python3.patch deleted file mode 100644 index 191aacfd6..000000000 --- a/user/openmsx/python3.patch +++ /dev/null @@ -1,265 +0,0 @@ ---- openmsx-0.3.1-source/scripts/authorlist.py.old 2010-08-09 22:34:42.000000000 +0000 -+++ openmsx-0.3.1-source/scripts/authorlist.py 2019-01-12 18:12:26.010000000 +0000 -@@ -10,7 +10,6 @@ - # <http://www.gnu.org/licenses/>. - # - --import string - import sys - - while 1: -@@ -18,10 +17,10 @@ - if data != '': - # do some processing of the contents of - # the data variable -- separate = string.split(data,";") -- print '%-30s %s' % (separate[1]+":", separate[2]) -+ separate = data.split(";") -+ print('%-30s %s' % (separate[1]+":", separate[2])) - # end of data processing command group -- # sys.stdout.write(res) -+ # sys.stdout.write(res) - else: - sys.stdout.flush() - break ---- openmsx-0.3.1-source/scripts/md5list.py.old 2010-08-09 22:34:42.000000000 +0000 -+++ openmsx-0.3.1-source/scripts/md5list.py 2019-01-12 18:16:21.260000000 +0000 -@@ -10,7 +10,6 @@ - # <http://www.gnu.org/licenses/>. - # - --import string - import sys - import subprocess - import os -@@ -18,25 +17,25 @@ - while 1: - data = sys.stdin.readline() - if data != '': -- # leave out all comment lines (lines starting with '#') -- comment_pos = string.find(data,'#') -- if comment_pos == 0: -- continue -- # separate the single entries by ';' -- separate = string.split(data,";") -- if len(separate) != 4: -- continue -- systemtype = (os.uname())[0] -- if systemtype == 'Linux': -- md5call = ["md5sum"] -- elif systemtype == 'Darwin': -- md5call = ["md5", "-r"] -- else: -- md5call = ["md5sum"] -- md5call = md5call + ["src/"+string.strip(separate[1])] -- md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] -- md5sum = string.split(md5sum) -- res = "%-32s = %s\n" % (separate[1], md5sum[0]) -+ # leave out all comment lines (lines starting with '#') -+ comment_pos = data.find('#') -+ if comment_pos == 0: -+ continue -+ # separate the single entries by ';' -+ separate = data.split(";") -+ if len(separate) != 4: -+ continue -+ systemtype = (os.uname())[0] -+ if systemtype == 'Linux': -+ md5call = ["md5sum"] -+ elif systemtype == 'Darwin': -+ md5call = ["md5", "-r"] -+ else: -+ md5call = ["md5sum"] -+ md5call = md5call + ["src/"+separate[1].strip()] -+ md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] -+ md5sum = md5sum.split() -+ res = "%-32s = %s\n" % (separate[1], md5sum[0].decode('utf-8')) - sys.stdout.write(res) - else: - sys.stdout.flush() ---- openmsx-0.3.1-source/scripts/midifiles.py.old 2010-08-09 22:34:42.000000000 +0000 -+++ openmsx-0.3.1-source/scripts/midifiles.py 2019-01-12 18:09:21.660000000 +0000 -@@ -10,23 +10,22 @@ - # <http://www.gnu.org/licenses/>. - # - --import string - import sys - - res = "" - while 1: - data = sys.stdin.readline() - if data != '': -- # leave out all comment lines (lines starting with '#') -- comment_pos = string.find(data,'#') -- if comment_pos == 0: -- continue -- # separate the single entries by ';' -- separate = string.split(data,";") -- if len(separate) != 4: -- continue -- res = res + " src/" + string.strip(separate[1]) -+ # leave out all comment lines (lines starting with '#') -+ comment_pos = data.find('#') -+ if comment_pos == 0: -+ continue -+ # separate the single entries by ';' -+ separate = data.split(";") -+ if len(separate) != 4: -+ continue -+ res = res + " src/" + separate[1].strip() - else: -- sys.stdout.write(res) -+ sys.stdout.write(res) - sys.stdout.flush() - break ---- openmsx-0.3.1-source/scripts/namelist.py.old 2010-08-09 22:34:42.000000000 +0000 -+++ openmsx-0.3.1-source/scripts/namelist.py 2019-01-12 18:24:41.820000000 +0000 -@@ -10,27 +10,26 @@ - # <http://www.gnu.org/licenses/>. - # - --import string - import sys - - while 1: - data = sys.stdin.readline() - if data != '': -- # leave out all comment lines (lines starting with '#') -- comment_pos = string.find(data,'#') -- if comment_pos == 0: -- continue -- # separate the single entries by ';' -- separate = string.split(data,";") -- if len(separate) != 4: -- continue -- res = "%-32s = %s\n" % (separate[1], string.strip(separate[3])) -+ # leave out all comment lines (lines starting with '#') -+ comment_pos = data.find('#') -+ if comment_pos == 0: -+ continue -+ # separate the single entries by ';' -+ separate = data.split(";") -+ if len(separate) != 4: -+ continue -+ res = "%-32s = %s\n" % (separate[1], separate[3].strip()) - sys.stdout.write(res) - else: - sys.stdout.flush() - break - - def authorlist(mystr): -- separate = string.split() -- for str in separate: -- print string.strip(str) -\ No newline at end of file -+ separate = mystr.split() -+ for str in separate: -+ print(str.strip()) ---- openmsx-0.3.1-source/scripts/playlist.py.old 2010-08-09 22:34:42.000000000 +0000 -+++ openmsx-0.3.1-source/scripts/playlist.py 2019-01-12 18:24:46.440000000 +0000 -@@ -10,31 +10,30 @@ - # <http://www.gnu.org/licenses/>. - # - --import string - import sys - - while 1: - data = sys.stdin.readline() - if data != '': -- # leave out all comment lines (lines starting with '#') -- comment_pos = string.find(data,'#') -- if comment_pos == 0: -- continue -- # separate the single entries by ';' -- separate = string.split(data,";") -- res = "" -- # leave out all lines which don't have the proper number of elements -- if len(separate) >= 1: -- res = string.strip(separate[0]) + " = " -- if len(separate) == 4: -- res = res + separate[1] -- res = res + "\n" -+ # leave out all comment lines (lines starting with '#') -+ comment_pos = data.find('#') -+ if comment_pos == 0: -+ continue -+ # separate the single entries by ';' -+ separate = data.split(";") -+ res = "" -+ # leave out all lines which don't have the proper number of elements -+ if len(separate) >= 1: -+ res = separate[0].strip() + " = " -+ if len(separate) == 4: -+ res = res + separate[1] -+ res = res + "\n" - sys.stdout.write(res) - else: - sys.stdout.flush() - break - - def authorlist(mystr): -- separate = string.split() -- for str in separate: -- print string.strip(str) -\ No newline at end of file -+ separate = mystr.split() -+ for str in separate: -+ print(str.strip()) ---- openmsx-0.3.1-source/scripts/sanitize_list.py.old 2010-08-09 22:34:42.000000000 +0000 -+++ openmsx-0.3.1-source/scripts/sanitize_list.py 2019-01-12 18:25:21.200000000 +0000 -@@ -10,34 +10,33 @@ - # <http://www.gnu.org/licenses/>. - # - --import string - import sys - - while 1: - data = sys.stdin.readline() - if data != '': -- # leave out all comment lines (lines starting with '#') -- comment_pos = string.find(data,'#') -- if comment_pos == 0: -- continue -- # separate the single entries by ';' -- separate = string.split(data,";") -- if len(separate) != 4: -- continue -- res = "" -- for str in separate: -- if res != '': -- res = res + ";" + string.strip(str) -- else: -- res = string.strip(str) -+ # leave out all comment lines (lines starting with '#') -+ comment_pos = data.find('#') -+ if comment_pos == 0: -+ continue -+ # separate the single entries by ';' -+ separate = data.split(";") -+ if len(separate) != 4: -+ continue -+ res = "" -+ for str in separate: -+ if res != '': -+ res = res + ";" + str.strip() -+ else: -+ res = str.strip() - # end of data processing command group -- res = res + "\n" -+ res = res + "\n" - sys.stdout.write(res) - else: - sys.stdout.flush() - break - - def authorlist(mystr): -- separate = string.split() -- for str in separate: -- print string.strip(str) -\ No newline at end of file -+ separate = mystr.split() -+ for str in separate: -+ print(str.strip()) diff --git a/user/opensfx/APKBUILD b/user/opensfx/APKBUILD index 08a453d65..cf52e2a84 100644 --- a/user/opensfx/APKBUILD +++ b/user/opensfx/APKBUILD @@ -1,20 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opensfx -pkgver=0.2.3 +pkgver=1.0.3 pkgrel=0 pkgdesc="Sound files for OpenTTD" -url="https://www.openttd.org/en/" +url="https://www.openttd.org/" arch="noarch" +options="!check" # Fails md5sum check because of git hash. license="CC-Sampling-Plus-1.0" depends="" makedepends="catcodec" subpackages="" -source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.gz" +source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz" builddir="$srcdir/$pkgname-$pkgver-source" build() { - make + make opensfx.cat } check() { @@ -28,4 +29,4 @@ package() { "$pkgdir"/usr/share/games/openttd/data/opensfx.obs } -sha512sums="7575c8febcbcabe8f9042a1a197ba76b9020e335663bf70b0aaebafe4b0758f82ff7acc624b1dfdc12d38e346f139454b78ea29e18a8bb8bd2afd3d6a209669c opensfx-0.2.3-source.tar.gz" +sha512sums="a077fcb1676ba17aa5e9e2df32c2d69452fe54895e3ac64a80c2a6247aa3ea2ef37443e2391f88117768eeb3f808793c78c11727c69bb3df2fde57f67964dbff opensfx-1.0.3-source.tar.xz" diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 3831b7b86..b2802c462 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,31 +1,41 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.10.2 +pkgver=14.1 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" arch="all" -options="!check" # Test files not shipped in release package. +#options="!check" # Test files not shipped in release package. license="GPL-2.0-only" depends="opengfx openmsx opensfx" -makedepends="fontconfig-dev freetype-dev icu-dev libpng-dev libxdg-basedir-dev - lzo-dev sdl-dev xz-dev zlib-dev" +makedepends="cmake curl-dev dbus-dev fluidsynth-dev fontconfig-dev freetype-dev + grfcodec harfbuzz-dev icu-dev libpng-dev lzo-dev mesa-dev sdl2-dev + xz-dev zlib-dev" subpackages="$pkgname-doc" -source="https://proxy.binaries.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz" +source="https://cdn.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --install-dir="$pkgdir" \ - --disable-strip - make + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} -B build + make -C build +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - make install + make -C build DESTDIR="$pkgdir" install } -sha512sums="03de85449a458c76c07d8a28c34f72bc95ab0652c666e5925da43746cdd4e95b0d66360b6e214d1df33f11b5346da2e3b9ca6832ac6628c7d6e5e0a791881683 openttd-1.10.2-source.tar.xz" +sha512sums="194135cc01457d9ed069c09d8961ad3de681bc9936533ca81ff23099f394bb9a83ef84a0852e85525e258f6149e14fd41cfc5f8e683c0643515005c42fb77e3b openttd-14.1-source.tar.xz" diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD index eecef5f51..a3d86d7b9 100644 --- a/user/openvpn/APKBUILD +++ b/user/openvpn/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=openvpn -pkgver=2.6.9 +pkgver=2.6.12 pkgrel=0 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)" url="https://openvpn.net/" @@ -72,7 +72,7 @@ pam() { "$subpkgdir"/usr/lib/openvpn/plugins/ } -sha512sums="095508b98b76f4bdf4e4dc8832dcff6ba8a2ddaadb5a8e65cd56f28d6f5694ee394210f991f5301e436fcc1b7880a7c8b59d27089d21a5672eeb79cabc243b21 openvpn-2.6.9.tar.gz +sha512sums="92f548186d9375d6ae47b1387dd191241b8a45aed82294523b3771bdd5e699b94265e1a3bbf3ef2638da0d54c19c783f54c456cbd755c846849bf67913cad6db openvpn-2.6.12.tar.gz 3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9 openvpn.initd 6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e openvpn.confd cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up diff --git a/user/pango/APKBUILD b/user/pango/APKBUILD index 43b8630fb..95e39984f 100644 --- a/user/pango/APKBUILD +++ b/user/pango/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=pango -pkgver=1.50.7 +pkgver=1.56.3 pkgrel=0 pkgdesc="Library for laying out and rendering text" url="https://www.pango.org/" arch="all" -options="!check" # no tests available license="LGPL-2.1+" depends="" +checkdepends="cantarell-fonts" makedepends="$depends_dev cairo-dev expat-dev fontconfig-dev freetype-dev fribidi-dev glib-dev gobject-introspection-dev harfbuzz-dev libxft-dev meson ninja" @@ -20,20 +20,33 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # 1.42.4-r1: # - CVE-2019-1010238 -build () { - meson \ +prepare() { + default_prepare + # Test fails on ppc64 with x-position moved; upstream suggested it was + # related to rounding differences in HarfBuzz. + rm tests/layouts/valid-20.layout +} + +build() { + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ --buildtype=release \ - . output - ninja -C output + --wrap-mode=nofallback \ + -Dintrospection=enabled \ + . build + meson compile -C build +} + +check() { + meson test -C build } package() { mkdir -p "$pkgdir"/etc/pango - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3 pango-1.50.7.tar.xz" +sha512sums="adb5aa66ea0c45f7bb112867a77f25d31d39bbb18fd8d41df0c1fd329714def874aa3cb8a49847561a75b0824c2abf8ce09a610d088e88d7de015c36a1536ac0 pango-1.56.3.tar.xz" diff --git a/user/pciutils/APKBUILD b/user/pciutils/APKBUILD index 75cac244f..6e3cc00da 100644 --- a/user/pciutils/APKBUILD +++ b/user/pciutils/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=pciutils pkgver=3.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" arch="all" options="!check" # No test suite. license="GPL-2.0-only" -depends="hwids-pci" +depends="hwdata" makedepends="eudev-dev kmod-dev linux-headers cmd:which" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" source="https://www.kernel.org/pub/software/utils/$pkgname/$pkgname-$pkgver.tar.gz diff --git a/user/perl-extutils-cppguess/APKBUILD b/user/perl-extutils-cppguess/APKBUILD index e2fdf5e55..653135d60 100644 --- a/user/perl-extutils-cppguess/APKBUILD +++ b/user/perl-extutils-cppguess/APKBUILD @@ -6,7 +6,7 @@ _author=ETJ _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} pkgver=0.27 -pkgrel=0 +pkgrel=1 pkgdesc="Perl module for checking C++ compiler and flags" url="https://metacpan.org/pod/ExtUtils::CppGuess" arch="noarch" @@ -14,7 +14,9 @@ license="Artistic-1.0-Perl OR GPL-1.0+" depends="perl perl-capture-tiny perl-extutils-parsexs" makedepends="perl-dev perl-module-build perl-extutils-cbuilder" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz + fix.patch + " builddir="$srcdir/ExtUtils-CppGuess-$pkgver" build() { @@ -31,4 +33,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="289e38f3033b3072ff40dffdea8cb60bc9f91e426ff927de2e8499724cecb03f76c4740b2f868d6c55bf019c9e6eb1a5de20111591c7292e60765f65a249e60c ExtUtils-CppGuess-0.27.tar.gz" +sha512sums="289e38f3033b3072ff40dffdea8cb60bc9f91e426ff927de2e8499724cecb03f76c4740b2f868d6c55bf019c9e6eb1a5de20111591c7292e60765f65a249e60c ExtUtils-CppGuess-0.27.tar.gz +d58f11f617021ff0783f615d5d777890ec379de6a9cb05ed271cae37529e63a7158be7aa83392d8882216971039941441f4d6d14e3155c7a51dd5e764f6c2976 fix.patch" diff --git a/user/perl-extutils-cppguess/fix.patch b/user/perl-extutils-cppguess/fix.patch new file mode 100644 index 000000000..13ddb2203 --- /dev/null +++ b/user/perl-extutils-cppguess/fix.patch @@ -0,0 +1,60 @@ +Fix MSVC detection. I don't know why I did this, either. + +Ref: #1174 + +--- ExtUtils-CppGuess-0.27/lib/ExtUtils/CppGuess.pm.old 2023-11-19 13:19:51.000000000 -0600 ++++ ExtUtils-CppGuess-0.27/lib/ExtUtils/CppGuess.pm 2024-07-10 11:26:59.221777726 -0500 +@@ -257,6 +257,12 @@ + compiler_command => 'clang++', + extra_lflags => '-lc++', + ); ++ } elsif ( $self->_cc_is_msvc( $c_compiler ) ) { ++ %guess = ( ++ compiler_command => 'cl', ++ extra_cflags => '-TP -EHsc', ++ extra_lflags => 'msvcprt.lib', ++ ); + } elsif( $self->_cc_is_sunstudio( $c_compiler ) ) { + %guess = ( + compiler_command => 'CC', +@@ -277,12 +283,6 @@ + # Don't use -lstdc++ if Perl was linked with -static-libstdc++ (ActivePerl 5.18+ on Windows) + $guess{extra_lflags} = '-lstdc++' + unless ($self->_config->{ldflags} || '') =~ /static-libstdc\+\+/; +- } elsif ( $self->_cc_is_msvc( $c_compiler ) ) { +- %guess = ( +- compiler_command => 'cl', +- extra_cflags => '-TP -EHsc', +- extra_lflags => 'msvcprt.lib', +- ); + } + $guess{$ENV2VAL{$_}} = $ENV{$_} for grep defined $ENV{$_}, keys %ENV2VAL; + if (!%guess) { +@@ -383,8 +383,12 @@ + + sub _cc_is_msvc { + my( $self, $cc ) = @_; +- $self->{is_msvc} +- = ($self->_os =~ /MSWin32/ and File::Basename::basename($cc) =~ /^cl/i); ++ $self->{is_msvc} = undef; ++ if ( ++ ($self->_os =~ /MSWin32/ and File::Basename::basename($cc) =~ /^cl/i) ++ ) { ++ $self->{is_msvc} = 1; ++ } + return $self->{is_msvc}; + } + +--- ExtUtils-CppGuess-0.27/t/002_icpp.t.old 2023-11-19 13:11:06.000000000 -0600 ++++ ExtUtils-CppGuess-0.27/t/002_icpp.t 2024-07-10 11:27:48.506428703 -0500 +@@ -9,8 +9,8 @@ + [ + { os => 'MSWin32', cc => 'cl', config => {ccflags => ''} }, + { +- is_sunstudio => 0, +- is_msvc => 1, is_gcc => 0, is_clang => 0, ++ is_sunstudio => undef, ++ is_msvc => 1, is_gcc => undef, is_clang => undef, + compiler_command => 'cl -TP -EHsc', + linker_flags => 'msvcprt.lib', + }, diff --git a/user/phonon-vlc/APKBUILD b/user/phonon-vlc/APKBUILD index de6f49d36..1eb6fc9b4 100644 --- a/user/phonon-vlc/APKBUILD +++ b/user/phonon-vlc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=phonon-vlc pkgver=0.11.1 -pkgrel=0 +pkgrel=1 pkgdesc="Phonon backend utilising VLC for media playback" url="https://www.kde.org/" arch="all" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index de6c5612b..7d1f5fddf 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -26,7 +26,7 @@ pkgname=php7 _pkgname=php pkgver=7.4.30 -pkgrel=0 +pkgrel=1 _apiver=20190902 _zendver=20190902 _pdover=20170320 @@ -81,6 +81,7 @@ source="https://www.php.net/distributions/$_pkgname-$pkgver.tar.bz2 disabled-tests.list enchant-2.patch fpm-paths.patch + gh14834.patch install-pear.patch libgd-unused-constants.patch no-max-ent-size.patch @@ -335,6 +336,7 @@ _build() { build() { export CFLAGS="$CFLAGS -fno-strict-aliasing -Wno-pointer-sign" + export CXXFLAGS="$CXXFLAGS -std=c++17" # apache-httpd module _build --disable-fpm \ @@ -382,7 +384,7 @@ check() { } package() { - make -j1 INSTALL_ROOT="$pkgdir" install + make -j1 INSTALL_ROOT="$pkgdir" V=1 VERBOSE=1 install install -Dm644 php.ini-production "$pkgdir"/etc/$_pkgname/php.ini find "$pkgdir" -name '.*' | xargs rm -rf @@ -549,9 +551,10 @@ cb3ba48fbd412f12d98ef1f88b509b40bc4ca44a16779a06d43e4db3cb8d24d54404b9e11ca941b5 a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf 587057aaf93feec2936e2851dbb42ba78310fc012e340d90c58a8912437a8b6a15585895490c31ac31cf36969ea1f2999993c5ca42031c378f31fb83d361fd73 disabled-tests.list 7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch -a77dd3bdf9dc7a0f2c06ff3e7c425d062bbaa29902c17402ce98701dc99499be863ad543aa5e6a7d1c249702d6afb193398dd3199ae58e42b32b95d434fb1883 fpm-paths.patch +846932c7bc2725c36ad319af41c8ba0e587dc2f87b40c812b1c75b73ff78da61c579d1a276b3ff70ccfee42bc69496c403423a1ed8895ba8c87776f4766061df fpm-paths.patch +aa16fbaaae386035bfa77b3e085b055714e5660addc1d20cd0869d680f81cac53b25249550924288cfcfa6379a8dfacc075242f84f6ee532d6bc0d3529809e33 gh14834.patch 951fa8445c20513aa48bf7c7d773c6b4012322e7e7592c13d965758e761b9898c484f0dbc5ae565c05787e6ab868769c97c71504624b10c9570e1d4214f75b10 install-pear.patch 441305a96329bf8442a6b633c0a8b8e53af0e6cd5fc673057cbb6b5aeb687542894a7a068073dad0a8d8dc75aa8ca42e6b0a32e29d2a7a69c115714a75127e97 libgd-unused-constants.patch 0e88f432d273103bff203b439cc3464d34613092007c88ec8806d82c3e317ba267d70c84e5ebc3c8b2c739fa498816e0e102a22b191ee387a42146f4ecc60481 no-max-ent-size.patch 9160e5c6b8bf2d87299f38421caf498519eb42243118570754a5764b5e682c546309548e76df6163df49e841ff51fb07e50fadeed1687da5d73dec1810c393ee test-fixes.patch -0cd6b8739533511c0d1edcb1ecff4d8d21a6b51d21f77c382645cf31d1645eeb2ebd80e2720557ceefa58f538385e097402bdc50e613dc7699bd8f033aefa543 zend_bool.patch" +d214722c394ef69ba91920e408f2fb694d7233bfe5fd4abe9764d91733a00e2b58d530cf82c2183d59f925f7a8f995e343dc9ce1c20457f7adf3b9789f9e18c3 zend_bool.patch" diff --git a/user/php7/fpm-paths.patch b/user/php7/fpm-paths.patch index 56d40298b..eeaeaeda1 100644 --- a/user/php7/fpm-paths.patch +++ b/user/php7/fpm-paths.patch @@ -1,6 +1,6 @@ --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c -@@ -1205,7 +1205,7 @@ +@@ -1212,7 +1212,7 @@ } if (!fpm_global_config.error_log) { @@ -9,7 +9,7 @@ } #ifdef HAVE_SYSTEMD -@@ -1710,7 +1710,7 @@ +@@ -1722,7 +1722,7 @@ if (fpm_globals.prefix == NULL) { spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR); } else { @@ -30,7 +30,7 @@ --- a/sapi/fpm/www.conf.in +++ b/sapi/fpm/www.conf.in -@@ -256,7 +256,7 @@ +@@ -257,7 +257,7 @@ ; The access log file ; Default: not set @@ -39,7 +39,7 @@ ; The access log format. ; The following syntax is allowed -@@ -320,7 +320,7 @@ +@@ -321,7 +321,7 @@ ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set @@ -48,7 +48,7 @@ ; The timeout for serving a single request after which a PHP backtrace will be ; dumped to the 'slowlog' file. A value of '0s' means 'off'. -@@ -418,6 +418,6 @@ +@@ -434,6 +434,6 @@ ; specified at startup with the -d argument ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com ;php_flag[display_errors] = off diff --git a/user/php7/gh14834.patch b/user/php7/gh14834.patch new file mode 100644 index 000000000..258b5e8f9 --- /dev/null +++ b/user/php7/gh14834.patch @@ -0,0 +1,62 @@ +From dc2ce0df9be530e7ee91b0dfa6eb6ce2d5e5baad Mon Sep 17 00:00:00 2001 +From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> +Date: Fri, 5 Jul 2024 23:34:09 +0200 +Subject: [PATCH] Fix GH-14834: Error installing PHP when --with-pear is used + +libxml2 2.13 makes changes to how the parsing state is set, update our +code accordingly. In particular, it started reporting entities within +attributes, while it should only report entities inside text nodes. +--- + ext/xml/compat.c | 2 +- + ext/xml/tests/gh14834.phpt | 29 +++++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+), 1 deletion(-) + create mode 100644 ext/xml/tests/gh14834.phpt + +diff --git a/ext/xml/compat.c b/ext/xml/compat.c +index 7b463ebb5112e..7ca015acc5421 100644 +--- a/ext/xml/compat.c ++++ b/ext/xml/compat.c +@@ -376,7 +376,7 @@ _get_entity(void *user, const xmlChar *name) + if (ret == NULL) + ret = xmlGetDocEntity(parser->parser->myDoc, name); + +- if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) { ++ if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) { + if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) { + /* Predefined entities will expand unless no cdata handler is present */ + if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) { +diff --git a/ext/xml/tests/gh14834.phpt b/ext/xml/tests/gh14834.phpt +new file mode 100644 +index 0000000000000..2781ba2ed0941 +--- /dev/null ++++ b/ext/xml/tests/gh14834.phpt +@@ -0,0 +1,29 @@ ++--TEST-- ++GH-14834 (Error installing PHP when --with-pear is used) ++--EXTENSIONS-- ++xml ++--FILE-- ++<?php ++$xml = <<<XML ++<?xml version="1.0" encoding="UTF-8"?> ++<!DOCTYPE root [ ++ <!ENTITY foo "ent"> ++]> ++<root> ++ <element hint="hello'world">&foo;<![CDATA[ & ]]><?x & ?></element> ++</root> ++XML; ++ ++$parser = xml_parser_create(); ++xml_set_character_data_handler($parser, function($_, $data) { ++ var_dump($data); ++}); ++xml_parse($parser, $xml, true); ++?> ++--EXPECT-- ++string(3) " ++ " ++string(3) "ent" ++string(7) " & " ++string(1) " ++" diff --git a/user/php7/zend_bool.patch b/user/php7/zend_bool.patch index b2e0b0f8f..cdea08533 100644 --- a/user/php7/zend_bool.patch +++ b/user/php7/zend_bool.patch @@ -8,7 +8,7 @@ the next 7.4 release[1], so don't bother forwarding. --- php-7.4.4/ext/reflection/php_reflection.c 2020-03-17 06:40:26.000000000 -0400 +++ php-7.4.4/ext/reflection/php_reflection.c 2020-03-30 01:00:27.938405046 -0400 -@@ -1304,7 +1304,7 @@ static void _reflection_export(INTERNAL_ +@@ -1318,7 +1318,7 @@ static void _reflection_export(INTERNAL_ zval *argument_ptr, *argument2_ptr; zval retval, params[2]; int result; diff --git a/user/pidgin/APKBUILD b/user/pidgin/APKBUILD index 3a5326d1b..9cb65dc8e 100644 --- a/user/pidgin/APKBUILD +++ b/user/pidgin/APKBUILD @@ -1,18 +1,21 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pidgin pkgver=2.14.8 -pkgrel=0 +pkgrel=1 pkgdesc="Multi-protocol instant messaging client" url="https://pidgin.im/" arch="all" license="GPL-2.0-only" depends="gst-plugins-base" +checkdepends="check-dev" makedepends="gtk+2.0-dev perl-dev libsm-dev startup-notification-dev libxml2-dev libidn-dev gnutls-dev dbus-dev dbus-glib-dev gstreamer-dev cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool gtkspell-dev gst-plugins-base-dev farstream-dev libgnt-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple" -source="https://downloads.sourceforge.net/pidgin/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/pidgin/$pkgname-$pkgver.tar.bz2 + pidgin-2.14.8-libpurple_test_fix.patch + " build() { LIBS="-lX11 -ltinfo" ./configure \ @@ -63,4 +66,5 @@ libpurple() { "$subpkgdir"/usr/share/ } -sha512sums="23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6 pidgin-2.14.8.tar.bz2" +sha512sums="23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6 pidgin-2.14.8.tar.bz2 +9b328516173c8c81bc99c3045fc91c1cd99a4b74a26b37b93ba9ec2fbfb7560bcaf0c5b8890a8ee02bbb19052a774f608d9a4061eb9966f70e5b19cd1dc144eb pidgin-2.14.8-libpurple_test_fix.patch" diff --git a/user/pidgin/pidgin-2.14.8-libpurple_test_fix.patch b/user/pidgin/pidgin-2.14.8-libpurple_test_fix.patch new file mode 100644 index 000000000..30caaa92e --- /dev/null +++ b/user/pidgin/pidgin-2.14.8-libpurple_test_fix.patch @@ -0,0 +1,52 @@ +# HG changeset patch +# Node ID e8f8e1558e11 +# Parent 930e4fb71321 +diff --git a/libpurple/tests/test_util.c b/libpurple/tests/test_util.c +--- a/libpurple/tests/test_util.c ++++ b/libpurple/tests/test_util.c +@@ -172,7 +172,7 @@ + fail_unless(1282941722 == purple_str_to_time("2010-08-27.204202", TRUE, NULL, NULL, NULL)); + fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21.3234", TRUE, NULL, NULL, NULL)); + fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21Z", TRUE, NULL, NULL, NULL)); +- fail_unless(1631512800 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL)); ++ fail_unless(1631491200 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL)); + + /* For testing local time we use Asia/Kathmandu because it's +05:45 and + * doesn't have DST which means the test should always pass regardless of +@@ -195,9 +195,14 @@ + * localtime. + */ + timestamp = purple_str_to_time("09/13/202115:34:34", TRUE, NULL, NULL, &rest); +- fail_unless(1631470500 == timestamp); ++ fail_unless(1631491200 == timestamp); + assert_string_equal("15:34:34", rest); + ++ timestamp = purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, &tm, &tz_off, &rest); ++ fail_unless(1282941722 == timestamp); ++ fail_unless((-7 * 60 * 60) == tz_off); ++ assert_string_equal("PDT", rest); ++ + /* finally revert the TZ environment variable */ + if(oldtz != NULL) { + g_setenv("TZ", oldtz, TRUE); +diff --git a/libpurple/util.c b/libpurple/util.c +--- a/libpurple/util.c ++++ b/libpurple/util.c +@@ -887,6 +887,17 @@ + t.tm_isdst = -1; /* -1 means dst info is not available */ + } + } ++ } else { ++ /* If we have a time, figure out if we need to adjust our tz offset. */ ++ if(!mktime_with_utc) { ++ if(utc) { ++ mktime_with_utc = TRUE; ++ tzoff = 0; ++ } else { ++ /* Local Time */ ++ t.tm_isdst = -1; /* -1 means dst info is not available */ ++ } ++ } + } + + g_free(hours); diff --git a/user/plib/APKBUILD b/user/plib/APKBUILD index f195034f9..d33532fa2 100644 --- a/user/plib/APKBUILD +++ b/user/plib/APKBUILD @@ -2,16 +2,17 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plib pkgver=1.8.5 -pkgrel=0 +pkgrel=1 pkgdesc="Portable game libraries" -url="http://plib.sourceforge.net/" +url="https://plib.sourceforge.net/" arch="all" options="!dbg" # No shared libraries license="LGPL-2.0+" depends="" -makedepends="autoconf automake libtool libxi-dev libxmu-dev libxt-dev mesa-dev" +makedepends="autoconf automake libtool libglvnd-dev libxi-dev libxmu-dev + libxt-dev" subpackages="$pkgname-dev" -source="http://plib.sourceforge.net/dist/plib-$pkgver.tar.gz +source="https://plib.sourceforge.net/dist/plib-$pkgver.tar.gz fix-openflight.patch joystick.patch CVE-2011-4620.patch diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index 4ab9b7ed7..65b12463e 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix -pkgver=3.7.3 -pkgrel=0 +pkgver=3.9.0 +pkgrel=1 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" -url="http://www.postfix.org/" +url="https://www.postfix.org/" arch="all" pkgusers="postfix" pkggroups="postfix postdrop" @@ -18,9 +18,8 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc install="$pkgname.pre-install" provider_priority=1 provides="sendmail" -source="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/$pkgname-$pkgver.tar.gz +source="https://postfix-mirror.horus-it.com/postfix-release/official/$pkgname-$pkgver.tar.gz honour-config-directory.patch - linux-6.patch postfix.initd " @@ -93,7 +92,6 @@ sqlite() { _database "sqlite" "SQLite 3" } -sha512sums="4ceedd1b7b364f47a3becc041cf29a48aea54e38306fd1227c5a7c25894831fb5c37150d99d781d237175e58da21ac53887c97d99bb6b715c4988777596ee890 postfix-3.7.3.tar.gz -63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch -aa9e47208041d652351ce167fe6205116658704189bc2a715a3edb31c0436d46fad909cfe57e1d6d869c933ff0b5237be0956b38a94b395781998c9092305274 linux-6.patch +sha512sums="46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324 postfix-3.9.0.tar.gz +c79334a2d4989990bf0bc26341332611521d7cd06f1dcacc7a3baef6bf2ddd5f90208f39b26b26a07b134a2398d669a40d5322b4be6c053947fc9a962ddf7111 honour-config-directory.patch 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/postfix/honour-config-directory.patch b/user/postfix/honour-config-directory.patch index a32c588ee..ad9d7ea3d 100644 --- a/user/postfix/honour-config-directory.patch +++ b/user/postfix/honour-config-directory.patch @@ -1,6 +1,6 @@ --- postfix-3.3.2/postfix-install +++ postfix-3.3.2/postfix-install -@@ -832,7 +832,7 @@ +@@ -846,7 +846,7 @@ # the wrong place when Postfix is being upgraded. case "$mail_version" in diff --git a/user/postfix/linux-6.patch b/user/postfix/linux-6.patch deleted file mode 100644 index 19e73dc34..000000000 --- a/user/postfix/linux-6.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/makedefs 2022-01-23 21:53:41.000000000 +0100 -+++ b/makedefs 2022-09-07 19:07:02.000000000 +0200 -@@ -627,7 +627,8 @@ - : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} - : ${PLUGIN_LD="${CC-gcc} -shared"} - ;; -- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR -+ Linux.[3456].*) -+ SYSTYPE=LINUX$RELEASE_MAJOR - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; ---- a/src/util/sys_defs.h 2021-12-05 19:59:27.000000000 +0100 -+++ b/src/util/sys_defs.h 2022-09-07 19:09:09.000000000 +0200 -@@ -751,7 +751,8 @@ - /* - * LINUX. - */ --#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) -+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) \ -+ || defined(LINUX6) - #define SUPPORTED - #define UINT32_TYPE unsigned int - #define UINT16_TYPE unsigned short diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD index 874246d25..b5f40acbb 100644 --- a/user/postgresql/APKBUILD +++ b/user/postgresql/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=postgresql -pkgver=14.6 +pkgver=14.15 pkgrel=0 pkgdesc="Featureful object-relational database system (RDBMS)" url="https://www.postgresql.org/" @@ -249,7 +249,7 @@ _submv() { done } -sha512sums="133083eb5709ace65dd81d326a960654dd6cfb35b3e85a35f71763c59dad0052a561c2aa1d1f52652b4bf81ed71edd232f170d483989d65ca354e653331faf2e postgresql-14.6.tar.bz2 +sha512sums="227f9551167ee62e5185d6f6777e100ecc09f497b9ee1b5a8e659de8d4c237b0f9a97005706bbf64c3e839271e2630f6a417ba98dfce47bcb4c27e8641a7c6ef postgresql-14.15.tar.bz2 5772c54378f885fd2924be431f577bcbc134481d17a1331afd42ebeea2995e52364601ca2e2839d3c1dd78c51e4483424d1ed8ef8cdf43889a5a209861396efc perl-rpath.patch 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch 323ea2f3b6d71b858153d1f8ae62a98548ce8b2d1e0d9214dd32e858e4ad9bd0194b8b2f6e9540ce6324e394a08f496b2822004c1c3fef11184f267fa401a087 disable-broken-tests.patch diff --git a/user/qca/APKBUILD b/user/qca/APKBUILD index 537b3b9aa..c142f5f42 100644 --- a/user/qca/APKBUILD +++ b/user/qca/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qca pkgver=2.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Qt cryptographic architecture" url="https://userbase.kde.org/QCA" arch="all" @@ -10,7 +10,10 @@ license="LGPL-2.1+" depends="" makedepends="cmake cyrus-sasl-dev qt5-qtbase-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.kde.org/stable/qca/$pkgver/qca-${pkgver}.tar.xz" +source="https://download.kde.org/stable/qca/$pkgver/qca-${pkgver}.tar.xz + gcc11.patch + test.patch + " build() { cmake \ @@ -29,4 +32,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c qca-2.2.1.tar.xz" +sha512sums="3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c qca-2.2.1.tar.xz +ff21970831239f17813c96d47ab690cc15afbc6a8da68c9c1f65d90f7314963ead2778b609ea74e3f26df4046a58907e726f51c31227714bb50c182c66a26e58 gcc11.patch +158e75c4b3940cd74b1bbcdffc2c281d771734169cf61e091c78fec40b218fe4f141c2978a33c121b354cb81235a60eecfca070e375d1e54563a354cd98c22e5 test.patch" diff --git a/user/qca/gcc11.patch b/user/qca/gcc11.patch new file mode 100644 index 000000000..4fc43d818 --- /dev/null +++ b/user/qca/gcc11.patch @@ -0,0 +1,26 @@ +From 32275f1a74c161d2fed8c056b2dd9555687a22f2 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Sun, 24 Jan 2021 18:43:39 +0100 +Subject: [PATCH] Move moc include outside the QCA namespace + +It's the right thing to do and also fixes build with gcc 11 +--- + src/qca_default.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qca_default.cpp b/src/qca_default.cpp +index 7c2a8f89..e31ce3e1 100644 +--- a/src/qca_default.cpp ++++ b/src/qca_default.cpp +@@ -1358,6 +1358,6 @@ QStringList plugin_priorities(Provider *defaultProvider) + return that->shared.plugin_priorities(); + } + +-#include "qca_default.moc" +- + } ++ ++#include "qca_default.moc" +-- +GitLab + diff --git a/user/qca/test.patch b/user/qca/test.patch new file mode 100644 index 000000000..6b9fb12ef --- /dev/null +++ b/user/qca/test.patch @@ -0,0 +1,77 @@ +From b9d914bb3b5b0ecf8568adf1b4610d4da2cde244 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Wed, 15 Sep 2021 10:34:08 +0200 +Subject: [PATCH] Make filewatchunittest much quicker + +Use QSignalSpy::wait to avoid waiting needlessly. +Reduce time to wait for (expected and unexpected) signals to 2s. +--- + .../filewatchunittest/filewatchunittest.cpp | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +diff --git a/unittest/filewatchunittest/filewatchunittest.cpp b/unittest/filewatchunittest/filewatchunittest.cpp +index d1bc117c..63baa655 100644 +--- a/unittest/filewatchunittest/filewatchunittest.cpp ++++ b/unittest/filewatchunittest/filewatchunittest.cpp +@@ -40,7 +40,7 @@ void FileWatchUnitTest::cleanupTestCase() + + void FileWatchUnitTest::filewatchTest() + { +- QWARN("Unittest will take about 1 minute. Please wait."); ++ QWARN("Unittest will take about 10 seconds. Please wait."); + + QCA::FileWatch watcher; + QCOMPARE( watcher.fileName(), QString() ); +@@ -55,41 +55,40 @@ void FileWatchUnitTest::filewatchTest() + + watcher.setFileName( tempFile->fileName() ); + QCOMPARE( watcher.fileName(), tempFile->fileName() ); +- QTest::qWait(7000); ++ QVERIFY(!spy.wait(2000)); + QCOMPARE( spy.count(), 0 ); + tempFile->close(); +- QTest::qWait(7000); ++ QVERIFY(!spy.wait(2000)); + QCOMPARE( spy.count(), 0 ); + + tempFile->open(); + tempFile->write("foo"); + tempFile->flush(); +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 1 ); + + tempFile->close(); +- QTest::qWait(7000); +- ++ QVERIFY(!spy.wait(2000)); + QCOMPARE( spy.count(), 1 ); + + tempFile->open(); + tempFile->write("foo"); + tempFile->flush(); +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 2 ); + + tempFile->write("bar"); + tempFile->flush(); +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 3 ); + + tempFile->close(); +- QTest::qWait(7000); ++ QVERIFY(!spy.wait(2000)); + + QCOMPARE( spy.count(), 3 ); + + delete tempFile; +- QTest::qWait(7000); ++ QVERIFY(spy.wait(2000)); + QCOMPARE( spy.count(), 4 ); + } + +-- +GitLab + diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD index c707b5c8e..5e716695d 100644 --- a/user/qemu/APKBUILD +++ b/user/qemu/APKBUILD @@ -6,7 +6,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qemu pkgver=4.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Machine emulator and virtualisation software" url="https://www.qemu.org/" arch="all" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 7ef7f7671..32717276c 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -2,7 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator pkgver=4.15.2 -pkgrel=0 +_llvmver=18 +pkgrel=3 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" arch="all" @@ -10,17 +11,25 @@ options="!check" # No test suite. license="LGPL-2.0 WITH Qt-LGPL-exception-1.1" depends="qt5-qtquickcontrols" makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtserialport-dev - qt5-qtscript-dev qt5-qttools-dev clang-dev llvm14-dev python3 + qt5-qtscript-dev qt5-qttools-dev clang-dev llvm${_llvmver}-dev python3 libexecinfo-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/$pkgname-opensource-src-$pkgver.tar.xz llvm13.patch + llvm15.patch + llvm16.patch + llvm16-deux.patch + llvm17.patch + llvm18.patch + llvm19.patch malloc_trim.patch + cstdint.patch " ldpath="/usr/lib/qtcreator" builddir="$srcdir/$pkgname-opensource-src-$pkgver" build() { + export LLVM_CONFIG="$(command -v llvm${_llvmver}-config)" export LLVM_INSTALL_DIR=/usr qmake -r "QMAKE_CFLAGS += $CFLAGS" "QMAKE_CXXFLAGS += $CXXFLAGS" "QMAKE_LFLAGS += $LDFLAGS" "QMAKE_LIBS += -lexecinfo" make @@ -32,4 +41,11 @@ package() { sha512sums="b29d5d97a1faa8d5756069d90c18d6d367e09057b97bd75c774bc2d1e373f9f4dcc24211188259f8d397bb932a65daaacda433bced796fd165654f5c3c621258 qt-creator-opensource-src-4.15.2.tar.xz c38cf1aea69bc52864d5aa4b6fbc01b5e91b1514a616056b270fcccc2744bb418eb93a470462823c05e00e44f44c45d8e26effd8aa72a6817402ddd9a6dd0cc4 llvm13.patch -7fcb9b293daecc4c0f294d372507db9a6282479c4cf45999446193d9f35552db2532d47dedc9c5666a10855e20d0fe655f0ee0408abca8cc8ffbf121a230960f malloc_trim.patch" +9bcb1a67ea28fa4b3a9abf120d96c44e9949da083f0010b1a32ff27873e290a419b4994503826ba721587ba9b9bb97eb81c59e9d192e916bcf6430e21b1b7feb llvm15.patch +0a986139b3ba25d4c5430bfde1ca10cb024666150c9dac4eb1b3f5bbf099c4017332745d2277837395b1761fca1f598a1807b6d21342b497d4800bb988236250 llvm16.patch +566307ecbc725863149c2407617ef5d2021c9cd6a5e69a8ccf3f9a7188e27fc77b5cca12e92c35255ce03f925f7e0370412c1f255e03b34dd165abee959d9eec llvm16-deux.patch +be2a3e99e1a7b72d3b8d092edaffc60249efbbe27d5037cebba388d36f0d404e8d109489336c83f684195532eb23d73ea89f57da31b3499a1ee84a86ce3653b7 llvm17.patch +02d0ac36e4c9fd5682d45ef5f040f6ef11c25b3c9a0865cb8a1ef660dfb067a3dbeac1187246da79a506db6c24379b77a7d8510edcf10c9a56c6a9de1b507672 llvm18.patch +ce849abae28a3fd946b490e55cc44f4c19fe3ccf167e936c9e01b7c240c98b7f7af27336549ccbe18995fd2ae81366278a8345f54d3d87127232c06649af0e71 llvm19.patch +7fcb9b293daecc4c0f294d372507db9a6282479c4cf45999446193d9f35552db2532d47dedc9c5666a10855e20d0fe655f0ee0408abca8cc8ffbf121a230960f malloc_trim.patch +7d7a739cf98c1bc4232d9d14334e3c3a319746db931aaad4d441c903351c56869015ce427e2098fbe930d56a2dd433b1869fbbf5a78f91c10a94f5a47a778ea0 cstdint.patch" diff --git a/user/qt-creator/cstdint.patch b/user/qt-creator/cstdint.patch new file mode 100644 index 000000000..39558e90f --- /dev/null +++ b/user/qt-creator/cstdint.patch @@ -0,0 +1,27 @@ +--- qt-creator-opensource-src-4.15.2/src/libs/qlitehtml/src/3rdparty/litehtml/include/litehtml/html.h.old 2021-07-12 21:12:54.000000000 -0500 ++++ qt-creator-opensource-src-4.15.2/src/libs/qlitehtml/src/3rdparty/litehtml/include/litehtml/html.h 2024-05-30 18:51:05.965117572 -0500 +@@ -9,6 +9,7 @@ + #include <cstring> + #include <algorithm> + #include <sstream> ++#include <cstdint> + #include "os_types.h" + #include "types.h" + #include "background.h" +--- qt-creator-opensource-src-4.15.2/src/libs/qlitehtml/src/3rdparty/litehtml/include/litehtml/num_cvt.h.old 2021-07-12 21:12:54.000000000 -0500 ++++ qt-creator-opensource-src-4.15.2/src/libs/qlitehtml/src/3rdparty/litehtml/include/litehtml/num_cvt.h 2024-05-30 18:54:29.873560575 -0500 +@@ -2,6 +2,7 @@ + #define NUM_CVT_H + + #include <string> ++#include <cstdint> + #include "os_types.h" + + namespace litehtml +@@ -16,4 +17,4 @@ + } + } + +-#endif // NUM_CVT_H +\ No newline at end of file ++#endif // NUM_CVT_H diff --git a/user/qt-creator/llvm15.patch b/user/qt-creator/llvm15.patch new file mode 100644 index 000000000..a35912171 --- /dev/null +++ b/user/qt-creator/llvm15.patch @@ -0,0 +1,29 @@ +From c7cdd55dea1f30b4d236d532bdadcf36bd174640 Mon Sep 17 00:00:00 2001 +From: Cristian Adam <cristian.adam@qt.io> +Date: Tue, 16 Aug 2022 21:04:39 +0200 +Subject: [PATCH] ClangFormat: Fix build for LLVM 15.0.0 + +This fixes the CMake build of Qt Creator against LLVM 15.0.0 + +Change-Id: Icecd45821091c8c2b565246cb17ce5a6e5c49f36 +Reviewed-by: <github-actions-qt-creator@cristianadam.eu> +Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> +--- + src/plugins/clangformat/CMakeLists.txt | 2 ++ + src/plugins/clangformat/clangformatutils.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp +index 230078558e5..973c1050772 100644 +--- a/src/plugins/clangformat/clangformatutils.cpp ++++ b/src/plugins/clangformat/clangformatutils.cpp +@@ -111,7 +111,9 @@ clang::format::FormatStyle qtcStyle() + style.ColumnLimit = 100; + style.CommentPragmas = "^ IWYU pragma:"; + style.CompactNamespaces = false; ++#if LLVM_VERSION_MAJOR < 15 + style.ConstructorInitializerAllOnOneLineOrOnePerLine = false; ++#endif + style.ConstructorInitializerIndentWidth = 4; + style.ContinuationIndentWidth = 4; + style.Cpp11BracedListStyle = true; diff --git a/user/qt-creator/llvm16-deux.patch b/user/qt-creator/llvm16-deux.patch new file mode 100644 index 000000000..00f35016c --- /dev/null +++ b/user/qt-creator/llvm16-deux.patch @@ -0,0 +1,45 @@ +From f4545807defdfb493c1d66a19430a69d81afa40b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <schaepers@kuennecke.com> +Date: Fri, 4 Nov 2022 07:18:50 +0100 +Subject: [PATCH] clang-format: Adapt to LLVM 16 + +Change-Id: I2e35f92db6de10b1e4bf173f0864f0cd893a011f +Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> +Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> +--- + src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++ + src/plugins/clangformat/clangformatutils.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp +index 7c83c8e43b2..6072082c8c7 100644 +--- a/src/plugins/clangformat/clangformatbaseindenter.cpp ++++ b/src/plugins/clangformat/clangformatbaseindenter.cpp +@@ -55,7 +55,11 @@ void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style, + + // This is a separate pass, don't do it unless it's the full formatting. + style.FixNamespaceComments = false; ++#if LLVM_VERSION_MAJOR >= 16 ++ style.AlignTrailingComments = {clang::format::FormatStyle::TCAS_Never, 0}; ++#else + style.AlignTrailingComments = false; ++#endif + + if (replacementsToKeep == ReplacementsToKeep::IndentAndBefore) + return; +diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp +index dbc4a6a347e..3b2901bcc8b 100644 +--- a/src/plugins/clangformat/clangformatutils.cpp ++++ b/src/plugins/clangformat/clangformatutils.cpp +@@ -64,7 +64,11 @@ clang::format::FormatStyle qtcStyle() + #else + style.AlignOperands = true; + #endif ++#if LLVM_VERSION_MAJOR >= 16 ++ style.AlignTrailingComments = {FormatStyle::TCAS_Always, 0}; ++#else + style.AlignTrailingComments = true; ++#endif + style.AllowAllParametersOfDeclarationOnNextLine = true; + #if LLVM_VERSION_MAJOR >= 10 + style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never; diff --git a/user/qt-creator/llvm16.patch b/user/qt-creator/llvm16.patch new file mode 100644 index 000000000..dc9c53940 --- /dev/null +++ b/user/qt-creator/llvm16.patch @@ -0,0 +1,44 @@ +From e20bdfae4de90401a518135bc22958549dceda66 Mon Sep 17 00:00:00 2001 +From: Christian Stenger <christian.stenger@qt.io> +Date: Tue, 31 Jan 2023 08:11:29 +0100 +Subject: [PATCH] ClangFormat: Adapt to changes in LLVM 16 + +Change-Id: Ia4a2cf21e351095609d8858f1f9355c6607470f3 +Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> +--- + src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++ + src/plugins/clangformat/clangformatutils.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp +index d61cbf2f1a8..fc08158d2d1 100644 +--- a/src/plugins/clangformat/clangformatbaseindenter.cpp ++++ b/src/plugins/clangformat/clangformatbaseindenter.cpp +@@ -38,7 +38,11 @@ void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style, + #else + style.SortIncludes = false; + #endif ++#if LLVM_VERSION_MAJOR >= 16 ++ style.SortUsingDeclarations = clang::format::FormatStyle::SUD_Never; ++#else + style.SortUsingDeclarations = false; ++#endif + + // This is a separate pass, don't do it unless it's the full formatting. + style.FixNamespaceComments = false; +diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp +index c7eb900fed5..d1d6bee684b 100644 +--- a/src/plugins/clangformat/clangformatutils.cpp ++++ b/src/plugins/clangformat/clangformatutils.cpp +@@ -152,7 +152,11 @@ clang::format::FormatStyle qtcStyle() + #else + style.SortIncludes = true; + #endif ++#if LLVM_VERSION_MAJOR >= 16 ++ style.SortUsingDeclarations = FormatStyle::SUD_Lexicographic; ++#else + style.SortUsingDeclarations = true; ++#endif + style.SpaceAfterCStyleCast = true; + style.SpaceAfterTemplateKeyword = false; + style.SpaceBeforeAssignmentOperators = true; diff --git a/user/qt-creator/llvm17.patch b/user/qt-creator/llvm17.patch new file mode 100644 index 000000000..3e4803bbf --- /dev/null +++ b/user/qt-creator/llvm17.patch @@ -0,0 +1,38 @@ +From 9ad9e49ccf6e0d7f4ba5765cff3af63fbbed60e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de> +Date: Wed, 2 Aug 2023 12:39:13 +0200 +Subject: [PATCH] clang-format: Fix build with LLVM 17 + +Change-Id: Ie6377be3be4a8c785d53f1eceabcc4811db4229d +Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> +--- + src/plugins/clangformat/clangformatutils.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp +index 928d30d241e..1aae91a186f 100644 +--- a/src/plugins/clangformat/clangformatutils.cpp ++++ b/src/plugins/clangformat/clangformatutils.cpp +@@ -165,7 +165,9 @@ clang::format::FormatStyle qtcStyle() + style.SpaceAfterTemplateKeyword = false; + style.SpaceBeforeAssignmentOperators = true; + style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements; ++#if LLVM_VERSION_MAJOR < 17 + style.SpaceInEmptyParentheses = false; ++#endif + style.SpacesBeforeTrailingComments = 1; + #if LLVM_VERSION_MAJOR >= 13 + style.SpacesInAngles = FormatStyle::SIAS_Never; +@@ -173,8 +175,12 @@ clang::format::FormatStyle qtcStyle() + style.SpacesInAngles = false; + #endif + style.SpacesInContainerLiterals = false; ++#if LLVM_VERSION_MAJOR >= 17 ++ style.SpacesInParens = FormatStyle::SIPO_Never; ++#else + style.SpacesInCStyleCastParentheses = false; + style.SpacesInParentheses = false; ++#endif + style.SpacesInSquareBrackets = false; + addQtcStatementMacros(style); + style.Standard = FormatStyle::LS_Cpp11; diff --git a/user/qt-creator/llvm18.patch b/user/qt-creator/llvm18.patch new file mode 100644 index 000000000..7294dec49 --- /dev/null +++ b/user/qt-creator/llvm18.patch @@ -0,0 +1,30 @@ +From 7457b623125f4bcdb7941769a385cfbfc0dcbf2b Mon Sep 17 00:00:00 2001 +From: hjk <hjk@qt.io> +Date: Fri, 8 Nov 2024 12:50:30 +0100 +Subject: [PATCH] ClangFormat: Fix warning on uninitialized struct member + +Clang 18's AlignConsecutiveStyle has a new bool AlignFunctionPointers member. + +Change-Id: I5d72d9caa4a6e58ffa09674d2d3b976a95ea5dd0 +Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> +--- + src/plugins/clangformat/clangformatutils.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- qt-creator-opensource-src-4.15.2/src/plugins/clangformat/clangformatutils.cpp.old 2024-12-04 16:32:21.224382015 -0600 ++++ qt-creator-opensource-src-4.15.2/src/plugins/clangformat/clangformatutils.cpp 2024-12-04 17:12:21.181020408 -0600 +@@ -51,7 +51,13 @@ + style.Language = FormatStyle::LK_Cpp; + style.AccessModifierOffset = -4; + style.AlignAfterOpenBracket = FormatStyle::BAS_Align; +-#if LLVM_VERSION_MAJOR >= 12 ++#if LLVM_VERSION_MAJOR >= 18 ++ style.AlignConsecutiveAssignments = {false, false, false, false, false, false}; ++ style.AlignConsecutiveDeclarations = {false, false, false, false, false, false}; ++#elif LLVM_VERSION_MAJOR >= 15 ++ style.AlignConsecutiveAssignments = {false, false, false, false, false}; ++ style.AlignConsecutiveDeclarations = {false, false, false, false, false}; ++#elif LLVM_VERSION_MAJOR >= 12 + style.AlignConsecutiveAssignments = FormatStyle::ACS_None; + style.AlignConsecutiveDeclarations = FormatStyle::ACS_None; + #else diff --git a/user/qt-creator/llvm19.patch b/user/qt-creator/llvm19.patch new file mode 100644 index 000000000..7dff56df4 --- /dev/null +++ b/user/qt-creator/llvm19.patch @@ -0,0 +1,28 @@ +From cc9ffdb685119a7c11248f08cf88308927252b85 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de> +Date: Tue, 30 Apr 2024 16:06:28 +0200 +Subject: [PATCH] ClangFormat: Fix compiliation with LLVM19 + +Change-Id: I4b166da2e477ffd101a5c4b9aa07c710f7698da9 +Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> +--- + src/plugins/clangformat/clangformatbaseindenter.cpp | 4 ++++ + src/plugins/clangformat/llvmfilesystem.h | 6 +++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp +index 1d5dc2730c3..b491bd293f1 100644 +--- a/src/plugins/clangformat/clangformatbaseindenter.cpp ++++ b/src/plugins/clangformat/clangformatbaseindenter.cpp +@@ -73,7 +73,11 @@ static void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style, + + static llvm::StringRef clearExtraNewline(llvm::StringRef text) + { ++#if LLVM_VERSION_MAJOR >= 16 ++ while (text.starts_with("\n\n")) ++#else + while (text.startswith("\n\n")) ++#endif + text = text.drop_front(); + return text; + } diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 7cd2f2b3e..0ba98bd30 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -2,7 +2,7 @@ pkgname=qt5-qtbase _pkgname=qtbase-everywhere pkgver=5.15.4 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform application and UI framework" url="https://www.qt.io/" arch="all" @@ -11,8 +11,8 @@ _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-tds $pkgname-x11" depends="" depends_dev="dbus-dev fontconfig-dev freetype-dev glib-dev libice-dev - libpng-dev libsm-dev libx11-dev libxext-dev mesa-dev openssl-dev perl - sqlite-dev zlib-dev $_sub" + libglvnd-dev libpng-dev libsm-dev libx11-dev libxext-dev mesa-dev + openssl-dev perl sqlite-dev zlib-dev $_sub" makedepends="$depends_dev at-spi2-core-dev bison cups-dev eudev-dev flex freetds-dev freetype-dev gperf gtk+2.0-dev harfbuzz-dev hicolor-icon-theme icu-dev @@ -173,7 +173,7 @@ x11() { usr/lib/qt5/plugins/printsupport* \ usr/lib/qt5/plugins/xcbglintegrations - scanelf -Rn "$pkgdir"/usr/ | egrep '(libX|libQt5Gui|libGL)' && return 1 + scanelf -Rn "$pkgdir"/usr/ | grep -E '(libX|libQt5Gui|libGL)' && return 1 return 0 } diff --git a/user/qt5-qtpositioning/APKBUILD b/user/qt5-qtpositioning/APKBUILD index b25f7df99..e81ddef81 100644 --- a/user/qt5-qtpositioning/APKBUILD +++ b/user/qt5-qtpositioning/APKBUILD @@ -3,7 +3,7 @@ pkgname=qt5-qtpositioning _pkgname=qtlocation-everywhere pkgver=5.15.4 -pkgrel=0 +pkgrel=1 pkgdesc="Geolocation services for Qt 5" url="https://www.qt.io/" arch="all" diff --git a/user/qt5-qtwayland/APKBUILD b/user/qt5-qtwayland/APKBUILD index b65bb6bac..5885128e8 100644 --- a/user/qt5-qtwayland/APKBUILD +++ b/user/qt5-qtwayland/APKBUILD @@ -10,7 +10,7 @@ arch="all" options="!check" license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0" depends="" -makedepends="libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev" +makedepends="libglvnd-dev libxkbcommon-dev mesa-dev qt5-qtbase-dev wayland-dev" subpackages="$pkgname-dev $pkgname-client $pkgname-compositor $pkgname-tools" install_if="qt5-qtbase~$pkgver wayland" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-opensource-src-$pkgver.tar.xz diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD index 63e18cb07..71f3238aa 100644 --- a/user/qt5-qtwebkit/APKBUILD +++ b/user/qt5-qtwebkit/APKBUILD @@ -4,7 +4,7 @@ pkgname=qt5-qtwebkit _realname=qtwebkit pkgver=5.212.0_git20200924 _ts=1600955993 -pkgrel=1 +pkgrel=4 pkgdesc="Open source Web browser engine" url="https://github.com/qtwebkit/qtwebkit/wiki" arch="all" @@ -24,10 +24,13 @@ source="https://download.qt.io/snapshots/ci/qtwebkit/${pkgver%.*}/$_ts/src/submo armv6.patch glib-compat.patch icu-68.patch + icu-75.patch jsc-musl.patch + missing-header.patch ppc-llint.patch ppc-ucontext.patch ppc64-llint.patch + webkit-offlineasm-warnings-ruby27.patch " builddir="$srcdir"/$_realname-opensource-src-${pkgver%.*} @@ -35,6 +38,7 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + export CXXFLAGS="$CXXFLAGS -Wno-deprecated-copy -Wno-deprecated-declarations" case "${CARCH}" in armv7|pmmx|ppc) @@ -90,7 +94,10 @@ sha512sums="e2983ac291654ac75a8cdaaa1ca16810ae047e8d78c8910c415ab76e6efa532b75b1 ca77802de1b945c05b6a88d5cc0cbb093a751ef16626d221c8b2ca5cf841f5d42fffe62087df1ce0964f8ce72148c0109ff85e5cef3390125c133b310031028e armv6.patch 9f42f3d64657fb9487d9299ad5931381f9aa91a746a5986dc361def5e9a6e02933054a66132fa99057460ad6de0c19e9b51e07594451cc4f38b19012a69d205c glib-compat.patch 5f0ca182c68c55a6f221e96bf2221784c7126006ea8db3e9eee2b66dbdda18d7d0f9830e8345ac2b0bc6f557af5d2a54a321b06be4a2c845dd1003282b053443 icu-68.patch +240ec1d145eee861c45da753b5f4b01a7aadeee4de604a701de9d326ab02a3565bd63398c98d820d7eae498d28cf8eb0b53615f634c3791915cae35bbd3e263a icu-75.patch 9e3638d4d5c6e56510525931b278c8d6e28134917c300837b4eccf1b9298af1e274668318af82091137e99b83da0f78904084b7ee9dd8422b347a0f35e765c31 jsc-musl.patch +ee3d06d3c350980a2a042961b6943d42706599b39270addce3904535811b18a2af8f74842f2d21267ce71250b97c05de600ec416e042f4d1cdbc2701711b5f4a missing-header.patch 4a3a15f8b1e63cade07c589be45afd794b45b34ee98e4d2d3fc2f52662c26c518d400b44c9314e41113cad847b9efd544d2a4c02425c9892ca9729e218ae9306 ppc-llint.patch 48f81c6a2c0f4e9b215dada4c0bebdafc66feb75178a7b1ca661f2bbcddd6b573e7db4dd179f6e4b6345c7ebcf17ce1c6647cc6ce39dbac8ba68f8863a98bdc0 ppc-ucontext.patch -db98d710815eb68f1fb025098b04c34b33518750c193e702383ca879e145c52ba4786fa4721f384f01f90231c32be9478d507c1000eb761621751edcd071b966 ppc64-llint.patch" +db98d710815eb68f1fb025098b04c34b33518750c193e702383ca879e145c52ba4786fa4721f384f01f90231c32be9478d507c1000eb761621751edcd071b966 ppc64-llint.patch +1431c6329fb9ef86dbe929a4002881f6a511aa8a2be684a7c96ea7ea48af53b4f0d96bd8e8367289080bed674ba35cab002747cf3820a6831e60f7ab7a53d3cc webkit-offlineasm-warnings-ruby27.patch" diff --git a/user/qt5-qtwebkit/icu-75.patch b/user/qt5-qtwebkit/icu-75.patch new file mode 100644 index 000000000..aaba87abd --- /dev/null +++ b/user/qt5-qtwebkit/icu-75.patch @@ -0,0 +1,55 @@ +Required for compatibility with ICU 75. + +--- qtwebkit-opensource-src-5.212/Source/cmake/OptionsCommon.cmake.old 2020-09-22 06:30:04.000000000 -0500 ++++ qtwebkit-opensource-src-5.212/Source/cmake/OptionsCommon.cmake 2024-08-12 23:20:50.344794822 -0500 +@@ -31,7 +31,7 @@ + if (COMPILER_IS_GCC_OR_CLANG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + endif () + + if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja") +--- qtwebkit-opensource-src-5.212/Source/WTF/wtf/StdLibExtras.h.old 2020-09-22 06:30:04.000000000 -0500 ++++ qtwebkit-opensource-src-5.212/Source/WTF/wtf/StdLibExtras.h 2024-08-12 23:38:15.214914980 -0500 +@@ -292,7 +292,7 @@ + // This adds various C++14 features for versions of the STL that may not yet have them. + namespace std { + // MSVC 2013 supports std::make_unique already. +-#if !defined(_MSC_VER) || _MSC_VER < 1800 ++#if 0 + template<class T> struct _Unique_if { + typedef unique_ptr<T> _Single_object; + }; +@@ -323,7 +323,7 @@ + #endif + + // MSVC 2015 supports these functions. +-#if !COMPILER(MSVC) || _MSC_VER < 1900 ++#if 0 + // Compile-time integer sequences + // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html + // (Note that we only implement index_sequence, and not the more generic integer_sequence). +--- qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessor.h.old 2020-09-22 06:30:04.000000000 -0500 ++++ qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessor.h 2024-08-13 00:27:21.354699921 -0500 +@@ -64,7 +64,7 @@ + + void reset(); + +- static void parseErrorFunc(void* userData, xmlError*); ++ static void parseErrorFunc(void* userData, const xmlError*); + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks +--- qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessorLibxslt.cpp.old 2020-09-22 06:30:04.000000000 -0500 ++++ qtwebkit-opensource-src-5.212/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2024-08-13 00:28:32.207221034 -0500 +@@ -78,7 +78,7 @@ + // It would be nice to do something with this error message. + } + +-void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) + { + PageConsoleClient* console = static_cast<PageConsoleClient*>(userData); + if (!console) diff --git a/user/qt5-qtwebkit/missing-header.patch b/user/qt5-qtwebkit/missing-header.patch new file mode 100644 index 000000000..da0eed43c --- /dev/null +++ b/user/qt5-qtwebkit/missing-header.patch @@ -0,0 +1,11 @@ +The GCC 13 C++ stdlib doesn't include <stdint.h> any more, which is used for uint32_t. +--- qtwebkit-opensource-src-5.212/Source/ThirdParty/ANGLE/src/common/mathutil.h.old 2020-09-22 06:30:04.000000000 -0500 ++++ qtwebkit-opensource-src-5.212/Source/ThirdParty/ANGLE/src/common/mathutil.h 2024-05-27 14:43:22.625301664 -0500 +@@ -14,6 +14,7 @@ + + #include <limits> + #include <algorithm> ++#include <stdint.h> + #include <string.h> + #include <stdlib.h> + diff --git a/user/qt5-qtwebkit/webkit-offlineasm-warnings-ruby27.patch b/user/qt5-qtwebkit/webkit-offlineasm-warnings-ruby27.patch new file mode 100644 index 000000000..d25c3b1d6 --- /dev/null +++ b/user/qt5-qtwebkit/webkit-offlineasm-warnings-ruby27.patch @@ -0,0 +1,46 @@ +From c7d19a492d97f9282a546831beb918e03315f6ef Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <aperez@igalia.com> +Date: Wed, 15 Jan 2020 22:15:38 +0000 +Subject: [PATCH] Offlineasm warnings with newer Ruby versions + https://bugs.webkit.org/show_bug.cgi?id=206233 + +Reviewed by Yusuke Suzuki. + +Avoid a warning about using Object#=~ on Annotation instances, which +has been deprecated in Ruby 2.7. + +* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator +to Annotation instances, which do not define it. + + +Canonical link: https://commits.webkit.org/219400@main +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/JavaScriptCore/ChangeLog | 13 +++++++++++++ + Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- + 2 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb +index 791c81a9868d..f14c873e2dbd 100644 +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -628,9 +628,7 @@ def parseSequence(final, comment) + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -644,6 +642,8 @@ def parseSequence(final, comment) + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD index 8cfadbd66..dbea3d65e 100644 --- a/user/quassel/APKBUILD +++ b/user/quassel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quassel pkgver=0.14.0 -pkgrel=0 +pkgrel=1 pkgdesc="Modern, cross-platform IRC client" url="https://quassel-irc.org/" arch="all" @@ -14,7 +14,7 @@ makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev libdbusmenu-qt-dev sonnet-dev kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev cmake boost-dev" langdir="/usr/share/quassel/translations" -subpackages="$pkgname-core $pkgname-client $pkgname-lang" +subpackages="$pkgname-core $pkgname-client $pkgname-lang $pkgname-libs" source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2" # secfixes: @@ -62,13 +62,38 @@ client() { mkdir -p "$subpkgdir"/usr/share/quassel mv "$pkgdir"/usr/share/quassel/stylesheets \ "$subpkgdir"/usr/share/quassel/ + mv "$pkgdir"/usr/share/quassel/icons \ + "$subpkgdir"/usr/share/quassel/ + + mkdir -p "$subpkgdir"/usr/lib + for component in client qtui uisupport; do + mv "$pkgdir"/usr/lib/libquassel-$component.* \ + "$subpkgdir"/usr/lib/ + done } core() { pkgdesc="Modern, cross-platform IRC daemon (core only)" depends="" + mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/quasselcore "$subpkgdir"/usr/bin/ + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libquassel-core* "$subpkgdir"/usr/lib/ +} + +libs() { + pkgdesc="Modern, cross-platform IRC daemon (libraries)" + depends="" + + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libquassel-common* "$subpkgdir"/usr/lib/ + + mkdir -p "$subpkgdir"/usr/share/quassel + for component in networks.ini scripts; do + mv "$pkgdir"/usr/share/quassel/$component \ + "$subpkgdir"/usr/share/quassel/ + done } sha512sums="ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f quassel-0.14.0.tar.bz2" diff --git a/user/r/APKBUILD b/user/r/APKBUILD index b41cd4411..25d44ef4d 100644 --- a/user/r/APKBUILD +++ b/user/r/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=r pkgver=4.2.3 -pkgrel=0 +pkgrel=1 pkgdesc="Environment for statistical computing and graphics" url="https://www.r-project.org/" arch="all" diff --git a/user/range-v3/APKBUILD b/user/range-v3/APKBUILD index 3221286be..84c9f8091 100644 --- a/user/range-v3/APKBUILD +++ b/user/range-v3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=range-v3 -pkgver=0.10.0 +pkgver=0.12.0 pkgrel=0 pkgdesc="Range library for C++" url="http://ericniebler.com/2018/12/05/standard-ranges/" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723 range-v3-0.10.0.tar.gz" +sha512sums="b8b632b8e0f2a3234ef61813212c237f648cd741e816ca57bd86f82f6459f7d755e2b70361d2aa43847874fb546a31a792ab1c3ba90292818ae7313438dc62d0 range-v3-0.12.0.tar.gz" diff --git a/user/raptor2/APKBUILD b/user/raptor2/APKBUILD index 2b7d49af2..2f10958cd 100644 --- a/user/raptor2/APKBUILD +++ b/user/raptor2/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=raptor2 pkgver=2.0.15 -pkgrel=2 +pkgrel=3 pkgdesc="RDF parser/serializer toolkit for Redland" url="https://www.librdf.org/raptor" arch="all" @@ -15,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://download.librdf.org/source/$pkgname-$pkgver.tar.gz CVE-2017-18926.patch CVE-2020-25713.patch + fix-checked-field-issue.patch " prepare() { @@ -48,4 +49,5 @@ package() { sha512sums="563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee raptor2-2.0.15.tar.gz 82f2f7ea4b72aa2bf444013a81db3cb17fcce2ae650bdb22eaab00d6d5cf7f950f7a550ffff49348db878f90f2753b407e6026d08d543cd0757c1687c6dad159 CVE-2017-18926.patch -6e7297bb786dd490202f9790e148b298380c1e47faa4970cb7efcd85fcea99eaa5f53e1c66627be9f7f42f6f27a3b1df94357c9db51abf8ed14727343d584f08 CVE-2020-25713.patch" +6e7297bb786dd490202f9790e148b298380c1e47faa4970cb7efcd85fcea99eaa5f53e1c66627be9f7f42f6f27a3b1df94357c9db51abf8ed14727343d584f08 CVE-2020-25713.patch +97ab7b8be0471d2b123603a2cf60a07508dcdacc0a14965dcf4dfe42a1b57e8baecd3488471aac7cd39d203cefbbc966c8ec492cfaafda62ebf2c80bf6c85f34 fix-checked-field-issue.patch" diff --git a/user/raptor2/fix-checked-field-issue.patch b/user/raptor2/fix-checked-field-issue.patch new file mode 100644 index 000000000..23f7fb1a7 --- /dev/null +++ b/user/raptor2/fix-checked-field-issue.patch @@ -0,0 +1,19 @@ +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8e..8bcee139 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ +-- +2.41.0 diff --git a/user/rdfind/APKBUILD b/user/rdfind/APKBUILD new file mode 100644 index 000000000..593bf3cf2 --- /dev/null +++ b/user/rdfind/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=rdfind +pkgver=1.6.0 +pkgrel=0 +pkgdesc="A tool for finding duplicate files" +url="https://rdfind.pauldreik.se/" +arch="all" +license="GPL-2.0+" +depends="" +checkdepends="cmd:which" +makedepends="nettle-dev" +subpackages="$pkgname-doc" +source="https://rdfind.pauldreik.se/rdfind-$pkgver.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="21d135551bd2d71a71dfe1e4faece6e980db3df18f34433b7b0a5da9e21ccc9067337892025afa9b4b1fd6069732a144b5b7b8e0441cbc9821a71a8b934cced1 rdfind-1.6.0.tar.gz" diff --git a/user/readstat/APKBUILD b/user/readstat/APKBUILD index bb9926267..1ce3b3249 100644 --- a/user/readstat/APKBUILD +++ b/user/readstat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=readstat -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=0 pkgdesc="Command-line tool for converting stats package files" url=" " @@ -9,7 +9,11 @@ license="MIT" depends="" makedepends="zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -source="https://github.com/WizardMac/ReadStat/releases/download/v$pkgver/readstat-$pkgver.tar.gz" +source="https://github.com/WizardMac/ReadStat/releases/download/v$pkgver/readstat-$pkgver.tar.gz + use-after-free.patch + buf-overflow.patch + big-endian.patch + " build() { ./configure \ @@ -35,4 +39,7 @@ libs() { default_libs } -sha512sums="0b6278c2f1acae2cb6c509dbf730b121e1d8cd6e53736f060c0b79ba5fbcf56e1c4ac39568d21e90f537a0bae0341d702421eb768d384f8891f6486b7c6c2f1f readstat-1.1.8.tar.gz" +sha512sums="1034d2ca4f45a5b93ed1857b9176965a1584c042bfc2316cc93d0a80f589dc55ad6fe01036a6b9a4db36080b2a9876472f9016ce01e015692430dbeb7e26ece0 readstat-1.1.9.tar.gz +b58b0b2d5da107048c4aedbb6a8a0cd7cd3710ac6e6cd5cb759fd149288da24fb2f52022586154eba42d32441ab5a6ec307f895af2875649bb57a4d0473d9a81 use-after-free.patch +cfcad56dfe51b1454010e6cf15961816de8b60f1d5918638b8f1f208d18713db281eb1d915db4cd79fe11d28c82a1c3c23a1a05a079b4071ba2f61c1d0c74dbc buf-overflow.patch +3aad51258a52c13c45bd94c7e12a9ae38923930f03dbbee650d489ef812999de82e8024ec5e74ca4ad191aa90b2c5d8dd983493121c9b874708b3f32419e1146 big-endian.patch" diff --git a/user/readstat/big-endian.patch b/user/readstat/big-endian.patch new file mode 100644 index 000000000..71f1db133 --- /dev/null +++ b/user/readstat/big-endian.patch @@ -0,0 +1,76 @@ +From 0034c8ee693563cbecae8fa8a24d3e8d5dcc6ab1 Mon Sep 17 00:00:00 2001 +From: Evan Miller <emmiller@gmail.com> +Date: Sat, 4 May 2024 08:50:28 -0400 +Subject: [PATCH] [SAS7BCAT writer] big-endian architecture fix + +Closes #302 +--- + src/sas/readstat_sas7bcat_write.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/sas/readstat_sas7bcat_write.c b/src/sas/readstat_sas7bcat_write.c +index 6544798c..9642fdad 100644 +--- a/src/sas/readstat_sas7bcat_write.c ++++ b/src/sas/readstat_sas7bcat_write.c +@@ -63,7 +63,8 @@ static sas7bcat_block_t *sas7bcat_block_for_label_set(readstat_label_set_t *r_la + + for (j=0; j<r_label_set->value_labels_count; j++) { + readstat_value_label_t *value_label = readstat_get_value_label(r_label_set, j); +- lbp1[2] = 24; // size - 6 ++ int16_t value_entry_len = 24; // size - 6 ++ memcpy(&lbp1[2], &value_entry_len, sizeof(int16_t)); + int32_t index = j; + memcpy(&lbp1[10], &index, sizeof(int32_t)); + if (r_label_set->type == READSTAT_TYPE_STRING) { +@@ -86,7 +87,7 @@ static sas7bcat_block_t *sas7bcat_block_for_label_set(readstat_label_set_t *r_la + memcpy(&lbp2[8], &label_len, sizeof(int16_t)); + memcpy(&lbp2[10], value_label->label, label_len); + +- lbp1 += 30; ++ lbp1 += 6 + value_entry_len; + lbp2 += 8 + 2 + value_label->label_len + 1; + } + +From 29aac3db79a5da20d1d1dcbb54a587c5ba51e7b3 Mon Sep 17 00:00:00 2001 +From: Evan Miller <emmiller@gmail.com> +Date: Sat, 4 May 2024 10:35:27 -0400 +Subject: [PATCH] [SAS7BCAT writer] more big-endian fixes + +--- + src/sas/readstat_sas7bcat_write.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/sas/readstat_sas7bcat_write.c b/src/sas/readstat_sas7bcat_write.c +index 9642fda..c25fec0 100644 +--- a/src/sas/readstat_sas7bcat_write.c ++++ b/src/sas/readstat_sas7bcat_write.c +@@ -46,7 +46,8 @@ static sas7bcat_block_t *sas7bcat_block_for_label_set(readstat_label_set_t *r_la + memcpy(&block->data[38], &count, sizeof(int32_t)); + memcpy(&block->data[42], &count, sizeof(int32_t)); + if (name_len > 8) { +- block->data[2] = (char)0x80; ++ int16_t flags = 0x80; ++ memcpy(&block->data[2], &flags, sizeof(int16_t)); + memcpy(&block->data[8], name, 8); + + memset(&block->data[106], ' ', 32); +@@ -139,16 +140,15 @@ static readstat_error_t sas7bcat_begin_data(void *writer_ctx) { + + // Page 1 + char *xlsr = &page[856]; +- int16_t block_idx, block_off; +- block_idx = 4; +- block_off = 16; ++ int32_t block_idx = 4; ++ int16_t block_off = 16; + for (i=0; i<writer->label_sets_count; i++) { + if (xlsr + 212 > page + hinfo->page_size) + break; + + memcpy(&xlsr[0], "XLSR", 4); + +- memcpy(&xlsr[4], &block_idx, sizeof(int16_t)); ++ memcpy(&xlsr[4], &block_idx, sizeof(int32_t)); + memcpy(&xlsr[8], &block_off, sizeof(int16_t)); + + xlsr[50] = 'O'; diff --git a/user/readstat/buf-overflow.patch b/user/readstat/buf-overflow.patch new file mode 100644 index 000000000..f3766bb24 --- /dev/null +++ b/user/readstat/buf-overflow.patch @@ -0,0 +1,26 @@ +From c7baae72b36acdc24f56ad48d3e859850fdbdc2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= <csardi.gabor@gmail.com> +Date: Sat, 17 Feb 2024 21:23:14 +0100 +Subject: [PATCH] Fix a buffer overflow (#311) + +It happens if raw_str_used underflows and ends up a very large number, +which is then used as the size of a string. + +Closes #285. +--- + src/spss/readstat_sav_read.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/spss/readstat_sav_read.c b/src/spss/readstat_sav_read.c +index 7f49490..460bf07 100644 +--- a/src/spss/readstat_sav_read.c ++++ b/src/spss/readstat_sav_read.c +@@ -717,7 +717,7 @@ static readstat_error_t sav_process_row(unsigned char *buffer, size_t buffer_len + } + if (++offset == col_info->width) { + if (++segment_offset < var_info->n_segments) { +- raw_str_used--; ++ if (raw_str_used > 0) raw_str_used--; + } + offset = 0; + col++; diff --git a/user/readstat/use-after-free.patch b/user/readstat/use-after-free.patch new file mode 100644 index 000000000..70ea38ffd --- /dev/null +++ b/user/readstat/use-after-free.patch @@ -0,0 +1,37 @@ +From 718d49155e327471ed9bf4a8c157f849f285b46c Mon Sep 17 00:00:00 2001 +From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de> +Date: Wed, 20 Sep 2023 15:18:07 +0200 +Subject: [PATCH] Fix use after free (#298) + +--- + src/bin/readstat.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/bin/readstat.c b/src/bin/readstat.c +index 48b8fdd..e3fbbd1 100644 +--- a/src/bin/readstat.c ++++ b/src/bin/readstat.c +@@ -397,8 +397,6 @@ static int convert_file(const char *input_filename, const char *catalog_filename + module->finish(rs_ctx->module_ctx); + } + +- free(rs_ctx); +- + if (error != READSTAT_OK) { + if (file_exists) { + fprintf(stderr, "Error opening %s: File exists (Use -f to overwrite)\n", output_filename); +@@ -406,9 +404,14 @@ static int convert_file(const char *input_filename, const char *catalog_filename + fprintf(stderr, "Error processing %s: %s\n", rs_ctx->error_filename, readstat_error_message(error)); + unlink(output_filename); + } ++ ++ free(rs_ctx); ++ + return 1; + } + ++ free(rs_ctx); ++ + return 0; + } + diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD index 0a6f287d8..2d58b308b 100644 --- a/user/redis/APKBUILD +++ b/user/redis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: V.Krishn <vkrishn4@gmail.com> # Maintainer: Alyx Wolcott <alyx@leuhta.com> pkgname=redis -pkgver=6.0.16 +pkgver=7.2.5 pkgrel=0 pkgdesc="Advanced key-value store" url="https://redis.io/" @@ -79,7 +79,7 @@ package() { install } -sha512sums="83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845 redis-6.0.16.tar.gz +sha512sums="e064a0f380e3a00ab8eb2f10ed7317fd6aa27d64cf00792fab80465036f92d17b166050e71b8a779fdf024528ac736cb54722316811f99951c4e386f4ab2245d redis-7.2.5.tar.gz f768acea3e1868dbf0596085640c83e58d899860d7d647b0965fa858844c494d0a49b229fb417456d83f3e2690e5450950c31e0fa40529df85a9cde38d8981c4 fix-ppc-atomics.patch 856ae98e9e8670801827c3bd793dc14ed2c62c37365f8d04b452d7e1ab97300a0bf18c59b52ea686c2689d53aeed8e29e2c55207d3d4fb1fd8fc7fc820f33157 posix-runtest.patch 91b663f802aea9a473195940d3bf2ce3ca2af4e5b6e61a2d28ebbfe502ef2c764b574b7e87c49e60345d1a5d6b73d12920924c93b26be110c2ce824023347b6f redis.initd diff --git a/user/rendercheck/APKBUILD b/user/rendercheck/APKBUILD index 10ba7f50c..daec31c89 100644 --- a/user/rendercheck/APKBUILD +++ b/user/rendercheck/APKBUILD @@ -1,34 +1,30 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rendercheck -pkgver=1.5 +pkgver=1.6 pkgrel=0 pkgdesc="X11 Render extension testing and debugging utility" url="https://www.X.Org/" arch="all" +options="!check" # no test suite license="MIT" depends="" -makedepends="libx11-dev libxrender-dev util-macros xorgproto-dev" +makedepends="libx11-dev libxrender-dev xorgproto-dev libxext-dev meson" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/rendercheck-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/test/rendercheck-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check + meson setup \ + -Dprefix=/usr \ + -Dsysconfdir=/etc \ + -Dmandir=/usr/share/man \ + -Dlocalstatedir=/var \ + build + meson compile -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616 rendercheck-1.5.tar.bz2" +sha512sums="0cc5372a318d4a28d63d82a2efc42f15b810186ce91b226bc5b962520637b628b1ae991a9e7745f8239c4fd100bf8f8eab79bc3803a01cad6827022af49be1a3 rendercheck-1.6.tar.xz" diff --git a/user/ripgrep/APKBUILD b/user/ripgrep/APKBUILD index 5fbb25b33..bed8032f8 100644 --- a/user/ripgrep/APKBUILD +++ b/user/ripgrep/APKBUILD @@ -2,86 +2,76 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=ripgrep -pkgver=11.0.2 -pkgrel=1 +pkgver=14.1.0 +pkgrel=0 pkgdesc="Recursively searches directories for a regex pattern" url="https://github.com/BurntSushi/ripgrep" arch="all" license="Unlicense" depends="" makedepends="cargo pcre2-dev" -subpackages="$pkgname-zsh-completion:_zshcomp:noarch" +subpackages="" source="" # dependencies taken from Cargo.lock cargo_deps=" -$pkgname-$pkgver -aho-corasick-0.7.4 -atty-0.2.13 -base64-0.10.1 -bitflags-1.1.0 -bstr-0.2.6 -bytecount-0.5.1 -byteorder-1.3.2 -cc-1.0.38 -cfg-if-0.1.9 -clap-2.33.0 -crossbeam-channel-0.3.9 -crossbeam-utils-0.6.6 -encoding_rs-0.8.17 -encoding_rs_io-0.1.6 -fnv-1.0.6 -fs_extra-1.1.0 -globset-0.4.4 -grep-0.2.4 -grep-cli-0.1.3 -grep-matcher-0.1.3 -grep-pcre2-0.1.3 -grep-printer-0.1.3 -grep-regex-0.1.4 -grep-searcher-0.1.5 -ignore-0.4.9 -itoa-0.4.4 -jemalloc-sys-0.3.2 -jemallocator-0.3.2 -lazy_static-1.3.0 -libc-0.2.60 -log-0.4.8 -memchr-2.2.1 -memmap-0.7.0 -num_cpus-1.10.1 -packed_simd-0.3.3 -pcre2-0.2.1 -pcre2-sys-0.2.2 -pkg-config-0.3.15 -proc-macro2-0.4.30 -quote-0.6.13 -regex-1.2.0 -regex-automata-0.1.8 -regex-syntax-0.6.10 -ryu-1.0.0 -same-file-1.0.5 -serde-1.0.98 -serde_derive-1.0.98 -serde_json-1.0.40 -strsim-0.8.0 -syn-0.15.42 -termcolor-1.0.5 -textwrap-0.11.0 -thread_local-0.3.6 -ucd-util-0.1.5 -unicode-width-0.1.5 -unicode-xid-0.1.0 -utf8-ranges-1.0.3 -walkdir-2.2.9 -winapi-0.3.7 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.2 -winapi-x86_64-pc-windows-gnu-0.4.0 -wincolor-1.0.1 +$pkgname $pkgver +aho-corasick 1.1.2 +anyhow 1.0.79 +autocfg 1.1.0 +bstr 1.9.0 +cc 1.0.83 +cfg-if 1.0.0 +crossbeam-deque 0.8.4 +crossbeam-epoch 0.9.17 +crossbeam-utils 0.8.18 +encoding_rs 0.8.33 +encoding_rs_io 0.1.7 +globset 0.4.14 +grep 0.3.1 +grep-cli 0.1.10 +grep-matcher 0.1.7 +grep-pcre2 0.1.7 +grep-printer 0.2.1 +grep-regex 0.1.12 +grep-searcher 0.1.13 +ignore 0.4.22 +itoa 1.0.10 +jemalloc-sys 0.5.4+5.3.0-patched +jemallocator 0.5.4 +jobserver 0.1.27 +lexopt 0.3.0 +libc 0.2.151 +libm 0.2.8 +log 0.4.20 +memchr 2.7.1 +memmap2 0.9.3 +num-traits 0.2.17 +packed_simd 0.3.9 +pcre2 0.2.6 +pcre2-sys 0.2.8 +pkg-config 0.3.28 +proc-macro2 1.0.76 +quote 1.0.35 +regex-automata 0.4.3 +regex-syntax 0.8.2 +ryu 1.0.16 +same-file 1.0.6 +serde 1.0.195 +serde_derive 1.0.195 +serde_json 1.0.111 +syn 2.0.48 +termcolor 1.4.0 +textwrap 0.16.0 +unicode-ident 1.0.12 +walkdir 2.4.0 +winapi 0.3.9 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-util 0.1.6 +winapi-x86_64-pc-windows-gnu 0.4.0 " -source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" prepare() { export CARGO_HOME="$srcdir/cargo-home" @@ -90,7 +80,7 @@ prepare() { (builddir=$srcdir; default_prepare) mkdir -p "$CARGO_VENDOR" - cat <<- EOF > "$CARGO_HOME/config" + cat <<- EOF > "$CARGO_HOME/config.toml" [source.adelie] directory = "${CARGO_VENDOR}" @@ -99,7 +89,7 @@ prepare() { local-registry = "/nonexistant" EOF - for _dep in $cargo_deps; do + for _dep in $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2#g'); do ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" @@ -127,75 +117,57 @@ package() { cargo install --no-track --features pcre2 --path . --root="$pkgdir"/usr } -_zshcomp() { - pkgdesc="ZSH completion for ripgrep" - license="BSD-3-Clause" - install_if="$pkgname=$pkgver-r$pkgrel zsh" - - install -Dm0755 $builddir/complete/_rg "$subpkgdir"/usr/share/zsh/site-functions/_rg -} - -sha512sums="8a9e75ad442bc12a6b189eca39b09e890a2bbf6d9b3b55515517c97201bea8577851da443a108fe7524ec4bbe35ea624aca9c872ab31d991baab282e7265383c ripgrep-11.0.2.tar.gz -06863d85a3183c7ace014d6a8345d47147df53475c194030607314b80e00890625ae88e3e669d15e54704f2d3132dd6bf56dc057b87dab7f06c5deaf50d29b79 aho-corasick-0.7.4.tar.gz -4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz -674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 base64-0.10.1.tar.gz -e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz -e5a4dd8061208bd153052fc991d827e96f5d3358ffde84c68d4fcee4ef5ec65de4482795f4d4fcdd5b2b4cea4b69a7e35e369f09a476ab536ecec54aa8d051d4 bstr-0.2.6.tar.gz -9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9 bytecount-0.5.1.tar.gz -2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f byteorder-1.3.2.tar.gz -0d08ddd3f30c52eaca8195f9cd473ce3fdde6c6788481a33a8970c842781ce1eeb521023291f75d7c03279f524e8739abf3cc66f51ebf6e68945626589f37d30 cc-1.0.38.tar.gz -45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz -f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz -4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919 crossbeam-channel-0.3.9.tar.gz -771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5 crossbeam-utils-0.6.6.tar.gz -db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453 encoding_rs-0.8.17.tar.gz -ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9 encoding_rs_io-0.1.6.tar.gz -f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 fnv-1.0.6.tar.gz -c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a fs_extra-1.1.0.tar.gz -b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985 globset-0.4.4.tar.gz -c6983df9dcc268bc9835173189afc28ffec9dd234a0949389a40629e5644707b7c1b90025882c2580cc5f963fc4902070b191ecc6cacd602fa4c140ee8bdfbd1 grep-0.2.4.tar.gz -5867afd60939e24b7baa848f72342fc7cf927f198b7c945a00a93c8c504f18fdc75adbb1f28ad559dd7bb301ace6bd2641a79d138c5f742c366d9cd7a3452da9 grep-cli-0.1.3.tar.gz -74a9786be82cbda9f446aef20752afcf7796d91eac5a6b12060fe844ccd676c5f9097332828c267690eaf814356ebcb4dd2f4a674e32e57d39c3914c9ca399ec grep-matcher-0.1.3.tar.gz -49777885abbf028ac7845d76faf4d1f566d7551e71cdd9788bcc237f110d1f77fb438c42e965ec0b3b2943022acf0fd1b28f7b6e5ed3bf20525476eb9e9aa749 grep-pcre2-0.1.3.tar.gz -99ee04909054b1a63890de3711c6c09e8ba206a9a30a2f61e2f8b82a23f8b8711cf00102d5aaae2b6b965b6a7c01e09380254841e94fa7d3dbaf63f5c03a854e grep-printer-0.1.3.tar.gz -7756cb4e448246186c49a0246084d634f9194259899efe3eb078a09917e350da7e37d5e03187c55ab5da23e265b4912cdfceb8bd23fe27bbbc2e5a9cda562cc0 grep-regex-0.1.4.tar.gz -ac09b3e7dacfd2ad3587c23fee858d9c726b21e638ddb6f9c4b992649911400e3ec44c2b90d13fb8212ae38d3a8ff38220cc922af76c1291b8fa2e9dd098fb16 grep-searcher-0.1.5.tar.gz -e1ab4c2708a1301156b9da6f084c9b8cc7e9a2c8a657043cc6c47d4fe235d5241761c4c1bbb9bb9e65655134fea1320398d67855bfdd595c87d94ee90c480b38 ignore-0.4.9.tar.gz -f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz -b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647 jemalloc-sys-0.3.2.tar.gz -e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6 jemallocator-0.3.2.tar.gz -08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822 lazy_static-1.3.0.tar.gz -649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c libc-0.2.60.tar.gz -0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz -0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d memchr-2.2.1.tar.gz -3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa memmap-0.7.0.tar.gz -f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd num_cpus-1.10.1.tar.gz -f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826 packed_simd-0.3.3.tar.gz -6e9a0d60c8bc633d4f19fbbb3934f86bd95e34dcfec8aad55dae5ebe4ed854dcb42ad265f4b0ed5c1a8683a032268bb38b2c3899d25428311cebf97789c62d0a pcre2-0.2.1.tar.gz -cae12d44a43c05b2303f230112f8cce349141a697a0ed7ab8b9acc1a812f8ae8db156dfdcf40eae3b51c143b31cbf842dddcb133eb7e0430ef78cf36906ff652 pcre2-sys-0.2.2.tar.gz -645aed8e24ce99085e4f152eac511df50646f17705d57bd8566e70e17c18bd6b05001479c94b2425e45c67d4f84797784053a8299957a1492289853755a7867d pkg-config-0.3.15.tar.gz -73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz -bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e quote-0.6.13.tar.gz -ed4317e4b91b91b4807daa56d8070a5cba5f99ecbaa23b78b92438d19415f38dc1befb11e8b5ade63cd1b392fb83778350583cf531c374303c6f3405e6b4784d regex-1.2.0.tar.gz -41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a regex-automata-0.1.8.tar.gz -30b5cc9887210c5594d57be7f05e25475b56732c9a0be02452aacf80b456f12450b63f4acbb67badb3ad16f22d244431f5bcf5ee30b9ce8f35dcdeddf3972175 regex-syntax-0.6.10.tar.gz -b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0 ryu-1.0.0.tar.gz -33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc same-file-1.0.5.tar.gz -a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7 serde-1.0.98.tar.gz -16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece serde_derive-1.0.98.tar.gz -d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842 serde_json-1.0.40.tar.gz -1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz -b2feecfb9d05e2d2a184d92ae78f873147e4950641dfc9300988d6974a85a63690c41bf22ecede2a2ac8e45ffe41b13011e5eaa82be5ce6037b40b9b247bd989 syn-0.15.42.tar.gz -d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca termcolor-1.0.5.tar.gz -f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz -cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz -14de9b370a49fe6fcce871e223daa257ca5e50e3d8cdfa3c6800db89ec4a0e6bac55e2b73990768fbc2a13a16d77c8b59015c4c4fe413735e7c893ac3651f5b3 ucd-util-0.1.5.tar.gz -bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz -cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz -24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8 utf8-ranges-1.0.3.tar.gz -43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b walkdir-2.2.9.tar.gz -6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz +sha512sums="eb0234269164758d6a9051f405771f259636a79094aeee0b667931747c1c3f0f03a764b3eab0be227b8242923a5777b1a6ef31fdd410f4ba4c674764e4fac1fa ripgrep-14.1.0.tar.gz +61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c aho-corasick-1.1.2.tar.gz +ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 anyhow-1.0.79.tar.gz +df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f autocfg-1.1.0.tar.gz +dc313a16c38ad881128977a20bb390e7c95a96d9530596433a7c4fd7f77d5fffd079d436006dd8d2bfc4aacdd7f0aff229504444250418f6aa3f8d6d4df9abba bstr-1.9.0.tar.gz +742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 cc-1.0.83.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +cc036613727a3aa8933bec419ba8a5fd2f506770ad2cf874ff757b048e0d29ea3f1b0e2b72d2d5352ed4b62c6764c7bbb10d0d4e217176da26bf5ae4bca0b68b crossbeam-deque-0.8.4.tar.gz +9bdeb0415ea26250547ed9f34a8dd4c17f9379e3c56f8f17315e48f9bf63ce1b79c37786ead0f4df026e31b0b5965d181c36839d891c14149529ac42b5cedea4 crossbeam-epoch-0.9.17.tar.gz +977f41d7596a8d206fab665570f155479e15a83698fa54e714305d56ce32d78abc6f778b5f6e3c379ed1da27e241639cf4d0cd12922383f774ae85b32a4dc550 crossbeam-utils-0.8.18.tar.gz +20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc encoding_rs-0.8.33.tar.gz +0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c encoding_rs_io-0.1.7.tar.gz +e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc globset-0.4.14.tar.gz +2ce36f84a561f5a66b67e2f0b79ecb9d7a3220fd48f4b0215c4964d2e686f096aa52890b79ae770f4857a1393a2e482750e171606a1c25f1cc6295bf439d694f grep-0.3.1.tar.gz +057bc0192bc2dab55babdc40c94d421f2e30d3001801469480bbdd77eeee896c3b4a2f17e7a648e7d21f178636ab1363eb3b3abbd3a6e453d07d1c2d60a53112 grep-cli-0.1.10.tar.gz +bc15eec0b6f409926099f2aa46f040c8de240e50537358a50d12ce7cfaff4894ec43910d2e01ec087c2c0777773ef25e2f0d653c33a59c5162e23e85e76ec9f8 grep-matcher-0.1.7.tar.gz +2efcf39decd5472fedde41bc73be15e3145bf860aa8b5635f7c0fd47bcd8498ad75a32f8ec09cac872eaea7c4bcc14ee22be9612f0415d9fb0a86f041567cf92 grep-pcre2-0.1.7.tar.gz +2dc876143cd8480dd2cc4be5397de21eaddd5cce4a23494a5a68c8d9814d0cdec01fd14d5cd6aa23a17b3a43fcfc2843d4057b5dce144dd1cb7a936c53ee326d grep-printer-0.2.1.tar.gz +95df80807aa14cdbefa4d8d8cb8fd91263fe26009ba3ecb4a30acff1332bd51b87c94935a489405c6bf98e76126a5a06cfe7f5b677001da4e18c18375c00f142 grep-regex-0.1.12.tar.gz +8e7ecbcbe09f5a57fad71e0010d2cc29f3b622bf6ff80cd2d75a8898b43ec7ca43a1d8efb4921032f865a81c38176c694faf6627cc747350a31510bef662cf9f grep-searcher-0.1.13.tar.gz +9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9 ignore-0.4.22.tar.gz +fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 itoa-1.0.10.tar.gz +b81c75efa70b869abe08c0805fd9545436ccd4e6ce24bb7355c1b3684a03bbf234af0680854f3fd9b519e7d59296d32ef04497a1f45584ed8de462e4e21d60c1 jemalloc-sys-0.5.4+5.3.0-patched.tar.gz +23b0107ce5fa6a31cbe2cd07beeee973543c1e5f6f2a57fde5a313dfdf0b7138a0675fd00b1b4823d60eeffe02b9159d0261579c9ee4ce4246fcf799f9c1f853 jemallocator-0.5.4.tar.gz +2681234952be7a5ae67770d45f4d52e8278347f79b349bda594626712b1fba595a4cf46e8fb5426b548c325a23243facf7fbdc01ae0e853e492aff39444879a5 jobserver-0.1.27.tar.gz +7ce3856a54fa6274ea3d5a4fe353f4a0411f5f6754fe8a5e7a114705f063300a93aa2efad765bc1dd0244caee15a8cf44a3de540a4db0626ed2ac6476bdb6843 lexopt-0.3.0.tar.gz +2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec libc-0.2.151.tar.gz +753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5 libm-0.2.8.tar.gz +8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e log-0.4.20.tar.gz +5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 memchr-2.7.1.tar.gz +025068aaf27296731c3a4fd8df3b745cd37e86a564aa5ab9a8eccddb99fa054820eff5a6a858c3f443666bf594b149c84045f43a555353286b066b3f1ff514cf memmap2-0.9.3.tar.gz +4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e num-traits-0.2.17.tar.gz +1336ed8aee50a580784f38388f0cc2f0a8639149333e94b7f83aa7cc314a80c60b66ac203a7302cd4cf01f3d0b89da58d2ce9038b7685840fbc1b758217dbd1b packed_simd-0.3.9.tar.gz +101a0c4f1300ef7184aafba9048e0a7ad310d86d5236871e2b2477d4cedb23ac8bd6c6cd48970145eccbfb684f3efb5a80100e056e0c6052bc6fdbc4ad308317 pcre2-0.2.6.tar.gz +4f0b21a0dff41ccbfb1dd6387d63b066e71002a7b96f76d8ab5ff34c056cd862337c1ef08daf30436fdf68eba4eb98f6e8a1ad6d2903e2e348ed9b85e2a7f616 pcre2-sys-0.2.8.tar.gz +1ef92c5cf5320fb2e7d9e337edae08eaef01c762cb18406f732af731e5a94bef95be36cc0e0f5643f47a925aa127c5520a961c034e7b86357715656707a6e0e4 pkg-config-0.3.28.tar.gz +2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247 proc-macro2-1.0.76.tar.gz +f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 quote-1.0.35.tar.gz +4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 regex-automata-0.4.3.tar.gz +301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 regex-syntax-0.8.2.tar.gz +89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 ryu-1.0.16.tar.gz +3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c same-file-1.0.6.tar.gz +0002ecb933d08fbdc8585ee74efb4048d385459f629261f5a4a8401b794f1c02b8296db79f479013a0b2a47ba99bee6c02d60d0fc2454e32f1b038b4071e8727 serde-1.0.195.tar.gz +8a82ae4e7cfe0c3ac27688cc95d74bf4c2e10c1fe845ab28fb57579b2f47f36d13218c2ae603f93f00114065d47c3e46166dea39b205be673f443c34305dacce serde_derive-1.0.195.tar.gz +11851e34a9a40de32654a12ada1d1bd01abb11531c5804f5d0747bbb01bf59025dd92be916104fbc278bbba5c89c77920941b83c0ac2f0da23f5d61a7788e83f serde_json-1.0.111.tar.gz +926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 syn-2.0.48.tar.gz +36c8550fe85cb90c4fdd1a6e3f60b42b6c71f65b6128da97d5ad6aac8350d907410899ad4a47bb4dc72ea6d00bc69e5a1ccc80ee9b0e80a1a27912e233f3e416 termcolor-1.4.0.tar.gz +97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 textwrap-0.16.0.tar.gz +bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 unicode-ident-1.0.12.tar.gz +09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9 walkdir-2.4.0.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz -54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a winapi-util-0.1.2.tar.gz -4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz -f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1 wincolor-1.0.1.tar.gz" +b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 winapi-util-0.1.6.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz" diff --git a/user/rspamd/10-conf-split-workers.patch b/user/rspamd/10-conf-split-workers.patch index 505d2c72e..be8f073e4 100644 --- a/user/rspamd/10-conf-split-workers.patch +++ b/user/rspamd/10-conf-split-workers.patch @@ -36,7 +36,7 @@ upgrading the aport! - -worker "fuzzy" { - bind_socket = "localhost:11335"; -- count = -1; # Disable by default +- count = -1; # Disable by default, see #4677 for details - .include "$CONFDIR/worker-fuzzy.inc" - .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc" - .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc" diff --git a/user/rspamd/APKBUILD b/user/rspamd/APKBUILD index 2c9699529..e4d36f982 100644 --- a/user/rspamd/APKBUILD +++ b/user/rspamd/APKBUILD @@ -5,11 +5,12 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=rspamd -pkgver=3.2 +pkgver=3.11.1 pkgrel=0 pkgdesc="Fast, free and open-source spam filtering system" url="https://rspamd.com/" arch="all" +options="!check" # Tests require LuaJIT's ffi module license="Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND LGPL-2.1+ AND LGPL-3.0-only AND MIT AND Zlib" pkgusers="rspamd" pkggroups="rspamd" @@ -21,7 +22,9 @@ makedepends=" file-dev glib-dev icu-dev + libarchive-dev libevent-dev + libexecinfo-dev libgd-dev libsodium-dev lua5.3 @@ -31,6 +34,7 @@ makedepends=" perl ragel sqlite-dev + zstd-dev " install="$pkgname.pre-install" subpackages=" @@ -38,24 +42,29 @@ subpackages=" $pkgname-client $pkgname-libs $pkgname-utils::noarch - $pkgname-controller::noarch - $pkgname-fuzzy::noarch - $pkgname-proxy::noarch $pkgname-openrc $pkgname-dbg " +ldpath="/usr/lib/rspamd" source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgver.tar.gz $pkgname.logrotated $pkgname.initd $pkgname.confd - 10-conf-split-workers.patch " +provides=" + rspamd-controller=$pkgver-r$pkgrel + rspamd-fuzzy=$pkgver-r$pkgrel + rspamd-proxy=$pkgver-r$pkgrel + " + +replaces="rspamd-controller rspamd-fuzzy rspamd-proxy" + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - cmake -B build \ + LDFLAGS="$LDFLAGS -lexecinfo" cmake -B build \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCONFDIR=/etc/$pkgname \ @@ -65,41 +74,34 @@ build() { -DENABLE_LUAJIT=OFF \ -DLUA_INCLUDE_DIR=/usr/include/lua5.3 \ -DLUA_LIBRARY=/usr/lib/lua5.3/liblua.so \ - -DENABLE_REDIRECTOR=ON \ -DENABLE_URL_INCLUDE=ON \ + -DENABLE_BACKWARD=OFF \ -DENABLE_PCRE2=ON \ + -DENABLE_URL_INCLUDE=ON \ + -DSYSTEM_ZSTD=ON \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ "$CMAKE_CROSSOPTS" . - make -C build + cmake --build build --target all } check() { - make -C build rspamd-test + cmake --build build --target run-test } package() { - make -C build DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build cd "$pkgdir" - local path=usr/bin - for b in rspamd rspamc rspamadm; - do - rm "$path"/$b - mv "$path"/$b-$pkgver "$path"/$b - done - mv "$path"/rspamd_stats "$path"/rspamd-stats - mkdir -p ./usr/sbin - mv usr/bin/rspamd usr/sbin/ - - mkdir -p usr/share/doc/$pkgname - mv usr/share/$pkgname/www/README.md \ - usr/share/doc/$pkgname/ + install -D usr/share/"$pkgname"/www/README.md \ + usr/share/doc/"$pkgname"/README.md + rm usr/share/"$pkgname"/www/README.md install -Dm 644 "$srcdir"/$pkgname.logrotated etc/logrotate.d/$pkgname install -Dm 755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname install -Dm 644 "$srcdir"/$pkgname.confd etc/conf.d/$pkgname + install -d etc/"$pkgname"/local.d etc/"$pkgname"/override.d mkdir -p etc/$pkgname/local.d \ etc/$pkgname/override.d @@ -116,14 +118,14 @@ client() { pkgdesc="$pkgdesc (console client)" mkdir -p "$subpkgdir/usr/bin" - mv "$pkgdir/usr/bin/rspamc" "$subpkgdir/usr/bin/rspamc" + mv "$pkgdir"/usr/bin/rspamc* "$subpkgdir/usr/bin/" } libs() { pkgdesc="$pkgdesc (libraries)" - mkdir -p "$subpkgdir/usr/lib/$subpkgname" - mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$subpkgname/" + mkdir -p "$subpkgdir/usr/lib/$pkgname" + mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$pkgname/" } utils() { @@ -131,42 +133,10 @@ utils() { depends="perl" mkdir -p "$subpkgdir/usr/bin" - mv "$pkgdir/usr/bin/${pkgname}-stats" "$subpkgdir/usr/bin/" - mv "$pkgdir/usr/bin/${pkgname}-redirector" "$subpkgdir/usr/bin/" -} - -fuzzy() { - pkgdesc="$pkgdesc (local fuzzy storage)" - license="Apache-2.0" - depends="$pkgname" - - mkdir -p "$subpkgdir/etc/$pkgname/modules.d" - mv "$pkgdir/etc/$pkgname"/worker-fuzzy.* "$subpkgdir/etc/$pkgname/" - mv "$pkgdir/etc/$pkgname"/modules.d/fuzzy_* "$subpkgdir/etc/$pkgname/modules.d/" -} - -controller() { - pkgdesc="$pkgdesc (controller web interface)" - license="MIT" - depends="$pkgname" - - mkdir -p "$subpkgdir/usr/share/$pkgname" - mv "$pkgdir/usr/share/$pkgname/www" "$subpkgdir/usr/share/$pkgname/www" - mkdir -p "$subpkgdir/etc/$pkgname" - mv "$pkgdir/etc/$pkgname"/worker-controller.* "$subpkgdir/etc/$pkgname/" -} - -proxy() { - pkgdesc="$pkgdesc (milter support)" - license="Apache-2.0" - depends="$pkgname" - - mkdir -p "$subpkgdir/etc/$pkgname" - mv "$pkgdir/etc/$pkgname"/worker-proxy.* "$subpkgdir/etc/$pkgname/" + mv "$pkgdir/usr/bin/${pkgname}"_stats "$subpkgdir/usr/bin/" } -sha512sums="fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79 rspamd-3.2.tar.gz +sha512sums="979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab rspamd-3.11.1.tar.gz 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated -782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3 rspamd.initd -a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd -a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e 10-conf-split-workers.patch" +c136126e3d3953079939b2b0b9b49f5f921af4c3aa0ad59a206632436ff963a69b5980a3b8e4eb14882d8db31d6fd96045a9e1cd6302ad111d76b8e92fab890e rspamd.initd +a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd" diff --git a/user/rspamd/rspamd.initd b/user/rspamd/rspamd.initd index aaa40428b..cf0ea79ab 100644 --- a/user/rspamd/rspamd.initd +++ b/user/rspamd/rspamd.initd @@ -13,7 +13,7 @@ description_reopen="Reopen log files" : ${cfgfile:=${RSPAMD_CONFIG:-/etc/rspamd/rspamd.conf}} : ${startuplog:=${RSPAMD_STARTUPLOG:-/dev/null}} -command="/usr/sbin/rspamd" +command="/usr/bin/rspamd" command_args="--config $cfgfile --no-fork ${command_args:-}" command_background="yes" pidfile="/run/rspamd/$RC_SVCNAME.pid" diff --git a/user/rttr/APKBUILD b/user/rttr/APKBUILD index 58d0bb293..a4e5385db 100644 --- a/user/rttr/APKBUILD +++ b/user/rttr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rttr pkgver=0.9.6 -pkgrel=0 +pkgrel=1 pkgdesc="C++ reflection library" url=" " arch="all" @@ -15,6 +15,11 @@ source="https://github.com/rttrorg/rttr/releases/download/v$pkgver/rttr-$pkgver- dlclose-doesnt-work.patch install-doc.patch permissions.patch + header.patch + clang.patch + no-pessimising-moves.patch + gcc9.patch + show-warnings-not-error-out.patch " build() { @@ -26,7 +31,7 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=class-memaccess -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=class-memaccess -Wno-deprecated-declarations -Wno-pessimizing-move -DNDEBUG" \ ${CMAKE_CROSSOPTS} . make } @@ -43,4 +48,9 @@ sha512sums="7e0d4fa87f83feda0b926d4d0e52aaf0f369f25fe7e23e5ffe86c0bba159e8353cef 559b4d55109b7021082cdd15663075312d80a896325db2b6bba43bf9d3ba17ecc2152aa30617f200be904351c7f8ba188b7e7a6b29a71612b42d48a5a0535aa7 arm64.patch 76efa45715d2a6459ae3cf5a6189de414775eed11a1f6780de563005765139ae6be86e30ead63b5ef8e9a5e84ba77a4ef2b7a75ded7506c6c8d81a696a887ff3 dlclose-doesnt-work.patch 825ca43fb35f6139db13f0b01818b49bb1556a1190ac2941c643e4d438c5b458883fa2ffb64d95625125c251632da7b3d8b703141335df8883b6e186f2e6a349 install-doc.patch -905e4c62093ee3877a8a15a1cbd4bc20499e04916ce869a495cf4ef9f47aa94d56aa5ac861d0ca8b6079f2a3b398f92237dc423e452130f7c40b9a170a8aa625 permissions.patch" +905e4c62093ee3877a8a15a1cbd4bc20499e04916ce869a495cf4ef9f47aa94d56aa5ac861d0ca8b6079f2a3b398f92237dc423e452130f7c40b9a170a8aa625 permissions.patch +75ff5e06f92c94db6b7c04846bfff1dcde22b81831a40ad7533cd93fc9ca300c76ca1266081ac4784bc3b94a8b805db28b841702b10d66232c1110d57c812245 header.patch +3bbdc8feb9b64b4a9f0db138ea0612e3e5a57004fda8b856c30a5f05824009543f396654c6ef3b6e157ce62c7057a239029dd35c749387d9ad91dcc4ac2c00e4 clang.patch +3e7f81db25f0af6a3924e693d30cb5895fbc13dd3eac752d66082ae34c08fc779de086764f63f52170399cb85c5cf87ef182bdc8d8f054fd7f085bc90e779dc8 no-pessimising-moves.patch +2dda29b06484bfad15fefe919bce30ab1b6a6f0b9aec10a09736e1018565151cb675874484b4bb573d27d0742fe5943e002074cfa9f822fc1d3888fd3c8a9dc0 gcc9.patch +f42539edff3b08cf2938a489a9163e3ab81fd43422de1b22a23bae8ef198554f46b5ded4e6f09fb2840fbdd711385563bedcdbb9238569ff7c9484b84eb7bc53 show-warnings-not-error-out.patch" diff --git a/user/rttr/clang.patch b/user/rttr/clang.patch new file mode 100644 index 000000000..9d1a5431b --- /dev/null +++ b/user/rttr/clang.patch @@ -0,0 +1,141 @@ +From 1a357c61e8bc75d6b1a6b8cc88142fbed25a70e9 Mon Sep 17 00:00:00 2001 +From: acki-m <acki-m@users.noreply.github.com> +Date: Fri, 14 Sep 2018 08:50:00 +0200 +Subject: [PATCH] Bugfix clang virtual override warning (#192) + +* fixed missing use of 'override' in classes that use RTTR_ENABLE + +following test case: + +struct s_base +{ +virtual ~s_base() = default; // always use virtual dtor in base class +RTTR_ENABLE() +}; + +struct s_derived : s_base +{ +~s_derived() override = default; +// Clang options require "override" on inherited virtual functions +RTTR_ENABLE(s_base) +}; + +clang warning is: 'get_derived_info' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override] + +The fix is to disable the warning for the usage of RTTR_ENABLE only + +* add test case code in unit test for warning of override inconsistency + +* added missing quotes +--- + src/rttr/detail/base/core_prerequisites.h | 21 +++++++++++++++++-- + src/rttr/rttr_enable.h | 2 ++ + .../property/property_class_inheritance.cpp | 4 ++++ + 3 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/src/rttr/detail/base/core_prerequisites.h b/src/rttr/detail/base/core_prerequisites.h +index d9fc0a22..f60d91c3 100644 +--- a/src/rttr/detail/base/core_prerequisites.h ++++ b/src/rttr/detail/base/core_prerequisites.h +@@ -261,15 +261,21 @@ namespace rttr + # define RTTR_BEGIN_DISABLE_CONDITIONAL_EXPR_WARNING + # define RTTR_END_DISABLE_CONDITIONAL_EXPR_WARNING + #if RTTR_COMP_VER >= 700 +- + #define RTTR_BEGIN_DISABLE_EXCEPT_TYPE_WARNING _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wnoexcept-type\"") + #define RTTR_END_DISABLE_EXCEPT_TYPE_WARNING _Pragma ("GCC diagnostic pop") + #else +- + #define RTTR_BEGIN_DISABLE_EXCEPT_TYPE_WARNING + #define RTTR_END_DISABLE_EXCEPT_TYPE_WARNING ++#endif + ++#if RTTR_COMP_VER >= 510 ++# define RTTR_BEGIN_DISABLE_OVERRIDE_WARNING _Pragma ("GCC diagnostic push") \ ++ _Pragma ("GCC diagnostic ignored \"-Wsuggest-override\"") ++# define RTTR_END_DISABLE_OVERRIDE_WARNING _Pragma ("GCC diagnostic pop") ++# else ++# define RTTR_BEGIN_DISABLE_OVERRIDE_WARNING ++# define RTTR_END_DISABLE_OVERRIDE_WARNING + #endif + + # define RTTR_DECLARE_PLUGIN_CTOR __attribute__((constructor)) +@@ -298,6 +304,15 @@ namespace rttr + # define RTTR_END_DISABLE_EXCEPT_TYPE_WARNING + #endif + ++#if defined(__has_warning) && __has_warning("-Winconsistent-missing-override") ++# define RTTR_BEGIN_DISABLE_OVERRIDE_WARNING _Pragma ("clang diagnostic push") \ ++ _Pragma ("clang diagnostic ignored \"-Winconsistent-missing-override\"") ++# define RTTR_END_DISABLE_OVERRIDE_WARNING _Pragma ("clang diagnostic pop") ++#else ++# define RTTR_BEGIN_DISABLE_OVERRIDE_WARNING ++# define RTTR_END_DISABLE_OVERRIDE_WARNING ++#endif ++ + # define RTTR_DECLARE_PLUGIN_CTOR __attribute__((__constructor__)) + # define RTTR_DECLARE_PLUGIN_DTOR __attribute__((__destructor__)) + +@@ -315,6 +330,8 @@ namespace rttr + # define RTTR_END_DISABLE_EXCEPT_TYPE_WARNING + # define RTTR_DECLARE_PLUGIN_CTOR + # define RTTR_DECLARE_PLUGIN_DTOR ++# define RTTR_BEGIN_DISABLE_OVERRIDE_WARNING ++# define RTTR_END_DISABLE_OVERRIDE_WARNING + + #else + # pragma message("WARNING: unknown compiler, don't know how to disable deprecated warnings") +diff --git a/src/rttr/rttr_enable.h b/src/rttr/rttr_enable.h +index 1bd2e774..93d0fadd 100644 +--- a/src/rttr/rttr_enable.h ++++ b/src/rttr/rttr_enable.h +@@ -81,10 +81,12 @@ + + #define RTTR_ENABLE(...) \ + public:\ ++RTTR_BEGIN_DISABLE_OVERRIDE_WARNING \ + virtual RTTR_INLINE rttr::type get_type() const { return rttr::detail::get_type_from_instance(this); } \ + virtual RTTR_INLINE void* get_ptr() { return reinterpret_cast<void*>(this); } \ + virtual RTTR_INLINE rttr::detail::derived_info get_derived_info() { return {reinterpret_cast<void*>(this), rttr::detail::get_type_from_instance(this)}; } \ + using base_class_list = TYPE_LIST(__VA_ARGS__); \ ++RTTR_END_DISABLE_OVERRIDE_WARNING \ + private: + + #endif // DOXYGEN +diff --git a/src/unit_tests/property/property_class_inheritance.cpp b/src/unit_tests/property/property_class_inheritance.cpp +index 3618ac5c..e10c795c 100644 +--- a/src/unit_tests/property/property_class_inheritance.cpp ++++ b/src/unit_tests/property/property_class_inheritance.cpp +@@ -56,6 +56,7 @@ struct left : virtual top + { + + left() : _p2(true){} ++ ~left() override = default; + bool _p2; + + RTTR_ENABLE(top) +@@ -67,6 +68,7 @@ struct right : virtual top + { + + right() : _p3(true){} ++ ~right() override = default; + bool _p3; + + RTTR_ENABLE(top) +@@ -77,6 +79,7 @@ struct right : virtual top + struct right_2 + { + virtual ~right_2() {} ++ + right_2() : _p4(true){} + bool _p4; + RTTR_ENABLE() +@@ -87,6 +90,7 @@ struct right_2 + struct bottom : left, right, right_2 + { + bottom() : _p5(23.0){} ++ ~bottom() override = default; + + double _p5; + diff --git a/user/rttr/gcc9.patch b/user/rttr/gcc9.patch new file mode 100644 index 000000000..4e438859e --- /dev/null +++ b/user/rttr/gcc9.patch @@ -0,0 +1,103 @@ +From 7edbd580cfad509a3253c733e70144e36f02ecd4 Mon Sep 17 00:00:00 2001 +From: Axel Menzel <info@axelmenzel.de> +Date: Sun, 8 Aug 2021 12:27:15 +0200 +Subject: [PATCH] add github actions workflow & disable gcc9 warnings + +Additional: disable initializer list warning +--- + .github/workflows/linux.yml | 23 +++++++++++++++++++ + src/rttr/detail/base/core_prerequisites.h | 15 ++++++++++++ + src/rttr/detail/variant/variant_data_policy.h | 3 ++- + 3 files changed, 40 insertions(+), 1 deletion(-) + create mode 100644 .github/workflows/linux.yml + +diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml +new file mode 100644 +index 00000000..c232943e +--- /dev/null ++++ b/.github/workflows/linux.yml +@@ -0,0 +1,23 @@ ++name: Linux ++ ++on: [push] ++env: ++ # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) ++ BUILD_TYPE: Release ++ ++jobs: ++ build: ++ runs-on: ubuntu-latest ++ ++ steps: ++ - uses: actions/checkout@v2 ++ - uses: seanmiddleditch/gha-setup-ninja@master ++ ++ - name: Configure CMake ++ run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_EXAMPLES=OFF -G Ninja ++ ++ - name: Build ++ run: cmake --build ${{github.workspace}}/build ++ ++ - name: Test ++ run: cmake --build ${{github.workspace}}/build --target run_tests +diff --git a/src/rttr/detail/base/core_prerequisites.h b/src/rttr/detail/base/core_prerequisites.h +index 6aa29d77..601ddeb9 100644 +--- a/src/rttr/detail/base/core_prerequisites.h ++++ b/src/rttr/detail/base/core_prerequisites.h +@@ -278,6 +278,15 @@ namespace rttr + # define RTTR_END_DISABLE_OVERRIDE_WARNING + #endif + ++#if RTTR_COMP_VER >= 900 ++# define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING _Pragma ("GCC diagnostic push") \ ++ _Pragma ("GCC diagnostic ignored \"-Winit-list-lifetime\"") ++# define RTTR_END_DISABLE_INIT_LIST_WARNING _Pragma ("GCC diagnostic pop") ++# else ++# define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING ++# define RTTR_END_DISABLE_INIT_LIST_WARNING ++#endif ++ + # define RTTR_DECLARE_PLUGIN_CTOR __attribute__((constructor)) + # define RTTR_DECLARE_PLUGIN_DTOR __attribute__((destructor)) + +@@ -313,6 +322,10 @@ namespace rttr + # define RTTR_END_DISABLE_OVERRIDE_WARNING + #endif + ++ ++# define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING ++# define RTTR_END_DISABLE_INIT_LIST_WARNING ++ + # define RTTR_DECLARE_PLUGIN_CTOR __attribute__((__constructor__)) + # define RTTR_DECLARE_PLUGIN_DTOR __attribute__((__destructor__)) + +@@ -332,6 +345,8 @@ namespace rttr + # define RTTR_DECLARE_PLUGIN_DTOR + # define RTTR_BEGIN_DISABLE_OVERRIDE_WARNING + # define RTTR_END_DISABLE_OVERRIDE_WARNING ++# define RTTR_BEGIN_DISABLE_INIT_LIST_WARNING ++# define RTTR_END_DISABLE_INIT_LIST_WARNING + + #else + # pragma message("WARNING: unknown compiler, don't know how to disable deprecated warnings") +diff --git a/src/rttr/detail/variant/variant_data_policy.h b/src/rttr/detail/variant/variant_data_policy.h +index 39dbb2f9..8eeaafbe 100644 +--- a/src/rttr/detail/variant/variant_data_policy.h ++++ b/src/rttr/detail/variant/variant_data_policy.h +@@ -434,7 +434,7 @@ struct variant_data_policy_big : variant_data_base_policy<T, variant_data_policy + { + delete &value; + } +- ++RTTR_BEGIN_DISABLE_INIT_LIST_WARNING + static RTTR_INLINE void clone(const T& value, variant_data& dest) + { + reinterpret_cast<T*&>(dest) = new T(value); +@@ -450,6 +450,7 @@ struct variant_data_policy_big : variant_data_base_policy<T, variant_data_policy + { + reinterpret_cast<T*&>(dest) = new T(std::forward<U>(value)); + } ++RTTR_END_DISABLE_INIT_LIST_WARNING + }; + + ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/user/rttr/header.patch b/user/rttr/header.patch new file mode 100644 index 000000000..ee908775b --- /dev/null +++ b/user/rttr/header.patch @@ -0,0 +1,21 @@ +From b16fccf0fbbbf94064bf2a6c7c47f2b910ab31f1 Mon Sep 17 00:00:00 2001 +From: Veawor Liu <veawor@gmail.com> +Date: Tue, 22 Oct 2019 05:04:47 +0800 +Subject: [PATCH] Fixed compiler errors. (#253) + +--- + src/rttr/variant.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/rttr/variant.h b/src/rttr/variant.h +index cec094b0..40978e3b 100644 +--- a/src/rttr/variant.h ++++ b/src/rttr/variant.h +@@ -38,6 +38,7 @@ + #include <cstddef> + #include <cstdint> + #include <algorithm> ++#include <string> + + namespace rttr + { diff --git a/user/rttr/no-pessimising-moves.patch b/user/rttr/no-pessimising-moves.patch new file mode 100644 index 000000000..7ca6655fc --- /dev/null +++ b/user/rttr/no-pessimising-moves.patch @@ -0,0 +1,65 @@ +From ea1e41f02ca1e32a9bbb731fec05708101c0e03f Mon Sep 17 00:00:00 2001 +From: Andrey Davydov <andrey.a.davydov@gmail.com> +Date: Mon, 6 Jan 2020 15:11:47 +0300 +Subject: [PATCH] fix pessimizing moves + +--- + src/rttr/detail/registration/bind_impl.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/rttr/detail/registration/bind_impl.h b/src/rttr/detail/registration/bind_impl.h +index 7bb63278..606398a4 100644 +--- a/src/rttr/detail/registration/bind_impl.h ++++ b/src/rttr/detail/registration/bind_impl.h +@@ -295,7 +295,7 @@ class registration::bind<detail::ctor_func, Class_Type, F, acc_level, Visitor_Li + std::move(get_metadata(std::forward<Args>(args)...)), + std::move(get_default_args<type_list<Acc_Func>, function_type>(std::forward<Args>(args)...)), + std::move(create_param_infos<type_list<F>, function_type>(std::forward<Args>(args)...))); +- return std::move(ctor); ++ return ctor; + } + public: + bind(const std::shared_ptr<detail::registration_executer>& reg_exec, F func) +@@ -397,6 +397,6 @@ class registration::bind<detail::prop, Class_Type, A, acc_level, Visitor_List> : + getter_policy, setter_policy, + Metadata_Count>>(name, type::get<Class_Type>(), acc, std::move(metadata_list)); +- return std::move(prop); ++ return prop; + } + + public: +@@ -491,6 +491,6 @@ class registration::bind<detail::prop, Class_Type, A1, A2, acc_level, Visitor_Li + Metadata_Count>>(name, type::get<Class_Type>(), + getter, setter, std::move(metadata_list)); +- return std::move(prop); ++ return prop; + } + + public: +@@ -583,7 +583,7 @@ class registration::bind<detail::prop_readonly, Class_Type, A, acc_level, Visito + > + >(name, acc, std::move(metadata_list)); + +- return std::move(prop); ++ return prop; + } + + public: +@@ -678,7 +678,7 @@ class registration::bind<detail::meth, Class_Type, F, acc_level, Visitor_List> : + std::move(get_metadata(std::forward<Args>(args)...)), + std::move(get_default_args<type_list<Acc_Func>, function_type>(std::forward<Args>(args)...)), + std::move(create_param_infos<type_list<F>, function_type>(std::forward<Args>(args)...)) ); +- return std::move(meth); ++ return meth; + } + + template<typename Policy, std::size_t Metadata_Count, typename...TArgs, typename...Param_Args> +@@ -791,7 +791,7 @@ class registration::bind<detail::enum_, Class_Type, Enum_Type> : public registra + std::move(get_metadata(std::forward<Args>(args)...))); + + +- return std::move(enum_wrapper); ++ return enum_wrapper; + } + + public: diff --git a/user/rttr/show-warnings-not-error-out.patch b/user/rttr/show-warnings-not-error-out.patch new file mode 100644 index 000000000..11d332048 --- /dev/null +++ b/user/rttr/show-warnings-not-error-out.patch @@ -0,0 +1,16 @@ +diff -ur a/CMake/utility.cmake b/CMake/utility.cmake +--- a/CMake/utility.cmake 2024-06-04 17:45:24.308248159 +0000 ++++ b/CMake/utility.cmake 2024-06-04 17:46:10.476409691 +0000 +@@ -392,10 +392,10 @@ + #################################################################################### + function( set_compiler_warnings target) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set(WARNINGS "-Werror" ++ set(WARNINGS "-Wextra" + "-Wall") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(WARNINGS "-Werror" ++ set(WARNINGS "-Wextra" + "-Wall") + elseif(MSVC) + set(WARNINGS "/WX" diff --git a/user/rust/0001-Fix-LLVM-build.patch b/user/rust/0001-Fix-LLVM-build.patch index 3be2eb456..67ad9dbf8 100644 --- a/user/rust/0001-Fix-LLVM-build.patch +++ b/user/rust/0001-Fix-LLVM-build.patch @@ -1,17 +1,17 @@ -From 1a5423cf2c7eb0784fcc9b789cdd271efbf43d45 Mon Sep 17 00:00:00 2001 +From 855b7d97e96e67bd5db5c0016c3b9965a5c1843f Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 00:04:29 -0500 -Subject: [PATCH 01/14] Fix LLVM build +Subject: [PATCH 01/12] Fix LLVM build --- - src/bootstrap/lib.rs | 2 +- + src/bootstrap/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 3130dcc277b..c6ac4f9e636 100644 ---- a/src/bootstrap/lib.rs -+++ b/src/bootstrap/lib.rs -@@ -957,7 +957,7 @@ fn cflags(&self, target: TargetSelection, which: GitRepo, c: CLang) -> Vec<Strin +diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs +index 33b8f1a7ce720..d933a8bc37f88 100644 +--- a/src/bootstrap/src/lib.rs ++++ b/src/bootstrap/src/lib.rs +@@ -1262,7 +1262,7 @@ impl Build { .args() .iter() .map(|s| s.to_string_lossy().into_owned()) @@ -19,7 +19,4 @@ index 3130dcc277b..c6ac4f9e636 100644 + .filter(|s| !s.starts_with("-O") && !s.starts_with("/O") && !s.starts_with("-static")) .collect::<Vec<String>>(); - // If we're compiling on macOS then we add a few unconditional flags --- -2.35.1 - + // If we're compiling C++ on macOS then we add a flag indicating that diff --git a/user/rust/0002-Fix-linking-to-zlib-when-cross-compiling.patch b/user/rust/0002-Fix-linking-to-zlib-when-cross-compiling.patch index a78395597..d7c5fc1dc 100644 --- a/user/rust/0002-Fix-linking-to-zlib-when-cross-compiling.patch +++ b/user/rust/0002-Fix-linking-to-zlib-when-cross-compiling.patch @@ -1,36 +1,34 @@ -From 702ebc6e2283f69e8b024b2cf12899a2bbdf6e8b Mon Sep 17 00:00:00 2001 +From 9357baa3eede8062b7c17407d23c3d2102af8435 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Wed, 10 Jan 2018 13:36:41 -0600 -Subject: [PATCH 02/14] Fix linking to zlib when cross-compiling +Subject: [PATCH 02/12] Fix linking to zlib when cross-compiling --- - compiler/rustc_llvm/build.rs | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + compiler/rustc_llvm/build.rs | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs -index 3b6808d693f..4713f550a73 100644 +index 4b0c1229da134..2d61b834c784b 100644 --- a/compiler/rustc_llvm/build.rs +++ b/compiler/rustc_llvm/build.rs -@@ -177,16 +177,15 @@ fn main() { +@@ -219,10 +219,8 @@ fn main() { // of llvm-config, not the target that we're attempting to link. let mut cmd = Command::new(&llvm_config); cmd.arg(llvm_link_arg).arg("--libs"); +- +- if !is_crossed { +- cmd.arg("--system-libs"); +- } + cmd.arg("--system-libs"); + cmd.args(&components); -- if !is_crossed { -- cmd.arg("--system-libs"); -- } else if target.contains("windows-gnu") { -+ if target.contains("windows-gnu") { - println!("cargo:rustc-link-lib=shell32"); - println!("cargo:rustc-link-lib=uuid"); - } else if target.contains("netbsd") || target.contains("haiku") || target.contains("darwin") { + // We need libkstat for getHostCPUName on SPARC builds. + // See also: https://github.com/llvm/llvm-project/issues/64186 +@@ -255,7 +253,6 @@ fn main() { println!("cargo:rustc-link-lib=z"); + println!("cargo:rustc-link-lib=execinfo"); } - cmd.args(&components); for lib in output(&mut cmd).split_whitespace() { let name = if let Some(stripped) = lib.strip_prefix("-l") { --- -2.35.1 - diff --git a/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch b/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch index 69dbf3530..cfcc2ad83 100644 --- a/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch +++ b/user/rust/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch @@ -1,34 +1,52 @@ -From 41ab14f51521d94673ddae78e91611a3e7197078 Mon Sep 17 00:00:00 2001 +From cb97ef40ec507c7ff20f7c0857b1892a1946a0f3 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 2 Dec 2017 17:25:44 -0600 -Subject: [PATCH 03/14] Fix rustdoc when cross-compiling on musl +Subject: [PATCH 03/12] Fix rustdoc when cross-compiling on musl musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. --- - src/bootstrap/bin/rustdoc.rs | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) + src/bootstrap/src/bin/rustdoc.rs | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) -diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index ad3800834b0..e19b589233e 100644 ---- a/src/bootstrap/bin/rustdoc.rs -+++ b/src/bootstrap/bin/rustdoc.rs -@@ -22,14 +22,11 @@ fn main() { - Err(_) => 0, - }; +diff --git a/src/bootstrap/src/bin/rustdoc.rs b/src/bootstrap/src/bin/rustdoc.rs +index dbbce6fe22047..3d3cb241eaab6 100644 +--- a/src/bootstrap/src/bin/rustdoc.rs ++++ b/src/bootstrap/src/bin/rustdoc.rs +@@ -6,12 +6,13 @@ use std::ffi::OsString; + use std::path::PathBuf; + use std::process::Command; + +-use dylib_util::{dylib_path, dylib_path_var}; ++use dylib_util::dylib_path_var; + + #[path = "../utils/bin_helpers.rs"] + mod bin_helpers; + + #[path = "../utils/dylib.rs"] ++#[allow(dead_code)] + mod dylib_util; + + fn main() { +@@ -28,9 +29,6 @@ fn main() { + // is passed (a bit janky...) + let target = args.windows(2).find(|w| &*w[0] == "--target").and_then(|w| w[1].to_str()); - let mut dylib_path = dylib_path(); - dylib_path.insert(0, PathBuf::from(libdir.clone())); - let mut cmd = Command::new(rustdoc); - cmd.args(&args) - .arg("--sysroot") - .arg(&sysroot) -- .env(dylib_path_var(), env::join_paths(&dylib_path).unwrap()); -+ .env(dylib_path_var(), PathBuf::from(libdir.clone())); + + if target.is_some() { +@@ -43,7 +41,7 @@ fn main() { + } + + cmd.args(&args); +- cmd.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap()); ++ cmd.env(dylib_path_var(), PathBuf::from(libdir.clone())); // Force all crates compiled by this compiler to (a) be unstable and (b) // allow the `rustc_private` feature to link to other unstable crates -@@ -62,7 +59,7 @@ fn main() { +@@ -68,7 +66,7 @@ fn main() { eprintln!( "rustdoc command: {:?}={:?} {:?}", dylib_path_var(), @@ -36,7 +54,4 @@ index ad3800834b0..e19b589233e 100644 + PathBuf::from(libdir.clone()), cmd, ); - eprintln!("sysroot: {:?}", sysroot); --- -2.35.1 - + eprintln!("sysroot: {sysroot:?}"); diff --git a/user/rust/0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch b/user/rust/0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch index 418346caa..56dfc19d4 100644 --- a/user/rust/0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch +++ b/user/rust/0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch @@ -1,57 +1,80 @@ -From e653caa13dce250139440eab3da38c9ec2f641d5 Mon Sep 17 00:00:00 2001 +From 7e2507b33ffb027a331f7cbd3477043288f49797 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Fri, 8 Sep 2017 22:11:14 -0500 -Subject: [PATCH 05/14] Remove musl_root and CRT fallback from musl targets +Subject: [PATCH 04/12] Remove musl_root and CRT fallback from musl targets --- compiler/rustc_codegen_ssa/src/back/link.rs | 6 +-- - compiler/rustc_target/src/spec/crt_objects.rs | 25 ----------- - .../rustc_target/src/spec/linux_musl_base.rs | 4 -- - config.toml.example | 17 -------- - src/bootstrap/cc_detect.rs | 27 +----------- - src/bootstrap/compile.rs | 42 +------------------ - src/bootstrap/config.rs | 10 ----- - src/bootstrap/configure.py | 28 ------------- - src/bootstrap/lib.rs | 19 --------- - src/bootstrap/sanity.rs | 23 ---------- + .../rustc_target/src/spec/base/linux_musl.rs | 6 +-- + compiler/rustc_target/src/spec/crt_objects.rs | 22 ---------- + compiler/rustc_target/src/spec/mod.rs | 5 --- + config.example.toml | 17 -------- + src/bootstrap/configure.py | 34 --------------- + src/bootstrap/src/core/build_steps/compile.rs | 42 +------------------ + src/bootstrap/src/core/config/config.rs | 11 ----- + src/bootstrap/src/core/sanity.rs | 23 ---------- + src/bootstrap/src/lib.rs | 19 --------- + src/bootstrap/src/utils/cc_detect.rs | 26 ------------ + .../host-x86_64/dist-arm-linux/Dockerfile | 1 - .../dist-i586-gnu-i586-i686-musl/Dockerfile | 2 - - .../host-x86_64/dist-various-1/Dockerfile | 8 ---- + .../host-x86_64/dist-various-1/Dockerfile | 4 -- .../host-x86_64/dist-various-2/Dockerfile | 3 +- .../host-x86_64/dist-x86_64-musl/Dockerfile | 1 - .../host-x86_64/test-various/Dockerfile | 1 - - 15 files changed, 5 insertions(+), 211 deletions(-) + 17 files changed, 4 insertions(+), 219 deletions(-) diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index 93d8a6e8680..a14b0c943e3 100644 +index f5e8d5fc92a91..b65999ec7230f 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -1508,16 +1508,12 @@ fn detect_self_contained_mingw(sess: &Session) -> bool { - - /// Whether we link to our own CRT objects instead of relying on gcc to pull them. +@@ -1806,7 +1806,7 @@ fn detect_self_contained_mingw(sess: &Session) -> bool { + /// Various toolchain components used during linking are used from rustc distribution + /// instead of being found somewhere on the host system. /// We only provide such support for a very limited number of targets. --fn crt_objects_fallback(sess: &Session, crate_type: CrateType) -> bool { -+fn crt_objects_fallback(sess: &Session, _crate_type: CrateType) -> bool { - if let Some(self_contained) = sess.opts.cg.link_self_contained { - return self_contained; - } +-fn self_contained_components(sess: &Session, crate_type: CrateType) -> LinkSelfContainedComponents { ++fn self_contained_components(sess: &Session, _crate_type: CrateType) -> LinkSelfContainedComponents { + // Turn the backwards compatible bool values for `self_contained` into fully inferred + // `LinkSelfContainedComponents`. + let self_contained = +@@ -1828,10 +1828,6 @@ fn self_contained_components(sess: &Session, crate_type: CrateType) -> LinkSelfC + return components; + } + +- // FIXME: Find a better heuristic for "native musl toolchain is available", +- // based on host and linker path, for example. +- // (https://github.com/rust-lang/rust/pull/71769#issuecomment-626330237). +- LinkSelfContainedDefault::InferredForMusl => sess.crt_static(Some(crate_type)), + LinkSelfContainedDefault::InferredForMingw => { + sess.host == sess.target + && sess.target.vendor != "uwp" +diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs +index 5117cadbee0e6..36d64059d59ad 100644 +--- a/compiler/rustc_target/src/spec/base/linux_musl.rs ++++ b/compiler/rustc_target/src/spec/base/linux_musl.rs +@@ -1,13 +1,9 @@ +-use crate::spec::crt_objects; +-use crate::spec::{base, LinkSelfContainedDefault, TargetOptions}; ++use crate::spec::{base, TargetOptions}; + + pub fn opts() -> TargetOptions { + let mut base = base::linux::opts(); - match sess.target.crt_objects_fallback { -- // FIXME: Find a better heuristic for "native musl toolchain is available", -- // based on host and linker path, for example. -- // (https://github.com/rust-lang/rust/pull/71769#issuecomment-626330237). -- Some(CrtObjectsFallback::Musl) => sess.crt_static(Some(crate_type)), - Some(CrtObjectsFallback::Mingw) => { - sess.host == sess.target - && sess.target.vendor != "uwp" + base.env = "musl".into(); +- base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained(); +- base.post_link_objects_self_contained = crt_objects::post_musl_self_contained(); +- base.link_self_contained = LinkSelfContainedDefault::InferredForMusl; + + // These targets statically link libc by default + base.crt_static_default = true; diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs -index 2fc9ab29f92..0bf7d197583 100644 +index 53f710b8f9e14..2a4eec15f2027 100644 --- a/compiler/rustc_target/src/spec/crt_objects.rs +++ b/compiler/rustc_target/src/spec/crt_objects.rs -@@ -62,28 +62,6 @@ pub(super) fn all(obj: &str) -> CrtObjects { +@@ -61,28 +61,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects { ]) } --pub(super) fn pre_musl_fallback() -> CrtObjects { +-pub(super) fn pre_musl_self_contained() -> CrtObjects { - new(&[ - (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]), - (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]), @@ -62,7 +85,7 @@ index 2fc9ab29f92..0bf7d197583 100644 - ]) -} - --pub(super) fn post_musl_fallback() -> CrtObjects { +-pub(super) fn post_musl_self_contained() -> CrtObjects { - new(&[ - (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]), - (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]), @@ -73,58 +96,46 @@ index 2fc9ab29f92..0bf7d197583 100644 - ]) -} - - pub(super) fn pre_mingw_fallback() -> CrtObjects { + pub(super) fn pre_mingw_self_contained() -> CrtObjects { new(&[ (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]), -@@ -126,7 +104,6 @@ pub(super) fn post_wasi_fallback() -> CrtObjects { - /// Which logic to use to determine whether to fall back to the "self-contained" mode or not. - #[derive(Clone, Copy, PartialEq, Hash, Debug)] - pub enum CrtObjectsFallback { -- Musl, - Mingw, - Wasm, - } -@@ -136,7 +113,6 @@ impl FromStr for CrtObjectsFallback { +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index 941d767b850dc..1ce8e0e64e4c7 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -549,9 +549,6 @@ pub enum LinkSelfContainedDefault { + /// The target spec explicitly disables self-contained linking. + False, + +- /// The target spec requests that the self-contained mode is inferred, in the context of musl. +- InferredForMusl, +- + /// The target spec requests that the self-contained mode is inferred, in the context of mingw. + InferredForMingw, - fn from_str(s: &str) -> Result<CrtObjectsFallback, ()> { +@@ -568,7 +565,6 @@ impl FromStr for LinkSelfContainedDefault { Ok(match s { -- "musl" => CrtObjectsFallback::Musl, - "mingw" => CrtObjectsFallback::Mingw, - "wasm" => CrtObjectsFallback::Wasm, + "false" => LinkSelfContainedDefault::False, + "true" | "wasm" => LinkSelfContainedDefault::True, +- "musl" => LinkSelfContainedDefault::InferredForMusl, + "mingw" => LinkSelfContainedDefault::InferredForMingw, _ => return Err(()), -@@ -147,7 +123,6 @@ fn from_str(s: &str) -> Result<CrtObjectsFallback, ()> { - impl ToJson for CrtObjectsFallback { - fn to_json(&self) -> Json { - match *self { -- CrtObjectsFallback::Musl => "musl", - CrtObjectsFallback::Mingw => "mingw", - CrtObjectsFallback::Wasm => "wasm", + }) +@@ -590,7 +586,6 @@ impl ToJson for LinkSelfContainedDefault { + // Stable backwards-compatible values + LinkSelfContainedDefault::True => "true".to_json(), + LinkSelfContainedDefault::False => "false".to_json(), +- LinkSelfContainedDefault::InferredForMusl => "musl".to_json(), + LinkSelfContainedDefault::InferredForMingw => "mingw".to_json(), } -diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs -index 5038a967d0a..9931578ba86 100644 ---- a/compiler/rustc_target/src/spec/linux_musl_base.rs -+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs -@@ -1,13 +1,9 @@ --use crate::spec::crt_objects::{self, CrtObjectsFallback}; - use crate::spec::TargetOptions; - - pub fn opts() -> TargetOptions { - let mut base = super::linux_base::opts(); - - base.env = "musl".to_string(); -- base.pre_link_objects_fallback = crt_objects::pre_musl_fallback(); -- base.post_link_objects_fallback = crt_objects::post_musl_fallback(); -- base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); - - // These targets statically link libc by default - base.crt_static_default = true; -diff --git a/config.toml.example b/config.toml.example -index ad48cc881f3..40c7e5ae06d 100644 ---- a/config.toml.example -+++ b/config.toml.example -@@ -511,14 +511,6 @@ changelog-seen = 2 - # supplementary build information, like distro-specific package versions. - #description = <none> (string) + } +diff --git a/config.example.toml b/config.example.toml +index f94553dd63f72..687a79bdd3ccc 100644 +--- a/config.example.toml ++++ b/config.example.toml +@@ -592,14 +592,6 @@ + # behavior -- this may lead to miscompilations or other bugs. + #description = "" -# The root location of the musl installation directory. The library directory -# will also need to contain libunwind.a for an unwinding implementation. Note @@ -137,7 +148,7 @@ index ad48cc881f3..40c7e5ae06d 100644 # By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix # platforms to ensure that the compiler is usable by default from the build # directory (as it links to a number of dynamic libraries). This may not be -@@ -684,15 +676,6 @@ changelog-seen = 2 +@@ -835,15 +827,6 @@ # only use static libraries. If unset, the target's default linkage is used. #crt-static = <platform-specific> (bool) @@ -150,80 +161,59 @@ index ad48cc881f3..40c7e5ae06d 100644 -# The full path to the musl libdir. -#musl-libdir = musl-root/lib - - # The root location of the `wasm32-wasi` sysroot. Only used for the - # `wasm32-wasi` target. If you are building wasm32-wasi target, make sure to - # create a `[target.wasm32-wasi]` section and move this field there. -diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs -index 8c47f625d73..9e3b3e880ec 100644 ---- a/src/bootstrap/cc_detect.rs -+++ b/src/bootstrap/cc_detect.rs -@@ -42,8 +42,6 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> { - Some(PathBuf::from(ar)) - } else if target.contains("msvc") { - None -- } else if target.contains("musl") { -- Some(PathBuf::from("ar")) - } else if target.contains("openbsd") { - Some(PathBuf::from("ar")) - } else if target.contains("vxworks") { -@@ -98,7 +96,7 @@ pub fn find(build: &mut Build) { - if let Some(cc) = config.and_then(|c| c.cc.as_ref()) { - cfg.compiler(cc); - } else { -- set_compiler(&mut cfg, Language::C, target, config, build); -+ set_compiler(&mut cfg, Language::C, target, config); - } - - let compiler = cfg.get_compiler(); -@@ -126,7 +124,7 @@ pub fn find(build: &mut Build) { - cfg.compiler(cxx); - true - } else if build.hosts.contains(&target) || build.build == target { -- set_compiler(&mut cfg, Language::CPlusPlus, target, config, build); -+ set_compiler(&mut cfg, Language::CPlusPlus, target, config); - true - } else { - // Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars). -@@ -158,7 +156,6 @@ fn set_compiler( - compiler: Language, - target: TargetSelection, - config: Option<&Target>, -- build: &Build, - ) { - match &*target.triple { - // When compiling for android we may have the NDK configured in the -@@ -201,26 +198,6 @@ fn set_compiler( - } - } - -- "mips-unknown-linux-musl" => { -- if cfg.get_compiler().path().to_str() == Some("gcc") { -- cfg.compiler("mips-linux-musl-gcc"); -- } -- } -- "mipsel-unknown-linux-musl" => { -- if cfg.get_compiler().path().to_str() == Some("gcc") { -- cfg.compiler("mipsel-linux-musl-gcc"); -- } -- } -- -- t if t.contains("musl") => { -- if let Some(root) = build.musl_root(target) { -- let guess = root.join("bin/musl-gcc"); -- if guess.exists() { -- cfg.compiler(guess); -- } -- } -- } -- - _ => {} - } - } -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index f05d1dcf4fc..f3f04f07dd2 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -200,38 +200,7 @@ fn copy_self_contained_objects( + # The root location of the `wasm32-wasip1` sysroot. Only used for WASI + # related targets. Make sure to create a `[target.wasm32-wasip1]` + # section and move this field there (or equivalent for the target being built). +diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py +index 818a7daadcab8..a7331009faf82 100755 +--- a/src/bootstrap/configure.py ++++ b/src/bootstrap/configure.py +@@ -99,40 +99,6 @@ def v(*args): + v("llvm-filecheck", None, "set path to LLVM's FileCheck utility") + v("python", "build.python", "set path to python") + v("android-ndk", "build.android-ndk", "set path to Android NDK") +-v("musl-root", "target.x86_64-unknown-linux-musl.musl-root", +- "MUSL root installation directory (deprecated)") +-v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root", +- "x86_64-unknown-linux-musl install directory") +-v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root", +- "i586-unknown-linux-musl install directory") +-v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root", +- "i686-unknown-linux-musl install directory") +-v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root", +- "arm-unknown-linux-musleabi install directory") +-v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root", +- "arm-unknown-linux-musleabihf install directory") +-v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root", +- "armv5te-unknown-linux-musleabi install directory") +-v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root", +- "armv7-unknown-linux-musleabi install directory") +-v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root", +- "armv7-unknown-linux-musleabihf install directory") +-v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root", +- "aarch64-unknown-linux-musl install directory") +-v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root", +- "mips-unknown-linux-musl install directory") +-v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root", +- "mipsel-unknown-linux-musl install directory") +-v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root", +- "mips64-unknown-linux-muslabi64 install directory") +-v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root", +- "mips64el-unknown-linux-muslabi64 install directory") +-v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root", +- "riscv32gc-unknown-linux-musl install directory") +-v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root", +- "riscv64gc-unknown-linux-musl install directory") +-v("musl-root-loongarch64", "target.loongarch64-unknown-linux-musl.musl-root", +- "loongarch64-unknown-linux-musl install directory") + v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs", + "rootfs in qemu testing, you probably don't want to use this") + v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", +diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs +index e927b491c71ea..b77e1a1598f12 100644 +--- a/src/bootstrap/src/core/build_steps/compile.rs ++++ b/src/bootstrap/src/core/build_steps/compile.rs +@@ -362,38 +362,7 @@ fn copy_self_contained_objects( // Copies the libc and CRT objects. // @@ -232,7 +222,7 @@ index f05d1dcf4fc..f3f04f07dd2 100644 - // to using gcc from a glibc-targeting toolchain for linking. - // To do that we have to distribute musl startup objects as a part of Rust toolchain - // and link with them manually in the self-contained mode. -- if target.contains("musl") { +- if target.contains("musl") && !target.contains("unikraft") { - let srcdir = builder.musl_libdir(target).unwrap_or_else(|| { - panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple) - }); @@ -246,11 +236,11 @@ index f05d1dcf4fc..f3f04f07dd2 100644 - DependencyType::TargetSelfContained, - ); - } -- let crt_path = builder.ensure(native::CrtBeginEnd { target }); +- let crt_path = builder.ensure(llvm::CrtBeginEnd { target }); - for &obj in &["crtbegin.o", "crtbeginS.o", "crtend.o", "crtendS.o"] { - let src = crt_path.join(obj); - let target = libdir_self_contained.join(obj); -- builder.copy(&src, &target); +- builder.copy_link(&src, &target); - target_deps.push((target, DependencyType::TargetSelfContained)); - } - @@ -258,14 +248,14 @@ index f05d1dcf4fc..f3f04f07dd2 100644 - let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained); - target_deps.push((libunwind_path, DependencyType::TargetSelfContained)); - } -- } else if target.ends_with("-wasi") { -+ if target.ends_with("-wasi") { - let srcdir = builder - .wasi_root(target) - .unwrap_or_else(|| { -@@ -315,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car +- } else if target.contains("-wasi") { ++ if target.contains("-wasi") { + let srcdir = builder.wasi_libdir(target).unwrap_or_else(|| { + panic!( + "Target {:?} does not have a \"wasi-root\" key in Config.toml \ +@@ -501,15 +470,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car .arg("--manifest-path") - .arg(builder.src.join("library/test/Cargo.toml")); + .arg(builder.src.join("library/sysroot/Cargo.toml")); - // Help the libc crate compile by assisting it in finding various - // sysroot native libraries. @@ -276,57 +266,65 @@ index f05d1dcf4fc..f3f04f07dd2 100644 - } - } - - if target.ends_with("-wasi") { - if let Some(p) = builder.wasi_root(target) { - let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap()); -diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index d6f77fe6cd6..a2be14e5d5a 100644 ---- a/src/bootstrap/config.rs -+++ b/src/bootstrap/config.rs -@@ -173,8 +173,6 @@ pub struct Config { + if target.contains("-wasi") { + if let Some(dir) = builder.wasi_libdir(target) { + let root = format!("native={}", dir.to_str().unwrap()); +diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs +index 3e1bc9a9acdd9..2289138cbc3e6 100644 +--- a/src/bootstrap/src/core/config/config.rs ++++ b/src/bootstrap/src/core/config/config.rs +@@ -313,8 +313,6 @@ pub struct Config { + pub print_step_timings: bool, pub print_step_rusage: bool, - pub missing_tools: bool, - // Fallback musl-root for all targets - pub musl_root: Option<PathBuf>, pub prefix: Option<PathBuf>, pub sysconfdir: Option<PathBuf>, pub datadir: Option<PathBuf>, -@@ -301,8 +299,6 @@ pub struct Target { - pub sanitizers: Option<bool>, - pub profiler: Option<bool>, +@@ -558,8 +556,6 @@ pub struct Target { + pub profiler: Option<StringOrBool>, + pub rpath: Option<bool>, pub crt_static: Option<bool>, - pub musl_root: Option<PathBuf>, - pub musl_libdir: Option<PathBuf>, pub wasi_root: Option<PathBuf>, pub qemu_rootfs: Option<PathBuf>, - pub no_std: bool, -@@ -534,7 +530,6 @@ struct Rust { - default_linker: Option<String>, - channel: Option<String>, - description: Option<String>, -- musl_root: Option<String>, - rpath: Option<bool>, - verbose_tests: Option<bool>, - optimize_tests: Option<bool>, -@@ -580,8 +575,6 @@ struct TomlTarget { - sanitizers: Option<bool>, - profiler: Option<bool>, - crt_static: Option<bool>, -- musl_root: Option<String>, -- musl_libdir: Option<String>, - wasi_root: Option<String>, - qemu_rootfs: Option<String>, - no_std: Option<bool>, -@@ -943,7 +936,6 @@ pub fn parse(args: &[String]) -> Config { - set(&mut config.llvm_tools_enabled, rust.llvm_tools); - config.rustc_parallel = rust.parallel_compiler.unwrap_or(false); - config.rustc_default_linker = rust.default_linker; -- config.musl_root = rust.musl_root.map(PathBuf::from); - config.save_toolstates = rust.save_toolstates.map(PathBuf::from); - set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings)); - set(&mut config.backtrace_on_ice, rust.backtrace_on_ice); -@@ -989,8 +981,6 @@ pub fn parse(args: &[String]) -> Config { + pub runner: Option<String>, +@@ -1080,7 +1076,6 @@ define_config! { + default_linker: Option<String> = "default-linker", + channel: Option<String> = "channel", + description: Option<String> = "description", +- musl_root: Option<String> = "musl-root", + rpath: Option<bool> = "rpath", + strip: Option<bool> = "strip", + frame_pointers: Option<bool> = "frame-pointers", +@@ -1134,8 +1129,6 @@ define_config! { + profiler: Option<StringOrBool> = "profiler", + rpath: Option<bool> = "rpath", + crt_static: Option<bool> = "crt-static", +- musl_root: Option<String> = "musl-root", +- musl_libdir: Option<String> = "musl-libdir", + wasi_root: Option<String> = "wasi-root", + qemu_rootfs: Option<String> = "qemu-rootfs", + no_std: Option<bool> = "no-std", +@@ -1570,7 +1563,6 @@ impl Config { + default_linker, + channel, + description, +- musl_root, + rpath, + verbose_tests, + optimize_tests, +@@ -1673,7 +1665,6 @@ impl Config { + config.rustc_parallel = + parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly"); + config.rustc_default_linker = default_linker; +- config.musl_root = musl_root.map(PathBuf::from); + config.save_toolstates = save_toolstates.map(PathBuf::from); + set( + &mut config.deny_warnings, +@@ -1876,8 +1867,6 @@ impl Config { target.ranlib = cfg.ranlib.map(PathBuf::from); target.linker = cfg.linker.map(PathBuf::from); target.crt_static = cfg.crt_static; @@ -334,80 +332,11 @@ index d6f77fe6cd6..a2be14e5d5a 100644 - target.musl_libdir = cfg.musl_libdir.map(PathBuf::from); target.wasi_root = cfg.wasi_root.map(PathBuf::from); target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from); - target.sanitizers = cfg.sanitizers; -diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py -index 94424cb4548..9ae0cc053e3 100755 ---- a/src/bootstrap/configure.py -+++ b/src/bootstrap/configure.py -@@ -114,34 +114,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", - "aarch64-linux-android NDK standalone path") - v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk", - "x86_64-linux-android NDK standalone path") --v("musl-root", "target.x86_64-unknown-linux-musl.musl-root", -- "MUSL root installation directory (deprecated)") --v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root", -- "x86_64-unknown-linux-musl install directory") --v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root", -- "i586-unknown-linux-musl install directory") --v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root", -- "i686-unknown-linux-musl install directory") --v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root", -- "arm-unknown-linux-musleabi install directory") --v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root", -- "arm-unknown-linux-musleabihf install directory") --v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root", -- "armv5te-unknown-linux-musleabi install directory") --v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root", -- "armv7-unknown-linux-musleabi install directory") --v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root", -- "armv7-unknown-linux-musleabihf install directory") --v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root", -- "aarch64-unknown-linux-musl install directory") --v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root", -- "mips-unknown-linux-musl install directory") --v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root", -- "mipsel-unknown-linux-musl install directory") --v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root", -- "mips64-unknown-linux-muslabi64 install directory") --v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root", -- "mips64el-unknown-linux-muslabi64 install directory") - v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs", - "rootfs in qemu testing, you probably don't want to use this") - v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", -diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index c6ac4f9e636..d381678b02a 100644 ---- a/src/bootstrap/lib.rs -+++ b/src/bootstrap/lib.rs -@@ -1059,25 +1059,6 @@ fn crt_static(&self, target: TargetSelection) -> Option<bool> { - } - } - -- /// Returns the "musl root" for this `target`, if defined -- fn musl_root(&self, target: TargetSelection) -> Option<&Path> { -- self.config -- .target_config -- .get(&target) -- .and_then(|t| t.musl_root.as_ref()) -- .or_else(|| self.config.musl_root.as_ref()) -- .map(|p| &**p) -- } -- -- /// Returns the "musl libdir" for this `target`. -- fn musl_libdir(&self, target: TargetSelection) -> Option<PathBuf> { -- let t = self.config.target_config.get(&target)?; -- if let libdir @ Some(_) = &t.musl_libdir { -- return libdir.clone(); -- } -- self.musl_root(target).map(|root| root.join("lib")) -- } -- - /// Returns the sysroot for the wasi target, if defined - fn wasi_root(&self, target: TargetSelection) -> Option<&Path> { - self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p) -diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index d7db2cef24f..a791177956d 100644 ---- a/src/bootstrap/sanity.rs -+++ b/src/bootstrap/sanity.rs + target.runner = cfg.runner; +diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs +index e03b1e179084e..e61335d9b46c1 100644 +--- a/src/bootstrap/src/core/sanity.rs ++++ b/src/bootstrap/src/core/sanity.rs @@ -11,7 +11,6 @@ use std::collections::HashMap; use std::env; @@ -416,12 +345,12 @@ index d7db2cef24f..a791177956d 100644 use std::path::PathBuf; use std::process::Command; -@@ -178,28 +177,6 @@ pub fn check(build: &mut Build) { - } +@@ -323,28 +322,6 @@ than building it. + continue; } -- // Make sure musl-root is valid -- if target.contains("musl") { +- // Make sure musl-root is valid. +- if target.contains("musl") && !target.contains("unikraft") { - // If this is a native target (host is also musl) and no musl-root is given, - // fall back to the system toolchain in /usr before giving up - if build.musl_root(*target).is_none() && build.config.build == *target { @@ -442,15 +371,101 @@ index d7db2cef24f..a791177956d 100644 - } - } - - if need_cmake && target.contains("msvc") { + if need_cmake && target.is_msvc() { // There are three builds of cmake on windows: MSVC, MinGW, and // Cygwin. The Cygwin build does not have generators for Visual +diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs +index 30d775f774ce7..23145199b4bbb 100644 +--- a/src/bootstrap/src/lib.rs ++++ b/src/bootstrap/src/lib.rs +@@ -1365,25 +1365,6 @@ impl Build { + } + } + +- /// Returns the "musl root" for this `target`, if defined +- fn musl_root(&self, target: TargetSelection) -> Option<&Path> { +- self.config +- .target_config +- .get(&target) +- .and_then(|t| t.musl_root.as_ref()) +- .or(self.config.musl_root.as_ref()) +- .map(|p| &**p) +- } +- +- /// Returns the "musl libdir" for this `target`. +- fn musl_libdir(&self, target: TargetSelection) -> Option<PathBuf> { +- let t = self.config.target_config.get(&target)?; +- if let libdir @ Some(_) = &t.musl_libdir { +- return libdir.clone(); +- } +- self.musl_root(target).map(|root| root.join("lib")) +- } +- + /// Returns the `lib` directory for the WASI target specified, if + /// configured. + /// +diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs +index 3ba4e0cb686e6..33dba449dee2a 100644 +--- a/src/bootstrap/src/utils/cc_detect.rs ++++ b/src/bootstrap/src/utils/cc_detect.rs +@@ -41,7 +41,7 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> { + Some(PathBuf::from(ar)) + } else if target.is_msvc() { + None +- } else if target.contains("musl") || target.contains("openbsd") { ++ } else if target.contains("openbsd") { + Some(PathBuf::from("ar")) + } else if target.contains("vxworks") { + Some(PathBuf::from("wr-ar")) +@@ -197,30 +197,6 @@ fn default_compiler( + } + } + +- "mips-unknown-linux-musl" if compiler == Language::C => { +- if cfg.get_compiler().path().to_str() == Some("gcc") { +- Some(PathBuf::from("mips-linux-musl-gcc")) +- } else { +- None +- } +- } +- "mipsel-unknown-linux-musl" if compiler == Language::C => { +- if cfg.get_compiler().path().to_str() == Some("gcc") { +- Some(PathBuf::from("mipsel-linux-musl-gcc")) +- } else { +- None +- } +- } +- +- t if t.contains("musl") && compiler == Language::C => { +- if let Some(root) = build.musl_root(target) { +- let guess = root.join("bin/musl-gcc"); +- if guess.exists() { Some(guess) } else { None } +- } else { +- None +- } +- } +- + t if t.contains("-wasi") => { + let root = PathBuf::from(std::env::var_os("WASI_SDK_PATH")?); + let compiler = match compiler { +diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile +index 420c42bc9d807..83ff773c08e1a 100644 +--- a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile ++++ b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile +@@ -36,7 +36,6 @@ ENV HOSTS=arm-unknown-linux-gnueabi,aarch64-unknown-linux-musl + ENV RUST_CONFIGURE_ARGS \ + --enable-full-tools \ + --disable-docs \ +- --musl-root-aarch64=/usr/local/aarch64-linux-musl \ + --enable-sanitizers \ + --enable-profiler \ + --set target.aarch64-unknown-linux-musl.crt-static=false diff --git a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile -index c98fc7dcfff..c2f1494f7e2 100644 +index a62f98b21d225..f949736e866c4 100644 --- a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile -@@ -34,8 +34,6 @@ COPY scripts/cmake.sh /scripts/ - RUN /scripts/cmake.sh +@@ -58,8 +58,6 @@ COPY scripts/sccache.sh /scripts/ + RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS \ - --musl-root-i586=/musl-i586 \ @@ -459,42 +474,37 @@ index c98fc7dcfff..c2f1494f7e2 100644 # Newer binutils broke things on some vms/distros (i.e., linking against diff --git a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile -index cd0f01faa1b..6951c9ea9b1 100644 +index 09fbbac466c72..1ab841763db19 100644 --- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile -@@ -172,14 +172,6 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft - CC_riscv64gc_unknown_none_elf=false +@@ -154,10 +154,6 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft + CC_x86_64_pc_windows_gnullvm=x86_64-w64-mingw32-clang ENV RUST_CONFIGURE_ARGS \ - --musl-root-armv5te=/musl-armv5te \ - --musl-root-arm=/musl-arm \ - --musl-root-armhf=/musl-armhf \ - --musl-root-armv7hf=/musl-armv7hf \ -- --musl-root-mips=/musl-mips \ -- --musl-root-mipsel=/musl-mipsel \ -- --musl-root-mips64=/musl-mips64 \ -- --musl-root-mips64el=/musl-mips64el \ --disable-docs ENV SCRIPT \ diff --git a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile -index e363c4f79f9..7aaf101e4b5 100644 +index 9b15bb3530b61..d15d69e4fee47 100644 --- a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile -@@ -119,7 +119,6 @@ ENV TARGETS=$TARGETS,i686-unknown-freebsd - RUN ln -s /usr/include/asm-generic /usr/local/include/asm +@@ -134,6 +134,5 @@ RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm + RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm - ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \ -- --set target.wasm32-wasi.wasi-root=/wasm32-wasi \ +-ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enable-llvm-bitcode-linker --disable-docs \ ++ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --enable-llvm-bitcode-linker --disable-docs - --musl-root-armv7=/musl-armv7 -+ --set target.wasm32-wasi.wasi-root=/wasm32-wasi ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS diff --git a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile -index 51645a81853..b9edb339cc0 100644 +index c9a6a2dd069e2..30eda009dee30 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile -@@ -37,7 +37,6 @@ RUN sh /scripts/sccache.sh +@@ -35,7 +35,6 @@ RUN sh /scripts/sccache.sh ENV HOSTS=x86_64-unknown-linux-musl ENV RUST_CONFIGURE_ARGS \ @@ -503,17 +513,14 @@ index 51645a81853..b9edb339cc0 100644 --enable-sanitizers \ --enable-profiler \ diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile -index 4d554a2852a..919e267724c 100644 +index 944d9aed3190b..b0ffa7c0e316e 100644 --- a/src/ci/docker/host-x86_64/test-various/Dockerfile +++ b/src/ci/docker/host-x86_64/test-various/Dockerfile -@@ -31,7 +31,6 @@ COPY scripts/sccache.sh /scripts/ - RUN sh /scripts/sccache.sh +@@ -45,7 +45,6 @@ COPY host-x86_64/dist-various-2/build-wasi-toolchain.sh /tmp/ + ENV WASI_SDK_PATH=/wasi-sdk-22.0 ENV RUST_CONFIGURE_ARGS \ - --musl-root-x86_64=/usr/local/x86_64-linux-musl \ - --set build.nodejs=/node-v15.14.0-linux-x64/bin/node \ --set rust.lld --- -2.35.1 - + # Some run-make tests have assertions about code size, and enabling debug diff --git a/user/rust/0004-Use-static-native-libraries-when-linking-static-exec.patch b/user/rust/0004-Use-static-native-libraries-when-linking-static-exec.patch deleted file mode 100644 index 0682ec78d..000000000 --- a/user/rust/0004-Use-static-native-libraries-when-linking-static-exec.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 53c4a9c8ab26e10d1790b5a85fa26058f4252e2d Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Fri, 8 Sep 2017 00:05:18 -0500 -Subject: [PATCH 04/14] Use static native libraries when linking static - executables - -On ELF targets like Linux, gcc/ld will create a dynamically-linked -executable without warning, even when passed `-static`, when asked to -link to a `.so`. Avoid this confusing and unintended behavior by always -using the static version of libraries when trying to link static -executables. ---- - compiler/rustc_codegen_ssa/src/back/link.rs | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index 58e0667d678..93d8a6e8680 100644 ---- a/compiler/rustc_codegen_ssa/src/back/link.rs -+++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -1833,7 +1833,7 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>( - // external build system already has the native dependencies defined, and it - // will provide them to the linker itself. - if sess.opts.debugging_opts.link_native_libraries { -- add_upstream_native_libraries(cmd, sess, codegen_results); -+ add_upstream_native_libraries(cmd, sess, codegen_results, crate_type); - } - - // Library linking above uses some global state for things like `-Bstatic`/`-Bdynamic` to make -@@ -2359,8 +2359,7 @@ fn add_dynamic_crate(cmd: &mut dyn Linker, sess: &Session, cratepath: &Path) { - } - } - --/// Link in all of our upstream crates' native dependencies. Remember that all of these upstream --/// native dependencies are all non-static dependencies. We've got two cases then: -+/// Link in all of our upstream crates' native dependencies. We have two cases: - /// - /// 1. The upstream crate is an rlib. In this case we *must* link in the native dependency because - /// the rlib is just an archive. -@@ -2378,6 +2377,7 @@ fn add_upstream_native_libraries( - cmd: &mut dyn Linker, - sess: &Session, - codegen_results: &CodegenResults, -+ crate_type: CrateType, - ) { - let mut last = (NativeLibKind::Unspecified, None); - for &cnum in &codegen_results.crate_info.used_crates { -@@ -2398,7 +2398,19 @@ fn add_upstream_native_libraries( - NativeLibKind::Dylib { as_needed } => { - cmd.link_dylib(name, verbatim, as_needed.unwrap_or(true)) - } -- NativeLibKind::Unspecified => cmd.link_dylib(name, verbatim, true), -+ NativeLibKind::Unspecified => { -+ // On some targets, like Linux, linking a static executable inhibits using -+ // dylibs at all. Force native libraries to be static, even if for example -+ // an upstream rlib was originally linked against a native shared library. -+ if crate_type == config::CrateType::Executable -+ && sess.crt_static(Some(crate_type)) -+ && !sess.target.options.crt_static_allows_dylibs -+ { -+ cmd.link_staticlib(name, verbatim) -+ } else { -+ cmd.link_dylib(name, verbatim, true) -+ } -+ }, - NativeLibKind::Framework { as_needed } => { - cmd.link_framework(name, as_needed.unwrap_or(true)) - } --- -2.35.1 - diff --git a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/user/rust/0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch index 27b3cd547..cbb22cd45 100644 --- a/user/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +++ b/user/rust/0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch @@ -1,7 +1,7 @@ From 78ae73f09d07c847ede1dc683b8907f5bd5bd17f Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Sat, 9 Sep 2017 00:14:16 -0500 -Subject: [PATCH 06/14] Prefer libgcc_eh over libunwind for musl +Subject: [PATCH 05/12] Prefer libgcc_eh over libunwind for musl --- library/unwind/src/lib.rs | 2 +- @@ -11,7 +11,7 @@ diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs index 079626f0fea..590fca0acfa 100644 --- a/library/unwind/src/lib.rs +++ b/library/unwind/src/lib.rs -@@ -51,7 +51,7 @@ +@@ -63,7 +63,7 @@ #[link(name = "unwind", cfg(not(target_feature = "crt-static")))] extern "C" {} } else { diff --git a/user/rust/0006-Link-libssp_nonshared.a-on-all-musl-targets.patch b/user/rust/0006-Link-libssp_nonshared.a-on-all-musl-targets.patch new file mode 100644 index 000000000..d34bb560d --- /dev/null +++ b/user/rust/0006-Link-libssp_nonshared.a-on-all-musl-targets.patch @@ -0,0 +1,28 @@ +From f516ef748075ddfbcbaec493e1a7ee1e59538bd0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 3 Nov 2019 17:01:32 -0600 +Subject: [PATCH 06/12] Link libssp_nonshared.a on all musl targets + +--- + compiler/rustc_target/src/spec/base/linux_musl.rs | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs +index 36d64059d59ad..c113af2464423 100644 +--- a/compiler/rustc_target/src/spec/base/linux_musl.rs ++++ b/compiler/rustc_target/src/spec/base/linux_musl.rs +@@ -1,10 +1,13 @@ +-use crate::spec::{base, TargetOptions}; ++use crate::spec::{add_link_args, base, Cc, LinkerFlavor, Lld, TargetOptions}; + + pub fn opts() -> TargetOptions { + let mut base = base::linux::opts(); + + base.env = "musl".into(); + ++ // libssp_nonshared.a is needed for __stack_chk_fail_local when using libc.so ++ add_link_args(&mut base.post_link_args, LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-lssp_nonshared"]); ++ + // These targets statically link libc by default + base.crt_static_default = true; + diff --git a/user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch b/user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch deleted file mode 100644 index 7838e5a05..000000000 --- a/user/rust/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 976ff1e1bbdbb9c0c0a32a6a27238b51e6467f8f Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sun, 3 Nov 2019 17:01:32 -0600 -Subject: [PATCH 07/14] Link libssp_nonshared.a on all musl targets - ---- - compiler/rustc_target/src/spec/linux_musl_base.rs | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs -index 9931578ba86..a1cece5733c 100644 ---- a/compiler/rustc_target/src/spec/linux_musl_base.rs -+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs -@@ -1,10 +1,13 @@ --use crate::spec::TargetOptions; -+use crate::spec::{LinkerFlavor, TargetOptions}; - - pub fn opts() -> TargetOptions { - let mut base = super::linux_base::opts(); - - base.env = "musl".to_string(); - -+ // libssp_nonshared.a is needed for __stack_chk_fail_local when using libc.so -+ base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-lssp_nonshared".to_string()]); -+ - // These targets statically link libc by default - base.crt_static_default = true; - --- -2.35.1 - diff --git a/user/rust/0007-test-failed-doctest-output-Fix-normalization.patch b/user/rust/0007-test-failed-doctest-output-Fix-normalization.patch new file mode 100644 index 000000000..373e1751a --- /dev/null +++ b/user/rust/0007-test-failed-doctest-output-Fix-normalization.patch @@ -0,0 +1,33 @@ +From 5ecc3bac493f2df5b76f42cff6ea602d1624d323 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 7 Oct 2019 18:36:28 -0500 +Subject: [PATCH 07/12] test/failed-doctest-output: Fix normalization + +Otherwise we get: + +1 +2 running 2 tests +- test $DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED +- test $DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED ++ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED ++ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED +5 +6 failures: +7 +--- + tests/rustdoc-ui/doctest/failed-doctest-output.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/rustdoc-ui/doctest/failed-doctest-output.rs b/tests/rustdoc-ui/doctest/failed-doctest-output.rs +index d4d49b73793e6..9c44f7ce23281 100644 +--- a/tests/rustdoc-ui/doctest/failed-doctest-output.rs ++++ b/tests/rustdoc-ui/doctest/failed-doctest-output.rs +@@ -7,7 +7,7 @@ + + //@ compile-flags:--test --test-args --test-threads=1 + //@ rustc-env:RUST_BACKTRACE=0 +-//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR" ++//@ normalize-stdout-test: "[[:graph:]]*tests/rustdoc-ui/doctest" -> "$$DIR" + //@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + //@ failure-status: 101 + diff --git a/user/rust/0008-test-failed-doctest-output-Fix-normalization.patch b/user/rust/0008-test-failed-doctest-output-Fix-normalization.patch deleted file mode 100644 index f8c537afe..000000000 --- a/user/rust/0008-test-failed-doctest-output-Fix-normalization.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 26ba9c852ad73dcc0401b74534b34bf33d5b6444 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Mon, 7 Oct 2019 18:36:28 -0500 -Subject: [PATCH 08/14] test/failed-doctest-output: Fix normalization - -Otherwise we get: - -1 -2 running 2 tests -- test $DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED -- test $DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED -+ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED -+ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED -5 -6 failures: -7 ---- - src/test/rustdoc-ui/failed-doctest-output.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/src/test/rustdoc-ui/failed-doctest-output.rs -index 92473b49e14..ed29b446aba 100644 ---- a/src/test/rustdoc-ui/failed-doctest-output.rs -+++ b/src/test/rustdoc-ui/failed-doctest-output.rs -@@ -4,7 +4,7 @@ - - // compile-flags:--test --test-args --test-threads=1 - // rustc-env:RUST_BACKTRACE=0 --// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR" -+// normalize-stdout-test: "[[:graph:]]*src/test/rustdoc-ui" -> "$$DIR" - // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" - // failure-status: 101 - --- -2.35.1 - diff --git a/user/rust/0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch new file mode 100644 index 000000000..43f0f37f2 --- /dev/null +++ b/user/rust/0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -0,0 +1,22 @@ +From cf671a6f53fe74b02aa48c0206d48506d6cdd7cd Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 01:32:20 +0000 +Subject: [PATCH 08/12] test/sysroot-crates-are-unstable: Fix test when rpath is + disabled + +Without this environment var, the test can't run rustc to find +the sysroot path. +--- + tests/run-make/sysroot-crates-are-unstable/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/run-make/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile +index 1e267fb9576ba..30c33c5c13d20 100644 +--- a/tests/run-make/sysroot-crates-are-unstable/Makefile ++++ b/tests/run-make/sysroot-crates-are-unstable/Makefile +@@ -1,2 +1,4 @@ ++-include ../tools.mk ++ + all: +- '$(PYTHON)' test.py ++ env '$(HOST_RPATH_ENV)' '$(PYTHON)' test.py diff --git a/user/rust/0009-Ignore-broken-and-non-applicable-tests.patch b/user/rust/0009-Ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 000000000..b8b1b8932 --- /dev/null +++ b/user/rust/0009-Ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,47 @@ +From cc6d3d3ab26517d5f8f09536b016154944bdceff Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 09/12] Ignore broken and non-applicable tests + +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + tests/run-make/long-linker-command-lines/Makefile | 2 ++ + tests/run-make/sysroot-crates-are-unstable/Makefile | 2 ++ + tests/ui/process/env-funky-keys.rs | 1 + + 3 files changed, 7 insertions(+) + +diff --git a/tests/run-make/long-linker-command-lines/Makefile b/tests/run-make/long-linker-command-lines/Makefile +index f864ea74f4a95..f16eaf544cc3f 100644 +--- a/tests/run-make/long-linker-command-lines/Makefile ++++ b/tests/run-make/long-linker-command-lines/Makefile +@@ -1,4 +1,6 @@ + # ignore-cross-compile ++# ignore-test ++ + include ../tools.mk + + export LD_LIBRARY_PATH := $(HOST_RPATH_DIR) +diff --git a/tests/run-make/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile +index 30c33c5c13d20..d733bb1c557f5 100644 +--- a/tests/run-make/sysroot-crates-are-unstable/Makefile ++++ b/tests/run-make/sysroot-crates-are-unstable/Makefile +@@ -1,3 +1,5 @@ ++# ignore-test ++ + -include ../tools.mk + + all: +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index 314ccaea01525..7f5b9efaa10b1 100644 +--- a/tests/ui/process/env-funky-keys.rs ++++ b/tests/ui/process/env-funky-keys.rs +@@ -1,6 +1,7 @@ + //@ run-pass + // Ignore this test on Android, because it segfaults there. + ++//@ ignore-test + //@ ignore-android + //@ ignore-windows + //@ ignore-wasm32 no execve diff --git a/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch deleted file mode 100644 index dfefc36ec..000000000 --- a/user/rust/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 765788107fca34a8fcedf03a8902932255ad01cb Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Mon, 17 Sep 2018 01:32:20 +0000 -Subject: [PATCH 09/14] test/sysroot-crates-are-unstable: Fix test when rpath - is disabled - -Without this environment var, the test can't run rustc to find -the sysroot path. ---- - .../run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -index 1e267fb9576..30c33c5c13d 100644 ---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -@@ -1,2 +1,4 @@ -+-include ../tools.mk -+ - all: -- '$(PYTHON)' test.py -+ env '$(HOST_RPATH_ENV)' '$(PYTHON)' test.py --- -2.35.1 - diff --git a/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch b/user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch index 6f1c99212..4a83e137f 100644 --- a/user/rust/0012-Link-stage-2-tools-dynamically-to-libstd.patch +++ b/user/rust/0010-Link-stage-2-tools-dynamically-to-libstd.patch @@ -1,17 +1,17 @@ -From 74767e8d9cad131d8fb67054df8110065649e6dd Mon Sep 17 00:00:00 2001 +From 4443dc788cea90bdb1f9e5f3d9b702a3be46d4ed Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 24 Sep 2018 23:42:23 +0000 -Subject: [PATCH 12/14] Link stage 2 tools dynamically to libstd +Subject: [PATCH 10/12] Link stage 2 tools dynamically to libstd --- - src/bootstrap/builder.rs | 2 +- + src/bootstrap/src/core/builder.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 0d387ff1e37..f3ecd9067d3 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -1639,7 +1639,7 @@ pub fn cargo( +diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs +index cd276674dee6b..a16297b4fe6cc 100644 +--- a/src/bootstrap/src/core/builder.rs ++++ b/src/bootstrap/src/core/builder.rs +@@ -2096,7 +2096,7 @@ impl<'a> Builder<'a> { // When we build Rust dylibs they're all intended for intermediate // usage, so make sure we pass the -Cprefer-dynamic flag instead of // linking all deps statically into the dylib. @@ -20,6 +20,3 @@ index 0d387ff1e37..f3ecd9067d3 100644 rustflags.arg("-Cprefer-dynamic"); } --- -2.35.1 - diff --git a/user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch deleted file mode 100644 index e55c1bffc..000000000 --- a/user/rust/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5f08947cef0556245748e5a3d0b9d1da926939ff Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sat, 6 Oct 2018 04:01:48 +0000 -Subject: [PATCH 10/14] test/use-extern-for-plugins: Don't assume multilib - ---- - src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -index 838b1a2719b..94fa9f6d067 100644 ---- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -+++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -@@ -4,12 +4,7 @@ - # ignore-openbsd - # ignore-sunos - --HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') --ifeq ($(findstring i686,$(HOST)),i686) --TARGET := $(subst i686,x86_64,$(HOST)) --else --TARGET := $(subst x86_64,i686,$(HOST)) --endif -+TARGET := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') - - all: - $(RUSTC) foo.rs -C extra-filename=-host --- -2.35.1 - diff --git a/user/rust/0011-Ignore-broken-and-non-applicable-tests.patch b/user/rust/0011-Ignore-broken-and-non-applicable-tests.patch deleted file mode 100644 index b01d5f490..000000000 --- a/user/rust/0011-Ignore-broken-and-non-applicable-tests.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b7ab3ecb6233472afdbb5247b4c48cc8f45ad8ac Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sun, 16 Sep 2018 16:38:48 +0000 -Subject: [PATCH 11/14] Ignore broken and non-applicable tests - -c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 -env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) -long-linker-command-lines: takes >10 minutes to run (but still passes) -sysroot-crates-are-unstable: can't run rustc without RPATH ---- - src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile | 2 ++ - src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 2 ++ - src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++ - src/test/ui/env-funky-keys.rs | 1 + - 4 files changed, 7 insertions(+) - -diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -index f124ca2ab61..363b18f0985 100644 ---- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -+++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -@@ -1,3 +1,5 @@ -+# ignore-aarch64 -+ - -include ../tools.mk - - all: -diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -index 5876fbc94bc..5f167ece1a2 100644 ---- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -+++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -@@ -1,3 +1,5 @@ -+# ignore-test -+ - -include ../tools.mk - - all: -diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -index 30c33c5c13d..d733bb1c557 100644 ---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -@@ -1,3 +1,5 @@ -+# ignore-test -+ - -include ../tools.mk - - all: -diff --git a/src/test/ui/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs -index 4548d333947..00dd85244d8 100644 ---- a/src/test/ui/env-funky-keys.rs -+++ b/src/test/ui/env-funky-keys.rs -@@ -1,6 +1,7 @@ - // run-pass - // Ignore this test on Android, because it segfaults there. - -+// ignore-test - // ignore-android - // ignore-windows - // ignore-emscripten no execve --- -2.35.1 - diff --git a/user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch b/user/rust/0011-Move-debugger-scripts-to-usr-share-rust.patch index 912a99395..604e223e8 100644 --- a/user/rust/0013-Move-debugger-scripts-to-usr-share-rust.patch +++ b/user/rust/0011-Move-debugger-scripts-to-usr-share-rust.patch @@ -1,7 +1,7 @@ -From 137de7f431c116721de728a121f0c38aa24f58b6 Mon Sep 17 00:00:00 2001 +From 762d3cd3f87b7fdbb885e1bcd4d1314437dd9377 Mon Sep 17 00:00:00 2001 From: Samuel Holland <samuel@sholland.org> Date: Mon, 17 Sep 2018 02:09:10 +0000 -Subject: [PATCH 13/14] Move debugger scripts to /usr/share/rust +Subject: [PATCH 11/12] Move debugger scripts to /usr/share/rust --- src/bootstrap/dist.rs | 2 +- @@ -11,10 +11,10 @@ Subject: [PATCH 13/14] Move debugger scripts to /usr/share/rust 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index f5ae8103cb0..28c9f3c05bc 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -474,7 +474,7 @@ fn make_run(run: RunConfig<'_>) { +index 76aad16c1fc26..db53459e8cae4 100644 +--- a/src/bootstrap/src/core/build_steps/dist.rs ++++ b/src/bootstrap/src/core/build_steps/dist.rs +@@ -521,7 +521,7 @@ impl Step for DebuggerScripts { fn run(self, builder: &Builder<'_>) { let host = self.host; let sysroot = self.sysroot; @@ -24,7 +24,7 @@ index f5ae8103cb0..28c9f3c05bc 100644 let cp_debugger_script = |file: &str| { builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644); diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb -index b950cea79ed..559bfe3f1f9 100755 +index 9abed30ea6f73..4c7f953edfa46 100755 --- a/src/etc/rust-gdb +++ b/src/etc/rust-gdb @@ -12,7 +12,7 @@ fi @@ -33,11 +33,11 @@ index b950cea79ed..559bfe3f1f9 100755 RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" -GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" +GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust" + # Get the commit hash for path remapping + RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')" - # Run GDB with the additional arguments that load the pretty printers - # Set the environment variable `RUST_GDB` to overwrite the call to a diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui -index 9744913b686..8722acdcc52 100755 +index 913269316bd4c..f444fbc4b104e 100755 --- a/src/etc/rust-gdbgui +++ b/src/etc/rust-gdbgui @@ -41,7 +41,7 @@ fi @@ -46,11 +46,11 @@ index 9744913b686..8722acdcc52 100755 RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" -GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" +GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust" + # Get the commit hash for path remapping + RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')" - # Set the environment variable `RUST_GDB` to overwrite the call to a - # different/specific command (defaults to `gdb`). diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb -index bce72f1bad6..8abb0124527 100755 +index bce72f1bad698..8abb012452787 100755 --- a/src/etc/rust-lldb +++ b/src/etc/rust-lldb @@ -30,8 +30,8 @@ EOF @@ -64,6 +64,3 @@ index bce72f1bad6..8abb0124527 100755 # Call LLDB with the commands added to the argument list exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@" --- -2.35.1 - diff --git a/user/rust/0012-Add-foxkit-target-specs.patch b/user/rust/0012-Add-foxkit-target-specs.patch new file mode 100644 index 000000000..06ba6a488 --- /dev/null +++ b/user/rust/0012-Add-foxkit-target-specs.patch @@ -0,0 +1,206 @@ +From 7e50215a21b198c73fe575d28c847fd645c4ee40 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 02:29:06 +0000 +Subject: [PATCH 12/12] Add foxkit target specs + +--- + .../src/spec/targets/aarch64_foxkit_linux_musl.rs | 11 +++++++++++ + .../src/spec/targets/armv7_foxkit_linux_musleabihf.rs | 11 +++++++++++ + .../rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs | 11 +++++++++++ + compiler/rustc_target/src/spec/mod.rs | 7 +++++++ + .../src/spec/targets/powerpc64_foxkit_linux_musl.rs | 11 +++++++++++ + .../src/spec/targets/powerpc_foxkit_linux_musl.rs | 11 +++++++++++ + .../rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs | 11 +++++++++++ + 7 files changed, 73 insertions(+) + create mode 100644 compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs + create mode 100644 compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs + +diff --git a/compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..4bdd51af4fe +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs +@@ -0,0 +1,11 @@ ++use crate::spec::Target; ++ ++pub fn target() -> Target { ++ let mut base = super::aarch64_unknown_linux_musl::target(); ++ ++ base.llvm_target = "aarch64-foxkit-linux-musl".into(); ++ base.vendor = "foxkit".into(); ++ base.options.crt_static_default = false; ++ ++ base ++} +diff --git a/compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs +new file mode 100644 +index 00000000000..994f3c39e7c +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs +@@ -0,0 +1,11 @@ ++use crate::spec::Target; ++ ++pub fn target() -> Target { ++ let mut base = super::armv7_unknown_linux_musleabihf::target(); ++ ++ base.llvm_target = "armv7-foxkit-linux-musleabihf".into(); ++ base.vendor = "foxkit".into(); ++ base.options.crt_static_default = false; ++ ++ base ++} +diff --git a/compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..028e4b5e930 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs +@@ -0,0 +1,11 @@ ++use crate::spec::Target; ++ ++pub fn target() -> Target { ++ let mut base = super::i586_unknown_linux_musl::target(); ++ ++ base.llvm_target = "i586-foxkit-linux-musl".into(); ++ base.vendor = "foxkit".into(); ++ base.options.crt_static_default = false; ++ ++ base ++} +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index 92678aed5b1..66a408d0b36 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -1519,6 +1519,13 @@ fn $module() { + } + + supported_targets! { ++ ("aarch64-foxkit-linux-musl", aarch64_foxkit_linux_musl), ++ ("armv7-foxkit-linux-musleabihf", armv7_foxkit_linux_musleabihf), ++ ("i586-foxkit-linux-musl", i586_foxkit_linux_musl), ++ ("powerpc-foxkit-linux-musl", powerpc_foxkit_linux_musl), ++ ("powerpc64-foxkit-linux-musl", powerpc64_foxkit_linux_musl), ++ ("x86_64-foxkit-linux-musl", x86_64_foxkit_linux_musl), ++ + ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu), + ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32), + ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), +diff --git a/compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..04a50f84b60 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs +@@ -0,0 +1,11 @@ ++use crate::spec::Target; ++ ++pub fn target() -> Target { ++ let mut base = super::powerpc64_unknown_linux_musl::target(); ++ ++ base.llvm_target = "powerpc64-foxkit-linux-musl".into(); ++ base.vendor = "foxkit".into(); ++ base.options.crt_static_default = false; ++ ++ base ++} +diff --git a/compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..7bca52c4299 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs +@@ -0,0 +1,11 @@ ++use crate::spec::Target; ++ ++pub fn target() -> Target { ++ let mut base = super::powerpc_unknown_linux_musl::target(); ++ ++ base.llvm_target = "powerpc-foxkit-linux-musl".into(); ++ base.vendor = "foxkit".into(); ++ base.options.crt_static_default = false; ++ ++ base ++} +diff --git a/compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..1ff73687c00 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs +@@ -0,0 +1,11 @@ ++use crate::spec::Target; ++ ++pub fn target() -> Target { ++ let mut base = super::x86_64_unknown_linux_musl::target(); ++ ++ base.llvm_target = "x86_64-foxkit-linux-musl".into(); ++ base.vendor = "foxkit".into(); ++ base.options.crt_static_default = false; ++ ++ base ++} +-- +2.35.1 + +--- rustc-1.80.0-src/tests/assembly/targets/targets-elf.rs.old 2006-07-23 20:21:28.000000000 -0500 ++++ rustc-1.80.0-src/tests/assembly/targets/targets-elf.rs 2024-07-30 09:49:06.031041198 -0500 +@@ -9,6 +9,9 @@ + //@ revisions: aarch64_be_unknown_netbsd + //@ [aarch64_be_unknown_netbsd] compile-flags: --target aarch64_be-unknown-netbsd + //@ [aarch64_be_unknown_netbsd] needs-llvm-components: aarch64 ++//@ revisions: aarch64_foxkit_linux_musl ++//@ [aarch64_foxkit_linux_musl] compile-flags: --target aarch64-foxkit-linux-musl ++//@ [aarch64_foxkit_linux_musl] needs-llvm-components: aarch64 + //@ revisions: aarch64_fuchsia + //@ [aarch64_fuchsia] compile-flags: --target aarch64-fuchsia + //@ [aarch64_fuchsia] needs-llvm-components: aarch64 +@@ -120,6 +123,9 @@ + //@ revisions: armv6k_nintendo_3ds + //@ [armv6k_nintendo_3ds] compile-flags: --target armv6k-nintendo-3ds + //@ [armv6k_nintendo_3ds] needs-llvm-components: arm ++//@ revisions: armv7_foxkit_linux_musleabihf ++//@ [armv7_foxkit_linux_musleabihf] compile-flags: --target armv7-foxkit-linux-musleabihf ++//@ [armv7_foxkit_linux_musleabihf] needs-llvm-components: arm + //@ revisions: armv7_linux_androideabi + //@ [armv7_linux_androideabi] compile-flags: --target armv7-linux-androideabi + //@ [armv7_linux_androideabi] needs-llvm-components: arm +@@ -192,6 +198,9 @@ + //@ revisions: hexagon_unknown_none_elf + //@ [hexagon_unknown_none_elf] compile-flags: --target hexagon-unknown-none-elf + //@ [hexagon_unknown_none_elf] needs-llvm-components: hexagon ++//@ revisions: i586_foxkit_linux_musl ++//@ [i586_foxkit_linux_musl] compile-flags: --target i586-foxkit-linux-musl ++//@ [i586_foxkit_linux_musl] needs-llvm-components: x86 + //@ revisions: i586_pc_nto_qnx700 + //@ [i586_pc_nto_qnx700] compile-flags: --target i586-pc-nto-qnx700 + //@ [i586_pc_nto_qnx700] needs-llvm-components: x86 +@@ -306,6 +315,9 @@ + //@ revisions: msp430_none_elf + //@ [msp430_none_elf] compile-flags: --target msp430-none-elf + //@ [msp430_none_elf] needs-llvm-components: msp430 ++//@ revisions: powerpc64_foxkit_linux_musl ++//@ [powerpc64_foxkit_linux_musl] compile-flags: --target powerpc64-foxkit-linux-musl ++//@ [powerpc64_foxkit_linux_musl] needs-llvm-components: powerpc + //@ revisions: powerpc64_unknown_freebsd + //@ [powerpc64_unknown_freebsd] compile-flags: --target powerpc64-unknown-freebsd + //@ [powerpc64_unknown_freebsd] needs-llvm-components: powerpc +@@ -330,6 +342,9 @@ + //@ revisions: powerpc64le_unknown_linux_musl + //@ [powerpc64le_unknown_linux_musl] compile-flags: --target powerpc64le-unknown-linux-musl + //@ [powerpc64le_unknown_linux_musl] needs-llvm-components: powerpc ++//@ revisions: powerpc_foxkit_linux_musl ++//@ [powerpc_foxkit_linux_musl] compile-flags: --target powerpc-foxkit-linux-musl ++//@ [powerpc_foxkit_linux_musl] needs-llvm-components: powerpc + //@ revisions: powerpc_unknown_freebsd + //@ [powerpc_unknown_freebsd] compile-flags: --target powerpc-unknown-freebsd + //@ [powerpc_unknown_freebsd] needs-llvm-components: powerpc +@@ -507,6 +522,9 @@ + //@ revisions: x86_64_fortanix_unknown_sgx + //@ [x86_64_fortanix_unknown_sgx] compile-flags: --target x86_64-fortanix-unknown-sgx + //@ [x86_64_fortanix_unknown_sgx] needs-llvm-components: x86 ++//@ revisions: x86_64_foxkit_linux_musl ++//@ [x86_64_foxkit_linux_musl] compile-flags: --target x86_64-foxkit-linux-musl ++//@ [x86_64_foxkit_linux_musl] needs-llvm-components: x86 + //@ revisions: x86_64_fuchsia + //@ [x86_64_fuchsia] compile-flags: --target x86_64-fuchsia + //@ [x86_64_fuchsia] needs-llvm-components: x86 diff --git a/user/rust/0014-Add-foxkit-target-specs.patch b/user/rust/0014-Add-foxkit-target-specs.patch deleted file mode 100644 index ec1a4a0e7..000000000 --- a/user/rust/0014-Add-foxkit-target-specs.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 7e50215a21b198c73fe575d28c847fd645c4ee40 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Mon, 17 Sep 2018 02:29:06 +0000 -Subject: [PATCH 14/14] Add foxkit target specs - ---- - .../src/spec/aarch64_foxkit_linux_musl.rs | 11 +++++++++++ - .../src/spec/armv7_foxkit_linux_musleabihf.rs | 11 +++++++++++ - .../rustc_target/src/spec/i586_foxkit_linux_musl.rs | 11 +++++++++++ - compiler/rustc_target/src/spec/mod.rs | 7 +++++++ - .../src/spec/powerpc64_foxkit_linux_musl.rs | 11 +++++++++++ - .../src/spec/powerpc_foxkit_linux_musl.rs | 11 +++++++++++ - .../rustc_target/src/spec/x86_64_foxkit_linux_musl.rs | 11 +++++++++++ - 7 files changed, 73 insertions(+) - create mode 100644 compiler/rustc_target/src/spec/aarch64_foxkit_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/armv7_foxkit_linux_musleabihf.rs - create mode 100644 compiler/rustc_target/src/spec/i586_foxkit_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/powerpc64_foxkit_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/powerpc_foxkit_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/x86_64_foxkit_linux_musl.rs - -diff --git a/compiler/rustc_target/src/spec/aarch64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_foxkit_linux_musl.rs -new file mode 100644 -index 00000000000..4bdd51af4fe ---- /dev/null -+++ b/compiler/rustc_target/src/spec/aarch64_foxkit_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::aarch64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "aarch64-foxkit-linux-musl".to_string(); -+ base.vendor = "foxkit".to_string(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/armv7_foxkit_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_foxkit_linux_musleabihf.rs -new file mode 100644 -index 00000000000..994f3c39e7c ---- /dev/null -+++ b/compiler/rustc_target/src/spec/armv7_foxkit_linux_musleabihf.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::armv7_unknown_linux_musleabihf::target(); -+ -+ base.llvm_target = "armv7-foxkit-linux-musleabihf".to_string(); -+ base.vendor = "foxkit".to_string(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/i586_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/i586_foxkit_linux_musl.rs -new file mode 100644 -index 00000000000..028e4b5e930 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/i586_foxkit_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::i586_unknown_linux_musl::target(); -+ -+ base.llvm_target = "i586-foxkit-linux-musl".to_string(); -+ base.vendor = "foxkit".to_string(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index 92678aed5b1..66a408d0b36 100644 ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -804,6 +804,13 @@ fn $module() { - } - - supported_targets! { -+ ("aarch64-foxkit-linux-musl", aarch64_foxkit_linux_musl), -+ ("armv7-foxkit-linux-musleabihf", armv7_foxkit_linux_musleabihf), -+ ("i586-foxkit-linux-musl", i586_foxkit_linux_musl), -+ ("powerpc-foxkit-linux-musl", powerpc_foxkit_linux_musl), -+ ("powerpc64-foxkit-linux-musl", powerpc64_foxkit_linux_musl), -+ ("x86_64-foxkit-linux-musl", x86_64_foxkit_linux_musl), -+ - ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu), - ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32), - ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), -diff --git a/compiler/rustc_target/src/spec/powerpc64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_foxkit_linux_musl.rs -new file mode 100644 -index 00000000000..04a50f84b60 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/powerpc64_foxkit_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc64-foxkit-linux-musl".to_string(); -+ base.vendor = "foxkit".to_string(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/powerpc_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_foxkit_linux_musl.rs -new file mode 100644 -index 00000000000..7bca52c4299 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/powerpc_foxkit_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc-foxkit-linux-musl".to_string(); -+ base.vendor = "foxkit".to_string(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/x86_64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_foxkit_linux_musl.rs -new file mode 100644 -index 00000000000..1ff73687c00 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/x86_64_foxkit_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::x86_64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "x86_64-foxkit-linux-musl".to_string(); -+ base.vendor = "foxkit".to_string(); -+ base.options.crt_static_default = false; -+ -+ base -+} --- -2.35.1 - diff --git a/user/rust/0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch b/user/rust/0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch deleted file mode 100644 index 6a65b8f35..000000000 --- a/user/rust/0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fc0cf16ce6bdf46929c91a4826b93370ba08a970 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sun, 3 Jul 2022 18:24:44 -0500 -Subject: [PATCH] psm: Use OpenPOWER ABI on BE PowerPC 64/musl - -The musl libc uses ELFv2 (OpenPOWER ABI) on both big and little endian -64-bit PowerPC targets. Before this change, running `cargo test` on a -powerpc64-foxkit-linux-musl host showed a SIGSEGV. Now all tests pass. - ---- rustc-1.60.0-src/vendor/psm/build.rs.old 2022-04-04 06:10:56.000000000 -0500 -+++ rustc-1.60.0-src/vendor/psm/build.rs 2022-07-03 18:52:46.829357810 -0500 -@@ -41,6 +41,7 @@ - ("arm", _, _, _) => Some(("src/arch/arm_aapcs.s", true)), - ("aarch64", _, _, _) => Some(("src/arch/aarch_aapcs64.s", true)), - ("powerpc", _, _, _) => Some(("src/arch/powerpc32.s", true)), -+ ("powerpc64", _, _, "musl") => Some(("src/arch/powerpc64_openpower.s", true)), - ("powerpc64", "little", _, _) => Some(("src/arch/powerpc64_openpower.s", true)), - ("powerpc64", _, _, _) => Some(("src/arch/powerpc64.s", true)), - ("s390x", _, _, _) => Some(("src/arch/zseries_linux.s", true)), ---- rustc-1.60.0-src/vendor/psm/.cargo-checksum.json.old 2022-04-04 06:10:56.000000000 -0500 -+++ rustc-1.60.0-src/vendor/psm/.cargo-checksum.json 2022-07-03 18:53:10.636824874 -0500 -@@ -1 +1 @@ --{"files":{"Cargo.lock":"2928b712f89aee2b62581df1e552b7cb8288d999ba180291b4900b86a05c6d8d","Cargo.toml":"c2c5a0154a80cffc82349cd98f819ea1259c92f195c5878ceefb66e06b14d28c","LICENSE-APACHE":"965a63a81d9a2fbeb5f9096954dabb49690f9dffcdac9825f675b25c807252a2","LICENSE-MIT":"3e3714aa69bd874601741fd7d7ad5298740cece37778e279fc1ab4451c5a11af","README.mkd":"6385ecaced99b0a29a5b40166d34ef9312f322c1b8ad002bef3b08cd6c3e29b2","build.rs":"1d7872546e6924bbb2947edc055ddd01f48683cc80d9d75a846adb65540345f0","examples/info.rs":"8ffb89912304ecbf3d714dcc094f42e86fdd0738625b2e76be2e7d59ab0736cf","examples/on_stack_fibo.rs":"287f0a08b177a97366a5da39e24e33e1f4bbe30a1f2473956721c8a9d93926a4","examples/on_stack_fibo_alloc_each_frame.rs":"e084041bbb81d51b195a4db539a765409272916df29c83a62213a93de4b6fca3","examples/panics.rs":"6791fe0dda9456b3becf989cbc89bc45ae27302e633572a57bbf10a57b830076","examples/replace_stack_1.rs":"374a28881f5e5dbf9db9b9e34929fb7a7e6f3910d782a6718f53ac269807b990","examples/thread.rs":"3cf92882aff96151608584d63535701cc8e5ae953d7ecf706d77371180bff025","src/arch/aarch64_armasm.asm":"1c737338287f3de981fbae97f104ac5e49425ba7fbcb4f7d80120afae47a86d5","src/arch/aarch_aapcs64.s":"459b8cd5a96104893e8f849ac83369101d7204c933841672df162104bebd2375","src/arch/arm_aapcs.s":"4ada635e8528279bd0326654f5203b6bdc94dd68c94fdef5de551384ba1b1747","src/arch/arm_armasm.asm":"e3b514169f19368b0b49374412de38bd9f50576e7b93b64d685a0f84fa8f4c91","src/arch/mips64_eabi.s":"4e6f95f89ba72fc4dd1a9a547920764f66d98251d236941cee4d227010484520","src/arch/mips_eabi.s":"8b7927fd63660eb276e2951f28df6b11920f04be4dc17a16b66ad386da12c4c3","src/arch/powerpc32.s":"0b508a65dec7254ba2e0dc65a2c9e86c21069fe62f5d7c41f5190415a4885912","src/arch/powerpc64.s":"c1602d09d12ba1df48fc96af0f827f8679fc93cee728813527fb1b817a788911","src/arch/powerpc64_openpower.s":"421b11cc7381427d1e2acb4e681c9836ccfea0b79930492f0a99ec4d27495e58","src/arch/psm.h":"2cebda3740aa73b167b8ec18e3d2202ca46e400a081a46329b86051abd1a872a","src/arch/riscv.s":"a81d2af4bcc9c29db304730697e52a89a7376b51d2735185c67be8910d0cdf39","src/arch/riscv64.s":"a51da67ce569e2442ff487b062bb8fdfe7c769f3f05a88de480bd5ab214d9a4f","src/arch/sparc64.s":"6250acbd938aea2e440061663a79fbb2dac0592b3a193f027b6b910e2a8e3af1","src/arch/sparc_sysv.s":"c2da7576e1fbe2234cc8a5cf937f7676e125435295f8c32089bfa0b0f27fde5e","src/arch/wasm32.o":"d7279f419cb7e169cae2af2463507652e0393b801c2f4580244de70d3def58b6","src/arch/wasm32.s":"1ebdc90de48f13e6474ee17c406578fc090ff61e57c1f560ecf6e6b75c7ef10a","src/arch/x86.s":"1919a4af1474895f904ed4281a4a8fcdd0428dab257bff4ea262db83ed63b445","src/arch/x86_64.s":"c80f1a3e22db61fd62b5ef2e1b6663185403bdcbcfbfe7ff0f8e0831ff0cafcf","src/arch/x86_64_msvc.asm":"85683bc65a03371ea7d8d79dcbe487f690cc2460c359817fc63c30d575ad8957","src/arch/x86_64_windows_gnu.s":"44637034e094ec0ad76dbe1232e97271c8155eb93bcb1dd86fe825acd05978a0","src/arch/x86_msvc.asm":"1735d4b19f8e46d0699fc9538baa7ab0885d27531ef7d9960e2027ad8137769b","src/arch/x86_windows_gnu.s":"b94d907a86f230c5c8ca1c708ede173f73c5269496f3959e08e4a92155e160d7","src/arch/zseries_linux.s":"5c3379a76e31bf13abf240efda12596fabce108cf63f60f9d0495e82ab8f1717","src/lib.rs":"18774ee37630bc6c7a36273014f80f6afa3f73bf34f4c49f5795d2eb5df1c195","tests/stack_direction.rs":"77d8f9dee196e99e70d569f59fef82bc2f88a8ec17bfe07ebe2f005fcb815c8b","tests/stack_direction_2.rs":"f9191394de5b6381af6ba8223e7717230059dc335f639238c0ddbc7eb87bfc0e"},"package":"cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"} -\ No newline at end of file -+{"files":{"Cargo.lock":"2928b712f89aee2b62581df1e552b7cb8288d999ba180291b4900b86a05c6d8d","Cargo.toml":"c2c5a0154a80cffc82349cd98f819ea1259c92f195c5878ceefb66e06b14d28c","LICENSE-APACHE":"965a63a81d9a2fbeb5f9096954dabb49690f9dffcdac9825f675b25c807252a2","LICENSE-MIT":"3e3714aa69bd874601741fd7d7ad5298740cece37778e279fc1ab4451c5a11af","README.mkd":"6385ecaced99b0a29a5b40166d34ef9312f322c1b8ad002bef3b08cd6c3e29b2","build.rs":"1720311de1fd3ffb442697d68a9f1522996de80daf9db44b2635d31e7b3ffbc0","examples/info.rs":"8ffb89912304ecbf3d714dcc094f42e86fdd0738625b2e76be2e7d59ab0736cf","examples/on_stack_fibo.rs":"287f0a08b177a97366a5da39e24e33e1f4bbe30a1f2473956721c8a9d93926a4","examples/on_stack_fibo_alloc_each_frame.rs":"e084041bbb81d51b195a4db539a765409272916df29c83a62213a93de4b6fca3","examples/panics.rs":"6791fe0dda9456b3becf989cbc89bc45ae27302e633572a57bbf10a57b830076","examples/replace_stack_1.rs":"374a28881f5e5dbf9db9b9e34929fb7a7e6f3910d782a6718f53ac269807b990","examples/thread.rs":"3cf92882aff96151608584d63535701cc8e5ae953d7ecf706d77371180bff025","src/arch/aarch64_armasm.asm":"1c737338287f3de981fbae97f104ac5e49425ba7fbcb4f7d80120afae47a86d5","src/arch/aarch_aapcs64.s":"459b8cd5a96104893e8f849ac83369101d7204c933841672df162104bebd2375","src/arch/arm_aapcs.s":"4ada635e8528279bd0326654f5203b6bdc94dd68c94fdef5de551384ba1b1747","src/arch/arm_armasm.asm":"e3b514169f19368b0b49374412de38bd9f50576e7b93b64d685a0f84fa8f4c91","src/arch/mips64_eabi.s":"4e6f95f89ba72fc4dd1a9a547920764f66d98251d236941cee4d227010484520","src/arch/mips_eabi.s":"8b7927fd63660eb276e2951f28df6b11920f04be4dc17a16b66ad386da12c4c3","src/arch/powerpc32.s":"0b508a65dec7254ba2e0dc65a2c9e86c21069fe62f5d7c41f5190415a4885912","src/arch/powerpc64.s":"c1602d09d12ba1df48fc96af0f827f8679fc93cee728813527fb1b817a788911","src/arch/powerpc64_openpower.s":"421b11cc7381427d1e2acb4e681c9836ccfea0b79930492f0a99ec4d27495e58","src/arch/psm.h":"2cebda3740aa73b167b8ec18e3d2202ca46e400a081a46329b86051abd1a872a","src/arch/riscv.s":"a81d2af4bcc9c29db304730697e52a89a7376b51d2735185c67be8910d0cdf39","src/arch/riscv64.s":"a51da67ce569e2442ff487b062bb8fdfe7c769f3f05a88de480bd5ab214d9a4f","src/arch/sparc64.s":"6250acbd938aea2e440061663a79fbb2dac0592b3a193f027b6b910e2a8e3af1","src/arch/sparc_sysv.s":"c2da7576e1fbe2234cc8a5cf937f7676e125435295f8c32089bfa0b0f27fde5e","src/arch/wasm32.o":"d7279f419cb7e169cae2af2463507652e0393b801c2f4580244de70d3def58b6","src/arch/wasm32.s":"1ebdc90de48f13e6474ee17c406578fc090ff61e57c1f560ecf6e6b75c7ef10a","src/arch/x86.s":"1919a4af1474895f904ed4281a4a8fcdd0428dab257bff4ea262db83ed63b445","src/arch/x86_64.s":"c80f1a3e22db61fd62b5ef2e1b6663185403bdcbcfbfe7ff0f8e0831ff0cafcf","src/arch/x86_64_msvc.asm":"85683bc65a03371ea7d8d79dcbe487f690cc2460c359817fc63c30d575ad8957","src/arch/x86_64_windows_gnu.s":"44637034e094ec0ad76dbe1232e97271c8155eb93bcb1dd86fe825acd05978a0","src/arch/x86_msvc.asm":"1735d4b19f8e46d0699fc9538baa7ab0885d27531ef7d9960e2027ad8137769b","src/arch/x86_windows_gnu.s":"b94d907a86f230c5c8ca1c708ede173f73c5269496f3959e08e4a92155e160d7","src/arch/zseries_linux.s":"5c3379a76e31bf13abf240efda12596fabce108cf63f60f9d0495e82ab8f1717","src/lib.rs":"18774ee37630bc6c7a36273014f80f6afa3f73bf34f4c49f5795d2eb5df1c195","tests/stack_direction.rs":"77d8f9dee196e99e70d569f59fef82bc2f88a8ec17bfe07ebe2f005fcb815c8b","tests/stack_direction_2.rs":"f9191394de5b6381af6ba8223e7717230059dc335f639238c0ddbc7eb87bfc0e"},"package":"cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"} diff --git a/user/rust/0040-rls-atomics.patch b/user/rust/0040-rls-atomics.patch deleted file mode 100644 index e084217ba..000000000 --- a/user/rust/0040-rls-atomics.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- rustc-1.58.1-src/src/tools/rls/rls/src/cmd.rs -+++ rustc-1.58.1-src/src/tools/rls/rls/src/cmd.rs -@@ -7,7 +7,7 @@ use crate::config::Config; - use crate::server::{self, LsService, Notification, Request, RequestId}; - use rls_analysis::{AnalysisHost, Target}; - use rls_vfs::Vfs; --use std::sync::atomic::{AtomicU64, Ordering}; -+use std::sync::atomic::{AtomicU32, Ordering}; - - use lsp_types::{ - ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem, -@@ -316,8 +316,8 @@ fn url(file_name: &str) -> Url { - } - - fn next_id() -> RequestId { -- static ID: AtomicU64 = AtomicU64::new(1); -- RequestId::Num(ID.fetch_add(1, Ordering::SeqCst)) -+ static ID: AtomicU32 = AtomicU32::new(1); -+ RequestId::Num(ID.fetch_add(1, Ordering::SeqCst).into()) - } - - // Custom reader and output for the RLS server. ---- rustc-1.58.1-src/src/tools/rls/rls/src/server/io.rs -+++ rustc-1.58.1-src/src/tools/rls/rls/src/server/io.rs -@@ -5,7 +5,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest}; - - use std::fmt; - use std::io::{self, BufRead, Write}; --use std::sync::atomic::{AtomicU64, Ordering}; -+use std::sync::atomic::{AtomicU32, Ordering}; - use std::sync::Arc; - - use jsonrpc_core::{self as jsonrpc, response, version, Id}; -@@ -169,13 +169,13 @@ pub trait Output: Sync + Send + Clone + 'static { - /// An output that sends notifications and responses on `stdout`. - #[derive(Clone)] - pub(super) struct StdioOutput { -- next_id: Arc<AtomicU64>, -+ next_id: Arc<AtomicU32>, - } - - impl StdioOutput { - /// Constructs a new `stdout` output. - pub(crate) fn new() -> StdioOutput { -- StdioOutput { next_id: Arc::new(AtomicU64::new(1)) } -+ StdioOutput { next_id: Arc::new(AtomicU32::new(1).into()) } - } - } - -@@ -192,7 +192,7 @@ impl Output for StdioOutput { - } - - fn provide_id(&self) -> RequestId { -- RequestId::Num(self.next_id.fetch_add(1, Ordering::SeqCst)) -+ RequestId::Num(self.next_id.fetch_add(1, Ordering::SeqCst).into()) - } - } - diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD index 71c68ec18..ede75b2d8 100644 --- a/user/rust/APKBUILD +++ b/user/rust/APKBUILD @@ -1,21 +1,27 @@ # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=rust -pkgver=1.60.0 -_bootver=1.60.0 -_llvmver=14 +pkgver=1.80.0 +_bootver=1.79.0-r0 +_llvmver=18 pkgrel=0 pkgdesc="The Rust Programming Language" url="https://www.rust-lang.org" arch="all" -options="!check" # Failures on aarch64 and ppc64. +#options="!check" # Failures on aarch64 and ppc64. license="(Apache-2.0 OR MIT) AND (NCSA OR MIT) AND BSD-2-Clause AND BSD-3-Clause" depends="$pkgname-std=$pkgver-r$pkgrel gcc musl-dev" +# debuginfo-gdb tests fail due to security settings +# node makes Rust think it can do rustdoc-gui tests which require many NPM pkgs +checkdepends="!gdb !node" makedepends=" curl-dev llvm$_llvmver-dev llvm$_llvmver-test-utils openssl-dev python3 + cargo-bootstrap=$_bootver + rust-bootstrap=$_bootver + rustfmt-bootstrap=$_bootver zlib-dev " provides="$pkgname-bootstrap=$pkgver-r$pkgrel" @@ -33,66 +39,43 @@ subpackages=" cargo-doc:_cargo_doc:noarch cargo-bash-completion:_cargo_bashcomp:noarch cargo-zsh-completion:_cargo_zshcomp:noarch - rls rustfmt " -_targets=" - aarch64-foxkit-linux-musl - armv7-foxkit-linux-musleabihf - i586-foxkit-linux-musl - powerpc-foxkit-linux-musl - powerpc64-foxkit-linux-musl - x86_64-foxkit-linux-musl - " source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz 0001-Fix-LLVM-build.patch 0002-Fix-linking-to-zlib-when-cross-compiling.patch 0003-Fix-rustdoc-when-cross-compiling-on-musl.patch - 0004-Use-static-native-libraries-when-linking-static-exec.patch - 0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch - 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch - 0007-Link-libssp_nonshared.a-on-all-musl-targets.patch - 0008-test-failed-doctest-output-Fix-normalization.patch - 0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch - 0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch - 0011-Ignore-broken-and-non-applicable-tests.patch - 0012-Link-stage-2-tools-dynamically-to-libstd.patch - 0013-Move-debugger-scripts-to-usr-share-rust.patch - 0014-Add-foxkit-target-specs.patch - 0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch - 0040-rls-atomics.patch + 0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch + 0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch + 0006-Link-libssp_nonshared.a-on-all-musl-targets.patch + 0007-test-failed-doctest-output-Fix-normalization.patch + 0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch + 0009-Ignore-broken-and-non-applicable-tests.patch + 0010-Link-stage-2-tools-dynamically-to-libstd.patch + 0011-Move-debugger-scripts-to-usr-share-rust.patch + 0012-Add-foxkit-target-specs.patch + mir-opt-tests-endianness.patch powerpc-atomics.patch + ppc64-abi.patch + stdarch-ppc.patch + test-be.patch + ui-test-strings.patch " -for t in $_targets; do - source="$source - https://distfiles.adelielinux.org/source/rust/cargo-$_bootver-$t.tar.xz - https://distfiles.adelielinux.org/source/rust/rust-std-$_bootver-$t.tar.xz - https://distfiles.adelielinux.org/source/rust/rustc-$_bootver-$t.tar.xz - " -done builddir="$srcdir/rustc-$pkgver-src" _rlibdir="/usr/lib/rustlib/$CTARGET/lib" prepare() { default_prepare + # These tests require Node and various NPM packages. + rm -rf "$builddir"/tests/rustdoc-* - $srcdir/cargo-$_bootver-$CBUILD/install.sh \ - --destdir=$srcdir/prebuilt \ - --prefix=/ \ - --disable-ldconfig - $srcdir/rust-std-$_bootver-$CBUILD/install.sh \ - --destdir=$srcdir/prebuilt \ - --prefix=/ \ - --disable-ldconfig - $srcdir/rustc-$_bootver-$CBUILD/install.sh \ - --destdir=$srcdir/prebuilt \ - --prefix=/ \ - --disable-ldconfig + # Tests depend on FP precision that can't be given on i586: #1259 + rm -f "$builddir"/tests/ui/traits/object/print_vtable_sizes.rs + rm -f "$builddir"/tests/ui/traits/object/print_vtable_sizes.stdout } build() { cat > config.toml <<- EOF - changelog-seen = 2 [build] doc-stage = 2 build-stage = 2 @@ -100,9 +83,9 @@ build() { build = "$CBUILD" host = [ "$CHOST" ] target = [ "$CTARGET" ] - cargo = "$srcdir/prebuilt/bin/cargo" - rustc = "$srcdir/prebuilt/bin/rustc" - rustfmt = "$srcdir/prebuilt/bin/rustfmt" + cargo = "/usr/bin/cargo" + rustc = "/usr/bin/rustc" + rustfmt = "/usr/bin/rustfmt" docs = true compiler-docs = false submodules = false @@ -110,7 +93,7 @@ build() { locked-deps = true vendor = true extended = true - tools = [ "analysis", "cargo", "clippy", "rls", "rustfmt", "src" ] + tools = [ "analysis", "cargo", "clippy", "rustfmt", "src" ] verbose = 1 sanitizers = false profiler = false @@ -121,7 +104,7 @@ build() { optimize = true debug = false codegen-units = 1 - debuginfo-level = 2 + debuginfo-level = 1 debuginfo-level-rustc = 0 debuginfo-level-tests = 0 backtrace = true @@ -162,7 +145,7 @@ build() { check() { LLVM_LINK_SHARED=1 \ - python3 x.py test -j ${JOBS:-2} --no-doc --no-fail-fast + python3 x.py test -j ${JOBS:-2} --no-doc tests/ui } package() { @@ -294,16 +277,9 @@ _cargo_doc() { "$subpkgdir"/usr/share/man/man1 } -rls() { - pkgdesc="The Rust language server" - license="Apache-2.0 OR MIT" - depends="$pkgname-std=$pkgver-r$pkgrel" - - _mv "$pkgdir"/usr/bin/rls "$subpkgdir"/usr/bin -} - rustfmt() { pkgdesc="Format Rust code" + provides="rustfmt-bootstrap=$pkgver-r$pkgrel" depends="$pkgname-std=$pkgver-r$pkgrel" _mv "$pkgdir"/usr/bin/rustfmt "$subpkgdir"/usr/bin @@ -315,39 +291,22 @@ _mv() { mv "$@" } -sha512sums="d0c113e8c2c67bf10773c9403dc4c4700c4deb2fb287bfec51e565d3473d2b481d8ae2c90b272cd67b3a87d7443ea25a34c7b40ba8cd7106bf5d71126ab141c3 rustc-1.60.0-src.tar.xz -c65d52bbc3745fcc5c4fd314cc7f00be6778579983002d3f8d173611d034686293f318b07e3327d2d09d2e81f092c2f287d6aede7494e94f12e99d2575875e27 0001-Fix-LLVM-build.patch -e28d0f44ab0b4af68ed8fbef394ca362bdbbfee7011342bfd5e4195069e716b581bd50e21494ce51f6d8f7a4797d1342fb807c910a275fb394ca503f345a8664 0002-Fix-linking-to-zlib-when-cross-compiling.patch -7d174cd27e618212e534459455b9017636f56e9a9db81413a714f718a988a9d1fc7b4c0b98d4a2f0b1971d662c7df98be370e0d10e81d3e50d37589fe3b671fa 0003-Fix-rustdoc-when-cross-compiling-on-musl.patch -0ea1605f7e7b94a317cead8b2552fa0d95b6bd41a4727d892fa284ccb5b718aa32a625abcaa4c651a324437c4c06e53da464c6cb21518663bda05ded4ba12815 0004-Use-static-native-libraries-when-linking-static-exec.patch -dad4fc3ece2e093ed90e10b04a7c1fcdcec3e6fcfc5818401db19ec20365f581dc2ed1f771abca64e24edf3e6bc9c67fbecb85e1470a00359a00a47eab3b45f6 0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch -65116731811c178e980b1d980d524645897bc3f81e9f9ad8051235fa4bad7bbf20519173057e9d7b3f9c8459cc35dd2902c7ccd9e5070587848ea9886793ea35 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch -21550b68581c46847ccd5fb20551441b8ce41e948a596bfaffa6f81fcb1a273756e76bcf7ac033241b248b93661a09a9962ae7ffd93b7850d13e5e51695ec705 0007-Link-libssp_nonshared.a-on-all-musl-targets.patch -9242b001e8c4a9ae5a7a726e43724c3e07813e3105fae50efab5f289f15fb6493cb6f15694f5a0289d5a7effc0704f2fe715af981c50d54a805393c0c72e2cf7 0008-test-failed-doctest-output-Fix-normalization.patch -45bcce759138df475f8fbeb8089420bd38a399f5a018ebdf6d5a79e7c714c9ec770c765c32dda0ab4e368c5dd226f474b6894d70b14e41bea57284eeeb1a2f58 0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch -23f622841ba2030b02f52ed560c4be6800469e8021aa71842a702860c97b90edadf5de593ea4f6b9a158d7d0e4c83b52b419f770a8dac2b69633d643468c54d5 0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch -73282af6c50155a29c2c98117a1ce6d28be42d04c25dc8ea2388de6923361fb7ae44d16bb81c57bb3d326d434f11ae6cdf72b8a0293421e8d0eaa931398e52d3 0011-Ignore-broken-and-non-applicable-tests.patch -2f139d1d544b2f1248f352bf3cadb93ca5935338a671480045979579ebab8f0f6b8f7509256fb0f31083291c58310f83c32b9034ca2229dd6dbacb6a743eae74 0012-Link-stage-2-tools-dynamically-to-libstd.patch -62b08c73e62da98fa02c26f47a5009f9ebcab95090d51cc55ae005827f366de5b556c32c995f55f9025fadeff4e0485ed0908526845a02abe5ae8b1b86839130 0013-Move-debugger-scripts-to-usr-share-rust.patch -530bae858f9db0049f4b4666afb05cadf25f37181597274a7a456fc51b32f04523da75ee7ab9ab1d8226c7e7ddd2b771bb9d2052cab430e482d2d1ee6b34eafc 0014-Add-foxkit-target-specs.patch -7fee0667793d5d5ee5cb600e24129c81de50511814e8f1a2f16bb47350087c5f42a01671415b10b01e414e9ff03008892a35c6cb616737175217bdccd1fa3f1e 0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch -a2a05a64ca57dcde23c11ed8bd6ce530d80b99464c895c256b4e9cba02997121205a091de43f516563d5d618ea522d89639507ba94961807ada743a3099fe8d8 0040-rls-atomics.patch -99db0614b821a1ef767f68396253f7a620a491adf29ea01887cf4614e4dbb63c2544e1d7a6ad63a629995a2093cb26b4013f9a321dab65a235187e825c51c6a8 powerpc-atomics.patch -d9140531c720f128371a7abe1b15dcafd44859e52ef64c18cbebad16fa60bb928671eced22ef2b6ec46e2826bc7a1f4e1eeffcd5f187b26b74b41e543d515a01 cargo-1.60.0-aarch64-foxkit-linux-musl.tar.xz -b620eb8855190bb6d56d79decfef1bc90f073fb11f61cf236443c43b774502499735cc18b778886df226bdffbb834bc39ef8c910877849600377c97d0ba33cee rust-std-1.60.0-aarch64-foxkit-linux-musl.tar.xz -d436a1b5bccac1917ba8ef3110c66e81d146369833729081ffb56004fbbde2becee871dc636f13b722517fb443e74d8f532c7eaa92f8e1f65608c9f5bd2d5ab3 rustc-1.60.0-aarch64-foxkit-linux-musl.tar.xz -114063a3624c2c7bc65f4176209baa13cf633a64b75fc7c962cc999f5caf3ee5b9f60e3ad2c6a93df3ea1e00ac45259ad076d8ec04a0e4d9511b21c804ae5eb5 cargo-1.60.0-armv7-foxkit-linux-musleabihf.tar.xz -9819a4f9e7c8125896cd42fed02e84678218937cd0a8758e5b16011d4486305211b777c191cc1f9ac68f3100b7b94bd6a874a3f5f63400851bac90db055c9f6b rust-std-1.60.0-armv7-foxkit-linux-musleabihf.tar.xz -40a57b5a05e31145e7664db674c8793ab874cd651bcd7577aea9225904413f085086102abfe244bdc78b19b8d6e6d0bc3a7009294b9021a1befa8f2f0216f68d rustc-1.60.0-armv7-foxkit-linux-musleabihf.tar.xz -9c8679b6611a4b356e500fe4f4b1b3523db09ddf9abec9b39ca2e0436a0b34558790348f7594132a8a5d6b8d4390a24252ae9afa7c16962f7b3609fa970c9775 cargo-1.60.0-i586-foxkit-linux-musl.tar.xz -a37fa51e63cfbb357b197f8c4d0ba3673e8eee5bd788cca8a79836248451f6e34304bc93960b758848089e2c99d6ae8fd20ad9f9838af53b2243d396666f6ea9 rust-std-1.60.0-i586-foxkit-linux-musl.tar.xz -b66f58da3a9f72a051342df3e57e4a204f44570c5e05c2bd2e00d22051403fac57f0edbaf595d05f1d57ac91dcb5bdab01a32c081b9b4d45c9768f58fff85a0e rustc-1.60.0-i586-foxkit-linux-musl.tar.xz -649c554666a2ed39db0176daf1f76ea51093cf2aa56c692830cff22c9e79ce622be9117c1026efed5a0fdcbe65efe57f5233cc2e88126dc708527f8ee9d03687 cargo-1.60.0-powerpc-foxkit-linux-musl.tar.xz -f262de70c936bc33ec4836a66f0320ca0a99b19c8996174dba2596a4d373cfe6e19acfe12b255fbd0fe54fe2a8a5ca31e85f7974c3504d58b219f6bca6164efa rust-std-1.60.0-powerpc-foxkit-linux-musl.tar.xz -f52d03674577fca4b48f9ea3d5d60170a63a4f378ab8cdffca62bb3c6e9850371ad37d125bdf155e15edae1ca7a86ef7bef6ec02216755a96cef35f3a98cdb50 rustc-1.60.0-powerpc-foxkit-linux-musl.tar.xz -8a70eec1ccbad10022b6bbdd4c2be096130fdccad776f21608c074653afc3dc68aee0ee2475d9df877c447109584d36f94936dc22eead3700b6cee59ac5ae7e8 cargo-1.60.0-powerpc64-foxkit-linux-musl.tar.xz -72848344807e1dff8b872848c7449631397f8167619a6916ffeb4e0a43ecc394ec32c407cf2c7a85613690abba1d39087568a307f99e0e5a9afe656133c85765 rust-std-1.60.0-powerpc64-foxkit-linux-musl.tar.xz -7ce9d9b10e50e96b377fe1e3e1bab2b422432b234fe217c2df5bbd766d384bdeceb015e0a847a45ab2906144e09cdd2d95857941a4f46ede78597d04438e7aa5 rustc-1.60.0-powerpc64-foxkit-linux-musl.tar.xz -249322775192152da6578122cd608cc2649edbbb9df54ea1132b2ec0b353b4ad9e2ac3295c8fb32777b3a255a4a8569feca4a63f5e1723299f53265a9d32945a cargo-1.60.0-x86_64-foxkit-linux-musl.tar.xz -c55fb5896fdabd091f14dfdb872cec249358dfffe8a5fd8987a3ee193cdfc741dd47e5577718e00386abf4015e0717747cc377d11a467f8774a4d0e9cd4657a9 rust-std-1.60.0-x86_64-foxkit-linux-musl.tar.xz -f63c79a5f51c5369747d2bc3bccd06ddac3d2c36b68fd058f499217d64abddad00902c5b59be4601bd587ff9761fc95f9af8a6182868b125d9a9fdae80db4ade rustc-1.60.0-x86_64-foxkit-linux-musl.tar.xz" +sha512sums="548522599122bdff739472c1d120dcff8de171d6f4155c2fb73e47c7d80431694ceceb0439f36ef2a7bea23ac5a76de8e1f75fcade1f3ff2c3fca0ab21e6197a rustc-1.80.0-src.tar.xz +b701f9ae32c4e62dde7ecaef40a9083f6253d83dcd3821c6ce86784fb439b11c5b908e42b4d9eff9ebe8860b3b4673c489ff8e6b4828e15df02756e4c8985c94 0001-Fix-LLVM-build.patch +1f976da43d99ff58b7d8716e594485e191c2df43ab4c75123a223ae0cfcca0c129281575d2bee5996faf10f9008357d30c48876a491b62bdd722c83c4f3d35d2 0002-Fix-linking-to-zlib-when-cross-compiling.patch +619a0150bdc59ef8d844e9eff907e51015003164d17012b38bcac642618efb65e25ea4b1ead06d4b023caf02d4eb8dbd481daa04b42d0002a9986f05854c0ca4 0003-Fix-rustdoc-when-cross-compiling-on-musl.patch +cfd8cfc1a8af2a8319ae9bd4ed14b1ef22d429e99da4237ea7d037d6fa556174db6b47e9268c8c258e08b7a71d8c2370cce8445c3dd994a07e4699705f2ae2de 0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch +6868fe48b7424d39c94ea560037ab4154a0b8f20a027617433d912a5ec60cf0bf1a49da165009345b75f8aedf7d0f81dd23135f9bb28d3f5cd081b56aa74a986 0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch +b34187a82cd3db02b8aac8f18147d653a7191b841e145460dfbff518a7747a6aa1c08721703929bfc7e446c9ed9512383a5eefaad2cb5c02d16e8f00d12627db 0006-Link-libssp_nonshared.a-on-all-musl-targets.patch +e13020274290c1149b7fcf3a119cc34d7f6b64abaa69d6ac9a8780569c4f44041c40b915da6e9675cc7e0ee05d42b13e14608fbab6eac6d3547428bf21f4e9f2 0007-test-failed-doctest-output-Fix-normalization.patch +6850174cebb3dfb2f41e277b0b46db9cabe18c904f39a6775f8cd12dc6c237a7de820a5dc8c538f9b965c069b4197141f0613add096574a7df4ca2d1ae01ab4d 0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +f98ae741a9f33a0e3541c6c43a3eb86b653b202d70783435ea2cc1b35c1da8b6db796e9217e243050de05b9ea2520600c5e890481d2366a1da742aad3482fab2 0009-Ignore-broken-and-non-applicable-tests.patch +6b68d068d7653b81590f7a0bd5359868c0ce48fa3eda467cac9dbfcead7b566ab27489ee923b024e71294130a17b1f2efc1a06a8effc93ea4a4d5a43ec8d091d 0010-Link-stage-2-tools-dynamically-to-libstd.patch +c6d94cbb80394d270302a2389c22b528583c4ad7298c7b3f657175912e0abd075b45ec847daa2c8e6e4eb38536a8a37461cd15d78c0f83771d816f11e1cf2e01 0011-Move-debugger-scripts-to-usr-share-rust.patch +690d12d2b983f82fadad1ff661887852227871787d8b4f5dff7de96ac94dbb7d64887e19258fa146e8cf1e6356cffa6e5954739e9e133165e8d2c970c6f47a84 0012-Add-foxkit-target-specs.patch +e8561c9ceadf121239ad13496e4baeca6a93e29bb99bc2d37d9e1919caaf0e2456219a0e3d3cd88af281b2b9d23c735597f1ee05cc99daa690961397aa28efa6 mir-opt-tests-endianness.patch +5d57a7a18e0a7f8b7755de89255f97642e4fe585a02465de70227867ac99db84766cd25e702ae13c3a4488504bd4c84eb7e9ceb3a83fdf8f2df0eacf64cc16c1 powerpc-atomics.patch +4d21e0e04768e19f1d93ee54d787ed1c4c6fe1e7cab91c92413caa22765f96843f9d98ccb014210d893b3a6bb3246b6fba60b8d6d8a832fedbeff50803225b81 ppc64-abi.patch +63592425a6f68046b75148a25289ff1b8b6a7db02ca0aa7c97d35697f18267a6adeb8be3136c8fd930704352d5528e70b0d57f79bac39b9331953174f76d5919 stdarch-ppc.patch +07591c0b6731349093aee868723ab526391a6dda946e9dd442428d878e3d5f23223277778ea71860f0101cac23f47e7973f36d4fd88cf5d3e3ad95e9d6b07b27 test-be.patch +c1cdcff68504e5b7b9d5f3081c83c8d8855d9523cc3539bd727f3dc78b7db70b4ce40c76852dd62fc50423128faf86ed8af1c65f7955134af85bc494dd376001 ui-test-strings.patch" diff --git a/user/rust/maintain b/user/rust/maintain deleted file mode 100755 index 7242bcc60..000000000 --- a/user/rust/maintain +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -e - -# https://distfiles.smaeul.xyz/distfiles/adelie/ -# https://gist.github.com/smaeul/21b74f847c31824eed4291eb265fa801 - -BASE=https://distfiles.smaeul.xyz/distfiles/adelie; -DEST=/var/www/source/rust; - -cd ${DEST}; - -curl -s ${BASE}/ \ - | grep -Eo 'href=.*\.xz"' \ - | cut -d'"' -f2 \ - | while read k; do - printf " * %s\n" "${k}"; - curl -sO ${BASE}/${k}; - done diff --git a/user/rust/mir-opt-tests-endianness.patch b/user/rust/mir-opt-tests-endianness.patch new file mode 100644 index 000000000..e6972ebe9 --- /dev/null +++ b/user/rust/mir-opt-tests-endianness.patch @@ -0,0 +1,1564 @@ +Upstream: https://github.com/rust-lang/rust/pull/126502 + +From 31851d4770774ac95a694f2596138fc43fcd39b4 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Fri, 14 Jun 2024 15:49:45 -0700 +Subject: [PATCH 1/3] Add `-Zdump-mir-exclude-alloc-bytes` + +--- + compiler/rustc_interface/src/tests.rs | 1 + + compiler/rustc_middle/src/mir/pretty.rs | 3 +++ + compiler/rustc_session/src/options.rs | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs +index 6ffc518097ef0..619b125a8780d 100644 +--- a/compiler/rustc_interface/src/tests.rs ++++ b/compiler/rustc_interface/src/tests.rs +@@ -683,6 +683,7 @@ fn test_unstable_options_tracking_hash() { + untracked!(dump_mir, Some(String::from("abc"))); + untracked!(dump_mir_dataflow, true); + untracked!(dump_mir_dir, String::from("abc")); ++ untracked!(dump_mir_exclude_alloc_bytes, true); + untracked!(dump_mir_exclude_pass_number, true); + untracked!(dump_mir_graphviz, true); + untracked!(dump_mono_stats, SwitchWithOptPath::Enabled(Some("mono-items-dir/".into()))); +diff --git a/compiler/rustc_middle/src/mir/pretty.rs b/compiler/rustc_middle/src/mir/pretty.rs +index 4657f4dcf8132..3ea98de1a177d 100644 +--- a/compiler/rustc_middle/src/mir/pretty.rs ++++ b/compiler/rustc_middle/src/mir/pretty.rs +@@ -1521,6 +1521,9 @@ impl<'a, 'tcx, Prov: Provenance, Extra, Bytes: AllocBytes> std::fmt::Display + // We are done. + return write!(w, " {{}}"); + } ++ if tcx.sess.opts.unstable_opts.dump_mir_exclude_alloc_bytes { ++ return write!(w, " {{ .. }}"); ++ } + // Write allocation bytes. + writeln!(w, " {{")?; + write_allocation_bytes(tcx, alloc, w, " ")?; +diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs +index 9a10adeb6d1a1..a3f1369776de4 100644 +--- a/compiler/rustc_session/src/options.rs ++++ b/compiler/rustc_session/src/options.rs +@@ -1647,6 +1647,8 @@ options! { + (default: no)"), + dump_mir_dir: String = ("mir_dump".to_string(), parse_string, [UNTRACKED], + "the directory the MIR is dumped into (default: `mir_dump`)"), ++ dump_mir_exclude_alloc_bytes: bool = (false, parse_bool, [UNTRACKED], ++ "exclude the raw bytes of allocations when dumping MIR (used in tests) (default: no)"), + dump_mir_exclude_pass_number: bool = (false, parse_bool, [UNTRACKED], + "exclude the pass number when dumping MIR (used in tests) (default: no)"), + dump_mir_graphviz: bool = (false, parse_bool, [UNTRACKED], + +From 1a05cb2d9358879468c87645b0c1d5d1e8e12a12 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Fri, 14 Jun 2024 16:01:26 -0700 +Subject: [PATCH 2/3] Use `-Zdump-mir-exclude-alloc-bytes` in some mir-opt + tests + +--- + tests/mir-opt/const_debuginfo.rs | 2 +- + tests/mir-opt/const_prop/address_of_pair.rs | 1 + + tests/mir-opt/const_prop/checked_add.rs | 2 +- + tests/mir-opt/const_prop/mutable_variable_aggregate.rs | 1 + + tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs | 1 + + tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs | 1 + + tests/mir-opt/const_prop/return_place.rs | 2 +- + tests/mir-opt/const_prop/slice_len.rs | 2 +- + tests/mir-opt/const_prop/tuple_literal_propagation.rs | 1 + + tests/mir-opt/dataflow-const-prop/checked.rs | 2 +- + tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs | 2 +- + tests/mir-opt/dataflow-const-prop/enum.rs | 1 + + tests/mir-opt/dataflow-const-prop/struct.rs | 1 + + tests/mir-opt/dataflow-const-prop/tuple.rs | 1 + + tests/mir-opt/enum_opt.rs | 2 +- + tests/mir-opt/gvn.rs | 1 + + tests/mir-opt/pre-codegen/optimizes_into_variable.rs | 2 +- + 17 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/tests/mir-opt/const_debuginfo.rs b/tests/mir-opt/const_debuginfo.rs +index 907d7fef06746..3b2bc4559ced9 100644 +--- a/tests/mir-opt/const_debuginfo.rs ++++ b/tests/mir-opt/const_debuginfo.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: ConstDebugInfo +-//@ compile-flags: -C overflow-checks=no -Zmir-enable-passes=+GVN ++//@ compile-flags: -C overflow-checks=no -Zmir-enable-passes=+GVN -Zdump-mir-exclude-alloc-bytes + + struct Point { + x: u32, +diff --git a/tests/mir-opt/const_prop/address_of_pair.rs b/tests/mir-opt/const_prop/address_of_pair.rs +index 6d0c0f8ad52a7..9acaaa0ccaf9d 100644 +--- a/tests/mir-opt/const_prop/address_of_pair.rs ++++ b/tests/mir-opt/const_prop/address_of_pair.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR address_of_pair.fn0.GVN.diff + pub fn fn0() -> bool { +diff --git a/tests/mir-opt/const_prop/checked_add.rs b/tests/mir-opt/const_prop/checked_add.rs +index 0560b04957311..d450f7d03f38c 100644 +--- a/tests/mir-opt/const_prop/checked_add.rs ++++ b/tests/mir-opt/const_prop/checked_add.rs +@@ -1,6 +1,6 @@ + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + //@ test-mir-pass: GVN +-//@ compile-flags: -C overflow-checks=on ++//@ compile-flags: -C overflow-checks=on -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR checked_add.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate.rs +index 7de647ed9c37f..80cd75215c1b7 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate.rs ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR mutable_variable_aggregate.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs +index 5656c0e7a6863..856afd53ab46b 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR mutable_variable_aggregate_mut_ref.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs +index cc92949128f72..2c6cc0db6b211 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs ++++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs +@@ -1,5 +1,6 @@ + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR mutable_variable_unprop_assign.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/return_place.rs b/tests/mir-opt/const_prop/return_place.rs +index e7eea11ae492f..c5293aa73e55b 100644 +--- a/tests/mir-opt/const_prop/return_place.rs ++++ b/tests/mir-opt/const_prop/return_place.rs +@@ -1,6 +1,6 @@ + //@ test-mir-pass: GVN + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY +-//@ compile-flags: -C overflow-checks=on ++//@ compile-flags: -C overflow-checks=on -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR return_place.add.GVN.diff + // EMIT_MIR return_place.add.PreCodegen.before.mir +diff --git a/tests/mir-opt/const_prop/slice_len.rs b/tests/mir-opt/const_prop/slice_len.rs +index 63cdbf01b3e82..265a496f39a36 100644 +--- a/tests/mir-opt/const_prop/slice_len.rs ++++ b/tests/mir-opt/const_prop/slice_len.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: GVN +-//@ compile-flags: -Zmir-enable-passes=+InstSimplify ++//@ compile-flags: -Zmir-enable-passes=+InstSimplify -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + // EMIT_MIR_FOR_EACH_BIT_WIDTH + +diff --git a/tests/mir-opt/const_prop/tuple_literal_propagation.rs b/tests/mir-opt/const_prop/tuple_literal_propagation.rs +index e42a62cb6fdf3..baed5670dda81 100644 +--- a/tests/mir-opt/const_prop/tuple_literal_propagation.rs ++++ b/tests/mir-opt/const_prop/tuple_literal_propagation.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + // EMIT_MIR tuple_literal_propagation.main.GVN.diff + +diff --git a/tests/mir-opt/dataflow-const-prop/checked.rs b/tests/mir-opt/dataflow-const-prop/checked.rs +index a73693464f95b..f5a6cdb2c8d35 100644 +--- a/tests/mir-opt/dataflow-const-prop/checked.rs ++++ b/tests/mir-opt/dataflow-const-prop/checked.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: DataflowConstProp +-//@ compile-flags: -Coverflow-checks=on ++//@ compile-flags: -Coverflow-checks=on -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + + // EMIT_MIR checked.main.DataflowConstProp.diff +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs +index 3a0cbac328cb5..087bd7a18572c 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: DataflowConstProp +-//@ compile-flags: -Zmir-enable-passes=+GVN,+Inline ++//@ compile-flags: -Zmir-enable-passes=+GVN,+Inline -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.rs b/tests/mir-opt/dataflow-const-prop/enum.rs +index 946cfa4c76c02..37304e3a270e9 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.rs ++++ b/tests/mir-opt/dataflow-const-prop/enum.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: DataflowConstProp ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + + #![feature(custom_mir, core_intrinsics, rustc_attrs)] +diff --git a/tests/mir-opt/dataflow-const-prop/struct.rs b/tests/mir-opt/dataflow-const-prop/struct.rs +index eed782c9036b2..4b160c3dab7e8 100644 +--- a/tests/mir-opt/dataflow-const-prop/struct.rs ++++ b/tests/mir-opt/dataflow-const-prop/struct.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: DataflowConstProp ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + + #[derive(Copy, Clone)] +diff --git a/tests/mir-opt/dataflow-const-prop/tuple.rs b/tests/mir-opt/dataflow-const-prop/tuple.rs +index d624e21f21ac4..19b675770abe9 100644 +--- a/tests/mir-opt/dataflow-const-prop/tuple.rs ++++ b/tests/mir-opt/dataflow-const-prop/tuple.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: DataflowConstProp ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + + // EMIT_MIR tuple.main.DataflowConstProp.diff +diff --git a/tests/mir-opt/enum_opt.rs b/tests/mir-opt/enum_opt.rs +index 2cc5df84d6b59..e42be8ac06dc9 100644 +--- a/tests/mir-opt/enum_opt.rs ++++ b/tests/mir-opt/enum_opt.rs +@@ -1,7 +1,7 @@ + // skip-filecheck + //@ test-mir-pass: EnumSizeOpt + // EMIT_MIR_FOR_EACH_BIT_WIDTH +-//@ compile-flags: -Zunsound-mir-opts ++//@ compile-flags: -Zunsound-mir-opts -Zdump-mir-exclude-alloc-bytes + + #![feature(arbitrary_enum_discriminant, repr128)] + +diff --git a/tests/mir-opt/gvn.rs b/tests/mir-opt/gvn.rs +index 86f42d23f3835..29f28e7af4145 100644 +--- a/tests/mir-opt/gvn.rs ++++ b/tests/mir-opt/gvn.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + //@ only-64bit + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.rs b/tests/mir-opt/pre-codegen/optimizes_into_variable.rs +index de5e2d5c3121b..44b4b0ad888a5 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.rs ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.rs +@@ -1,6 +1,6 @@ + // skip-filecheck + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY +-//@ compile-flags: -C overflow-checks=on ++//@ compile-flags: -C overflow-checks=on -Zdump-mir-exclude-alloc-bytes + + struct Point { + x: u32, + +From 7c3673ff6f2ff4e8e85344c091c9feb4b5da1290 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Fri, 14 Jun 2024 16:05:22 -0700 +Subject: [PATCH 3/3] Bless mir-opt for excluded alloc bytes + +--- + .../const_debuginfo.main.ConstDebugInfo.diff | 8 +-- + .../const_prop/address_of_pair.fn0.GVN.diff | 6 +- + .../checked_add.main.GVN.panic-abort.diff | 6 +- + .../checked_add.main.GVN.panic-unwind.diff | 6 +- + .../mutable_variable_aggregate.main.GVN.diff | 6 +- + ...e_variable_aggregate_mut_ref.main.GVN.diff | 6 +- + ...le_unprop_assign.main.GVN.panic-abort.diff | 6 +- + ...e_unprop_assign.main.GVN.panic-unwind.diff | 6 +- + .../return_place.add.GVN.panic-abort.diff | 6 +- + .../return_place.add.GVN.panic-unwind.diff | 6 +- + ...lace.add.PreCodegen.before.panic-abort.mir | 4 +- + ...ace.add.PreCodegen.before.panic-unwind.mir | 4 +- + .../slice_len.main.GVN.32bit.panic-abort.diff | 6 +- + ...slice_len.main.GVN.32bit.panic-unwind.diff | 6 +- + .../slice_len.main.GVN.64bit.panic-abort.diff | 6 +- + ...slice_len.main.GVN.64bit.panic-unwind.diff | 6 +- + ...eral_propagation.main.GVN.panic-abort.diff | 6 +- + ...ral_propagation.main.GVN.panic-unwind.diff | 6 +- + ...ed.main.DataflowConstProp.panic-abort.diff | 10 +--- + ...d.main.DataflowConstProp.panic-unwind.diff | 10 +--- + ...n.DataflowConstProp.32bit.panic-abort.diff | 12 +--- + ....DataflowConstProp.32bit.panic-unwind.diff | 12 +--- + ...n.DataflowConstProp.64bit.panic-abort.diff | 12 +--- + ....DataflowConstProp.64bit.panic-unwind.diff | 12 +--- + ...oxed_slice.main.GVN.32bit.panic-abort.diff | 14 ++--- + ...xed_slice.main.GVN.32bit.panic-unwind.diff | 14 ++--- + ...oxed_slice.main.GVN.64bit.panic-abort.diff | 14 ++--- + ...xed_slice.main.GVN.64bit.panic-unwind.diff | 14 ++--- + .../enum.simple.DataflowConstProp.32bit.diff | 6 +- + .../enum.simple.DataflowConstProp.64bit.diff | 6 +- + .../enum.statics.DataflowConstProp.32bit.diff | 23 +++----- + .../enum.statics.DataflowConstProp.64bit.diff | 23 +++----- + .../struct.main.DataflowConstProp.32bit.diff | 58 ++++++------------- + .../struct.main.DataflowConstProp.64bit.diff | 58 ++++++------------- + .../tuple.main.DataflowConstProp.32bit.diff | 18 ++---- + .../tuple.main.DataflowConstProp.64bit.diff | 18 ++---- + .../enum_opt.cand.EnumSizeOpt.32bit.diff | 6 +- + .../enum_opt.cand.EnumSizeOpt.64bit.diff | 6 +- + .../enum_opt.unin.EnumSizeOpt.32bit.diff | 6 +- + .../enum_opt.unin.EnumSizeOpt.64bit.diff | 6 +- + ...vn.arithmetic_checked.GVN.panic-abort.diff | 6 +- + ...n.arithmetic_checked.GVN.panic-unwind.diff | 6 +- + .../gvn.fn_pointers.GVN.panic-abort.diff | 18 +++--- + .../gvn.fn_pointers.GVN.panic-unwind.diff | 18 +++--- + .../gvn.indirect_static.GVN.panic-abort.diff | 4 +- + .../gvn.indirect_static.GVN.panic-unwind.diff | 4 +- + .../gvn.wide_ptr_integer.GVN.panic-abort.diff | 10 +--- + ...gvn.wide_ptr_integer.GVN.panic-unwind.diff | 10 +--- + ...o_variable.main.GVN.32bit.panic-abort.diff | 6 +- + ..._variable.main.GVN.32bit.panic-unwind.diff | 6 +- + ...o_variable.main.GVN.64bit.panic-abort.diff | 6 +- + ..._variable.main.GVN.64bit.panic-unwind.diff | 6 +- + 52 files changed, 182 insertions(+), 382 deletions(-) + +diff --git a/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff +index ac33f51984cd8..8088984bc77ab 100644 +--- a/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff ++++ b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff +@@ -105,11 +105,7 @@ + } + } + +- ALLOC0 (size: 8, align: 4) { +- 20 00 00 00 20 00 00 00 │ ... ... +- } ++ ALLOC0 (size: 8, align: 4) { .. } + +- ALLOC1 (size: 4, align: 2) { +- 01 00 63 00 │ ..c. +- } ++ ALLOC1 (size: 4, align: 2) { .. } + +diff --git a/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff b/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff +index 3f4958f60e85b..ac372f837268b 100644 +--- a/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff ++++ b/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff +@@ -44,9 +44,7 @@ + StorageDead(_2); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff +index 0e93c167ebc96..798f957caa58c 100644 +--- a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff +@@ -24,9 +24,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff +index 589eed5776c9f..a09f8ee5be12a 100644 +--- a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff +@@ -24,9 +24,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff +index b6ff7b0fc234d..7584353620ec5 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff +@@ -24,9 +24,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 2a 00 00 00 2b 00 00 00 │ *...+... + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff +index 4ed7c98514796..e16e2969eb895 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff +@@ -31,9 +31,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 2a 00 00 00 2b 00 00 00 │ *...+... + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff +index d1d23675bfd91..19d79694666f2 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff +@@ -48,9 +48,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff +index 4d69c9ce2efe6..2bb277bf27f7f 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff +@@ -48,9 +48,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff b/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff +index b2d40daa80c4c..037fe60c2fdb3 100644 +--- a/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff +@@ -17,9 +17,7 @@ + + _0 = const 4_u32; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff +index 2eafc51cd3db6..438a1cebea8cb 100644 +--- a/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff +@@ -17,9 +17,7 @@ + + _0 = const 4_u32; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir +index f87c26bb004c6..66fd61cc3aee9 100644 +--- a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir ++++ b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir +@@ -15,6 +15,4 @@ fn add() -> u32 { + } + } + +-ALLOC0 (size: 8, align: 4) { +- 04 00 00 00 00 __ __ __ │ .....░░░ +-} ++ALLOC0 (size: 8, align: 4) { .. } +diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir +index 33f97591387c3..f9b07a59de9c3 100644 +--- a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir ++++ b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir +@@ -15,6 +15,4 @@ fn add() -> u32 { + } + } + +-ALLOC0 (size: 8, align: 4) { +- 04 00 00 00 00 __ __ __ │ .....░░░ +-} ++ALLOC0 (size: 8, align: 4) { .. } +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff +index ef298dddd5a49..8415789de6ecd 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff +index 5379df3f60b44..fea7caac3cdce 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff +index ef298dddd5a49..8415789de6ecd 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff +index 5379df3f60b44..fea7caac3cdce 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff +index c2f3fb1b3b575..bf8fece3d37b9 100644 +--- a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff +@@ -31,9 +31,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff +index 55d9a3b0cac67..02a75849d8872 100644 +--- a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff +@@ -31,9 +31,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff +index 53663c6476bdc..79ea55617481e 100644 +--- a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff +@@ -76,13 +76,9 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 80 01 __ __ __ │ .....░░░ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 03 00 00 00 00 __ __ __ │ .....░░░ +- } +++ ALLOC1 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff +index 34feb2a640629..bd22c50dd8fcf 100644 +--- a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff +@@ -76,13 +76,9 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 80 01 __ __ __ │ .....░░░ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 03 00 00 00 00 __ __ __ │ .....░░░ +- } +++ ALLOC1 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff +index 8005bc23cf699..4097e060f4d47 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff +@@ -94,15 +94,9 @@ + } + } + +- ALLOC2 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC2 (size: 8, align: 4) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC1 (size: 8, align: 4) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff +index 42b1be32387c4..ff44d0df5e3e9 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff +@@ -98,15 +98,9 @@ + } + } + +- ALLOC2 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC2 (size: 8, align: 4) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC1 (size: 8, align: 4) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff +index 7b57b0db50c94..3662c3b59d271 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff +@@ -94,15 +94,9 @@ + } + } + +- ALLOC2 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC2 (size: 16, align: 8) { .. } + +- ALLOC1 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC1 (size: 16, align: 8) { .. } + +- ALLOC0 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff +index 2e75a63e29052..68dee57dee9e0 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff +@@ -98,15 +98,9 @@ + } + } + +- ALLOC2 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC2 (size: 16, align: 8) { .. } + +- ALLOC1 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC1 (size: 16, align: 8) { .. } + +- ALLOC0 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff +index 06011f9d75967..9d96e895c8aa5 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff +@@ -102,17 +102,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind unreachable]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +- } +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff +index eb4a3ffd91d2e..0bdff584b01ec 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff +@@ -106,17 +106,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind: bb2]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +- } +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff +index a7cc243e548e9..99e96fe5d70fd 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff +@@ -102,17 +102,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind unreachable]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC2 (size: 16, align: 8) { .. } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff +index c905a48862caa..5eefabeac3868 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff +@@ -106,17 +106,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind: bb2]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC2 (size: 16, align: 8) { .. } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff +index 89ed26f065b28..a64dda0d06c48 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff +@@ -60,9 +60,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff +index 89ed26f065b28..a64dda0d06c48 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff +@@ -60,9 +60,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff +index fe8ed0114897d..b4d14f25fe2ab 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff +@@ -43,7 +43,7 @@ + bb0: { + StorageLive(_1); + StorageLive(_2); +- _2 = const {ALLOC1: &E}; ++ _2 = const {ALLOC0: &E}; + - _1 = (*_2); + + _1 = const E::V1(0_i32); + StorageDead(_2); +@@ -79,7 +79,7 @@ + bb4: { + StorageLive(_7); + StorageLive(_8); +- _8 = const {ALLOC2: &&E}; ++ _8 = const {ALLOC1: &&E}; + _7 = (*_8); + StorageDead(_8); + StorageLive(_9); +@@ -111,21 +111,14 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC3 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } + +- ALLOC2 (static: RC, size: 4, align: 4) { +- ╾ALLOC0<imm>╼ │ ╾──╼ +- } +++ ALLOC2 (size: 8, align: 4) { .. } +++ ++ ALLOC1 (static: RC, size: 4, align: 4) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 04 00 00 00 │ ........ +- } ++- ALLOC2 (size: 8, align: 4) { .. } +++ ALLOC3 (size: 8, align: 4) { .. } + +- ALLOC1 (static: statics::C, size: 8, align: 4) { +- 00 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (static: statics::C, size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff +index df3a989d09eba..57d02b87d1369 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff +@@ -43,7 +43,7 @@ + bb0: { + StorageLive(_1); + StorageLive(_2); +- _2 = const {ALLOC1: &E}; ++ _2 = const {ALLOC0: &E}; + - _1 = (*_2); + + _1 = const E::V1(0_i32); + StorageDead(_2); +@@ -79,7 +79,7 @@ + bb4: { + StorageLive(_7); + StorageLive(_8); +- _8 = const {ALLOC2: &&E}; ++ _8 = const {ALLOC1: &&E}; + _7 = (*_8); + StorageDead(_8); + StorageLive(_9); +@@ -111,21 +111,14 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC3 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } + +- ALLOC2 (static: RC, size: 8, align: 8) { +- ╾ALLOC0<imm>╼ │ ╾──────╼ +- } +++ ALLOC2 (size: 8, align: 4) { .. } +++ ++ ALLOC1 (static: RC, size: 8, align: 8) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 04 00 00 00 │ ........ +- } ++- ALLOC2 (size: 8, align: 4) { .. } +++ ALLOC3 (size: 8, align: 4) { .. } + +- ALLOC1 (static: statics::C, size: 8, align: 4) { +- 00 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (static: statics::C, size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff +index f674169e28b26..a6da1483c1ac5 100644 +--- a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff +@@ -112,7 +112,7 @@ + _9 = (_10.2: &[f32]); + StorageDead(_10); + StorageLive(_14); +- _14 = const {ALLOC4: &&SmallStruct}; ++ _14 = const {ALLOC0: &&SmallStruct}; + _31 = deref_copy (*_14); + StorageLive(_11); + _32 = deref_copy (*_14); +@@ -149,7 +149,7 @@ + _21 = (_22.2: &[f32]); + StorageDead(_22); + StorageLive(_26); +- _26 = const {ALLOC5: &&BigStruct}; ++ _26 = const {ALLOC1: &&BigStruct}; + _35 = deref_copy (*_26); + StorageLive(_23); + _36 = deref_copy (*_26); +@@ -197,51 +197,31 @@ + StorageDead(_1); + return; + } +-+ } ++ } ++ +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC6 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC3 (size: 8, align: 4) { .. } + + +-+ ALLOC7 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC4 (size: 8, align: 4) { .. } + + +-+ ALLOC8 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC5 (size: 8, align: 4) { .. } + + +-+ ALLOC9 (size: 8, align: 4) { +-+ 01 00 00 00 01 00 00 00 │ ........ +-+ } +++ ALLOC6 (size: 4, align: 4) { .. } + + +-+ ALLOC10 (size: 4, align: 4) { +-+ 01 00 00 00 │ .... +- } +- +- ALLOC5 (static: BIG_STAT, size: 4, align: 4) { +- ╾ALLOC0<imm>╼ │ ╾──╼ +- } ++ ALLOC1 (static: BIG_STAT, size: 4, align: 4) { .. } + +- ALLOC0 (size: 20, align: 4) { +- 0x00 │ 01 00 00 00 23 00 00 00 ╾ALLOC1<imm>╼ 02 00 00 00 │ ....#...╾──╼.... +- 0x10 │ 00 00 a4 42 │ ...B +- } ++- ALLOC2 (size: 20, align: 4) { .. } +++ ALLOC7 (size: 20, align: 4) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 00 00 34 42 00 00 90 42 │ ..4B...B +- } ++- ALLOC3 (size: 8, align: 4) { .. } +++ ALLOC8 (size: 8, align: 4) { .. } + +- ALLOC4 (static: SMALL_STAT, size: 4, align: 4) { +- ╾ALLOC2<imm>╼ │ ╾──╼ +- } ++ ALLOC0 (static: SMALL_STAT, size: 4, align: 4) { .. } + +- ALLOC2 (size: 20, align: 4) { +- 0x00 │ 00 00 00 00 __ __ __ __ ╾ALLOC3<imm>╼ 01 00 00 00 │ ....░░░░╾──╼.... +- 0x10 │ 00 00 10 41 │ ...A +- } ++- ALLOC4 (size: 20, align: 4) { .. } +++ ALLOC9 (size: 20, align: 4) { .. } + +- ALLOC3 (size: 4, align: 4) { +- 00 00 50 41 │ ..PA +- } ++- ALLOC5 (size: 4, align: 4) { .. } +++ ALLOC10 (size: 4, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff +index c2608190a6b97..7ca25e4429953 100644 +--- a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff +@@ -112,7 +112,7 @@ + _9 = (_10.2: &[f32]); + StorageDead(_10); + StorageLive(_14); +- _14 = const {ALLOC4: &&SmallStruct}; ++ _14 = const {ALLOC0: &&SmallStruct}; + _31 = deref_copy (*_14); + StorageLive(_11); + _32 = deref_copy (*_14); +@@ -149,7 +149,7 @@ + _21 = (_22.2: &[f32]); + StorageDead(_22); + StorageLive(_26); +- _26 = const {ALLOC5: &&BigStruct}; ++ _26 = const {ALLOC1: &&BigStruct}; + _35 = deref_copy (*_26); + StorageLive(_23); + _36 = deref_copy (*_26); +@@ -197,51 +197,31 @@ + StorageDead(_1); + return; + } +-+ } ++ } ++ +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC6 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC3 (size: 8, align: 4) { .. } + + +-+ ALLOC7 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC4 (size: 8, align: 4) { .. } + + +-+ ALLOC8 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC5 (size: 8, align: 4) { .. } + + +-+ ALLOC9 (size: 8, align: 4) { +-+ 01 00 00 00 01 00 00 00 │ ........ +-+ } +++ ALLOC6 (size: 4, align: 4) { .. } + + +-+ ALLOC10 (size: 4, align: 4) { +-+ 01 00 00 00 │ .... +- } +- +- ALLOC5 (static: BIG_STAT, size: 8, align: 8) { +- ╾ALLOC0<imm>╼ │ ╾──────╼ +- } ++ ALLOC1 (static: BIG_STAT, size: 8, align: 8) { .. } + +- ALLOC0 (size: 32, align: 8) { +- 0x00 │ 01 00 00 00 23 00 00 00 ╾ALLOC1<imm>╼ │ ....#...╾──────╼ +- 0x10 │ 02 00 00 00 00 00 00 00 00 00 a4 42 __ __ __ __ │ ...........B░░░░ +- } ++- ALLOC2 (size: 32, align: 8) { .. } +++ ALLOC7 (size: 32, align: 8) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 00 00 34 42 00 00 90 42 │ ..4B...B +- } ++- ALLOC3 (size: 8, align: 4) { .. } +++ ALLOC8 (size: 8, align: 4) { .. } + +- ALLOC4 (static: SMALL_STAT, size: 8, align: 8) { +- ╾ALLOC2<imm>╼ │ ╾──────╼ +- } ++ ALLOC0 (static: SMALL_STAT, size: 8, align: 8) { .. } + +- ALLOC2 (size: 32, align: 8) { +- 0x00 │ 00 00 00 00 __ __ __ __ ╾ALLOC3<imm>╼ │ ....░░░░╾──────╼ +- 0x10 │ 01 00 00 00 00 00 00 00 00 00 10 41 __ __ __ __ │ ...........A░░░░ +- } ++- ALLOC4 (size: 32, align: 8) { .. } +++ ALLOC9 (size: 32, align: 8) { .. } + +- ALLOC3 (size: 4, align: 4) { +- 00 00 50 41 │ ..PA +- } ++- ALLOC5 (size: 4, align: 4) { .. } +++ ALLOC10 (size: 4, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff +index f5723cac7d9c8..e4031b65caafe 100644 +--- a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff +@@ -92,21 +92,13 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC3 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ +- } +++ ALLOC3 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff +index f5723cac7d9c8..e4031b65caafe 100644 +--- a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff +@@ -92,21 +92,13 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC3 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ +- } +++ ALLOC3 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff +index 775a60f1c9603..085c55caaa03c 100644 +--- a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff ++++ b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 05 20 00 00 │ ..... .. + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff +index c4b57579943d4..798b7c10fe8d5 100644 +--- a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff ++++ b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 02 00 00 00 00 00 00 00 05 20 00 00 00 00 00 00 │ ......... ...... + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff +index f7d0d1fb56c3e..a04829af4b532 100644 +--- a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff ++++ b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 05 20 00 00 01 00 00 00 │ . ...... + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff +index 15f1bd0df51a2..f5521a1e22a47 100644 +--- a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff ++++ b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 05 20 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ . .............. + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff +index 5bf22af6ae83d..0e3f2459fae35 100644 +--- a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff +@@ -140,9 +140,7 @@ + _0 = const (); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 00 00 00 00 00 00 00 00 00 __ __ __ __ __ __ __ │ .........░░░░░░░ + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff +index 18d2029e44500..2873d7ef0ab13 100644 +--- a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff +@@ -140,9 +140,7 @@ + _0 = const (); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 00 00 00 00 00 00 00 00 00 __ __ __ __ __ __ __ │ .........░░░░░░░ + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff b/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff +index 0c49e706c9ecf..b5c0cee784688 100644 +--- a/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff +@@ -8,10 +8,10 @@ + let mut _3: fn(u8) -> u8; + let _5: (); + let mut _6: fn(u8) -> u8; +- let mut _9: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _9: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _10: (); + let mut _11: fn(); +- let mut _13: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _13: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _14: (); + let mut _15: fn(); + scope 1 { +@@ -19,7 +19,7 @@ + let _4: fn(u8) -> u8; + scope 2 { + debug g => _4; +- let _7: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let _7: {closure@$DIR/gvn.rs:613:19: 613:21}; + scope 3 { + debug closure => _7; + let _8: fn(); +@@ -62,16 +62,16 @@ + StorageDead(_6); + StorageDead(_5); + - StorageLive(_7); +-- _7 = {closure@$DIR/gvn.rs:612:19: 612:21}; ++- _7 = {closure@$DIR/gvn.rs:613:19: 613:21}; + - StorageLive(_8); + + nop; +-+ _7 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +++ _7 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; + + nop; + StorageLive(_9); + - _9 = _7; + - _8 = move _9 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _9 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _8 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _9 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _8 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_9); + StorageLive(_10); + StorageLive(_11); +@@ -88,8 +88,8 @@ + StorageLive(_13); + - _13 = _7; + - _12 = move _13 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _13 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _12 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _13 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _12 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_13); + StorageLive(_14); + StorageLive(_15); +diff --git a/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff b/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff +index e5f865b74b9f4..7bc6573c13d4d 100644 +--- a/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff +@@ -8,10 +8,10 @@ + let mut _3: fn(u8) -> u8; + let _5: (); + let mut _6: fn(u8) -> u8; +- let mut _9: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _9: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _10: (); + let mut _11: fn(); +- let mut _13: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _13: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _14: (); + let mut _15: fn(); + scope 1 { +@@ -19,7 +19,7 @@ + let _4: fn(u8) -> u8; + scope 2 { + debug g => _4; +- let _7: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let _7: {closure@$DIR/gvn.rs:613:19: 613:21}; + scope 3 { + debug closure => _7; + let _8: fn(); +@@ -62,16 +62,16 @@ + StorageDead(_6); + StorageDead(_5); + - StorageLive(_7); +-- _7 = {closure@$DIR/gvn.rs:612:19: 612:21}; ++- _7 = {closure@$DIR/gvn.rs:613:19: 613:21}; + - StorageLive(_8); + + nop; +-+ _7 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +++ _7 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; + + nop; + StorageLive(_9); + - _9 = _7; + - _8 = move _9 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _9 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _8 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _9 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _8 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_9); + StorageLive(_10); + StorageLive(_11); +@@ -88,8 +88,8 @@ + StorageLive(_13); + - _13 = _7; + - _12 = move _13 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _13 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _12 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _13 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _12 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_13); + StorageLive(_14); + StorageLive(_15); +diff --git a/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff b/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff +index f853942bbb664..e84f91e495d9c 100644 +--- a/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff +@@ -13,7 +13,5 @@ + } + } + +- ALLOC0 (static: A, size: 2, align: 1) { +- 00 __ │ .░ +- } ++ ALLOC0 (static: A, size: 2, align: 1) { .. } + +diff --git a/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff b/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff +index f853942bbb664..e84f91e495d9c 100644 +--- a/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff +@@ -13,7 +13,5 @@ + } + } + +- ALLOC0 (static: A, size: 2, align: 1) { +- 00 __ │ .░ +- } ++ ALLOC0 (static: A, size: 2, align: 1) { .. } + +diff --git a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff +index 07c4c7663c154..3eed0473f7fc2 100644 +--- a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff +@@ -176,13 +176,9 @@ + + nop; + return; + } +-+ } ++ } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff +index df0f93f1077ee..9a6e255a872ea 100644 +--- a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff +@@ -176,13 +176,9 @@ + + nop; + return; + } +-+ } ++ } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff +index 2f34a62b3d136..45b8d89c0f4fa 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff +index da7add371a5bf..e6ee1e6f9a348 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff +index 2f34a62b3d136..45b8d89c0f4fa 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff +index da7add371a5bf..e6ee1e6f9a348 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + diff --git a/user/rust/powerpc-atomics.patch b/user/rust/powerpc-atomics.patch index 8ce1802e3..1a7d4dbea 100644 --- a/user/rust/powerpc-atomics.patch +++ b/user/rust/powerpc-atomics.patch @@ -1,37 +1,5 @@ ---- rustc-1.60.0-src/vendor/crossbeam-epoch-0.9.6/no_atomic.rs.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-epoch-0.9.6/no_atomic.rs 2022-11-23 07:34:18.412044423 +0000 -@@ -33,6 +33,7 @@ - "mipsel-unknown-none", - "mipsisa32r6-unknown-linux-gnu", - "mipsisa32r6el-unknown-linux-gnu", -+ "powerpc-foxkit-linux-musl", - "powerpc-unknown-freebsd", - "powerpc-unknown-linux-gnu", - "powerpc-unknown-linux-gnuspe", ---- rustc-1.60.0-src/vendor/crossbeam-epoch-0.9.6/.cargo-checksum.json.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-epoch-0.9.6/.cargo-checksum.json 2022-11-23 07:34:44.339249221 +0000 -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"7f3c7198f2e33ba93bb8270e1c1e8dc6d70c343987acd9d0706e3632cbb9e0ad","Cargo.lock":"10e3899295e7e8ce93d3f0b597efbec844bdda40f78ae717f5995341d41ee937","Cargo.toml":"d7e7ab87ca4a4e8cc4ae9644e1537eedc46473ff5f89399b4733c4bdf59058db","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"58a36da8f9ca3a9206d31a0d6e7548f200fe8746ebca5edca48679b0d29a8043","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic.rs":"63843b5ecd51b3fc98336247abe8efa824d826f142e40a761636e530d06f3b41","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"ea532517c8ca22010ed9a624b059471c8a57b25e7925f6a5dfb391be7646a1fa","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"7f3c7198f2e33ba93bb8270e1c1e8dc6d70c343987acd9d0706e3632cbb9e0ad","Cargo.lock":"10e3899295e7e8ce93d3f0b597efbec844bdda40f78ae717f5995341d41ee937","Cargo.toml":"d7e7ab87ca4a4e8cc4ae9644e1537eedc46473ff5f89399b4733c4bdf59058db","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"58a36da8f9ca3a9206d31a0d6e7548f200fe8746ebca5edca48679b0d29a8043","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"9414a8b6357e7c09f0d3d27e7738c96e1de8f5123a9183a90d463887ad3d91fb","src/atomic.rs":"63843b5ecd51b3fc98336247abe8efa824d826f142e40a761636e530d06f3b41","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"ea532517c8ca22010ed9a624b059471c8a57b25e7925f6a5dfb391be7646a1fa","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"} ---- rustc-1.60.0-src/vendor/crossbeam-epoch/no_atomic.rs.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-epoch/no_atomic.rs 2022-11-23 07:36:20.388894146 +0000 -@@ -38,6 +38,7 @@ - "mipsisa32r6-unknown-linux-gnu", - "mipsisa32r6el-unknown-linux-gnu", - "msp430-none-elf", -+ "powerpc-foxkit-linux-musl", - "powerpc-unknown-freebsd", - "powerpc-unknown-linux-gnu", - "powerpc-unknown-linux-gnuspe", ---- rustc-1.60.0-src/vendor/crossbeam-epoch/.cargo-checksum.json.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-epoch/.cargo-checksum.json 2022-11-23 07:37:55.218670583 +0000 -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"e365bcbfe702521e5001b10a9020da1625a02ea10f9f85a6ea94b61ced1e3c52","Cargo.lock":"cd2eea41973a985820c82112362fa654b4ceae9a0c7d5a67b8a5d3bc5cc34bde","Cargo.toml":"ea11651861129a3c0b0fc9ef38b725368e3983f674f8783fc5d9787459636456","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"ee1eaeee830c08c770bb84b40e6400af52c8db464945df0b82c8a4a4b4c681ec","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"e9050fceb20d62c608ff58e96f0324ad35e52137007115b03ba11011a5f673b5","src/atomic.rs":"3cbcf2aed303d5c2ce0a77461da9a01d31dec15a5d5ff4315d6dda3d090c3a90","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"8ced786536d8d688381a8aa0b61e6e4d5e4fdd88e892cf82c0c5731e4801aa60","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"e365bcbfe702521e5001b10a9020da1625a02ea10f9f85a6ea94b61ced1e3c52","Cargo.lock":"cd2eea41973a985820c82112362fa654b4ceae9a0c7d5a67b8a5d3bc5cc34bde","Cargo.toml":"ea11651861129a3c0b0fc9ef38b725368e3983f674f8783fc5d9787459636456","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"ee1eaeee830c08c770bb84b40e6400af52c8db464945df0b82c8a4a4b4c681ec","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"946da1976a3d8606f0fe4b573163d57636f82e2d8d1b73330675e23c606d954f","src/atomic.rs":"3cbcf2aed303d5c2ce0a77461da9a01d31dec15a5d5ff4315d6dda3d090c3a90","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"8ced786536d8d688381a8aa0b61e6e4d5e4fdd88e892cf82c0c5731e4801aa60","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"} ---- rustc-1.60.0-src/vendor/valuable/no_atomic.rs.old 2022-04-04 11:10:57.000000000 +0000 -+++ rustc-1.60.0-src/vendor/valuable/no_atomic.rs 2022-11-23 07:36:37.687029241 +0000 +--- rustc-1.60.0-src/vendor/valuable-0.1.0/no_atomic.rs.old 2022-04-04 11:10:57.000000000 +0000 ++++ rustc-1.60.0-src/vendor/valuable-0.1.0/no_atomic.rs 2022-11-23 07:36:37.687029241 +0000 @@ -32,6 +32,7 @@ "mipsel-unknown-none", "mipsisa32r6-unknown-linux-gnu", @@ -40,41 +8,9 @@ "powerpc-unknown-freebsd", "powerpc-unknown-linux-gnu", "powerpc-unknown-linux-gnuspe", ---- rustc-1.60.0-src/vendor/valuable/.cargo-checksum.json.old 2022-04-04 11:10:57.000000000 +0000 -+++ rustc-1.60.0-src/vendor/valuable/.cargo-checksum.json 2022-11-23 07:38:07.397357603 +0000 +--- rustc-1.60.0-src/vendor/valuable-0.1.0/.cargo-checksum.json.old 2022-04-04 11:10:57.000000000 +0000 ++++ rustc-1.60.0-src/vendor/valuable-0.1.0/.cargo-checksum.json 2022-11-23 07:38:07.397357603 +0000 @@ -1 +1 @@ -{"files":{"Cargo.lock":"fea5e41d2befef0b42734010a85f95548b5255ff1e4ee2dd2e6827adb8fe5f3e","Cargo.toml":"995a2454b4e3e583124d60b694e106ebd193b9742df3e050a6f49e5801b3597b","benches/structable.rs":"1baad763d1b0900004682b139efd58b17c974dc2068ede2229f8786e4a21372e","build.rs":"4ad508d818c27ee58bf7da2b9b4b425dae3e2656850327b3080fe2ad38767928","examples/derive.rs":"238473e63c0647cdb6652f1613575e24b323d40db5c8f3e5c32d64a3ea6b4048","examples/hello_world.rs":"75e48360e53b37e077e574d9c1aa2754b197f551ac5d604b03ebec9d31bab5cf","examples/print.rs":"924c55402b18e518317acc013a6cf407fcc13532c1eca8d9cd5f5631e79df960","no_atomic.rs":"b1c5cb0bd10733eb20516d10edc047b45aa67943f3347ae44fb779ed7fc7aff2","src/enumerable.rs":"008fe833c558f7e956ba0238a9d66947a671f66c5762905ed79d48a428c0ad44","src/field.rs":"c3d96f215c4bfc2a3910d0616fb335332d17f7dcf93ca739c933d88e1f98d229","src/lib.rs":"6954630c4c7c389192f3f8b5097076bbba6e43b5c4cd4ec68b4ffc18bff0a5b4","src/listable.rs":"f1a0743ed650604634972c19b66505a5727a6a6e2d7b54861e65cdcf10949432","src/mappable.rs":"ef7d334ef00d6b34cbff45b73b13935de6659933abafff9ad3d5d2a16d7ccac1","src/named_values.rs":"df5009074379ea59b02ebaf730890d0a4b6fa5c67c4057cc60f84d3652ca2bc5","src/slice.rs":"e382f56eb14ea7848276a4c8bda537f5207a4a6ed7a4b2ee4d2dde7feebce3b4","src/structable.rs":"369b17701d59bab138eac22ec043d434a052f49976236cc5ee680e72ca23ed6e","src/tuplable.rs":"e8b64a0761263666d984257109b5d54337cd97be59f08b08ec153e68ec1636c5","src/valuable.rs":"f8fdef201d3181935330fb86b27c455a5c86079f9f2cad363cda765801d7dd50","src/value.rs":"479d2c5b9d84c930e3abfe0032734ad92b243cf095f5fea6226a9da5eec81484","src/visit.rs":"060bacd3e1c0b333692f96c3ca970ca47a859cc28700713630996d9f0dc1668e"},"package":"830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"} \ No newline at end of file +{"files":{"Cargo.lock":"fea5e41d2befef0b42734010a85f95548b5255ff1e4ee2dd2e6827adb8fe5f3e","Cargo.toml":"995a2454b4e3e583124d60b694e106ebd193b9742df3e050a6f49e5801b3597b","benches/structable.rs":"1baad763d1b0900004682b139efd58b17c974dc2068ede2229f8786e4a21372e","build.rs":"4ad508d818c27ee58bf7da2b9b4b425dae3e2656850327b3080fe2ad38767928","examples/derive.rs":"238473e63c0647cdb6652f1613575e24b323d40db5c8f3e5c32d64a3ea6b4048","examples/hello_world.rs":"75e48360e53b37e077e574d9c1aa2754b197f551ac5d604b03ebec9d31bab5cf","examples/print.rs":"924c55402b18e518317acc013a6cf407fcc13532c1eca8d9cd5f5631e79df960","no_atomic.rs":"66d1146a63de2d24058f657aa14570038b96795a7facbab11402a96b6008f01a","src/enumerable.rs":"008fe833c558f7e956ba0238a9d66947a671f66c5762905ed79d48a428c0ad44","src/field.rs":"c3d96f215c4bfc2a3910d0616fb335332d17f7dcf93ca739c933d88e1f98d229","src/lib.rs":"6954630c4c7c389192f3f8b5097076bbba6e43b5c4cd4ec68b4ffc18bff0a5b4","src/listable.rs":"f1a0743ed650604634972c19b66505a5727a6a6e2d7b54861e65cdcf10949432","src/mappable.rs":"ef7d334ef00d6b34cbff45b73b13935de6659933abafff9ad3d5d2a16d7ccac1","src/named_values.rs":"df5009074379ea59b02ebaf730890d0a4b6fa5c67c4057cc60f84d3652ca2bc5","src/slice.rs":"e382f56eb14ea7848276a4c8bda537f5207a4a6ed7a4b2ee4d2dde7feebce3b4","src/structable.rs":"369b17701d59bab138eac22ec043d434a052f49976236cc5ee680e72ca23ed6e","src/tuplable.rs":"e8b64a0761263666d984257109b5d54337cd97be59f08b08ec153e68ec1636c5","src/valuable.rs":"f8fdef201d3181935330fb86b27c455a5c86079f9f2cad363cda765801d7dd50","src/value.rs":"479d2c5b9d84c930e3abfe0032734ad92b243cf095f5fea6226a9da5eec81484","src/visit.rs":"060bacd3e1c0b333692f96c3ca970ca47a859cc28700713630996d9f0dc1668e"},"package":"830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"} ---- rustc-1.60.0-src/vendor/crossbeam-utils-0.8.6/no_atomic.rs.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-utils-0.8.6/no_atomic.rs 2022-11-23 07:36:45.626173325 +0000 -@@ -33,6 +33,7 @@ - "mipsel-unknown-none", - "mipsisa32r6-unknown-linux-gnu", - "mipsisa32r6el-unknown-linux-gnu", -+ "powerpc-foxkit-linux-musl", - "powerpc-unknown-freebsd", - "powerpc-unknown-linux-gnu", - "powerpc-unknown-linux-gnuspe", ---- rustc-1.60.0-src/vendor/crossbeam-utils-0.8.6/.cargo-checksum.json.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-utils-0.8.6/.cargo-checksum.json 2022-11-23 07:38:18.586151345 +0000 -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"097eb3484f4f13471dfe6879ce61450cc60d4453aecb924f38a8f0e4af593cdd","Cargo.toml":"2734493ab832f12a4f849c333d2dd11760c6ce614b88355da21118f77acdcd70","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"39cf39e855e52559c8f68880a02b3e2778ae2d8f089650af1b3e34a85898aed7","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic/atomic_cell.rs":"9d0785073f506b75c110270947f6a8367ead7faaf29c507d4ede37125310cff6","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"ba2e34ed1e27f0d0d4f1bb8a5feb4eb8131f756adb27a719de52c26ee7b86b9c","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"097eb3484f4f13471dfe6879ce61450cc60d4453aecb924f38a8f0e4af593cdd","Cargo.toml":"2734493ab832f12a4f849c333d2dd11760c6ce614b88355da21118f77acdcd70","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"39cf39e855e52559c8f68880a02b3e2778ae2d8f089650af1b3e34a85898aed7","no_atomic.rs":"9414a8b6357e7c09f0d3d27e7738c96e1de8f5123a9183a90d463887ad3d91fb","src/atomic/atomic_cell.rs":"9d0785073f506b75c110270947f6a8367ead7faaf29c507d4ede37125310cff6","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"ba2e34ed1e27f0d0d4f1bb8a5feb4eb8131f756adb27a719de52c26ee7b86b9c","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"} ---- rustc-1.60.0-src/vendor/crossbeam-utils/no_atomic.rs.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-utils/no_atomic.rs 2022-11-23 07:36:50.575639725 +0000 -@@ -38,6 +38,7 @@ - "mipsisa32r6-unknown-linux-gnu", - "mipsisa32r6el-unknown-linux-gnu", - "msp430-none-elf", -+ "powerpc-foxkit-linux-musl", - "powerpc-unknown-freebsd", - "powerpc-unknown-linux-gnu", - "powerpc-unknown-linux-gnuspe", ---- rustc-1.60.0-src/vendor/crossbeam-utils/.cargo-checksum.json.old 2022-04-04 11:10:55.000000000 +0000 -+++ rustc-1.60.0-src/vendor/crossbeam-utils/.cargo-checksum.json 2022-11-23 07:38:29.424982814 +0000 -@@ -1 +1 @@ --{"files":{"CHANGELOG.md":"9cdf15c82899552034ec244963b75f3cad47814f6c9be2a86f14636d5350fd44","Cargo.toml":"1c13cefe3cda7dce177a000d253bd60bcc1dc0ef077811585625772711f87cb9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"7e74dc72343ff57e83d0a84a9fbdd9ff1645894165909999b4c3d2fba94bc96c","no_atomic.rs":"e9050fceb20d62c608ff58e96f0324ad35e52137007115b03ba11011a5f673b5","src/atomic/atomic_cell.rs":"dc1913fb0fdbf953c917131ecb74c81518b5f33754bd4565012f1f7d6a977718","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"d64faa1ca8896373468308031220940d988aa3a1679ea25d2291a7a7d22bc51a","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"} -\ No newline at end of file -+{"files":{"CHANGELOG.md":"9cdf15c82899552034ec244963b75f3cad47814f6c9be2a86f14636d5350fd44","Cargo.toml":"1c13cefe3cda7dce177a000d253bd60bcc1dc0ef077811585625772711f87cb9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"7e74dc72343ff57e83d0a84a9fbdd9ff1645894165909999b4c3d2fba94bc96c","no_atomic.rs":"946da1976a3d8606f0fe4b573163d57636f82e2d8d1b73330675e23c606d954f","src/atomic/atomic_cell.rs":"dc1913fb0fdbf953c917131ecb74c81518b5f33754bd4565012f1f7d6a977718","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"3f997f5b41fec286ccedcf3d36f801d741387badb574820b8e3456117ecd9154","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"6a7676fd4e50af63aec6f655121a10cd6e8c704f4677125388186ba58dc5842d","tests/atomic_cell.rs":"d64faa1ca8896373468308031220940d988aa3a1679ea25d2291a7a7d22bc51a","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"eb6c5b59f007e0d290dd0f58758e8ccb5cacd38af34e3341368ced815f0c41be","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"} diff --git a/user/rust/ppc64-abi.patch b/user/rust/ppc64-abi.patch new file mode 100644 index 000000000..763ebdec5 --- /dev/null +++ b/user/rust/ppc64-abi.patch @@ -0,0 +1,251 @@ +From dd2fc075aa673d06dff5f90a44b0162649dac52b Mon Sep 17 00:00:00 2001 +From: beetrees <b@beetr.ee> +Date: Sun, 4 Aug 2024 15:01:58 +0100 +Subject: [PATCH] Refactor `powerpc64` call ABI handling + +--- + .../rustc_target/src/abi/call/powerpc64.rs | 67 ++------- + tests/assembly/powerpc64-struct-abi.rs | 130 ++++++++++++++++++ + 2 files changed, 142 insertions(+), 55 deletions(-) + create mode 100644 tests/assembly/powerpc64-struct-abi.rs + +diff --git a/compiler/rustc_target/src/abi/call/powerpc64.rs b/compiler/rustc_target/src/abi/call/powerpc64.rs +index 11a6cb52babc9..749eea0ef6350 100644 +--- a/compiler/rustc_target/src/abi/call/powerpc64.rs ++++ b/compiler/rustc_target/src/abi/call/powerpc64.rs +@@ -41,64 +41,23 @@ where + }) + } + +-fn classify_ret<'a, Ty, C>(cx: &C, ret: &mut ArgAbi<'a, Ty>, abi: ABI) ++fn classify<'a, Ty, C>(cx: &C, arg: &mut ArgAbi<'a, Ty>, abi: ABI, is_ret: bool) + where + Ty: TyAbiInterface<'a, C> + Copy, + C: HasDataLayout, + { +- if !ret.layout.is_sized() { ++ if arg.is_ignore() || !arg.layout.is_sized() { + // Not touching this... + return; + } +- if !ret.layout.is_aggregate() { +- ret.extend_integer_width_to(64); ++ if !arg.layout.is_aggregate() { ++ arg.extend_integer_width_to(64); + return; + } + + // The ELFv1 ABI doesn't return aggregates in registers +- if abi == ELFv1 { +- ret.make_indirect(); +- return; +- } +- +- if let Some(uniform) = is_homogeneous_aggregate(cx, ret, abi) { +- ret.cast_to(uniform); +- return; +- } +- +- let size = ret.layout.size; +- let bits = size.bits(); +- if bits <= 128 { +- let unit = if cx.data_layout().endian == Endian::Big { +- Reg { kind: RegKind::Integer, size } +- } else if bits <= 8 { +- Reg::i8() +- } else if bits <= 16 { +- Reg::i16() +- } else if bits <= 32 { +- Reg::i32() +- } else { +- Reg::i64() +- }; +- +- ret.cast_to(Uniform::new(unit, size)); +- return; +- } +- +- ret.make_indirect(); +-} +- +-fn classify_arg<'a, Ty, C>(cx: &C, arg: &mut ArgAbi<'a, Ty>, abi: ABI) +-where +- Ty: TyAbiInterface<'a, C> + Copy, +- C: HasDataLayout, +-{ +- if !arg.layout.is_sized() { +- // Not touching this... +- return; +- } +- if !arg.layout.is_aggregate() { +- arg.extend_integer_width_to(64); ++ if is_ret && abi == ELFv1 { ++ arg.make_indirect(); + return; + } + +@@ -108,7 +67,10 @@ where + } + + let size = arg.layout.size; +- if size.bits() <= 64 { ++ if is_ret && size.bits() > 128 { ++ // Non-homogeneous aggregates larger than two doublewords are returned indirectly. ++ arg.make_indirect(); ++ } else if size.bits() <= 64 { + // Aggregates smaller than a doubleword should appear in + // the least-significant bits of the parameter doubleword. + arg.cast_to(Reg { kind: RegKind::Integer, size }) +@@ -138,14 +100,9 @@ where + } + }; + +- if !fn_abi.ret.is_ignore() { +- classify_ret(cx, &mut fn_abi.ret, abi); +- } ++ classify(cx, &mut fn_abi.ret, abi, true); + + for arg in fn_abi.args.iter_mut() { +- if arg.is_ignore() { +- continue; +- } +- classify_arg(cx, arg, abi); ++ classify(cx, arg, abi, false); + } + } +diff --git a/tests/assembly/powerpc64-struct-abi.rs b/tests/assembly/powerpc64-struct-abi.rs +new file mode 100644 +index 0000000000000..c36e3f2b62251 +--- /dev/null ++++ b/tests/assembly/powerpc64-struct-abi.rs +@@ -0,0 +1,130 @@ ++//@ revisions: elfv1-be elfv2-be elfv2-le ++//@ assembly-output: emit-asm ++//@[elfv1-be] compile-flags: --target powerpc64-unknown-linux-gnu ++//@[elfv1-be] needs-llvm-components: powerpc ++//@[elfv2-be] compile-flags: --target powerpc64-unknown-linux-musl ++//@[elfv2-be] needs-llvm-components: powerpc ++//@[elfv2-le] compile-flags: --target powerpc64le-unknown-linux-gnu ++//@[elfv2-le] needs-llvm-components: powerpc ++//@[elfv1-be] filecheck-flags: --check-prefix be ++//@[elfv2-be] filecheck-flags: --check-prefix be ++ ++#![feature(no_core, lang_items)] ++#![no_std] ++#![no_core] ++#![crate_type = "lib"] ++ ++#[lang = "sized"] ++trait Sized {} ++ ++#[lang = "copy"] ++trait Copy {} ++ ++#[lang = "freeze"] ++trait Freeze {} ++ ++#[lang = "unpin"] ++trait Unpin {} ++ ++impl Copy for u8 {} ++impl Copy for u16 {} ++impl Copy for u32 {} ++impl Copy for FiveU32s {} ++impl Copy for FiveU16s {} ++impl Copy for ThreeU8s {} ++ ++#[repr(C)] ++struct FiveU32s(u32, u32, u32, u32, u32); ++ ++#[repr(C)] ++struct FiveU16s(u16, u16, u16, u16, u16); ++ ++#[repr(C)] ++struct ThreeU8s(u8, u8, u8); ++ ++// CHECK-LABEL: read_large ++// be: lwz [[REG1:.*]], 16(4) ++// be-NEXT: stw [[REG1]], 16(3) ++// be-NEXT: ld [[REG2:.*]], 8(4) ++// be-NEXT: ld [[REG3:.*]], 0(4) ++// be-NEXT: std [[REG2]], 8(3) ++// be-NEXT: std [[REG3]], 0(3) ++// elfv2-le: lxvd2x [[REG1:.*]], 0, 4 ++// elfv2-le-NEXT: lwz [[REG2:.*]], 16(4) ++// elfv2-le-NEXT: stw [[REG2]], 16(3) ++// elfv2-le-NEXT: stxvd2x [[REG1]], 0, 3 ++// CHECK-NEXT: blr ++#[no_mangle] ++extern "C" fn read_large(x: &FiveU32s) -> FiveU32s { ++ *x ++} ++ ++// CHECK-LABEL: read_medium ++// elfv1-be: lhz [[REG1:.*]], 8(4) ++// elfv1-be-NEXT: ld [[REG2:.*]], 0(4) ++// elfv1-be-NEXT: sth [[REG1]], 8(3) ++// elfv1-be-NEXT: std [[REG2]], 0(3) ++// elfv2-be: lhz [[REG1:.*]], 8(3) ++// elfv2-be-NEXT: ld 3, 0(3) ++// elfv2-be-NEXT: sldi 4, [[REG1]], 48 ++// elfv2-le: ld [[REG1:.*]], 0(3) ++// elfv2-le-NEXT: lhz 4, 8(3) ++// elfv2-le-NEXT: mr 3, [[REG1]] ++// CHECK-NEXT: blr ++#[no_mangle] ++extern "C" fn read_medium(x: &FiveU16s) -> FiveU16s { ++ *x ++} ++ ++// CHECK-LABEL: read_small ++// elfv1-be: lbz [[REG1:.*]], 2(4) ++// elfv1-be-NEXT: lhz [[REG2:.*]], 0(4) ++// elfv1-be-NEXT: stb [[REG1]], 2(3) ++// elfv1-be-NEXT: sth [[REG2]], 0(3) ++// elfv2-be: lhz [[REG1:.*]], 0(3) ++// elfv2-be-NEXT: lbz 3, 2(3) ++// elfv2-be-NEXT: rldimi 3, [[REG1]], 8, 0 ++// elfv2-le: lbz [[REG1:.*]], 2(3) ++// elfv2-le-NEXT: lhz 3, 0(3) ++// elfv2-le-NEXT: rldimi 3, [[REG1]], 16, 0 ++// CHECK-NEXT: blr ++#[no_mangle] ++extern "C" fn read_small(x: &ThreeU8s) -> ThreeU8s { ++ *x ++} ++ ++// CHECK-LABEL: write_large ++// CHECK: std 3, 0(6) ++// be-NEXT: rldicl [[REG1:.*]], 5, 32, 32 ++// CHECK-NEXT: std 4, 8(6) ++// be-NEXT: stw [[REG1]], 16(6) ++// elfv2-le-NEXT: stw 5, 16(6) ++// CHECK-NEXT: blr ++#[no_mangle] ++extern "C" fn write_large(x: FiveU32s, dest: &mut FiveU32s) { ++ *dest = x; ++} ++ ++// CHECK-LABEL: write_medium ++// CHECK: std 3, 0(5) ++// be-NEXT: rldicl [[REG1:.*]], 4, 16, 48 ++// be-NEXT: sth [[REG1]], 8(5) ++// elfv2-le-NEXT: sth 4, 8(5) ++// CHECK-NEXT: blr ++#[no_mangle] ++extern "C" fn write_medium(x: FiveU16s, dest: &mut FiveU16s) { ++ *dest = x; ++} ++ ++// CHECK-LABEL: write_small ++// be: stb 3, 2(4) ++// be-NEXT: srwi [[REG1:.*]], 3, 8 ++// be-NEXT: sth [[REG1]], 0(4) ++// elfv2-le: sth 3, 0(4) ++// elfv2-le-NEXT: srwi [[REG1:.*]], 3, 16 ++// elfv2-le-NEXT: stb [[REG1]], 2(4) ++// CHECK-NEXT: blr ++#[no_mangle] ++extern "C" fn write_small(x: ThreeU8s, dest: &mut ThreeU8s) { ++ *dest = x; ++} diff --git a/user/rust/stdarch-ppc.patch b/user/rust/stdarch-ppc.patch new file mode 100644 index 000000000..eabe0d416 --- /dev/null +++ b/user/rust/stdarch-ppc.patch @@ -0,0 +1,116 @@ +Upstream: https://github.com/rust-lang/stdarch/pull/1582 + +From 7ac103f60d54362a752361dee3e63e23b98a342a Mon Sep 17 00:00:00 2001 +From: Luca Barbato <lu_zero@gentoo.org> +Date: Tue, 11 Jun 2024 09:49:16 +0000 +Subject: [PATCH] Use longer associated types in the Altivec traits + +--- + crates/core_arch/src/powerpc/altivec.rs | 34 ++++++++++++------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/crates/core_arch/src/powerpc/altivec.rs b/crates/core_arch/src/powerpc/altivec.rs +index 627809c6bc..29cdc41017 100644 +--- a/library/stdarch/crates/core_arch/src/powerpc/altivec.rs ++++ b/library/stdarch/crates/core_arch/src/powerpc/altivec.rs +@@ -410,8 +410,8 @@ mod sealed { + + #[unstable(feature = "stdarch_powerpc", issue = "111145")] + pub trait VectorInsert { +- type S; +- unsafe fn vec_insert<const IDX: u32>(self, s: Self::S) -> Self; ++ type Scalar; ++ unsafe fn vec_insert<const IDX: u32>(self, s: Self::Scalar) -> Self; + } + + const fn idx_in_vec<T, const IDX: u32>() -> u32 { +@@ -422,11 +422,11 @@ mod sealed { + ($ty:ident) => { + #[unstable(feature = "stdarch_powerpc", issue = "111145")] + impl VectorInsert for t_t_l!($ty) { +- type S = $ty; ++ type Scalar = $ty; + #[inline] + #[target_feature(enable = "altivec")] +- unsafe fn vec_insert<const IDX: u32>(self, s: Self::S) -> Self { +- simd_insert(self, const { idx_in_vec::<Self::S, IDX>() }, s) ++ unsafe fn vec_insert<const IDX: u32>(self, s: Self::Scalar) -> Self { ++ simd_insert(self, const { idx_in_vec::<Self::Scalar, IDX>() }, s) + } + } + }; +@@ -442,19 +442,19 @@ mod sealed { + + #[unstable(feature = "stdarch_powerpc", issue = "111145")] + pub trait VectorExtract { +- type S; +- unsafe fn vec_extract<const IDX: u32>(self) -> Self::S; ++ type Scalar; ++ unsafe fn vec_extract<const IDX: u32>(self) -> Self::Scalar; + } + + macro_rules! impl_vec_extract { + ($ty:ident) => { + #[unstable(feature = "stdarch_powerpc", issue = "111145")] + impl VectorExtract for t_t_l!($ty) { +- type S = $ty; ++ type Scalar = $ty; + #[inline] + #[target_feature(enable = "altivec")] +- unsafe fn vec_extract<const IDX: u32>(self) -> Self::S { +- simd_extract(self, const { idx_in_vec::<Self::S, IDX>() }) ++ unsafe fn vec_extract<const IDX: u32>(self) -> Self::Scalar { ++ simd_extract(self, const { idx_in_vec::<Self::Scalar, IDX>() }) + } + } + }; +@@ -3233,18 +3233,18 @@ mod sealed { + + #[unstable(feature = "stdarch_powerpc", issue = "111145")] + pub trait VectorRl { +- type B; +- unsafe fn vec_rl(self, b: Self::B) -> Self; ++ type Shift; ++ unsafe fn vec_rl(self, b: Self::Shift) -> Self; + } + + macro_rules! impl_vec_rl { + ($fun:ident ($a:ident)) => { + #[unstable(feature = "stdarch_powerpc", issue = "111145")] + impl VectorRl for $a { +- type B = t_u!($a); ++ type Shift = t_u!($a); + #[inline] + #[target_feature(enable = "altivec")] +- unsafe fn vec_rl(self, b: Self::B) -> Self { ++ unsafe fn vec_rl(self, b: Self::Shift) -> Self { + transmute($fun(transmute(self), b)) + } + } +@@ -3292,7 +3292,7 @@ mod sealed { + #[inline] + #[target_feature(enable = "altivec")] + #[unstable(feature = "stdarch_powerpc", issue = "111145")] +-pub unsafe fn vec_insert<T, const IDX: u32>(a: T, b: <T as sealed::VectorInsert>::S) -> T ++pub unsafe fn vec_insert<T, const IDX: u32>(a: T, b: <T as sealed::VectorInsert>::Scalar) -> T + where + T: sealed::VectorInsert, + { +@@ -3310,7 +3310,7 @@ where + #[inline] + #[target_feature(enable = "altivec")] + #[unstable(feature = "stdarch_powerpc", issue = "111145")] +-pub unsafe fn vec_extract<T, const IDX: u32>(a: T) -> <T as sealed::VectorExtract>::S ++pub unsafe fn vec_extract<T, const IDX: u32>(a: T) -> <T as sealed::VectorExtract>::Scalar + where + T: sealed::VectorExtract, + { +@@ -3949,7 +3949,7 @@ where + #[inline] + #[target_feature(enable = "altivec")] + #[unstable(feature = "stdarch_powerpc", issue = "111145")] +-pub unsafe fn vec_rl<T>(a: T, b: <T as sealed::VectorRl>::B) -> T ++pub unsafe fn vec_rl<T>(a: T, b: <T as sealed::VectorRl>::Shift) -> T + where + T: sealed::VectorRl, + { diff --git a/user/rust/test-be.patch b/user/rust/test-be.patch new file mode 100644 index 000000000..774f2887c --- /dev/null +++ b/user/rust/test-be.patch @@ -0,0 +1,49 @@ +From 26fa5c2c300f3c3a3ee3109c009bd4a6803a2a4c Mon Sep 17 00:00:00 2001 +From: Nikita Popov <npopov@redhat.com> +Date: Tue, 11 Jun 2024 10:13:07 +0200 +Subject: [PATCH] Make issue-122805.rs big endian compatible + +Instead of not generating the function at all on big endian (which +makes the CHECK lines fail), instead use to_le() on big endian, +so that we essentially perform a bswap for both endiannesses. +--- + tests/codegen/issues/issue-122805.rs | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/tests/codegen/issues/issue-122805.rs b/tests/codegen/issues/issue-122805.rs +index 6d108ada6dd..8e03c6c8884 100644 +--- a/tests/codegen/issues/issue-122805.rs ++++ b/tests/codegen/issues/issue-122805.rs +@@ -39,17 +39,20 @@ + // OPT3WINX64-NEXT: store <8 x i16> + // CHECK-NEXT: ret void + #[no_mangle] +-#[cfg(target_endian = "little")] + pub fn convert(value: [u16; 8]) -> [u8; 16] { ++ #[cfg(target_endian = "little")] ++ let bswap = u16::to_be; ++ #[cfg(target_endian = "big")] ++ let bswap = u16::to_le; + let addr16 = [ +- value[0].to_be(), +- value[1].to_be(), +- value[2].to_be(), +- value[3].to_be(), +- value[4].to_be(), +- value[5].to_be(), +- value[6].to_be(), +- value[7].to_be(), ++ bswap(value[0]), ++ bswap(value[1]), ++ bswap(value[2]), ++ bswap(value[3]), ++ bswap(value[4]), ++ bswap(value[5]), ++ bswap(value[6]), ++ bswap(value[7]), + ]; + unsafe { core::mem::transmute::<_, [u8; 16]>(addr16) } + } +-- +2.40.0 + diff --git a/user/rust/ui-test-strings.patch b/user/rust/ui-test-strings.patch new file mode 100644 index 000000000..182a233b0 --- /dev/null +++ b/user/rust/ui-test-strings.patch @@ -0,0 +1,25 @@ +check-cfg/well-known-values: We add our own vendor, so we need to include it. + +codegen/duplicated-path-in-error: musl's ldso error doesn't match glibc's. + +diff --git a/tests/ui/check-cfg/well-known-values.stderr b/tests/ui/check-cfg/well-known-values.stderr +index 00abb5f5e5c..84648541fb7 100644 +--- a/tests/ui/check-cfg/well-known-values.stderr ++++ b/tests/ui/check-cfg/well-known-values.stderr +@@ -230,7 +230,7 @@ warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE` + LL | target_vendor = "_UNEXPECTED_VALUE", + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | +- = note: expected values for `target_vendor` are: `apple`, `espressif`, `fortanix`, `ibm`, `kmc`, `nintendo`, `nvidia`, `pc`, `risc0`, `sony`, `sun`, `unikraft`, `unknown`, `uwp`, `win7`, and `wrs` ++ = note: expected values for `target_vendor` are: `apple`, `espressif`, `fortanix`, `foxkit`, `ibm`, `kmc`, `nintendo`, `nvidia`, `pc`, `risc0`, `sony`, `sun`, `unikraft`, `unknown`, `uwp`, `win7`, and `wrs` + = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration + + warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE` +diff --git a/tests/ui/codegen/duplicated-path-in-error.stderr b/tests/ui/codegen/duplicated-path-in-error.stderr +index d0d34e2f934..2892ebffdde 100644 +--- a/tests/ui/codegen/duplicated-path-in-error.stderr ++++ b/tests/ui/codegen/duplicated-path-in-error.stderr +@@ -1,2 +1,2 @@ +-error: couldn't load codegen backend /non-existing-one.so: cannot open shared object file: No such file or directory ++error: couldn't load codegen backend /non-existing-one.so: Error loading shared library /non-existing-one.so: No such file or directory + diff --git a/user/rxvt-unicode/APKBUILD b/user/rxvt-unicode/APKBUILD index bae5feaa3..ed074972a 100644 --- a/user/rxvt-unicode/APKBUILD +++ b/user/rxvt-unicode/APKBUILD @@ -4,16 +4,17 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=rxvt-unicode -pkgver=9.22 -pkgrel=4 +pkgver=9.31 +pkgrel=1 pkgdesc="Fork of the rxvt terminal emulator with improved unicode support" url="http://software.schmorp.de/pkg/rxvt-unicode.html" arch="all" options="!check" # No test suite. license="(GPL-2.0+ OR BSD-2-Clause) AND GPL-2.0+ AND GPL-3.0+" depends="$pkgname-terminfo" -makedepends="libx11-dev libxft-dev ncurses fontconfig-dev utmps-dev - gdk-pixbuf-dev libxrender-dev perl-dev startup-notification-dev" +makedepends="libx11-dev libxft-dev ncurses fontconfig-dev libptytty-dev + gdk-pixbuf-dev libxrender-dev perl-dev startup-notification-dev + libxext-dev" subpackages="$pkgname-doc $pkgname-terminfo::noarch" source="http://dist.schmorp.de/$pkgname/Attic/$pkgname-$pkgver.tar.bz2 gentables.patch @@ -21,8 +22,7 @@ source="http://dist.schmorp.de/$pkgname/Attic/$pkgname-$pkgver.tar.bz2 " build() { - export CXXFLAGS="$CXXFLAGS -DWTMPX_FILE=\\\"\"/run/utmps/wtmp\"\\\"" - LIBS="-lutmps -lskarnet" ./configure \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -63,6 +63,6 @@ terminfo() { mv "$pkgdir"/usr/share/terminfo "$subpkgdir"/usr/share/terminfo } -sha512sums="b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 rxvt-unicode-9.22.tar.bz2 +sha512sums="4d14ecbbb62de1b1c717277f5aae5cfb536e11392f2d4b82c884c1713f437fce8e9dd69a328fa353a55d068d8ee4121a31900f45191acec172d5dc76652b6255 rxvt-unicode-9.31.tar.bz2 a45074b8fe39ffb712bd53b03521a8611fe5887a97ea09c1e85a7086de1042dd0360269803ffe5fcc56425af3c0cc3a55c214b2ef0fcfa2c3a298b4b37d261cb gentables.patch -42314393f7f061f1aa2cf2fedd3d84e96d3104868b0629cefd9e9b313529afde52127a412992e76935fa2de8d4e685d6b5ce42162cb8d1b0365de63d10c11925 kerning.patch" +e4e9a05e006a555a8ee6df66dd8d4e93beb9f4e07fd4a889f53dc7ca8cbb49f3c8be140b51bcb26de62e505f3852877aff25f03c6872752133255bbeda291fb8 kerning.patch" diff --git a/user/rxvt-unicode/kerning.patch b/user/rxvt-unicode/kerning.patch index a29a6f608..6897ba364 100644 --- a/user/rxvt-unicode/kerning.patch +++ b/user/rxvt-unicode/kerning.patch @@ -1,6 +1,6 @@ --- a/src/rxvtfont.C 2008-07-09 12:21:45.000000000 +0400
+++ b/src/rxvtfont.C 2009-10-30 14:32:53.000000000 +0300
-@@ -1195,12 +1195,14 @@
+@@ -1304,12 +1304,14 @@
XGlyphInfo g;
XftTextExtents16 (disp, f, &ch, 1, &g);
diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index fe725f999..cbccc10cf 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,14 +1,13 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.3.7.2 +pkgver=2.4.1.0 pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14 +_skalibs_version=2.14.4 depends="" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" @@ -18,12 +17,11 @@ source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ - --enable-static \ --disable-allstatic \ --prefix=/usr \ - --libdir=/usr/lib \ --libexecdir="/usr/lib/$pkgname" \ - --with-dynlib=/lib + --with-pkgconfig \ + --enable-pkgconfig make } @@ -33,4 +31,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="4dc89e3b8ba22e4e63e8e5a84432ce444865712755c600b4bc62b49dda13c09c372ff2169b0db4790d0f07c392005dda76ed1df5ef8335d2f382d09919b53eae s6-dns-2.3.7.2.tar.gz" +sha512sums="48e8c6b0bf0704b674f56267ea3e4b7261bbc6344b121ec87053a9a7e2f4740e5e90ec60eaaa96a1e0fe08f82f4f8ffd8b29d4d097a1a108d9bcbaae0de3905b s6-dns-2.4.1.0.tar.gz" diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index d232f09d8..6dcd1feb8 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -1,14 +1,13 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-utils -pkgver=2.6.2.0 -pkgrel=1 +pkgver=2.6.3.0 +pkgrel=0 pkgdesc="skarnet.org's Linux-specific miscellaneous utilities" url="https://skarnet.org/software/s6-linux-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -18,7 +17,9 @@ build() { ./configure \ --disable-allstatic \ --prefix=/usr \ - --with-dynlib=/lib + --with-dynlib=/lib \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -28,4 +29,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="b7bc96ef3aa81bc01c6ca2a82591201be0966d8aa2b71545c963f67dba8441a05631e0ea593f0a693ee04d6d2637754e9543eddbfe70ed9c0529ff49081aa54d s6-linux-utils-2.6.2.0.tar.gz" +sha512sums="ddd8f96d637b25d3f846d546145325a8cb78a3ba3cbf897649f924ee739c7dbe891907f886dd25f11d0354b40022fe7d16b1907044716d05720e8fd6c0171e60 s6-linux-utils-2.6.3.0.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index f99d5a2e8..b6757a898 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,29 +1,31 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.7.0.3 +pkgver=2.7.1.0 pkgrel=0 pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities." url="https://skarnet.org/software/s6-networking/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.1 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6dns_version=2.4.1 +_bearssl_version=0.6 depends="execline" depends_dev="skalibs-dev>=$_skalibs_version" -makedepends="$depends_dev execline-dev s6-dev s6-dns-dev bearssl-dev" +makedepends="$depends_dev execline-dev>=$_execline_version s6-dev>=$_s6_version s6-dns-dev>=$_s6dns_version bearssl-dev>=$_bearssl_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ - --enable-static \ --disable-allstatic \ --prefix=/usr \ - --libdir=/usr/lib \ --libexecdir="/usr/lib/$pkgname" \ - --with-dynlib=/lib \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-ssl=bearssl make } @@ -34,4 +36,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="50d369303bd448d09a3f6431e64fb0f0b13383c92764b499ed881af3a6a8c4f779f1f9d98341943f6fdc8b18d16df444897d3750212df89efd838b6de562eede s6-networking-2.7.0.3.tar.gz" +sha512sums="33741efa5c1908f8e7396929df08c3591e25b7c58335b331a146db17a9b7e5c00b75dd3337aa46114723969b8490fb1b6754a25357003780bdfd0a2fd8e3283c s6-networking-2.7.1.0.tar.gz" diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index 0a4386fe4..6d0909f02 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,14 +1,13 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.3.0.3 -pkgrel=1 +pkgver=2.3.1.0 +pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -18,7 +17,9 @@ build() { ./configure \ --disable-allstatic \ --prefix=/usr \ - --with-dynlib=/lib + --with-dynlib=/lib \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -28,4 +29,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f s6-portable-utils-2.3.0.3.tar.gz" +sha512sums="80ab6152d5c3f88449d77924ceb43ccef12a41918d2fd8042ded15423b8f65e612d582c6475d73c500380018a91f7adc48c71740c898015565a046a8fbef1cd5 s6-portable-utils-2.3.1.0.tar.gz" diff --git a/user/sane/APKBUILD b/user/sane/APKBUILD index d9f618013..2eade25c0 100644 --- a/user/sane/APKBUILD +++ b/user/sane/APKBUILD @@ -3,16 +3,17 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sane _pkgname=sane-backends -pkgver=1.0.30 +pkgver=1.3.1 +_hash=83bdbb6c9a115184c2d48f1fdc6847db pkgrel=0 pkgdesc="Scanner access library" url="http://www.sane-project.org/" arch="all" -license="GPL-2.0+ AND GPL-2.0+-with-sane-exception AND Public-Domain" +license="GPL-2.0+ AND Public-Domain" depends="" makedepends="diffutils file libtool libusb-dev v4l-utils-dev net-snmp-dev libpng-dev libjpeg-turbo-dev tiff-dev libgphoto2-dev libieee1284-dev - linux-headers ncurses-dev" + libxml2-dev linux-headers ncurses-dev python3-dev" install="saned.pre-install $pkgname.pre-install" pkgusers="saned" pkggroups="scanner" @@ -37,9 +38,8 @@ done subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils saned saned-openrc:openrc:noarch $pkgname-udev::noarch $_pkgname::noarch $pkgname-lang" -source="https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-1.0.30.tar.gz +source="https://gitlab.com/sane-project/backends/uploads/$_hash/$_pkgname-$pkgver.tar.gz saned.initd - endian.patch include.patch network.patch pidfile.patch @@ -139,11 +139,10 @@ _backend() { fi } -sha512sums="e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5 sane-backends-1.0.30.tar.gz +sha512sums="c6c12bce5242fcdf208f034cc544605cad36fad60316cb51f0e1f6fe23d1566823778c7af4b0fc94ca4154e2cd3e38a9202073e4a4af05f641c3da081722a535 sane-backends-1.3.1.tar.gz 0a06eaa28b345202f2bdf8361e06f843bb7a010b7d8f80132f742672c94249c43f64031cefa161e415e2e2ab3a53b23070fb63854283f9e040f5ff79394ac7d1 saned.initd -c7523b2684726cf35c0b251fe2e1863120284ff6ea3f93b53feb5dfa020c1e383910ecdd1a0c77a2289912ac4fd355cb3c743ea3706dab1bcf0a3412e1d0fbcc endian.patch 1779ff8beb1ba5f9238c25d819a7f0045f7e257c19b511315feb85650e445ca86450a9e1d7ff8650499d3dae808589a6c2e358d5f3f39a3f40ce4999179b86d6 include.patch -dfeaef3c94c3e66b1cfb27348b8e1f3620143fd9a41e3c0b33d9c16f9bc4af2b20e40c83fec385c5765e8c3a812a00508bccdf8f27d571cfc0d8fac9dee41205 network.patch -8f0a1529a5793bc78422419b674963b543527c932476c9ea2d92ea0ad0a286691da306020824c1aaa0b35929f571480d21d7fc464a9f652e15664854c75a4cea pidfile.patch +ef5d572bd29463e0690f6b45ddc609045ba6e40ab7c6bdab065b9480eef38884604650fd390d2a3c46b1f13b228e700392a6f635b4d7372130de6b2106208405 network.patch +30ef4a151e896ad415bab5e6a2963611321ff39d4b91d591d2678a5f73b1cd809f90855f970edec3d944aa0f48fb2902c20184794f941312b849e7ab44967030 pidfile.patch 4de6f60452c0451769f5ce41e41ca4c2867a723e0d2bf22796dc8a266359bdc8a9e9542f4ba2dc42b15bd25b1c83d2c339177796043fdbcbc9d73ad4957f723c check.patch -de2bd02d02e9a2d061d7c5783d3e4e64e9a68e83b15adc122946efff369ad5e382bd918a9585f5fe99ede546f002bb3db0f1b54306f4409fde38b2e26c008162 BTS-304.patch" +9c4877335531415df4aa37d797927765076f2e98d7301e057b24d5e45a696b75e86140eec403a599508c270ff63faf29b07ced6591a647ff48d280edcab70208 BTS-304.patch" diff --git a/user/sane/BTS-304.patch b/user/sane/BTS-304.patch index 64b7dca02..6d36589e9 100644 --- a/user/sane/BTS-304.patch +++ b/user/sane/BTS-304.patch @@ -2,7 +2,7 @@ diff --git a/backend/genesys/image_pixel.cpp b/backend/genesys/image_pixel.cpp index 1b83e127d..1ebba7fe0 100644 --- a/backend/genesys/image_pixel.cpp +++ b/backend/genesys/image_pixel.cpp -@@ -46,6 +46,7 @@ +@@ -23,6 +23,7 @@ #include "image.h" #include <array> @@ -10,7 +10,7 @@ index 1b83e127d..1ebba7fe0 100644 namespace genesys { -@@ -207,7 +208,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma +@@ -184,7 +185,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma float val = (pixel.r >> 8) * 0.3f; val += (pixel.g >> 8) * 0.59f; val += (pixel.b >> 8) * 0.11f; @@ -19,7 +19,7 @@ index 1b83e127d..1ebba7fe0 100644 return; } case PixelFormat::I16: { -@@ -215,7 +216,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma +@@ -192,7 +193,7 @@ void set_pixel_to_row(std::uint8_t* data, std::size_t x, Pixel pixel, PixelForma float val = pixel.r * 0.3f; val += pixel.g * 0.59f; val += pixel.b * 0.11f; diff --git a/user/sane/endian.patch b/user/sane/endian.patch deleted file mode 100644 index f55f01ecc..000000000 --- a/user/sane/endian.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e1934720c687ed8c6125c75ac658f55b4e1513ce Mon Sep 17 00:00:00 2001 -From: Luiz Angelo Daros de Luca <luizluca@gmail.com> -Date: Sun, 2 Feb 2020 21:19:15 -0300 -Subject: [PATCH] genesys: fix bigendian build - -Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com> ---- - backend/genesys/low.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp -index 1e1b632bf..cbb43b045 100644 ---- a/backend/genesys/low.cpp -+++ b/backend/genesys/low.cpp -@@ -546,7 +546,7 @@ Image read_unshuffled_image_from_scanner(Genesys_Device* dev, const ScanSession& - } - - #ifdef WORDS_BIGENDIAN -- if (depth == 16) { -+ if (session.params.depth == 16) { - dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>(); - } - #endif --- -2.24.1 - diff --git a/user/sane/network.patch b/user/sane/network.patch index 845bf9913..a8f53cfce 100644 --- a/user/sane/network.patch +++ b/user/sane/network.patch @@ -1,6 +1,6 @@ --- sane-backends-1.0.30/sanei/sanei_tcp.c 2020-05-17 06:54:18.000000000 -0500 +++ sane-backends-1.0.30/sanei/sanei_tcp.c 2020-06-10 14:10:06.980398975 -0500 -@@ -46,6 +46,7 @@ +@@ -44,6 +44,7 @@ #include <stdlib.h> #include <string.h> #include <limits.h> @@ -8,7 +8,7 @@ #ifndef SSIZE_MAX #define SSIZE_MAX LONG_MAX -@@ -130,6 +131,7 @@ sanei_tcp_read(int fd, u_char * buf, siz +@@ -128,6 +130,7 @@ sanei_tcp_read(int fd, u_char * buf, siz { size_t bytes_recv = 0; ssize_t rc = 1; @@ -16,7 +16,7 @@ if (count > SSIZE_MAX) { errno = EINVAL; -@@ -139,9 +141,21 @@ sanei_tcp_read(int fd, u_char * buf, siz +@@ -137,9 +139,21 @@ sanei_tcp_read(int fd, u_char * buf, siz while (bytes_recv < count && rc > 0) { rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0); diff --git a/user/sane/pidfile.patch b/user/sane/pidfile.patch index 32989f651..579c99939 100644 --- a/user/sane/pidfile.patch +++ b/user/sane/pidfile.patch @@ -1,6 +1,6 @@ --- a/frontend/saned.c +++ b/frontend/saned.c -@@ -229,7 +229,7 @@ +@@ -230,7 +230,7 @@ int numchildren; #define SANED_CONFIG_FILE "saned.conf" diff --git a/user/screen/APKBUILD b/user/screen/APKBUILD index 295e51c7f..9e95191e9 100644 --- a/user/screen/APKBUILD +++ b/user/screen/APKBUILD @@ -2,22 +2,21 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=screen -pkgver=4.8.0 +pkgver=5.0.0 pkgrel=0 pkgdesc="A window manager that multiplexes a physical terminal" -url="http://ftp.gnu.org/gnu/screen/" +url="https://ftp.gnu.org/gnu/screen/" arch="all" options="!check" # No test suite. license="GPL-3.0+" depends="" -makedepends="ncurses-dev utmps-dev libutempter-dev" +makedepends="ncurses-dev utmps-dev libutempter-dev linux-pam-dev" subpackages="$pkgname-doc" source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz - utmpx.patch + missing-header.patch " build() { - export CFLAGS="-DNONETHACK -DGETUTENT" LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,7 +24,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --enable-colors256 + --enable-utmp make } @@ -40,5 +39,5 @@ package() { install -Dm644 etc/screenrc "$pkgdir"/etc/skel/.screenrc } -sha512sums="770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c screen-4.8.0.tar.gz -82aca3e16c8cd7a3029d3b589ff2dd3471708d6287979ebb5cfdaedbd1f3012c0cd660b131e0cbe142b99786e49ef8b24c63159523d870e95ccf71ec94b82634 utmpx.patch" +sha512sums="18a163313025c58950ec65fa83037ba1df0fa8e2346925593217fb0a6596f2f51914a4f0aec7f0e1c280d3d3ef964e7a886521f41f4b96f4ff08935be7f62117 screen-5.0.0.tar.gz +b698b28177362b2f078b01d8ea51d4b9061f5663c6b2f4d5c89dac506f6b035c33cc505c5c84d8a38ee48e3ab202fc15d4c90dff1baf5368b4ddf128f4ae9556 missing-header.patch" diff --git a/user/screen/missing-header.patch b/user/screen/missing-header.patch new file mode 100644 index 000000000..34e44d4fe --- /dev/null +++ b/user/screen/missing-header.patch @@ -0,0 +1,11 @@ +diff -ur a/utmp.c b/utmp.c +--- a/utmp.c 2024-08-29 09:46:14.655729962 +0000 ++++ b/utmp.c 2024-08-29 09:47:54.248164818 +0000 +@@ -35,6 +35,7 @@ + #include <fcntl.h> + #include <stdint.h> + #include <stdbool.h> ++#include <signal.h> + + #include "screen.h" + diff --git a/user/screen/utmpx.patch b/user/screen/utmpx.patch deleted file mode 100644 index c8c6f444b..000000000 --- a/user/screen/utmpx.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- screen-4.6.2/os.h.old 2018-09-27 23:11:11.655480028 -0700 -+++ screen-4.6.2/os.h 2018-09-27 23:11:34.745808665 -0700 -@@ -250,17 +250,13 @@ - #endif - - #if defined(UTMPOK) || defined(BUGGYGETLOGIN) --# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) -+# if defined(linux) - # include <utmpx.h> - # define UTMPFILE UTMPX_FILE - # define utmp utmpx --# define getutent getutxent - # define getutid getutxid - # define getutline getutxline - # define pututline pututxline --# define setutent setutxent --# define endutent endutxent --# define ut_time ut_xtime - # else /* SVR4 */ - # include <utmp.h> - # endif /* SVR4 */ diff --git a/user/sdl/APKBUILD b/user/sdl/APKBUILD index 4c3d0084f..39bde54af 100644 --- a/user/sdl/APKBUILD +++ b/user/sdl/APKBUILD @@ -10,7 +10,7 @@ license="LGPL-2.1+" depends="" depends_dev="libx11-dev" makedepends="$depends_dev libxext-dev libxrender-dev libx11-dev libice-dev - libsm-dev libxrandr-dev mesa-dev alsa-lib-dev glu-dev" + libsm-dev libxrandr-dev libglvnd-dev alsa-lib-dev glu-dev" subpackages="$pkgname-dev $pkgname-doc" source="http://www.libsdl.org/release/SDL-$pkgver.tar.gz SDL-1.2.10-GrabNotViewable.patch diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD index c7dd81e68..6e380a778 100644 --- a/user/sdl2/APKBUILD +++ b/user/sdl2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: August Klein <amatcoder@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sdl2 -pkgver=2.0.12 -pkgrel=0 +pkgver=2.0.22 +pkgrel=1 pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library" url="https://www.libsdl.org/" arch="all" @@ -11,9 +11,11 @@ license="zlib" depends="" makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxkbcommon-dev libxrandr-dev libxrender-dev libusb-dev mesa-dev - libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev cmake" + libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev libglvnd-dev cmake + libxinerama-dev wayland-dev wayland-protocols" subpackages="$pkgname-dev" source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz + altivec-detection.patch sdl2-soname.patch " builddir="$srcdir/SDL2-$pkgver" @@ -27,7 +29,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} -Bbuild make -C build @@ -37,5 +39,6 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 SDL2-2.0.12.tar.gz +sha512sums="ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a SDL2-2.0.22.tar.gz +f7ca983c0450e95a760041c5c329e715bb513100efbd12c2469fd283e7ca4d3643b8180d6d5e64c66075ea03e1e88364853aa76d3db6dbcc8d22e8eb385881d6 altivec-detection.patch 81b5807cd9f2683231c14562e961467fcd7ba257140d1a266932d6a6a5103633e3af896c09b261620b2934d521809e08ed79d3287c0897f4783c6afc1c01a566 sdl2-soname.patch" diff --git a/user/sdl2/altivec-detection.patch b/user/sdl2/altivec-detection.patch new file mode 100644 index 000000000..ccb60a375 --- /dev/null +++ b/user/sdl2/altivec-detection.patch @@ -0,0 +1,22 @@ +Use getauxval on Linux if available. + +--- SDL2-2.0.22/src/cpuinfo/SDL_cpuinfo.c.old 2022-01-08 02:29:52.000000000 +0000 ++++ SDL2-2.0.22/src/cpuinfo/SDL_cpuinfo.c 2025-04-27 18:58:12.097867624 +0000 +@@ -113,7 +113,7 @@ + #define CPU_HAS_AVX512F (1 << 12) + #define CPU_HAS_ARM_SIMD (1 << 13) + +-#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ && !__OpenBSD__ && !__FreeBSD__ ++#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ && !__OpenBSD__ && !__FreeBSD__ && !__linux__ + /* This is the brute force way of detecting instruction sets... + the idea is borrowed from the libmpeg2 library - thanks! + */ +@@ -333,6 +333,8 @@ + elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures)); + altivec = cpufeatures & PPC_FEATURE_HAS_ALTIVEC; + return altivec; ++#elif defined(__linux__) && defined(__powerpc__) && HAVE_GETAUXVAL ++ altivec = getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC; + #elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP + void (*handler) (int sig); + handler = signal(SIGILL, illegal_instruction); diff --git a/user/seatd/APKBUILD b/user/seatd/APKBUILD index dcf68d61e..f905c6029 100644 --- a/user/seatd/APKBUILD +++ b/user/seatd/APKBUILD @@ -1,39 +1,45 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=seatd -pkgver=0.7.0 -pkgrel=0 +pkgver=0.8.0 +pkgrel=1 pkgdesc="Seat management daemon and library" url="https://git.sr.ht/~kennylevinsen/seatd" arch="all" license="MIT" depends="" -makedepends="cmake elogind-dev meson ninja" -subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/seatd/archive/$pkgver.tar.gz" +makedepends="cmake elogind-dev meson scdoc" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/seatd/archive/$pkgver.tar.gz + $pkgname.confd + $pkgname.initd + " build() { # https://todo.sr.ht/~kennylevinsen/seatd/10 # https://www.openwall.com/lists/musl/2020/01/20/3 export CFLAGS="$CFLAGS -Wno-error=overflow" - meson \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ --buildtype=release \ - . output - ninja -C output + . build + meson compile -C build } check() { -# Add test instructions here. -: + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" meson install -C build + install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir"/etc/init.d/seatd + install -Dm644 "$srcdir/$pkgname.confd" "$pkgdir"/etc/conf.d/seatd } -sha512sums="c81c43994b92672a388bf255edb1fe24d3dba7ece2eb35f9fedc05cc0b8e464e9167ffed037645c4072430fe7b3b8fc80cc99f21fb5100654b5dd23a94742e66 seatd-0.7.0.tar.gz" +sha512sums="93b1e5c170564ce9654e4df9985af95cb505274b36e950998bb1f16803d2d46712140eded2bdd8d5e85aec62070afd9c224184276d79a0ff0813408dfc472db7 seatd-0.8.0.tar.gz +1ee755b462455fb20ee2f56b8d1a0f3a26eb9aed34eb6126e322243f9288b23577aff40e5a2c02449f349282af79eafd232b9e77cd196daa92ee8a9fcae2ec16 seatd.confd +54e1f20a37945f95b184a26dc9ef5cfe5ddcce4445672b04394465ba16d319f87c24c1b347400a0189c4f3de9bae1ee0a95c1dee94a0d677c9c980fc238fa2df seatd.initd" diff --git a/user/seatd/seatd.confd b/user/seatd/seatd.confd new file mode 100644 index 000000000..8eac7d11e --- /dev/null +++ b/user/seatd/seatd.confd @@ -0,0 +1,12 @@ +# Configuration for /etc/init.d/seatd + +# Sets the seatd log level; one of: silent, error, info, or debug. +# Defaults to "error". +#loglevel= + +# Log messages are redirected to syslog, unless `loglevel=silent`. +# Set to empty string to disable. +#error_logger="logger -t seatd -p daemon.$loglevel >/dev/null 2>&1" + +# Uncomment to run with process supervisor. +# supervisor="supervise-daemon" diff --git a/user/seatd/seatd.initd b/user/seatd/seatd.initd new file mode 100644 index 000000000..b686052bf --- /dev/null +++ b/user/seatd/seatd.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run + +name="seatd" +description="Seat management daemon" + +command="/usr/bin/seatd" +command_args="-g video -l ${loglevel:-error} ${command_args:-}" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" + +if [ "$loglevel" != 'silent' ]; then + : ${error_logger="logger -t $name -p daemon.${loglevel:-error} >/dev/null 2>&1"} +fi diff --git a/user/setxkbmap/APKBUILD b/user/setxkbmap/APKBUILD index 087db5504..1654e9ba5 100644 --- a/user/setxkbmap/APKBUILD +++ b/user/setxkbmap/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=setxkbmap -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=0 pkgdesc="Set keyboard layout in X11" url="https://www.X.Org/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="208f07a7f7bce47b573099d4cd8c941a3a4d74b456720bc3ca1cbba298381a2ab98c7500d6e6cd6d5dd61840b7c42cf6521da754ec395f266f8158102a55ad58 setxkbmap-1.3.3.tar.xz" +sha512sums="f4d026e7707656173f54d79b95ff3370ae06eaf252b89b79bc7175edeaf3ef79073d4d7d8a35fdee95608bf85d7d23514d74f00e55b613810ef6c3ccc0cf498b setxkbmap-1.3.4.tar.xz" diff --git a/user/smtpd-starttls-proxy/APKBUILD b/user/smtpd-starttls-proxy/APKBUILD index d597d3457..7896f97e2 100644 --- a/user/smtpd-starttls-proxy/APKBUILD +++ b/user/smtpd-starttls-proxy/APKBUILD @@ -1,26 +1,26 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=smtpd-starttls-proxy -pkgver=0.0.1.4 +pkgver=0.0.2.0 pkgrel=0 pkgdesc="An SMTP proxy implementing STARTTLS" url="https://skarnet.org/software/smtpd-starttls-proxy/" arch="all" options="!check" # No test suite. license="ISC" -depends="s6 s6-networking" -makedepends="skalibs-dev>=2.14 s6-dev>=2.12" +_skalibs_version=2.14.4 +_s6_version=2.13.2 +_s6net_version=2.7.1 +depends="s6>=$_s6_version s6-networking>=$_s6net_version" +makedepends="skalibs-dev>=$_skalibs_version s6-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://skarnet.org/software/smtpd-starttls-proxy/smtpd-starttls-proxy-$pkgver.tar.gz" build() { ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + --disable-allstatic \ --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var + --with-pkgconfig \ + --enable-pkgconfig make } @@ -30,4 +30,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="21dc1ee03d7178283a03f8b59f87b9277c5dd8d878a402b986563c4f54f7276bc0d3d05f569f2ddaf59223a3b57d24d4b80a56269bf73112de599e27d5d8795c smtpd-starttls-proxy-0.0.1.4.tar.gz" +sha512sums="e13bd72c0afdbe6e6673867b1d7354aa7067f755eebd3db32ecbaef2759e3db626954cacf4cb70d8aaea8899bf7c22a997f797f9991978890399ccfcb55de483 smtpd-starttls-proxy-0.0.2.0.tar.gz" diff --git a/user/spack/APKBUILD b/user/spack/APKBUILD index 5f696e7a1..71f7331c3 100644 --- a/user/spack/APKBUILD +++ b/user/spack/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Zach van Rijn <me@zv.io> # Maintainer: Zach van Rijn <me@zv.io> pkgname=spack -pkgver=0.21.0_p1 -pkgrel=5 +pkgver=0.23.0_p1 +pkgrel=0 pkgdesc="A flexible package manager for supercomputers." url="https://spack.io/" arch="all" @@ -17,7 +17,6 @@ subpackages="" # https://git.adelielinux.org/adelie/docs/-/wikis/Developer-Resources/Maintaining-Spack source="https://git.adelielinux.org/adelie/$pkgname/-/archive/adelie-v$pkgver/$pkgname-adelie-v$pkgver.tar.bz2 clingo-explicit-libatomic.patch - archspec-fix-cpu-family-detection.patch openssl-explicit-linux-headers.patch default-no-buildcache.patch @@ -44,10 +43,15 @@ check() { # On first run, Spack >=0.17.0 will bootstrap "clingo", # Spack's new "concretizer". The output from this process # is not kept, however it demonstrates Spack's functionality. + # + # The '--deprecated' flag is to prevent an interactive prompt + # warning about "deprecated" packages and/or versions. Order + # is important; it must come after the 'install' verb. + # export SPACK_DISABLE_LOCAL_CONFIG=true export SPACK_USER_CONFIG_PATH=${builddir}/tmp export SPACK_USER_CACHE_PATH=${builddir}/tmp - bin/spack --debug install zlib + bin/spack --debug install --deprecated zlib rm -fr var/spack/cache rm -fr etc/spack/linux # caches compilers.yaml @@ -67,9 +71,8 @@ package() { install -D -m644 "${srcdir}"/config.yaml "$pkgdir"/etc/spack/config.yaml; } -sha512sums="85ae21de1f6c3d6eb3d3f0edc878820f17bae27236ea89eae0f733fa178eff25da41264960a492a2f34e03bd4f668ba1a2cfc395a814693c23f83b4ac2a80985 spack-adelie-v0.21.0_p1.tar.bz2 -30f6d193971bc6f2941141d0da50d339c459f2b9c6157cc2659a589bd2b546fba35d580cad79dd1bc74bcd9de7db31bc937418598d73b68c69876fee6a1c5c73 clingo-explicit-libatomic.patch -a6503238d116b74ff9c4ecd08a984df90ce02f95c3e10e907481d99917c73339db1cc49f2b473a37875b92a9a6607cac72057c0a7b3d9a57d44c89ebe0ad3915 archspec-fix-cpu-family-detection.patch +sha512sums="c40eb2ce32a7a432474c76ec76cda3a2830b7e9668d1dd76bf491d09d4bea6902e24f1fbff3c39ac67d2c0dd1f89560662a2828f9516ed99df8dc8bbd01afe6d spack-adelie-v0.23.0_p1.tar.bz2 +a84df22016109bb8d86b5215b698251a5b10873042361c8bab79e4235e00f381a2d66cbfd84ce6b7933125971f3248008124ef7f7ad85451bf72b815c5b56aa0 clingo-explicit-libatomic.patch 8ded405082eec192187fb72896c68200985ee1226b2ef7da19ab43f31138972d5b4000cf997cb6e22664a7c100b52b842df07c44e188f87d4250f698d1885ea6 openssl-explicit-linux-headers.patch eec3e7dd818c39daea7b8d63b04a6c71d9eb3af32dd899cddc3642152252f4e2eebfd53c3c95365117f9a4826f6f29553f44373948e5c474388021302c8a5ce9 default-no-buildcache.patch eb09ce82d2c5c63c2cc63b2f82db2888f15ce82100311614f5a73773be2f605337811c4580e0d4eb2f87b730e7ce4afa6dcdc3f3f52321f63a29a2ad533ea5d4 default-adelie-upstream-git.patch diff --git a/user/spack/archspec-fix-cpu-family-detection.patch b/user/spack/archspec-fix-cpu-family-detection.patch deleted file mode 100644 index a3979ec95..000000000 --- a/user/spack/archspec-fix-cpu-family-detection.patch +++ /dev/null @@ -1,16 +0,0 @@ -See also: https://github.com/archspec/archspec/issues/102 - -diff --git a/lib/spack/external/archspec/cpu/detect.py b/lib/spack/external/archspec/cpu/detect.py -index a7cc4481f6..cadd593ca2 100644 ---- a/lib/spack/external/archspec/cpu/detect.py -+++ b/lib/spack/external/archspec/cpu/detect.py -@@ -92,7 +92,8 @@ def _machine(): - - # If we are not on Darwin, trust what Python tells us - if operating_system != "Darwin": -- return platform.machine() -+ machine = platform.machine() -+ return TARGETS[machine].family.name if machine in TARGETS else machine - - # On Darwin it might happen that we are on M1, but using an interpreter - # built for x86_64. In that case "platform.machine() == 'x86_64'", so we diff --git a/user/spack/clingo-explicit-libatomic.patch b/user/spack/clingo-explicit-libatomic.patch index 6a1d1a0aa..60bf83c5d 100644 --- a/user/spack/clingo-explicit-libatomic.patch +++ b/user/spack/clingo-explicit-libatomic.patch @@ -1,12 +1,12 @@ diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py -index ab5fe9a043..8a31208850 100644 +index 73ff2b1769..40c2c61dfc 100644 --- a/var/spack/repos/builtin/packages/clingo/package.py +++ b/var/spack/repos/builtin/packages/clingo/package.py -@@ -120,6 +120,7 @@ def cmake_args(self): - "-DCLINGO_BUILD_WITH_PYTHON=ON", - "-DPYCLINGO_USER_INSTALL=OFF", - "-DPYCLINGO_USE_INSTALL_PREFIX=ON", -+ "-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic", +@@ -118,6 +118,7 @@ def cmake_args(self): + self.define("PYCLINGO_USE_INSTALL_PREFIX", True), + self.define("PYCLINGO_INSTALL_DIR", python_platlib), + self.define("PYCLINGO_SUFFIX", suffix), ++ self.define("CMAKE_CXX_STANDARD_LIBRARIES", "-latomic"), self.cmake_py_shared, ] - if self.spec["cmake"].satisfies("@3.16.0:"): + else: diff --git a/user/spice-gtk/APKBUILD b/user/spice-gtk/APKBUILD index dae9a0eca..f1fd970a8 100644 --- a/user/spice-gtk/APKBUILD +++ b/user/spice-gtk/APKBUILD @@ -19,7 +19,9 @@ makedepends="$depends_dev acl-dev bash cyrus-sasl-dev eudev-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang spicy spice-glib:glib" -source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz" +source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz + fix-dirty-spicy-corruption.patch + " build() { # Note: pulseaudio support is disabled because it's deprecated. @@ -64,4 +66,5 @@ glib() { "$subpkgdir"/usr/lib/girepository-1.0/ } -sha512sums="fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137 spice-gtk-0.42.tar.xz" +sha512sums="fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137 spice-gtk-0.42.tar.xz +4da61b94db02f4db400be45933bb6d3d3aa05137dfba78dcbc1757d9709c4252984e12f61f88c953597925e3145f5637fde1e76422513e0d1808b53c61c521c7 fix-dirty-spicy-corruption.patch" diff --git a/user/spice-gtk/fix-dirty-spicy-corruption.patch b/user/spice-gtk/fix-dirty-spicy-corruption.patch new file mode 100644 index 000000000..44397fc67 --- /dev/null +++ b/user/spice-gtk/fix-dirty-spicy-corruption.patch @@ -0,0 +1,23 @@ +diff -ur a/build-aux/git-version-gen b/build-aux/git-version-gen +--- a/build-aux/git-version-gen 2024-12-10 15:40:58.099527209 +0000 ++++ b/build-aux/git-version-gen 2024-12-10 15:44:18.316014690 +0000 +@@ -133,19 +133,6 @@ + + v=`echo "$v" |sed 's/^v//'` + +-# Don't declare a version "dirty" merely because a time stamp has changed. +-git update-index --refresh > /dev/null 2>&1 +- +-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +-case "$dirty" in +- '') ;; +- *) # Append the suffix only if there isn't one already. +- case $v in +- *-dirty) ;; +- *) v="$v-dirty" ;; +- esac ;; +-esac +- + # Omit the trailing newline, so that m4_esyscmd can use the result directly. + echo "$v" | tr -d "$nl" + diff --git a/user/spirv-headers/APKBUILD b/user/spirv-headers/APKBUILD new file mode 100644 index 000000000..06f2234db --- /dev/null +++ b/user/spirv-headers/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=spirv-headers +pkgver=1.3.290.0 +pkgrel=0 +pkgdesc="Headers for translation between SPIR-V and LLVM IR" +url="https://github.com/KhronosGroup/SPIRV-Headers" +arch="noarch" +license="MIT" +depends="" +makedepends="cmake" +subpackages="" +source="spirv-headers-$pkgver.tar.gz::https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-$pkgver.tar.gz" +builddir="$srcdir/SPIRV-Headers-vulkan-sdk-$pkgver" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89 spirv-headers-1.3.290.0.tar.gz" diff --git a/user/spirv-tools/APKBUILD b/user/spirv-tools/APKBUILD new file mode 100644 index 000000000..874d2de0a --- /dev/null +++ b/user/spirv-tools/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=spirv-tools +pkgver=2024.3 +pkgrel=0 +pkgdesc="Utilities for working with SPIR-V modules " +url="https://github.com/KhronosGroup/SPIRV-Tools" +arch="all" +license="Apache-2.0" +depends="" +depends_dev="spirv-headers" +makedepends="$depends_dev cmake python3" +subpackages="$pkgname-dev" +source="spirv-tools-$pkgver.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v$pkgver.tar.gz + endian.patch + remove-copyright-check-test.patch + " +builddir="$srcdir/SPIRV-Tools-$pkgver" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DSPIRV-Headers_SOURCE_DIR="/usr" \ + -DSPIRV_TOOLS_BUILD_STATIC=off \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="804e2a076025a9afde2d7b0b6950fa7b7289b9aa911348b10aad45cc3515116b7484e886d49b524315f75e8d1a2009c2f26310352c154d1b23a58864e8535324 spirv-tools-2024.3.tar.gz +d31f1650a9f1d35b4ee95eddd6bd6aceb3490591e269f283b71589cfd3ca69b77467cabf659fdc42ee96433092434137a3be55c69b60b7edbcc40d5ed76357b1 endian.patch +a04f1a4d60d6206cbbd5e97dda58ca05689835520617dfe7bdfe29d66ab987f68080fbee85c039aecab554e01d94b16a99acfc2ffd29d9ef5861d3dd2e2dccb1 remove-copyright-check-test.patch" diff --git a/user/spirv-tools/endian.patch b/user/spirv-tools/endian.patch new file mode 100644 index 000000000..82a2812ad --- /dev/null +++ b/user/spirv-tools/endian.patch @@ -0,0 +1,283 @@ +From 4826b6eabc6102e49562c48effcabb7b87ceb041 Mon Sep 17 00:00:00 2001 +From: Hugo Devillers <hugo@xol.io> +Date: Sat, 1 Jul 2023 11:33:17 +0200 +Subject: [PATCH 1/6] remove dead code dealing with operand endianness + +--- + source/binary.cpp | 21 ++++++--------------- + 1 file changed, 6 insertions(+), 15 deletions(-) + +diff --git a/source/binary.cpp b/source/binary.cpp +index 207d4a9b37..b1e1922445 100644 +--- a/source/binary.cpp ++++ b/source/binary.cpp +@@ -440,10 +440,6 @@ spv_result_t Parser::parseOperand(size_t inst_offset, + + const uint32_t word = peek(); + +- // Do the words in this operand have to be converted to native endianness? +- // True for all but literal strings. +- bool convert_operand_endianness = true; +- + switch (type) { + case SPV_OPERAND_TYPE_TYPE_ID: + if (!word) +@@ -752,17 +748,12 @@ spv_result_t Parser::parseOperand(size_t inst_offset, + + if (_.requires_endian_conversion) { + // Copy instruction words. Translate to native endianness as needed. +- if (convert_operand_endianness) { +- const spv_endianness_t endianness = _.endian; +- std::transform(_.words + _.word_index, _.words + index_after_operand, +- std::back_inserter(*words), +- [endianness](const uint32_t raw_word) { +- return spvFixWord(raw_word, endianness); +- }); +- } else { +- words->insert(words->end(), _.words + _.word_index, +- _.words + index_after_operand); +- } ++ const spv_endianness_t endianness = _.endian; ++ std::transform(_.words + _.word_index, _.words + index_after_operand, ++ std::back_inserter(*words), ++ [endianness](const uint32_t raw_word) { ++ return spvFixWord(raw_word, endianness); ++ }); + } + + // Advance past the operand. + +From 39a63f822f0d1d93cabba4f4f3d980bc6ec1737b Mon Sep 17 00:00:00 2001 +From: Hugo Devillers <hugo@xol.io> +Date: Sat, 1 Jul 2023 11:50:03 +0200 +Subject: [PATCH 2/6] perform endianness conversion eagerly + +--- + source/binary.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/source/binary.cpp b/source/binary.cpp +index b1e1922445..d46dbc1d9e 100644 +--- a/source/binary.cpp ++++ b/source/binary.cpp +@@ -207,6 +207,10 @@ class Parser { + operands.reserve(25); + endian_converted_words.reserve(25); + expected_operands.reserve(25); ++ ++ native_words = std::make_unique<uint32_t[]>(num_words); ++ for (size_t i = 0; i < num_words; i++) ++ native_words[i] = spvFixWord(words[i], endian); + } + State() : State(0, 0, nullptr) {} + const uint32_t* words; // Words in the binary SPIR-V module. +@@ -218,6 +222,7 @@ class Parser { + // Is the SPIR-V binary in a different endianness from the host native + // endianness? + bool requires_endian_conversion; ++ std::unique_ptr<uint32_t[]> native_words; + + // Maps a result ID to its type ID. By convention: + // - a result ID that is a type definition maps to itself. +@@ -748,12 +753,8 @@ spv_result_t Parser::parseOperand(size_t inst_offset, + + if (_.requires_endian_conversion) { + // Copy instruction words. Translate to native endianness as needed. +- const spv_endianness_t endianness = _.endian; +- std::transform(_.words + _.word_index, _.words + index_after_operand, +- std::back_inserter(*words), +- [endianness](const uint32_t raw_word) { +- return spvFixWord(raw_word, endianness); +- }); ++ words->insert(words->end(), _.native_words.get() + _.word_index, ++ _.native_words.get() + index_after_operand); + } + + // Advance past the operand. + +From e6005633e64f4dac33aa2c4de42fe6bd3fb648ca Mon Sep 17 00:00:00 2001 +From: Hugo Devillers <hugo@xol.io> +Date: Sat, 1 Jul 2023 11:51:37 +0200 +Subject: [PATCH 3/6] fix string literals when file has non-native endianness + +--- + source/binary.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/binary.cpp b/source/binary.cpp +index d46dbc1d9e..34cb608abe 100644 +--- a/source/binary.cpp ++++ b/source/binary.cpp +@@ -591,7 +591,7 @@ spv_result_t Parser::parseOperand(size_t inst_offset, + case SPV_OPERAND_TYPE_OPTIONAL_LITERAL_STRING: { + const size_t max_words = _.num_words - _.word_index; + std::string string = +- spvtools::utils::MakeString(_.words + _.word_index, max_words, false); ++ spvtools::utils::MakeString(_.native_words.get() + _.word_index, max_words, false); + + if (string.length() == max_words * 4) + return exhaustedInputDiagnostic(inst_offset, opcode, type); + +From 3ccc744e814609fe63b755e37240e03cf07e2f2b Mon Sep 17 00:00:00 2001 +From: Hugo Devillers <hugo@xol.io> +Date: Sat, 1 Jul 2023 12:24:16 +0200 +Subject: [PATCH 4/6] don't convert endianness if not required + +--- + source/binary.cpp | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/source/binary.cpp b/source/binary.cpp +index 34cb608abe..69bd082598 100644 +--- a/source/binary.cpp ++++ b/source/binary.cpp +@@ -207,10 +207,6 @@ class Parser { + operands.reserve(25); + endian_converted_words.reserve(25); + expected_operands.reserve(25); +- +- native_words = std::make_unique<uint32_t[]>(num_words); +- for (size_t i = 0; i < num_words; i++) +- native_words[i] = spvFixWord(words[i], endian); + } + State() : State(0, 0, nullptr) {} + const uint32_t* words; // Words in the binary SPIR-V module. +@@ -267,6 +263,9 @@ spv_result_t Parser::parseModule() { + << _.words[0] << "'."; + } + _.requires_endian_conversion = !spvIsHostEndian(_.endian); ++ _.native_words = std::make_unique<uint32_t[]>(_.num_words); ++ for (size_t i = 0; i < _.num_words; i++) ++ _.native_words[i] = _.requires_endian_conversion ? spvFixWord(_.words[i], _.endian) : _.words[i]; + + // Process the header. + spv_header_t header; + +From 74df3cf1b49c9ae296ebbb16cf8e2e7b45584454 Mon Sep 17 00:00:00 2001 +From: Hugo Devillers <hugo@xol.io> +Date: Sat, 1 Jul 2023 12:42:04 +0200 +Subject: [PATCH 5/6] use native_words as a cache for spvFixWord + +--- + source/binary.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/binary.cpp b/source/binary.cpp +index 69bd082598..01322be0af 100644 +--- a/source/binary.cpp ++++ b/source/binary.cpp +@@ -173,7 +173,7 @@ class Parser { + // Returns the endian-corrected word at the given position. + uint32_t peekAt(size_t index) const { + assert(index < _.num_words); +- return spvFixWord(_.words[index], _.endian); ++ return _.native_words[index]; + } + + // Data members + +From 458eb86f866b489e93d17eee12f76207b93dd60d Mon Sep 17 00:00:00 2001 +From: Hugo Devillers <hugo@xol.io> +Date: Sat, 1 Jul 2023 16:59:06 +0200 +Subject: [PATCH 6/6] simplify and fix mismatched endian string parsing for + extract_source.cpp + +--- + tools/objdump/extract_source.cpp | 58 ++++---------------------------- + 1 file changed, 7 insertions(+), 51 deletions(-) + +diff --git a/tools/objdump/extract_source.cpp b/tools/objdump/extract_source.cpp +index 02959525c6..a179c722a0 100644 +--- a/tools/objdump/extract_source.cpp ++++ b/tools/objdump/extract_source.cpp +@@ -23,45 +23,12 @@ + #include "spirv-tools/libspirv.hpp" + #include "spirv/unified1/spirv.hpp" + #include "tools/util/cli_consumer.h" ++#include "source/binary.h" + + namespace { + + constexpr auto kDefaultEnvironment = SPV_ENV_UNIVERSAL_1_6; + +-// Extract a string literal from a given range. +-// Copies all the characters from `begin` to the first '\0' it encounters, while +-// removing escape patterns. +-// Not finding a '\0' before reaching `end` fails the extraction. +-// +-// Returns `true` if the extraction succeeded. +-// `output` value is undefined if false is returned. +-spv_result_t ExtractStringLiteral(const spv_position_t& loc, const char* begin, +- const char* end, std::string* output) { +- size_t sourceLength = std::distance(begin, end); +- std::string escapedString; +- escapedString.resize(sourceLength); +- +- size_t writeIndex = 0; +- size_t readIndex = 0; +- for (; readIndex < sourceLength; writeIndex++, readIndex++) { +- const char read = begin[readIndex]; +- if (read == '\0') { +- escapedString.resize(writeIndex); +- output->append(escapedString); +- return SPV_SUCCESS; +- } +- +- if (read == '\\') { +- ++readIndex; +- } +- escapedString[writeIndex] = begin[readIndex]; +- } +- +- spvtools::Error(spvtools::utils::CLIMessageConsumer, "", loc, +- "Missing NULL terminator for literal string."); +- return SPV_ERROR_INVALID_BINARY; +-} +- + spv_result_t extractOpString(const spv_position_t& loc, + const spv_parsed_instruction_t& instruction, + std::string* output) { +@@ -73,12 +40,8 @@ spv_result_t extractOpString(const spv_position_t& loc, + return SPV_ERROR_INVALID_BINARY; + } + +- const auto& operand = instruction.operands[1]; +- const char* stringBegin = +- reinterpret_cast<const char*>(instruction.words + operand.offset); +- const char* stringEnd = reinterpret_cast<const char*>( +- instruction.words + operand.offset + operand.num_words); +- return ExtractStringLiteral(loc, stringBegin, stringEnd, output); ++ *output = spvDecodeLiteralStringOperand(instruction, 1); ++ return SPV_SUCCESS; + } + + spv_result_t extractOpSourceContinued( +@@ -92,12 +55,8 @@ spv_result_t extractOpSourceContinued( + return SPV_ERROR_INVALID_BINARY; + } + +- const auto& operand = instruction.operands[0]; +- const char* stringBegin = +- reinterpret_cast<const char*>(instruction.words + operand.offset); +- const char* stringEnd = reinterpret_cast<const char*>( +- instruction.words + operand.offset + operand.num_words); +- return ExtractStringLiteral(loc, stringBegin, stringEnd, output); ++ *output = *output + spvDecodeLiteralStringOperand(instruction, 0); ++ return SPV_SUCCESS; + } + + spv_result_t extractOpSource(const spv_position_t& loc, +@@ -123,11 +82,8 @@ spv_result_t extractOpSource(const spv_position_t& loc, + return SPV_SUCCESS; + } + +- const char* stringBegin = +- reinterpret_cast<const char*>(instruction.words + 4); +- const char* stringEnd = +- reinterpret_cast<const char*>(instruction.words + instruction.num_words); +- return ExtractStringLiteral(loc, stringBegin, stringEnd, code); ++ *code = spvDecodeLiteralStringOperand(instruction, 3); ++ return SPV_SUCCESS; + } + + } // namespace diff --git a/user/spirv-tools/remove-copyright-check-test.patch b/user/spirv-tools/remove-copyright-check-test.patch new file mode 100644 index 000000000..7cd1cf879 --- /dev/null +++ b/user/spirv-tools/remove-copyright-check-test.patch @@ -0,0 +1,16 @@ +diff '--color=auto' -Nurd SPIRV-Tools-2024.3/CMakeLists.txt SPIRV-Tools-2024.3.new/CMakeLists.txt +--- SPIRV-Tools-2024.3/CMakeLists.txt 2024-06-20 07:29:42.000000000 -0700 ++++ SPIRV-Tools-2024.3.new/CMakeLists.txt 2024-08-27 20:52:51.548196076 -0700 +@@ -376,12 +376,6 @@ + ${CMAKE_INSTALL_INCLUDEDIR}/spirv-tools/) + endif(ENABLE_SPIRV_TOOLS_INSTALL) + +-if (NOT "${SPIRV_SKIP_TESTS}") +- add_test(NAME spirv-tools-copyrights +- COMMAND Python3::Interpreter utils/check_copyright.py +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +-endif() +- + set(SPIRV_LIBRARIES "-lSPIRV-Tools-opt -lSPIRV-Tools -lSPIRV-Tools-link") + set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools-shared") + diff --git a/user/squashfs-tools/APKBUILD b/user/squashfs-tools/APKBUILD index e33b06b16..be6eddb44 100644 --- a/user/squashfs-tools/APKBUILD +++ b/user/squashfs-tools/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=squashfs-tools -pkgver=4.4 +pkgver=4.6.1 pkgrel=0 pkgdesc="Tools for SquashFS, a highly compressed read-only filesystem" -url="http://squashfs.sourceforge.net" +url="https://squashfs.sourceforge.net" arch="all" options="!check" # No test suite. license="GPL-2.0+" @@ -12,7 +12,6 @@ makedepends="attr-dev lz4-dev lzo-dev xz-dev zlib-dev" source="https://downloads.sourceforge.net/squashfs/squashfs$pkgver.tar.gz fix-compat.patch " -builddir="$srcdir/squashfs$pkgver/$pkgname" # secfixes: # 4.3-r5: @@ -21,13 +20,13 @@ builddir="$srcdir/squashfs$pkgver/$pkgname" # - CVE-2015-4646 build() { - make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 + make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 -C squashfs-tools } package() { - mkdir -p "$pkgdir"/sbin - cp -a mksquashfs unsquashfs "$pkgdir"/sbin + mkdir -p "$pkgdir"/usr/sbin + cp -a squashfs-tools/mksquashfs squashfs-tools/unsquashfs "$pkgdir"/usr/sbin } -sha512sums="e7119f82cea0eda8dffcbf15c9ee511ad457e004bfc0c5a5685e84785e49cf34f3c053036449af6bba0012cef48426f65958c97b9958d58f1b31175cb0bbbe24 squashfs4.4.tar.gz -12f5739aa32b9e15ba3d22e5953034f17867a8837475f13bde5bbc378dbded0483cde42c0cdfc5d33ab3723b9de752c71b5ba8f4301ca7b59aa4054d669c262d fix-compat.patch" +sha512sums="10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb squashfs4.6.1.tar.gz +7572f2fab6357525bc607a8db92b0c1f5fc7d482e935c3ee1828543a3de474162b71b8441f77ee1656873def8593d99158b14c55ec44799f22eed2978aa19147 fix-compat.patch" diff --git a/user/squashfs-tools/fix-compat.patch b/user/squashfs-tools/fix-compat.patch index e93b6b827..adc7e420d 100644 --- a/user/squashfs-tools/fix-compat.patch +++ b/user/squashfs-tools/fix-compat.patch @@ -1,6 +1,6 @@ ---- squashfs-tools/action.c -+++ squashfs-tools/action.c -@@ -2236,6 +2236,9 @@ +--- a/squashfs-tools/action.c ++++ b/squashfs-tools/action.c +@@ -2562,6 +2562,9 @@ return 1; } @@ -10,21 +10,21 @@ TEST_FN(name, ACTION_ALL_LNK, \ return fnmatch(atom->argv[0], action_data->name, ---- squashfs-tools/mksquashfs.c -+++ squashfs-tools/mksquashfs.c -@@ -4665,6 +4665,9 @@ - return paths; +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -4557,6 +4557,9 @@ + return source; } +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif - int excluded_match(char *name, struct pathname *path, struct pathnames **new) - { ---- squashfs-tools/unsquashfs.c -+++ squashfs-tools/unsquashfs.c -@@ -1457,6 +1457,9 @@ + static struct dir_info *add_source(struct dir_info *sdir, char *source, + char *subpath, char *file, char **prefix, +--- a/squashfs-tools/unsquashfs.c ++++ b/squashfs-tools/unsquashfs.c +@@ -1450,6 +1450,9 @@ free(paths); } @@ -32,5 +32,5 @@ +#define FNM_EXTMATCH 0 +#endif - int matches(struct pathnames *paths, char *name, struct pathnames **new) - { + struct pathname *add_path(struct pathname *paths, int type, char *target, + char *alltarget) diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD index c755ec767..0679774e1 100644 --- a/user/strongswan/APKBUILD +++ b/user/strongswan/APKBUILD @@ -12,6 +12,7 @@ pkggroups="ipsec" license="GPL-2.0 AND RSA-MD5 AND RSA-PKCS11 AND DES" depends="iproute2" depends_dev="" +checkdepends="libexecinfo-dev" makedepends="$depends_dev linux-headers python3 sqlite-dev openssl-dev curl-dev gmp-dev libcap-dev" subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc" diff --git a/user/supertux/APKBUILD b/user/supertux/APKBUILD index f1518855d..4e6b1c20d 100644 --- a/user/supertux/APKBUILD +++ b/user/supertux/APKBUILD @@ -2,19 +2,20 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=supertux pkgver=0.6.3 -pkgrel=0 +pkgrel=1 pkgdesc="Platform game featuring Tux the Penugin" url="https://www.supertux.org/" arch="all" license="GPL-3.0+" depends="" makedepends="boost-dev cmake curl-dev glew-dev libogg-dev libvorbis-dev zlib-dev - mesa-dev openal-soft-dev physfs-dev sdl2-dev sdl2_image-dev doxygen + libglvnd-dev openal-soft-dev physfs-dev sdl2-dev sdl2_image-dev doxygen freetype-dev glm libpng-dev" subpackages="$pkgname-doc" source="https://github.com/SuperTux/supertux/releases/download/v$pkgver/SuperTux-v$pkgver-Source.tar.gz find-sdl2.patch cmake32.patch + zip-header.patch " builddir="$srcdir"/SuperTux-v$pkgver-Source @@ -43,4 +44,5 @@ package() { sha512sums="c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798 SuperTux-v0.6.3-Source.tar.gz 9e229d837d8006d618320ef3f7465ef88f8903853ed1ef3e291373d25f8542010f7dad6c1c5859e857db48e1447337ddbed0619228f5eac6aba916b69567fd94 find-sdl2.patch -c0e6cdd52e07e04ef67edc8b7f3d3c37dd2ffd35381b704b43512a01bbd0a5a35fbeae7ec225be8e4643dbcaac3eae427d7ea5217dc1e676f2991ee46f5bf513 cmake32.patch" +c0e6cdd52e07e04ef67edc8b7f3d3c37dd2ffd35381b704b43512a01bbd0a5a35fbeae7ec225be8e4643dbcaac3eae427d7ea5217dc1e676f2991ee46f5bf513 cmake32.patch +038a00697db1533154d1664a58516827d1574c3b79712c72e3bbb92b23943a9ac3a198e20705a7ca470eb34be605d5765ef2a4ebc53694e28543b609a2f2444b zip-header.patch" diff --git a/user/supertux/zip-header.patch b/user/supertux/zip-header.patch new file mode 100644 index 000000000..b02e74d0e --- /dev/null +++ b/user/supertux/zip-header.patch @@ -0,0 +1,30 @@ +From 81809dd5e6f611b1d64d952f6d96310bcc9c5fca Mon Sep 17 00:00:00 2001 +From: Semphris <semphris@protonmail.com> +Date: Fri, 17 Jun 2022 12:36:26 -0400 +Subject: [PATCH] Fix problem with GCC 11 and Partio's ZIP manager (missing + #include <memory>) + +Closes #2219 on GitHub. Same fix, but puts the include closer to the copyright header. +--- + external/partio_zip/zip_manager.hpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/external/partio_zip/zip_manager.hpp b/external/partio_zip/zip_manager.hpp +index 666884dda53..245303c76be 100644 +--- a/external/partio_zip/zip_manager.hpp ++++ b/external/partio_zip/zip_manager.hpp +@@ -1,8 +1,12 @@ + // SOURCE: https://github.com/wdas/partio/blob/main/src/lib/io/ZIP.h ++// NOTE: This file was edited for purposes of compatibility with SuperTux. + +-/* ++// This include has been added to fix a problem with GCC 11+ (and maybe 10) ++#include <memory> ++ ++// ============================================================================= + +-NOTE: This file was edited for purposes of compatibility with SuperTux. ++/* + + PARTIO SOFTWARE + Copyright 2010 Disney Enterprises, Inc. All rights reserved diff --git a/user/sway/APKBUILD b/user/sway/APKBUILD new file mode 100644 index 000000000..16a8b3992 --- /dev/null +++ b/user/sway/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=sway +pkgver=1.10 +pkgrel=0 +pkgdesc="tiling Wayland compositor like i3" +url="https://swaywm.org" +arch="all" +license="MIT" +depends="wlroots-0.18 swaybg" +makedepends="cairo-dev gdk-pixbuf-dev json-c-dev meson libevdev-dev + libinput-dev>=1.26.0 libxkbcommon>=1.5.0 pango-dev pcre2-dev scdoc + wayland-protocols wlroots-0.18-dev" +subpackages="$pkgname-doc" +source="https://github.com/swaywm/sway/releases/download/$pkgver/sway-$pkgver.tar.gz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="f75a80506d2dcae722ea64c47fa423b9713bcfaa6541ffc353abd413238abb9ab7c88490d54e30ef09dc003215aa6a0005e5b425c9c943f982d5ff3c7cfad440 sway-1.10.tar.gz" diff --git a/user/sway/license.txt b/user/sway/license.txt new file mode 100644 index 000000000..3a62bb416 --- /dev/null +++ b/user/sway/license.txt @@ -0,0 +1,472 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FIXME +Upstream-Contact: FIXME +Source: FIXME +Disclaimer: Autogenerated by licensecheck + +Files: src/sway-1.9/.builds/alpine.yml + src/sway-1.9/.builds/archlinux.yml + src/sway-1.9/.builds/freebsd.yml + src/sway-1.9/.editorconfig + src/sway-1.9/.github/ISSUE_TEMPLATE/bug_report.md + src/sway-1.9/.github/ISSUE_TEMPLATE/config.yml + src/sway-1.9/.github/ISSUE_TEMPLATE/enhancement.md + src/sway-1.9/.github/ISSUE_TEMPLATE/i3_compat.md + src/sway-1.9/.mailmap + src/sway-1.9/CONTRIBUTING.md + src/sway-1.9/README.ar.md + src/sway-1.9/README.cs.md + src/sway-1.9/README.de.md + src/sway-1.9/README.dk.md + src/sway-1.9/README.es.md + src/sway-1.9/README.fr.md + src/sway-1.9/README.ge.md + src/sway-1.9/README.gr.md + src/sway-1.9/README.hi.md + src/sway-1.9/README.hu.md + src/sway-1.9/README.ir.md + src/sway-1.9/README.it.md + src/sway-1.9/README.ja.md + src/sway-1.9/README.ko.md + src/sway-1.9/README.md + src/sway-1.9/README.nl.md + src/sway-1.9/README.no.md + src/sway-1.9/README.pl.md + src/sway-1.9/README.pt.md + src/sway-1.9/README.ro.md + src/sway-1.9/README.ru.md + src/sway-1.9/README.sv.md + src/sway-1.9/README.tr.md + src/sway-1.9/README.uk.md + src/sway-1.9/README.zh-CN.md + src/sway-1.9/README.zh-TW.md + src/sway-1.9/assets/Sway_Logo+Text_Ver1.svg + src/sway-1.9/assets/Sway_Logo+Text_Ver1_1500x716.png + src/sway-1.9/assets/Sway_Logo+Text_Ver2.png + src/sway-1.9/assets/Sway_Logo+Text_Ver2.svg + src/sway-1.9/assets/Sway_Logo+Text_Ver3.svg + src/sway-1.9/assets/Sway_Logo+Text_Ver4.png + src/sway-1.9/assets/Sway_Logo+Text_Ver4.svg + src/sway-1.9/assets/Sway_Tree.png + src/sway-1.9/assets/Sway_Tree.svg + src/sway-1.9/assets/Sway_Wallpaper_Blue_1136x640.png + src/sway-1.9/assets/Sway_Wallpaper_Blue_1136x640_Portrait.png + src/sway-1.9/assets/Sway_Wallpaper_Blue_2048x1536.png + src/sway-1.9/assets/Sway_Wallpaper_Blue_768x1024.png + src/sway-1.9/assets/Sway_Wallpaper_Blue_768x1024_Portrait.png + src/sway-1.9/client/meson.build + src/sway-1.9/client/pool-buffer.c + src/sway-1.9/common/background-image.c + src/sway-1.9/common/cairo.c + src/sway-1.9/common/gesture.c + src/sway-1.9/common/ipc-client.c + src/sway-1.9/common/list.c + src/sway-1.9/common/log.c + src/sway-1.9/common/loop.c + src/sway-1.9/common/meson.build + src/sway-1.9/common/pango.c + src/sway-1.9/common/stringop.c + src/sway-1.9/common/util.c + src/sway-1.9/completions/bash/sway + src/sway-1.9/completions/bash/swaybar + src/sway-1.9/completions/bash/swaymsg + src/sway-1.9/completions/fish/sway.fish + src/sway-1.9/completions/fish/swaymsg.fish + src/sway-1.9/completions/fish/swaynag.fish + src/sway-1.9/completions/meson.build + src/sway-1.9/completions/zsh/_sway + src/sway-1.9/completions/zsh/_swaybar + src/sway-1.9/completions/zsh/_swaymsg + src/sway-1.9/config.in + src/sway-1.9/include/background-image.h + src/sway-1.9/include/cairo_util.h + src/sway-1.9/include/gesture.h + src/sway-1.9/include/ipc-client.h + src/sway-1.9/include/ipc.h + src/sway-1.9/include/list.h + src/sway-1.9/include/log.h + src/sway-1.9/include/loop.h + src/sway-1.9/include/meson.build + src/sway-1.9/include/pango.h + src/sway-1.9/include/pool-buffer.h + src/sway-1.9/include/stringop.h + src/sway-1.9/include/sway/commands.h + src/sway-1.9/include/sway/config.h + src/sway-1.9/include/sway/criteria.h + src/sway-1.9/include/sway/decoration.h + src/sway-1.9/include/sway/desktop.h + src/sway-1.9/include/sway/desktop/idle_inhibit_v1.h + src/sway-1.9/include/sway/desktop/launcher.h + src/sway-1.9/include/sway/desktop/transaction.h + src/sway-1.9/include/sway/input/cursor.h + src/sway-1.9/include/sway/input/input-manager.h + src/sway-1.9/include/sway/input/keyboard.h + src/sway-1.9/include/sway/input/libinput.h + src/sway-1.9/include/sway/input/seat.h + src/sway-1.9/include/sway/input/switch.h + src/sway-1.9/include/sway/input/tablet.h + src/sway-1.9/include/sway/input/text_input.h + src/sway-1.9/include/sway/ipc-json.h + src/sway-1.9/include/sway/ipc-server.h + src/sway-1.9/include/sway/layers.h + src/sway-1.9/include/sway/output.h + src/sway-1.9/include/sway/server.h + src/sway-1.9/include/sway/surface.h + src/sway-1.9/include/sway/swaynag.h + src/sway-1.9/include/sway/tree/arrange.h + src/sway-1.9/include/sway/tree/container.h + src/sway-1.9/include/sway/tree/node.h + src/sway-1.9/include/sway/tree/root.h + src/sway-1.9/include/sway/tree/view.h + src/sway-1.9/include/sway/tree/workspace.h + src/sway-1.9/include/sway/xdg_decoration.h + src/sway-1.9/include/sway/xwayland.h + src/sway-1.9/include/swaybar/bar.h + src/sway-1.9/include/swaybar/config.h + src/sway-1.9/include/swaybar/i3bar.h + src/sway-1.9/include/swaybar/input.h + src/sway-1.9/include/swaybar/ipc.h + src/sway-1.9/include/swaybar/render.h + src/sway-1.9/include/swaybar/status_line.h + src/sway-1.9/include/swaybar/tray/host.h + src/sway-1.9/include/swaybar/tray/icon.h + src/sway-1.9/include/swaybar/tray/item.h + src/sway-1.9/include/swaybar/tray/tray.h + src/sway-1.9/include/swaybar/tray/watcher.h + src/sway-1.9/include/swaynag/config.h + src/sway-1.9/include/swaynag/render.h + src/sway-1.9/include/swaynag/swaynag.h + src/sway-1.9/include/swaynag/types.h + src/sway-1.9/include/util.h + src/sway-1.9/meson_options.txt + src/sway-1.9/protocols/meson.build + src/sway-1.9/protocols/wlr-output-power-management-unstable-v1.xml + src/sway-1.9/sway.desktop + src/sway-1.9/sway/commands.c + src/sway-1.9/sway/commands/assign.c + src/sway-1.9/sway/commands/bar.c + src/sway-1.9/sway/commands/bar/bind.c + src/sway-1.9/sway/commands/bar/binding_mode_indicator.c + src/sway-1.9/sway/commands/bar/colors.c + src/sway-1.9/sway/commands/bar/font.c + src/sway-1.9/sway/commands/bar/gaps.c + src/sway-1.9/sway/commands/bar/height.c + src/sway-1.9/sway/commands/bar/hidden_state.c + src/sway-1.9/sway/commands/bar/icon_theme.c + src/sway-1.9/sway/commands/bar/id.c + src/sway-1.9/sway/commands/bar/mode.c + src/sway-1.9/sway/commands/bar/modifier.c + src/sway-1.9/sway/commands/bar/output.c + src/sway-1.9/sway/commands/bar/pango_markup.c + src/sway-1.9/sway/commands/bar/position.c + src/sway-1.9/sway/commands/bar/separator_symbol.c + src/sway-1.9/sway/commands/bar/status_command.c + src/sway-1.9/sway/commands/bar/status_edge_padding.c + src/sway-1.9/sway/commands/bar/status_padding.c + src/sway-1.9/sway/commands/bar/strip_workspace_name.c + src/sway-1.9/sway/commands/bar/strip_workspace_numbers.c + src/sway-1.9/sway/commands/bar/swaybar_command.c + src/sway-1.9/sway/commands/bar/tray_bind.c + src/sway-1.9/sway/commands/bar/tray_output.c + src/sway-1.9/sway/commands/bar/tray_padding.c + src/sway-1.9/sway/commands/bar/workspace_buttons.c + src/sway-1.9/sway/commands/bar/workspace_min_width.c + src/sway-1.9/sway/commands/bar/wrap_scroll.c + src/sway-1.9/sway/commands/bind.c + src/sway-1.9/sway/commands/border.c + src/sway-1.9/sway/commands/client.c + src/sway-1.9/sway/commands/create_output.c + src/sway-1.9/sway/commands/default_border.c + src/sway-1.9/sway/commands/default_floating_border.c + src/sway-1.9/sway/commands/default_orientation.c + src/sway-1.9/sway/commands/exec.c + src/sway-1.9/sway/commands/exec_always.c + src/sway-1.9/sway/commands/exit.c + src/sway-1.9/sway/commands/floating.c + src/sway-1.9/sway/commands/floating_minmax_size.c + src/sway-1.9/sway/commands/floating_modifier.c + src/sway-1.9/sway/commands/focus.c + src/sway-1.9/sway/commands/focus_follows_mouse.c + src/sway-1.9/sway/commands/focus_on_window_activation.c + src/sway-1.9/sway/commands/focus_wrapping.c + src/sway-1.9/sway/commands/font.c + src/sway-1.9/sway/commands/for_window.c + src/sway-1.9/sway/commands/force_display_urgency_hint.c + src/sway-1.9/sway/commands/force_focus_wrapping.c + src/sway-1.9/sway/commands/fullscreen.c + src/sway-1.9/sway/commands/gaps.c + src/sway-1.9/sway/commands/gesture.c + src/sway-1.9/sway/commands/hide_edge_borders.c + src/sway-1.9/sway/commands/include.c + src/sway-1.9/sway/commands/inhibit_idle.c + src/sway-1.9/sway/commands/input.c + src/sway-1.9/sway/commands/input/accel_profile.c + src/sway-1.9/sway/commands/input/calibration_matrix.c + src/sway-1.9/sway/commands/input/click_method.c + src/sway-1.9/sway/commands/input/drag.c + src/sway-1.9/sway/commands/input/drag_lock.c + src/sway-1.9/sway/commands/input/dwt.c + src/sway-1.9/sway/commands/input/dwtp.c + src/sway-1.9/sway/commands/input/events.c + src/sway-1.9/sway/commands/input/left_handed.c + src/sway-1.9/sway/commands/input/map_from_region.c + src/sway-1.9/sway/commands/input/map_to_output.c + src/sway-1.9/sway/commands/input/map_to_region.c + src/sway-1.9/sway/commands/input/middle_emulation.c + src/sway-1.9/sway/commands/input/natural_scroll.c + src/sway-1.9/sway/commands/input/pointer_accel.c + src/sway-1.9/sway/commands/input/repeat_delay.c + src/sway-1.9/sway/commands/input/repeat_rate.c + src/sway-1.9/sway/commands/input/rotation_angle.c + src/sway-1.9/sway/commands/input/scroll_button.c + src/sway-1.9/sway/commands/input/scroll_button_lock.c + src/sway-1.9/sway/commands/input/scroll_factor.c + src/sway-1.9/sway/commands/input/scroll_method.c + src/sway-1.9/sway/commands/input/tap.c + src/sway-1.9/sway/commands/input/tap_button_map.c + src/sway-1.9/sway/commands/input/tool_mode.c + src/sway-1.9/sway/commands/input/xkb_capslock.c + src/sway-1.9/sway/commands/input/xkb_file.c + src/sway-1.9/sway/commands/input/xkb_layout.c + src/sway-1.9/sway/commands/input/xkb_model.c + src/sway-1.9/sway/commands/input/xkb_numlock.c + src/sway-1.9/sway/commands/input/xkb_options.c + src/sway-1.9/sway/commands/input/xkb_rules.c + src/sway-1.9/sway/commands/input/xkb_switch_layout.c + src/sway-1.9/sway/commands/input/xkb_variant.c + src/sway-1.9/sway/commands/kill.c + src/sway-1.9/sway/commands/layout.c + src/sway-1.9/sway/commands/mark.c + src/sway-1.9/sway/commands/max_render_time.c + src/sway-1.9/sway/commands/mode.c + src/sway-1.9/sway/commands/mouse_warping.c + src/sway-1.9/sway/commands/move.c + src/sway-1.9/sway/commands/new_float.c + src/sway-1.9/sway/commands/new_window.c + src/sway-1.9/sway/commands/no_focus.c + src/sway-1.9/sway/commands/nop.c + src/sway-1.9/sway/commands/opacity.c + src/sway-1.9/sway/commands/output.c + src/sway-1.9/sway/commands/output/adaptive_sync.c + src/sway-1.9/sway/commands/output/background.c + src/sway-1.9/sway/commands/output/disable.c + src/sway-1.9/sway/commands/output/dpms.c + src/sway-1.9/sway/commands/output/enable.c + src/sway-1.9/sway/commands/output/max_render_time.c + src/sway-1.9/sway/commands/output/mode.c + src/sway-1.9/sway/commands/output/position.c + src/sway-1.9/sway/commands/output/power.c + src/sway-1.9/sway/commands/output/render_bit_depth.c + src/sway-1.9/sway/commands/output/scale.c + src/sway-1.9/sway/commands/output/scale_filter.c + src/sway-1.9/sway/commands/output/subpixel.c + src/sway-1.9/sway/commands/output/toggle.c + src/sway-1.9/sway/commands/output/transform.c + src/sway-1.9/sway/commands/output/unplug.c + src/sway-1.9/sway/commands/popup_during_fullscreen.c + src/sway-1.9/sway/commands/primary_selection.c + src/sway-1.9/sway/commands/reload.c + src/sway-1.9/sway/commands/rename.c + src/sway-1.9/sway/commands/resize.c + src/sway-1.9/sway/commands/scratchpad.c + src/sway-1.9/sway/commands/seat.c + src/sway-1.9/sway/commands/seat/attach.c + src/sway-1.9/sway/commands/seat/cursor.c + src/sway-1.9/sway/commands/seat/fallback.c + src/sway-1.9/sway/commands/seat/hide_cursor.c + src/sway-1.9/sway/commands/seat/idle.c + src/sway-1.9/sway/commands/seat/keyboard_grouping.c + src/sway-1.9/sway/commands/seat/pointer_constraint.c + src/sway-1.9/sway/commands/seat/shortcuts_inhibitor.c + src/sway-1.9/sway/commands/seat/xcursor_theme.c + src/sway-1.9/sway/commands/set.c + src/sway-1.9/sway/commands/shortcuts_inhibitor.c + src/sway-1.9/sway/commands/show_marks.c + src/sway-1.9/sway/commands/smart_borders.c + src/sway-1.9/sway/commands/smart_gaps.c + src/sway-1.9/sway/commands/split.c + src/sway-1.9/sway/commands/sticky.c + src/sway-1.9/sway/commands/swap.c + src/sway-1.9/sway/commands/swaybg_command.c + src/sway-1.9/sway/commands/swaynag_command.c + src/sway-1.9/sway/commands/tiling_drag.c + src/sway-1.9/sway/commands/tiling_drag_threshold.c + src/sway-1.9/sway/commands/title_align.c + src/sway-1.9/sway/commands/title_format.c + src/sway-1.9/sway/commands/titlebar_border_thickness.c + src/sway-1.9/sway/commands/titlebar_padding.c + src/sway-1.9/sway/commands/unmark.c + src/sway-1.9/sway/commands/urgent.c + src/sway-1.9/sway/commands/workspace.c + src/sway-1.9/sway/commands/workspace_layout.c + src/sway-1.9/sway/commands/ws_auto_back_and_forth.c + src/sway-1.9/sway/commands/xwayland.c + src/sway-1.9/sway/config.c + src/sway-1.9/sway/config/bar.c + src/sway-1.9/sway/config/input.c + src/sway-1.9/sway/config/output.c + src/sway-1.9/sway/config/seat.c + src/sway-1.9/sway/criteria.c + src/sway-1.9/sway/decoration.c + src/sway-1.9/sway/desktop/desktop.c + src/sway-1.9/sway/desktop/idle_inhibit_v1.c + src/sway-1.9/sway/desktop/launcher.c + src/sway-1.9/sway/desktop/layer_shell.c + src/sway-1.9/sway/desktop/output.c + src/sway-1.9/sway/desktop/render.c + src/sway-1.9/sway/desktop/surface.c + src/sway-1.9/sway/desktop/transaction.c + src/sway-1.9/sway/desktop/xdg_shell.c + src/sway-1.9/sway/desktop/xwayland.c + src/sway-1.9/sway/input/cursor.c + src/sway-1.9/sway/input/input-manager.c + src/sway-1.9/sway/input/keyboard.c + src/sway-1.9/sway/input/libinput.c + src/sway-1.9/sway/input/seat.c + src/sway-1.9/sway/input/seatop_default.c + src/sway-1.9/sway/input/seatop_down.c + src/sway-1.9/sway/input/seatop_move_floating.c + src/sway-1.9/sway/input/seatop_move_tiling.c + src/sway-1.9/sway/input/seatop_resize_floating.c + src/sway-1.9/sway/input/seatop_resize_tiling.c + src/sway-1.9/sway/input/switch.c + src/sway-1.9/sway/input/tablet.c + src/sway-1.9/sway/input/text_input.c + src/sway-1.9/sway/ipc-json.c + src/sway-1.9/sway/ipc-server.c + src/sway-1.9/sway/lock.c + src/sway-1.9/sway/main.c + src/sway-1.9/sway/meson.build + src/sway-1.9/sway/realtime.c + src/sway-1.9/sway/server.c + src/sway-1.9/sway/sway-bar.5.scd + src/sway-1.9/sway/sway-input.5.scd + src/sway-1.9/sway/sway-ipc.7.scd + src/sway-1.9/sway/sway-output.5.scd + src/sway-1.9/sway/sway.1.scd + src/sway-1.9/sway/sway.5.scd + src/sway-1.9/sway/swaynag.c + src/sway-1.9/sway/tree/arrange.c + src/sway-1.9/sway/tree/container.c + src/sway-1.9/sway/tree/node.c + src/sway-1.9/sway/tree/output.c + src/sway-1.9/sway/tree/root.c + src/sway-1.9/sway/tree/view.c + src/sway-1.9/sway/tree/workspace.c + src/sway-1.9/sway/xdg_activation_v1.c + src/sway-1.9/sway/xdg_decoration.c + src/sway-1.9/swaybar/bar.c + src/sway-1.9/swaybar/config.c + src/sway-1.9/swaybar/i3bar.c + src/sway-1.9/swaybar/input.c + src/sway-1.9/swaybar/ipc.c + src/sway-1.9/swaybar/main.c + src/sway-1.9/swaybar/meson.build + src/sway-1.9/swaybar/render.c + src/sway-1.9/swaybar/status_line.c + src/sway-1.9/swaybar/swaybar-protocol.7.scd + src/sway-1.9/swaybar/tray/host.c + src/sway-1.9/swaybar/tray/icon.c + src/sway-1.9/swaybar/tray/item.c + src/sway-1.9/swaybar/tray/tray.c + src/sway-1.9/swaybar/tray/watcher.c + src/sway-1.9/swaymsg/main.c + src/sway-1.9/swaymsg/meson.build + src/sway-1.9/swaymsg/swaymsg.1.scd + src/sway-1.9/swaynag/config.c + src/sway-1.9/swaynag/main.c + src/sway-1.9/swaynag/meson.build + src/sway-1.9/swaynag/render.c + src/sway-1.9/swaynag/swaynag.1.scd + src/sway-1.9/swaynag/swaynag.5.scd + src/sway-1.9/swaynag/swaynag.c + src/sway-1.9/swaynag/types.c +Copyright: 2019, Purism SPC +License: UNKNOWN + FIXME + +Files: src/sway-1.9/LICENSE + src/sway-1.9/meson.build +Copyright: 2016-2017, Drew DeVault +License: Expat + FIXME + +Files: src/sway-1.9/protocols/wlr-input-inhibitor-unstable-v1.xml + src/sway-1.9/protocols/wlr-layer-shell-unstable-v1.xml +Copyright: 2017, Drew DeVault + 2018, Drew DeVault +License: HPND-sell-variant and/or NTP~disclaimer + FIXME + +Files: src/sway-1.9/assets/LICENSE +Copyright: NONE +License: CC0-1.0 + FIXME + +Files: src/sway-1.9/protocols/idle.xml +Copyright: 2015, Martin GräÃlin +License: LGPL-2.1+ + FIXME + +Files: src/sway-1.9/assets/Sway_Tree_1000x934.png +Copyright: ÂÂ
$I2Ã%I0?öÃÂÂÂÂZÃ%H¤2º$IZ + Ãâv¬ÂTp}ð>BÂ$ãÃ@¤ú ¤òÂ`q¤Â«Ã1ÂÂÂIÂnÂQÂè¤Ã-x³4Ã`N¤Â#uÂ$éÂ=Ãe Kª0 + Ãcu¤Â§fêçS´ÂÂ.Ij ]p9¢Ã¤Âq + ª0 Â'pÃ8sÃ¥héáø + $Ã@Â$IjÂÂp ÃÃ27ÂÃÂHÃ
$I2Ã%IÃB÷âkÂ2mh16¾K + R] + 1¦Ãûlø56Ã
î8 ÂâÂxoâ+Ã"ZÃ8|ÂÃñ$îÃõ¸ + 1Ãâ÷¸ + eèÂ$uÃ
ÂÂÂô _b_´E*¶Xgà Â$ÃÃ4ìÂÃ| + n³á<LC´ý© ºc0&Ã÷ZÂt¦qn ÃÂ$éøÃê4©à æÃ
E¨AÂÂ$iDÂÂ.Iª[/ÃÂPÃ
ÃÂTÂãÃ"JAÂ4¿CÂÂ.I±*ìÂqù z+[ÂbBÂTX/c $è¤[÷#2Cs ÂÃÂgô[ê¿ÿ%8rñ⽧¤ÂÃ)O + rºà ¸ + uèÂ$ÃÂýñ"¢Ã.B5RÂTábDÂ
H´ÂÂÃò$IZ + yµÃ
Ãx Â[^s(¢HÂô%:èÂ$5ÂN8 + Âà ¸_! + ÂÃý8 8 o KÂT) ãx¼Â(©«!Âà'~ÂM±#ÃÂ{ð >Ã
$D#ISñ4NÃzèÂ$]¤Â0vÃHDI Ã¥ÂÃba¬Âþ8Â1։e|Âi©&à ~ + ÂI]'IÃã¨ÂÂ.I + ÂFãPtER¯}uÂ$é»ú.ÂÂÂ.I[#¤zø£üÃÂDÃA¤W± + ¡d KÃÃIOcm¤:©/¦"þÂ$I±RcÃ@¤UÂ>Ã6³¼ÂU+â{ÃÿÂ$éU,ÂÃX2Ã%é<D©i + £¥¤©Â¹Â4K ðb:I¾à Âd KRSÂÂ(%ÃÂ
Â¥ÂToW!¦Â$é~ÃÂ$]ÂÂáÂRð!RÂh?$IÂÂÂý³Eº$Â@ÂÂ>ÃîhÂà ZÂá÷Â$é¬Â$]ÂÂÃÃÂBîH + ¨:`"B¤ ÂÂ9 + ¹H + ä.èÂ
°&úb+ìÂÂ8gà "Âá¸#ñ^ÃkøÂ` + ÃÃÂÂ(ékÂÂEÂr¢-¶ÃÃÂÃÂ$ + ÃÂ~ "Ã^Aú¾:¦!ÂÂ
d¯Â)èÂvÃ8DÂ|ÂvùrfÃÂú[ + ÃÂ~¢b$=Â}0 + ÃÂ%±þÂ8Cp+Fâ + Ã.E´*Ãà ,¤ÂÂÂ$yj.]Â*ÃÂÂV¡Â¸ Sa®nÂÂ(IÃOà + þÃÃÂèÂ$]Â4kÂq="÷ô»ÂúuÂÃòÃm·à WÂÂÂ?à Ã`ÃÿÂEÿÿ{ IªÃ
¿ÃUH2Ã%Iõ³(^A¨Â-i ?¨®pÂÃü=.¿`¿8}ðÂq豿)ã÷Â$ÂÃ
yXIº$©a6ÃwÃt(i ¿ÂÃÃqïúÃqÃÃ;~Ãÿû1!Iôvֻ4]Ry,Â?áÂÂ[1rºÂpÃÃÂXÃqªz9Ã*ÂWJçm0ÂQ·#!M_´ Ãexã9#Ip%VAÂÂ.©ÃÃ~Â/ +License: UNKNOWN + FIXME + +Files: src/sway-1.9/assets/Sway_Wallpaper_Blue_2048x1536_Portrait.png +Copyright: @ÂqÃê RÂE [ ÂÃA©Ã¢.Ãk+ê9ì¸A³-¬2¸uÃG`Ã
Ã¥cyH)Ã[°ù¿|ýÃÃÂ
ÃÂÂô´« Ãéòÿ:ÃãMµÂ
v9Â÷á + I#`à ;°g1áS{RõÃÂÃKø~Ãá-7µë¯'Â@øÃoyÂÂà Ã+j6ðã3@Ã%^Zèòò²{ÃVlBìÂÃÂ4,WÃt RÂ`5ö&Cl33Â$UÃìéùÂF¬Â=ÂçÃÃÃpÃäüôø4Ã"+ê7¹h=èú ZQ(iµFö + rÂu¹Ãa + ÃEà +License: UNKNOWN + FIXME + +Files: src/sway-1.9/assets/Sway_Wallpaper_Blue_1920x1080.png +Copyright: ZãÃÃiÂÂW8Ãdªê.ÂÂ¥ÂÃÃêdv<ñüÃ-¶ºÃÃþa/Q²¶(ðS¢4ÂëUòÂÂuWÂ<H~jVÂÃ
^Ã#`f^SÂÃ1Ã6 + Âz[#ò¡Â¸èÃë%÷pwÂðÂêÂ4þÃóiÂöp6ÃÃ¥Â!1ò]ÃÂ)øB Ã:63ÂJmÂ1ÃÂe«ãtªzîÂÃñ9LbQ Âe(ÃÃ2&aÂì ÃùÂÃT_Â:d«w+ Ãô +License: UNKNOWN + FIXME + +Files: src/sway-1.9/assets/Sway_Logo+Text_Ver3.png +Copyright: $§,ÂÂà ,Nz + ÂKÃdÃ4ëÂä%>*´áÂÃ,¨ÂÃNÃvÃ,%"â§ÿÂMª#åá +License: UNKNOWN + FIXME + +Files: src/sway-1.9/assets/Sway_Wallpaper_Blue_1366x768.png +Copyright: ÂÂý¤X-Ãëõ÷³ç³L-ÂÃ!ÂéÃ&LJÃú'°ÂúÃ3Ã
þòòÃDõIÂá=Ã¥ÃÂ%iÃb¬g- ï¹Â:Ã!MÃ=°Â{à + ¨Ixs¡S0HÂÃeÂÃÃÂ],ÂqêP n!3_³0S»ÃÃ[8/ XCëêõéAIÂ(iÂÃ` + ®äûÂ)û0ÃÃSñt< Â
°ºdñÃõ2GÃl('Ã5éÂÃLÂ1 ¨´ÂÃÃÃÂ:¦ÂH^1ÂÃhÃg*©Ã0 + ÃK¦Ãà ÃãéhÃ5Ã!ÃG£«$Â4ÂC,Âf¯RÃGþHÂ>ÃÃæ³:ÃE%Ãæ + Ã(kü)êÃÂÂjoä±ýÂg àvGn]IÃìXÂõÃx©ªÂ¢n4'³n5n7[Ãà ÃÂ|ý$`hTóæë + âÂù¾Â DðöP$ÃÂÃ
Ãñ#Â4ô +License: UNKNOWN + FIXME + diff --git a/user/swaybg/APKBUILD b/user/swaybg/APKBUILD new file mode 100644 index 000000000..9c7582585 --- /dev/null +++ b/user/swaybg/APKBUILD @@ -0,0 +1,36 @@ +# Contributor Síle Ekaterin Liszka <sheila@vulpine.house>: +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=swaybg +pkgver=1.2.1 +pkgrel=0 +pkgdesc="Wallpaper tool for Wayland compositors" +url="https://swaywm.org" +arch="all" +license="MIT" +depends="" +makedepends="cairo-dev gdk-pixbuf-dev meson scdoc wayland-dev + wayland-protocols" +subpackages="$pkgname-doc" +source="https://github.com/swaywm/swaybg/releases/download/v$pkgver/swaybg-$pkgver.tar.gz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="57b911c11055374079645b8acf5b81cb3481a6d290f6e1a7e18a8e52202edfc3f3a71cc09fbe8a0500223f3b28091a8c979ccdd917861321cb5b8201887a014a swaybg-1.2.1.tar.gz" diff --git a/user/swig/APKBUILD b/user/swig/APKBUILD index 20ec308c1..294e1c429 100644 --- a/user/swig/APKBUILD +++ b/user/swig/APKBUILD @@ -1,18 +1,16 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=swig -pkgver=4.0.2 -pkgrel=2 +pkgver=4.2.1 +pkgrel=0 pkgdesc="Tool for integrating C and C++ code with other languages" -url="http://www.swig.org/" +url="https://www.swig.org/" arch="all" license="GPL-3.0+ AND MIT" depends="" checkdepends="boost-dev diffutils" -makedepends="pcre-dev perl-dev python3-dev zlib-dev" +makedepends="pcre2-dev perl-dev python3-dev zlib-dev" subpackages="$pkgname-doc" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - fix-overload-simple-cast-test.patch - " +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -34,5 +32,4 @@ package() { install -D -m644 LICENSE-UNIVERSITIES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE-UNIVERSITIES } -sha512sums="05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed swig-4.0.2.tar.gz -3de6484d920d8ecf042102d40af3a375ecb1ead3c4e0bc45ae63633e5fd652f52e1938108f747514a654a19d93a783afe2968b141be56957f438162263d62d8a fix-overload-simple-cast-test.patch" +sha512sums="019dee5a46d57e1030eef47cd5d007ccaadbdcd4e53cd30d7c795f0118ecf4406a78185534502c81c5f6d7bac0713256e7e19b20b5a2d14e2c552219edbaf5cf swig-4.2.1.tar.gz" diff --git a/user/swig/fix-overload-simple-cast-test.patch b/user/swig/fix-overload-simple-cast-test.patch deleted file mode 100644 index a3c8cff26..000000000 --- a/user/swig/fix-overload-simple-cast-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a2850397ba3eec5d4c58304cf8277ca535919760 Mon Sep 17 00:00:00 2001 -From: Julien Schueller <schueller@phimeca.com> -Date: Thu, 5 Aug 2021 14:05:10 +0200 -Subject: [PATCH] [Python] Fix overload_simple_cast test with 3.10 - -Closes #2044 ---- - Examples/test-suite/python/python_overload_simple_cast_runme.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Examples/test-suite/python/python_overload_simple_cast_runme.py b/Examples/test-suite/python/python_overload_simple_cast_runme.py -index fc398ab29b9..7a0174af8a2 100644 ---- a/Examples/test-suite/python/python_overload_simple_cast_runme.py -+++ b/Examples/test-suite/python/python_overload_simple_cast_runme.py -@@ -9,6 +9,8 @@ def __init__(self, x): - def __int__(self): - return self.x - -+ def __index__(self): -+ return self.x - - class Ad: - diff --git a/user/sword/APKBUILD b/user/sword/APKBUILD index f436941ec..4cbe32615 100644 --- a/user/sword/APKBUILD +++ b/user/sword/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sword pkgver=1.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform library for accessing and searching OSIS books" url="http://www.crosswire.org/sword/index.jsp" arch="all" diff --git a/user/the_silver_searcher/APKBUILD b/user/the_silver_searcher/APKBUILD index e906445e6..7c504dc9e 100644 --- a/user/the_silver_searcher/APKBUILD +++ b/user/the_silver_searcher/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=the_silver_searcher pkgver=2.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="Tool for very fast searching of text in documents and code" url="https://geoff.greer.fm/ag/" arch="all" @@ -12,8 +12,11 @@ depends="" checkdepends="cram" makedepends="pcre-dev xz-dev zlib-dev" subpackages="$pkgname-doc" -source="https://geoff.greer.fm/ag/releases/the_silver_searcher-$pkgver.tar.gz" -builddir="$srcdir/the_silver_searcher-$pkgver" +source="https://geoff.greer.fm/ag/releases/the_silver_searcher-$pkgver.tar.gz + pipe-symlink.patch + pattern-fix.patch + no-common.patch + " build() { ./configure \ @@ -34,4 +37,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89d4e4f7f34c0d57aa880e7c3466f0373b961744a89ad30541e89e2d614322ab46c8044ec458406a117f74b0fea14cd3063fa4e0624a96526aa23eaccd6f1141 the_silver_searcher-2.2.0.tar.gz" +sha512sums="89d4e4f7f34c0d57aa880e7c3466f0373b961744a89ad30541e89e2d614322ab46c8044ec458406a117f74b0fea14cd3063fa4e0624a96526aa23eaccd6f1141 the_silver_searcher-2.2.0.tar.gz +4c7af6c22cb01d09070d642c2e1ace969ddbfc60750dba7ffa2f38cb960b68c01ffaa0edbbafe11cbc30805bd8f845bae1ea7863b181e55fc4263b4fe0b95fb4 pipe-symlink.patch +8cce44cc3d1b9732fa616ad34ccca3292dddbc45280c64434aaae5ce5bb14cb9847fb4ff584b3042215d3adef6460c6f74a64f6eabe583fa440d89fc74b39feb pattern-fix.patch +b7d0c96bfd8a9984b0082fac2530826cd3fb5f98ca957c03d628ed7f908f5e27108a18c00813fcb498ec12aa47b82fffc1d48b9d0ffaa5dd36960d7063c09a9e no-common.patch" diff --git a/user/the_silver_searcher/no-common.patch b/user/the_silver_searcher/no-common.patch new file mode 100644 index 000000000..50f1fa6a9 --- /dev/null +++ b/user/the_silver_searcher/no-common.patch @@ -0,0 +1,207 @@ +From 21eaa1c4160b868b0c5bbf59da17974429f30055 Mon Sep 17 00:00:00 2001 +From: Shlomi Fish <shlomif@shlomifish.org> +Date: Wed, 15 Apr 2020 20:23:52 +0300 +Subject: [PATCH] Fix multiple global symbols definitions. + +See the use of extern here: + +* https://www.geeksforgeeks.org/understanding-extern-keyword-in-c/ + +* https://en.wikipedia.org/wiki/External_variable + +* +https://stackoverflow.com/questions/496448/how-to-correctly-use-the-extern-keyword-in-c +--- + src/ignore.c | 2 ++ + src/ignore.h | 2 +- + src/log.c | 1 + + src/log.h | 2 +- + src/options.c | 2 ++ + src/options.h | 2 +- + src/search.c | 13 +++++++++++++ + src/search.h | 20 ++++++++++---------- + src/util.c | 2 ++ + src/util.h | 4 ++-- + 10 files changed, 35 insertions(+), 15 deletions(-) + +diff --git a/src/ignore.c b/src/ignore.c +index 7ae83f3ee..88036eff4 100644 +--- a/src/ignore.c ++++ b/src/ignore.c +@@ -20,6 +20,8 @@ + const int fnmatch_flags = FNM_PATHNAME; + #endif + ++ignores *root_ignores; ++ + /* TODO: build a huge-ass list of files we want to ignore by default (build cache stuff, pyc files, etc) */ + + const char *evil_hardcoded_ignore_files[] = { +diff --git a/src/ignore.h b/src/ignore.h +index 20d5a6af8..8db0f3772 100644 +--- a/src/ignore.h ++++ b/src/ignore.h +@@ -29,7 +29,7 @@ struct ignores { + }; + typedef struct ignores ignores; + +-ignores *root_ignores; ++extern ignores *root_ignores; + + extern const char *evil_hardcoded_ignore_files[]; + extern const char *ignore_pattern_files[]; +diff --git a/src/log.c b/src/log.c +index 1481b6d02..f6f4e9a83 100644 +--- a/src/log.c ++++ b/src/log.c +@@ -4,6 +4,7 @@ + #include "log.h" + #include "util.h" + ++pthread_mutex_t print_mtx = PTHREAD_MUTEX_INITIALIZER; + static enum log_level log_threshold = LOG_LEVEL_ERR; + + void set_log_level(enum log_level threshold) { +diff --git a/src/log.h b/src/log.h +index 85847ee7b..318622c3c 100644 +--- a/src/log.h ++++ b/src/log.h +@@ -9,7 +9,7 @@ + #include <pthread.h> + #endif + +-pthread_mutex_t print_mtx; ++extern pthread_mutex_t print_mtx; + + enum log_level { + LOG_LEVEL_DEBUG = 10, +diff --git a/src/options.c b/src/options.c +index 4abf4dcd3..699530138 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -20,6 +20,8 @@ const char *color_line_number = "\033[1;33m"; /* bold yellow */ + const char *color_match = "\033[30;43m"; /* black with yellow background */ + const char *color_path = "\033[1;32m"; /* bold green */ + ++cli_options opts; ++ + /* TODO: try to obey out_fd? */ + void usage(void) { + printf("\n"); +diff --git a/src/options.h b/src/options.h +index aae930936..0d852167e 100644 +--- a/src/options.h ++++ b/src/options.h +@@ -91,7 +91,7 @@ typedef struct { + } cli_options; + + /* global options. parse_options gives it sane values, everything else reads from it */ +-cli_options opts; ++extern cli_options opts; + + typedef struct option option_t; + +diff --git a/src/search.c b/src/search.c +index 0f4ae2113..0dad3c072 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -2,6 +2,19 @@ + #include "print.h" + #include "scandir.h" + ++size_t alpha_skip_lookup[256]; ++size_t *find_skip_lookup; ++uint8_t h_table[H_SIZE] __attribute__((aligned(64))); ++ ++work_queue_t *work_queue = NULL; ++work_queue_t *work_queue_tail = NULL; ++int done_adding_files = 0; ++pthread_cond_t files_ready = PTHREAD_COND_INITIALIZER; ++pthread_mutex_t stats_mtx = PTHREAD_MUTEX_INITIALIZER; ++pthread_mutex_t work_queue_mtx = PTHREAD_MUTEX_INITIALIZER; ++ ++symdir_t *symhash = NULL; ++ + void search_buf(const char *buf, const size_t buf_len, + const char *dir_full_path) { + int binary = -1; /* 1 = yes, 0 = no, -1 = don't know */ +diff --git a/src/search.h b/src/search.h +index 6bac42038..00aa018dd 100644 +--- a/src/search.h ++++ b/src/search.h +@@ -31,9 +31,9 @@ + #include "uthash.h" + #include "util.h" + +-size_t alpha_skip_lookup[256]; +-size_t *find_skip_lookup; +-uint8_t h_table[H_SIZE] __attribute__((aligned(64))); ++extern size_t alpha_skip_lookup[256]; ++extern size_t *find_skip_lookup; ++extern uint8_t h_table[H_SIZE] __attribute__((aligned(64))); + + struct work_queue_t { + char *path; +@@ -41,12 +41,12 @@ struct work_queue_t { + }; + typedef struct work_queue_t work_queue_t; + +-work_queue_t *work_queue; +-work_queue_t *work_queue_tail; +-int done_adding_files; +-pthread_cond_t files_ready; +-pthread_mutex_t stats_mtx; +-pthread_mutex_t work_queue_mtx; ++extern work_queue_t *work_queue; ++extern work_queue_t *work_queue_tail; ++extern int done_adding_files; ++extern pthread_cond_t files_ready; ++extern pthread_mutex_t stats_mtx; ++extern pthread_mutex_t work_queue_mtx; + + + /* For symlink loop detection */ +@@ -64,7 +64,7 @@ typedef struct { + UT_hash_handle hh; + } symdir_t; + +-symdir_t *symhash; ++extern symdir_t *symhash; + + ssize_t search_buf(const char *buf, const size_t buf_len, + const char *dir_full_path); +diff --git a/src/util.c b/src/util.c +index 3949477b2..90ffb6f1d 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -21,6 +21,8 @@ + } \ + return ptr; + ++FILE *out_fd = NULL; ++ag_stats stats; + void *ag_malloc(size_t size) { + void *ptr = malloc(size); + CHECK_AND_RETURN(ptr) +diff --git a/src/util.h b/src/util.h +index 0c9b9b112..338b05f45 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -12,7 +12,7 @@ + #include "log.h" + #include "options.h" + +-FILE *out_fd; ++extern FILE *out_fd; + + #ifndef TRUE + #define TRUE 1 +@@ -51,7 +51,7 @@ typedef struct { + } ag_stats; + + +-ag_stats stats; ++extern ag_stats stats; + + /* Union to translate between chars and words without violating strict aliasing */ + typedef union { diff --git a/user/the_silver_searcher/pattern-fix.patch b/user/the_silver_searcher/pattern-fix.patch new file mode 100644 index 000000000..6489e2c7c --- /dev/null +++ b/user/the_silver_searcher/pattern-fix.patch @@ -0,0 +1,78 @@ +From 755c6e5c06fc38903fa0d66be68a9c8ffa525c1b Mon Sep 17 00:00:00 2001 +From: Evan Moses <evan@emoses.org> +Date: Thu, 9 Jan 2020 17:34:44 -0800 +Subject: [PATCH] Fix ignore patterns in subdirectories with leading slashes + +Currenetly if you have an ignore file in a subdirectory "sub" with a pattern +like + /ignorethis +The directory sub/ignorethis will be ignored if you run ag from +within sub, but it won't be ignored if you run it from sub's parent. +that is + + $ ag needle + +will search files in sub/ignorethis, but + + $ cd sub + $ ag needle + +Will not. This is a bug +--- + src/ignore.c | 8 ++++++-- + tests/ignore_slash_in_subdir.t | 19 +++++++++++++++++++ + 2 files changed, 25 insertions(+), 2 deletions(-) + create mode 100644 tests/ignore_slash_in_subdir.t + +diff --git a/src/ignore.c b/src/ignore.c +index fa4188919..1d1c07b13 100644 +--- a/src/ignore.c ++++ b/src/ignore.c +@@ -206,6 +206,7 @@ static int ackmate_dir_match(const char *dir_name) { + /* This is the hottest code in Ag. 10-15% of all execution time is spent here */ + static int path_ignore_search(const ignores *ig, const char *path, const char *filename) { + char *temp; ++ int temp_start_pos; + size_t i; + int match_pos; + +@@ -216,9 +217,12 @@ static int path_ignore_search(const ignores *ig, const char *path, const char *f + } + + ag_asprintf(&temp, "%s/%s", path[0] == '.' ? path + 1 : path, filename); ++ //ig->abs_path has its leading slash stripped, so we have to strip the leading slash ++ //of temp as well ++ temp_start_pos = (temp[0] == '/') ? 1 : 0; + +- if (strncmp(temp, ig->abs_path, ig->abs_path_len) == 0) { +- char *slash_filename = temp + ig->abs_path_len; ++ if (strncmp(temp+temp_start_pos, ig->abs_path, ig->abs_path_len) == 0) { ++ char *slash_filename = temp + temp_start_pos + ig->abs_path_len; + if (slash_filename[0] == '/') { + slash_filename++; + } +diff --git a/tests/ignore_slash_in_subdir.t b/tests/ignore_slash_in_subdir.t +new file mode 100644 +index 000000000..167d6ffb4 +--- /dev/null ++++ b/tests/ignore_slash_in_subdir.t +@@ -0,0 +1,19 @@ ++Setup: ++ ++ $ . $TESTDIR/setup.sh ++ $ mkdir -p subdir/ignoredir ++ $ mkdir ignoredir ++ $ printf 'match1\n' > subdir/ignoredir/file1.txt ++ $ printf 'match1\n' > ignoredir/file1.txt ++ $ printf '/ignoredir\n' > subdir/.ignore ++ ++Ignore file in subdir/ignoredir, but not in ignoredir: ++ ++ $ ag match ++ ignoredir/file1.txt:1:match1 ++ ++From subdir, ignore file in subdir/ignoredir: ++ ++ $ cd subdir ++ $ ag match ++ [1] diff --git a/user/the_silver_searcher/pipe-symlink.patch b/user/the_silver_searcher/pipe-symlink.patch new file mode 100644 index 000000000..ee47f9439 --- /dev/null +++ b/user/the_silver_searcher/pipe-symlink.patch @@ -0,0 +1,26 @@ +From 095c3f091e23fda1d9d00bd42c38cf81bba1c14f Mon Sep 17 00:00:00 2001 +From: Jacob Wahlgren <jacob@dstsrc.net> +Date: Wed, 28 Nov 2018 23:35:52 +0100 +Subject: [PATCH] Skip symlinks to named pipes + +The d_type field contains the type as lstat would put it, but when +checking for a named pipe we need the stat behavior. + +Fixes https://github.com/ggreer/the_silver_searcher/issues/1272 +--- + src/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index cb23914d3..3949477b2 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -516,7 +516,7 @@ int is_symlink(const char *path, const struct dirent *d) { + + int is_named_pipe(const char *path, const struct dirent *d) { + #ifdef HAVE_DIRENT_DTYPE +- if (d->d_type != DT_UNKNOWN) { ++ if (d->d_type != DT_UNKNOWN && d->d_type != DT_LNK) { + return d->d_type == DT_FIFO || d->d_type == DT_SOCK; + } + #endif diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 671127e66..11d18ca49 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=thunar-volman -pkgver=4.18.0 +pkgver=4.20.0 pkgrel=0 pkgdesc="Volume manager for Thunar" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29681ede6274e999377e2aae2b157ed355d9e471416db2d4beb4432f84c60008f8c5008c87392c20da51d58fc3bd8f097d6f21764903baf1a301fb00e6166420 thunar-volman-4.18.0.tar.bz2" +sha512sums="8a25e94d2c182865c997c259fcccdf56d2e8fc4f6ace706f4ad0913061fb1337728f7101edd9fdf9ab3f1f4f47e66c5ee4273a51d081c3b106ec027b9c846c8f thunar-volman-4.20.0.tar.bz2" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 2de35a251..991c64f2a 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=thunar -pkgver=4.18.10 -pkgrel=0 +pkgver=4.20.0 +pkgrel=1 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ AND GPL-2.0+" -depends="" +depends="gvfs" makedepends="intltool gtk+3.0-dev exo-dev libxfce4ui-dev>=${pkgver%.*} vala-dev gobject-introspection-dev libsm-dev libgudev-dev libnotify-dev libexif-dev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f6b76db2cc69e4f14d46afb3ba602ba88d37b1d9e76e76dcf18949839ac1108c191bdd0158922a732805cfcb85780bbf6c998aedac02b502c8e1d8fcf4cfab32 thunar-4.18.10.tar.bz2" +sha512sums="fb2063676de82efe944222a6acdfa4c5ea9e4ac5123223528349ada623e37adbac40a2253f2a76b469d83a1f6791f884f1f825b86b58178fdecc5f706ee4a43f thunar-4.20.0.tar.bz2" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 482d1b57c..21b415dc6 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -1,7 +1,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=thunderbird -pkgver=91.13.0 -pkgrel=2 +pkgver=128.10.1 +pkgrel=0 +_llvmver=18 pkgdesc="Email client from Mozilla" url="https://www.thunderbird.net/" arch="all !ppc" # #837 @@ -12,7 +13,7 @@ depends="" # system-libs # actual deps makedepends=" - autoconf2.13 cargo cbindgen clang llvm14-dev node ncurses-dev + autoconf2.13 cargo cbindgen clang llvm${_llvmver}-dev node ncurses-dev perl python3 rust cmd:which alsa-lib-dev bzip2-dev icu-dev libevent-dev libffi-dev libpng-dev @@ -23,28 +24,26 @@ makedepends=" libxrender-dev libxt-dev nasm nss-static sqlite-dev startup-notification-dev unzip yasm zip gtk+2.0-dev " -source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz +_tbver="$pkgver"'esr' +source="https://archive.mozilla.org/pub/thunderbird/releases/$_tbver/source/thunderbird-$_tbver.source.tar.xz mozconfig bad-google-code.patch - BTS-1074.patch - disable-arm-flac.patch fix-mutex-build.patch fix-seccomp-bpf.patch - gcc89074.patch + icu-75.patch jpeg-link.patch + js-endian.patch mozilla-build-arm.patch - newer-cbindgen.patch pmmx-double-format.patch ppc32-fix.patch - python3.11-open-U.patch - python3.11-regex-inline-flags.patch rust-32bit.patch shut-up-warning.patch + skia-endian.patch skia-unified.patch stackwalk-x86-ppc.patch - triplet-vendor-support.patch webrender.patch + without-jit.patch thunderbird.desktop " @@ -52,6 +51,7 @@ somask="liblgpllibs.so libmozgtk.so libmozsandbox.so libmozsqlite3.so + libmozwayland.so libxul.so " _mozappdir=/usr/lib/thunderbird @@ -88,7 +88,7 @@ prepare() { # arch-specific configuration case "$CARCH" in - pmmx|x86*|arm*) + pmmx|x86*|arm*|aarch64) echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig ;; s390x) @@ -109,11 +109,14 @@ prepare() { } build() { + export CFLAGS="$CFLAGS -Wno-dangling-pointer -Wno-array-bounds -Wno-comment -Wno-maybe-uninitialized -Wno-misleading-indentation" + export CXXFLAGS="$CFLAGS -Wno-class-memaccess -Wno-changes-meaning" + export PATH="/usr/lib/llvm${_llvmver}/bin:${PATH}" #1230 export SHELL=/bin/sh export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 export USE_SHORT_LIBNAME=1 - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # set rpath so linker finds the libs export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}" @@ -132,7 +135,7 @@ run() { } package() { - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system DESTDIR="$pkgdir" ./mach install install -m755 -d ${pkgdir}/usr/share/applications @@ -151,25 +154,22 @@ package() { ${pkgdir}/usr/share/applications/thunderbird.desktop } -sha512sums="e73d3db4333ad659ec1ab249bd261e8c28301c125d0c39b473c83f8fccace6d4916a2bfef14fc20c065055ff6bbd3ca618b5aab178241b53509543640dcd541a thunderbird-91.13.0.source.tar.xz -afc87cdd19500f8b6b0bedabe98339cca9e6af86edb45e673c6ee0a49bdb3a48b1816f6f5f8790cab86cca428ab7f142cbeb6462079fe293f5f13563a7761896 mozconfig -ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch -df76bae9deaaae98afa9e1e853de5d41a4f84db65057bfe70de3ae172515bdef58a5f9ee0b2303493dc67e9a6aad54af4c9931166de1144737a5867f24b51a4f BTS-1074.patch -b44c55fb38b856791dd6966c5af24b657c0516d4f747fc0595eb470f58aa4b6e28c4304892589c6f9d623daba2e0fadc338303da409c4542a98d369339438ebe disable-arm-flac.patch -c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880 fix-mutex-build.patch -70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch -6eb7fb134760f5d232710c56f18f14de4f533e41e269531edd01f5650f6d641513e34a8d2294af5ad6fd184736f674c734efb4cc003636a75e14a8fdba2fe3b0 gcc89074.patch -240d6c9290a20e2c9ccfa2d15c9a636fc1b09b62f09285eb688974d888390da2a84271f14c397570b58ccdcf29b99370f7183cc0dbbbe581bf6e7d7ee8dcabd2 jpeg-link.patch -e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch -eb158bf2e4b9d513ae36f3c977a3b110ea8c4801c3c94841bc3ad4cdca3bdfc96d4a662e5a2e662fe7a01b0f1af097280097b16f5d0e83d29b4a7e6cbb8c7396 newer-cbindgen.patch -573b90c73512d2b9971e466b138ffeea94b28f9a20e11e75ee1121e3f6a14fb4bf1a30622da6d48f67e5ea0bc58b200ba5fc3e930bae52f83b2f25f6c10806dd pmmx-double-format.patch +sha512sums="09b54450928c6e0d948cd79a56c28bdb5fe5a81d7c710470a1ec195dd295c433b872682102c74930f19b1184391c30115293dadcd7dc8a08ae8baeb12770ef9c thunderbird-128.10.1esr.source.tar.xz +fec4e343db973f90a38cc86e145c8ab0c8bec8f6eed36ff47f9986b154ea44f0e72ea1b5c9862e772505b3371dc0a9265fa1a6bed59007a5845a1dc622fce4e8 mozconfig +1fff71be77aa34791ef8aa972b5dc5f131d79f4b895ebbfb59bc223078764d6f79c82a3a4e4c717a3893ecbe4907d556f27e97d2692e41f02365f06da759a71a bad-google-code.patch +5e6c3fa027052cc43ba161cf5c12016b07723e7c0b002a42431bbd5d716d512d5245ab6befbb56c37c7d244441533f810f4e7b583f83bbe965981931f1435a94 fix-mutex-build.patch +9f2892eff9d09f3eed1f9a9ee98ba9c6a6826c30ccdeabfefb8733abc98e7b612418827262423568e830c6354a2b8242f471bc200b7079f21862bb00947da716 fix-seccomp-bpf.patch +0a84e8cb6604fdb7601745b60c04ee74733632ada32bfd85eb32db8fee095cfb79c82033e5e3cf3bbc7b7f4df753e86ffe18e26e63a6603a93c3bb5a459aabd3 icu-75.patch +a2400c8df888637d9ebe33d82dc2fb95792685c9938b5486230a5c15bc819cbb850a2bdcb54a775516652fc8ffd6b40f8c591ab7941211f9516064101380ebbf jpeg-link.patch +d40e6c1a6e62d5e1dc350dc0bbaf2b8488b19ea0911532784f1df1199a7a5af0aae81b0b0d77c4398a2d903d86b5560f4442386eb446d9af8d58e73eea475e4f js-endian.patch +9f5730ee3a29b86786089abcfffab32bf2210f1a1ec43260ae824a08acda687dbfa37306b82a4978dd022bcf747eab155f7f3c5f73a1375f1c3c4fcd106dae3e mozilla-build-arm.patch +1864c6c63c647f3ed1b3ca4df7f52a2c7ec4c65f2e067a9842d24a242f01e047d59ffbf88ad3740d830df1eb0bade929e245e640db135fe14f4c0d879269cb7e pmmx-double-format.patch 06a3f4ee6d3726adf3460952fcbaaf24bb15ef8d15b3357fdd1766c7a62b00bd53a1e943b5df7f4e1a69f4fae0d44b64fae1e027d7812499c77894975969ea10 ppc32-fix.patch -07c311921e50fdb86c587000418306292548117f32a69b78db9d8ebd3a1b08196774a3d284b7e2898a2f1fbb9987b2367092f33957824514fd3d7c7b618a83e2 python3.11-open-U.patch -c9c5610b99e73a1eedd3510e73921cba84f8c6d0c58fc7fe5b4a7ec261bd5fe530560856fba46d6b37f84c6e467d5b43946968dc8230b5491bba976b0b5ae33c python3.11-regex-inline-flags.patch -153f955169e1489d49867be90f68e8a4722cad8edb3a9d1ddb6161e34399e1b4e9e82dc8d72aaba1d5f585bca7c4852433e8ecb068be1583df7155c7cce0223b rust-32bit.patch -39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch -961fa1c856e97e4d08da4682f520ecf23075571a532a781c5e14dbec4915130b02a8199caf6602013ea904d347c4f06d086b0fe84a3850dd6910d351232da599 skia-unified.patch -452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch -8c6160975f181ea0ab257134672e696d895b99c7bb00a260deedb38e3374510e848bf943197e0ab7f684a18496a898175159845b0e7325183c37748183418053 triplet-vendor-support.patch -b7c1ac21cd03b7cdc887e005ed970cf13ff95643c7651decf1e6d42094cda6a0464dc2ba3cded3827f6d0f3682c2c9b081a7667f386133aa6e3072d0464e72e8 webrender.patch +e1c8a85c46a9cc804eb6b5946d35b63fa2cfc7ad8b4f250c5eaf1b590b139a66d9a833246bc26ae2e340fffb81b6761cf51c600181895bd49feb9a3b8fbfe331 rust-32bit.patch +c2248297df00633771da7e6b9f2caba3dd5108d93617f652fa8b2fb4e6975821e5fee866c00713f8fce08e760fa456e2dd19a8ef7370e5a2c65dc09614526be9 shut-up-warning.patch +11f7ce86376b54281082fa5b9d3fefee8046eabe38a0ec17266764b4f62cb90f4744245c1ca93d73ed74cf81c066dab7ddcb3fe9704be8f91e0a2a4f664b203a skia-endian.patch +a6a14104ee6985867efb1937a262aba1538ed4b069bba56e400d75f51d84d29363d8bbb2183ee27785758ad3a8b8ae4350e23dc854d50c92cb2147eddf83b9bb skia-unified.patch +9df89366bd51670f534591e4c169186703ad3166a493f522e58f129fb79af375d71baaf0f6b238126792118a2d3ed0f011b010e39497ab5901ee5bea63a84fa2 stackwalk-x86-ppc.patch +7d6c5f3cafd29eae4e7c5433b14f49cc679eebdcb4e602af18819f685500747a6daa8d38fbb0f91878331b14ce299ca8b731f62ab013b69e579fc450b29fe743 webrender.patch +ed78e15030d79b10026ebae26e44a68d16c2a8567082072b5099b0dde4f79ae217a21737e0d9c7ec6a3cc99de3ab3c9083cca7d82889d559bb18cc15fa7e6f2a without-jit.patch 95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop" diff --git a/user/thunderbird/BTS-1074.patch b/user/thunderbird/BTS-1074.patch deleted file mode 100644 index ac851038d..000000000 --- a/user/thunderbird/BTS-1074.patch +++ /dev/null @@ -1,62 +0,0 @@ -gas(1) under binutils-2.41 no longer allows invalid negative shifts. - -This patch fixes the bundled FFmpeg in Thunderbird to not use them. - ---- thunderbird-91.13.0/media/ffvpx/libavcodec/x86/mathops.h.old 2023-10-03 22:15:24.440738743 -0500 -+++ thunderbird-91.13.0/media/ffvpx/libavcodec/x86/mathops.h 2023-10-03 22:15:41.458911245 -0500 -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - diff --git a/user/thunderbird/bad-google-code.patch b/user/thunderbird/bad-google-code.patch index e214af432..31659370d 100644 --- a/user/thunderbird/bad-google-code.patch +++ b/user/thunderbird/bad-google-code.patch @@ -1,6 +1,6 @@ --- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -@@ -45,6 +45,7 @@ +@@ -47,6 +47,7 @@ #include <sys/mman.h> #include <sys/stat.h> #include <unistd.h> @@ -34,7 +34,7 @@ --- firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h +++ firefox-esr-60.2.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -@@ -1134,6 +1134,12 @@ struct kernel_statfs { +@@ -1246,6 +1246,12 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 285 #endif diff --git a/user/thunderbird/disable-arm-flac.patch b/user/thunderbird/disable-arm-flac.patch deleted file mode 100644 index dff387361..000000000 --- a/user/thunderbird/disable-arm-flac.patch +++ /dev/null @@ -1,15 +0,0 @@ -32-bit ARM assembler is mostly for Android32 accel anyway. - -It doesn't link properly on musl (TEXTRELs). - ---- thunderbird-91.13.0/toolkit/moz.configure.old 2023-10-09 10:40:18.231733637 +0000 -+++ thunderbird-91.13.0/toolkit/moz.configure 2023-10-10 02:22:34.743712070 +0000 -@@ -1894,7 +1894,7 @@ - flac_only = True - elif target.cpu == "x86_64": - flags = ["-D__x86_64__", "-DPIC", "-DELF", "-Pconfig_unix64.asm"] -- elif target.cpu in ("x86", "arm", "aarch64"): -+ elif target.cpu in ("x86", "aarch64"): - flac_only = True - else: - enable = False diff --git a/user/thunderbird/fix-mutex-build.patch b/user/thunderbird/fix-mutex-build.patch index a569e5aa7..1d1d0772b 100644 --- a/user/thunderbird/fix-mutex-build.patch +++ b/user/thunderbird/fix-mutex-build.patch @@ -1,18 +1,18 @@ --- firefox-60.3.0/memory/build/Mutex.h.old 2018-10-17 20:39:32.000000000 +0000 +++ firefox-60.3.0/memory/build/Mutex.h 2018-10-26 05:22:54.980000000 +0000 -@@ -39,7 +39,7 @@ +@@ -57,7 +57,7 @@ } #elif defined(XP_DARWIN) - mMutex = OS_SPINLOCK_INIT; + mMutex = OS_UNFAIR_LOCK_INIT; -#elif defined(XP_LINUX) && !defined(ANDROID) +#elif defined(XP_LINUX) && defined(__GLIBC__) pthread_mutexattr_t attr; if (pthread_mutexattr_init(&attr) != 0) { return false; -@@ -107,7 +107,7 @@ +@@ -142,7 +142,7 @@ # if defined(XP_DARWIN) - # define STATIC_MUTEX_INIT OS_SPINLOCK_INIT + # define STATIC_MUTEX_INIT OS_UNFAIR_LOCK_INIT -# elif defined(XP_LINUX) && !defined(ANDROID) +# elif defined(XP_LINUX) && defined(__GLIBC__) # define STATIC_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP diff --git a/user/thunderbird/fix-seccomp-bpf.patch b/user/thunderbird/fix-seccomp-bpf.patch index 47cde56c7..08068b5f5 100644 --- a/user/thunderbird/fix-seccomp-bpf.patch +++ b/user/thunderbird/fix-seccomp-bpf.patch @@ -1,8 +1,8 @@ --- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig 2015-09-23 09:10:08.812740571 +0200 +++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-09-23 09:11:38.404746155 +0200 -@@ -23,6 +23,11 @@ - #include "sandbox/linux/services/android_ucontext.h" - #endif +@@ -25,6 +25,11 @@ + #include "sandbox/linux/system_headers/linux_seccomp.h" + #include "sandbox/linux/system_headers/linux_signal.h" +// musl libc defines siginfo_t __si_fields instead of _sifields +#if defined(OS_LINUX) && !defined(__GLIBC__) diff --git a/user/thunderbird/gcc89074.patch b/user/thunderbird/gcc89074.patch deleted file mode 100644 index e9713193c..000000000 --- a/user/thunderbird/gcc89074.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-URL: https://bugzilla.mozilla.org/show_bug.cgi?id=1688122 -Upstream-URL: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89074 - -Valid code, but only used for debugging. GCC 12 fixed this. -Moz upstream not interested. - ---- firefox-91.13.0/dom/base/nsTreeSanitizer.cpp.old 2022-08-15 13:04:32.000000000 -0500 -+++ firefox-91.13.0/dom/base/nsTreeSanitizer.cpp 2022-11-19 00:42:15.892580023 -0600 -@@ -632,15 +632,6 @@ - constexpr const nsStaticAtom* const kURLAttributesSVG[] = {nsGkAtoms::href, - nullptr}; - --static_assert(AllOf(std::begin(kURLAttributesSVG), std::end(kURLAttributesSVG), -- [](auto aURLAttributeSVG) { -- return AnyOf(std::begin(kAttributesSVG), -- std::end(kAttributesSVG), -- [&](auto aAttributeSVG) { -- return aAttributeSVG == aURLAttributeSVG; -- }); -- })); -- - const nsStaticAtom* const kElementsMathML[] = { - nsGkAtoms::abs_, // abs - nsGkAtoms::_and, // and diff --git a/user/thunderbird/icu-75.patch b/user/thunderbird/icu-75.patch new file mode 100644 index 000000000..617dd76a9 --- /dev/null +++ b/user/thunderbird/icu-75.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/917599 +https://bugzilla.mozilla.org/show_bug.cgi?id=1862601 +https://hg.mozilla.org/try/rev/d5f3b0c4f08a426ce00a153c04e177eecb6820e2 + +# HG changeset patch +# User André Bargull <andre.bargull@gmail.com> +# Date 1697435923 -7200 +# Node ID d5f3b0c4f08a426ce00a153c04e177eecb6820e2 +# Parent c63994f8259efdf6e745c960aa9e1409d5477049 +Bug xxx - Part 12: Add new line break classes. r? + +diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp +--- a/intl/lwbrk/LineBreaker.cpp ++++ b/intl/lwbrk/LineBreaker.cpp +@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB + /* JT = 34, [JT] */ CLASS_CHARACTER, + /* JV = 35, [JV] */ CLASS_CHARACTER, + /* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER, + /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE, + /* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER, + /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER, + /* E_BASE = 40, [EB] */ CLASS_BREAKABLE, + /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER, +- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER}; ++ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER, ++ /* AKSARA = 43, [AK] */ CLASS_CHARACTER, ++ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER, ++ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER, ++ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER, ++ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER, ++ }; + + static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass), + "Gecko vs ICU LineBreak class mismatch"); + + auto cls = GetLineBreakClass(u); + MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass)); + + // Overrides based on rules for the different line-break values given in + + diff --git a/user/thunderbird/jpeg-link.patch b/user/thunderbird/jpeg-link.patch index a04d924d4..724bc76fb 100644 --- a/user/thunderbird/jpeg-link.patch +++ b/user/thunderbird/jpeg-link.patch @@ -1,6 +1,6 @@ --- firefox-91.13.0/toolkit/moz.configure.old 2022-08-15 13:05:59.000000000 -0500 +++ firefox-91.13.0/toolkit/moz.configure 2022-11-15 01:26:57.874201494 -0600 -@@ -1758,14 +1758,14 @@ +@@ -2274,14 +2274,14 @@ ) with only_when("--with-system-jpeg"): diff --git a/user/thunderbird/js-endian.patch b/user/thunderbird/js-endian.patch new file mode 100644 index 000000000..44f21d2d1 --- /dev/null +++ b/user/thunderbird/js-endian.patch @@ -0,0 +1,33 @@ +# HG changeset patch +# User A. Wilcox <AWilcox@Wilcox-Tech.com> +# Date 1729710191 18000 +# Wed Oct 23 14:03:11 2024 -0500 +# Node ID 6102585e0d752de1729135d4c7d917e751b268c5 +# Parent 61f7d9c0998e2ce8008cd15b187f86dfdba21a26 +Bug 1926667 - Ensure JSStructuredCloneReader::readTransferMap respects endianness r?sfink + +Differential Revision: https://phabricator.services.mozilla.com/D226707 + +diff --git a/js/src/vm/StructuredClone.cpp b/js/src/vm/StructuredClone.cpp +--- a/js/src/vm/StructuredClone.cpp ++++ b/js/src/vm/StructuredClone.cpp +@@ -3387,7 +3387,8 @@ bool JSStructuredCloneReader::readTransf + } + + headerPos.write( +- PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRING)); ++ NativeEndian::swapToLittleEndian( ++ PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRING))); + + uint64_t numTransferables; + MOZ_ALWAYS_TRUE(in.readPair(&tag, &data)); +@@ -3512,7 +3513,8 @@ bool JSStructuredCloneReader::readTransf + MOZ_ASSERT(TransferableMapHeader(data) == SCTAG_TM_TRANSFERRING); + #endif + headerPos.write( +- PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRED)); ++ NativeEndian::swapToLittleEndian( ++ PairToUInt64(SCTAG_TRANSFER_MAP_HEADER, SCTAG_TM_TRANSFERRED))); + + return true; + } diff --git a/user/thunderbird/mozconfig b/user/thunderbird/mozconfig index 9f77cf649..e236baa3e 100644 --- a/user/thunderbird/mozconfig +++ b/user/thunderbird/mozconfig @@ -23,3 +23,4 @@ ac_add_options --with-system-nss ac_add_options --with-system-pixman ac_add_options --with-system-png ac_add_options --with-system-zlib +ac_add_options --without-wasm-sandboxed-libraries diff --git a/user/thunderbird/mozilla-build-arm.patch b/user/thunderbird/mozilla-build-arm.patch index dcf2f6d8a..17c95d01d 100644 --- a/user/thunderbird/mozilla-build-arm.patch +++ b/user/thunderbird/mozilla-build-arm.patch @@ -1,10 +1,10 @@ --- ./gfx/ycbcr/moz.build.orig 2014-04-03 13:50:38.990296661 +0000 +++ ./gfx/ycbcr/moz.build 2014-04-03 13:52:26.878268547 +0000 -@@ -59,7 +59,7 @@ +@@ -53,7 +53,7 @@ 'yuv_row_other.cpp', ] --if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: +-if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['HAVE_ARM_NEON']: +if CONFIG['HAVE_ARM_NEON']: SOURCES += [ 'yuv_row_arm.s', diff --git a/user/thunderbird/newer-cbindgen.patch b/user/thunderbird/newer-cbindgen.patch deleted file mode 100644 index 9829237ee..000000000 --- a/user/thunderbird/newer-cbindgen.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove an extra constant definition that is now being - generated by newer versions of cbindgen (0.24), and causing - build failures because it is defined in several places. -Author: Olivier Tilloy <olivier.tilloy@canonical.com> -Upstream-URL: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 - ---- a/gfx/webrender_bindings/webrender_ffi.h -+++ b/gfx/webrender_bindings/webrender_ffi.h -@@ -77,8 +77,6 @@ struct WrPipelineInfo; - struct WrPipelineIdAndEpoch; - using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla - diff --git a/user/thunderbird/pmmx-double-format.patch b/user/thunderbird/pmmx-double-format.patch index 4b2289fab..e520987b3 100644 --- a/user/thunderbird/pmmx-double-format.patch +++ b/user/thunderbird/pmmx-double-format.patch @@ -12,5 +12,5 @@ index 51d79f9c2ec59..fafd7d6fc1e0d 100644 typedef double __double_t; +#endif typedef __double_t double_t; + typedef float __float_t; - /* diff --git a/user/thunderbird/python3.11-open-U.patch b/user/thunderbird/python3.11-open-U.patch deleted file mode 100644 index 8cbab9c0a..000000000 --- a/user/thunderbird/python3.11-open-U.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- thunderbird-91.11.0/dom/base/usecounters.py.python-open-U 2022-06-28 04:37:00.000000000 +0200 -+++ thunderbird-91.11.0/dom/base/usecounters.py 2022-07-11 19:17:46.266517761 +0200 -@@ -8,7 +8,7 @@ import re - - def read_conf(conf_filename): - # Can't read/write from a single StringIO, so make a new one for reading. -- stream = open(conf_filename, "rU") -+ stream = open(conf_filename, "r") - - def parse_counters(stream): - for line_num, line in enumerate(stream): ---- thunderbird-91.11.0/python/mozbuild/mozbuild/action/process_define_files.py.python-open-U 2022-06-28 04:37:39.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/action/process_define_files.py 2022-07-11 19:18:24.056417112 +0200 -@@ -36,7 +36,7 @@ def process_define_file(output, input): - ) and not config.substs.get("JS_STANDALONE"): - config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src")) - -- with open(path, "rU") as input: -+ with open(path, "r") as input: - r = re.compile( - "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U - ) ---- thunderbird-91.11.0/python/mozbuild/mozbuild/backend/base.py.python-open-U 2022-06-28 04:37:39.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/backend/base.py 2022-07-11 19:18:34.165390187 +0200 -@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin): - return status - - @contextmanager -- def _write_file(self, path=None, fh=None, readmode="rU"): -+ def _write_file(self, path=None, fh=None, readmode="r"): - """Context manager to write a file. - - This is a glorified wrapper around FileAvoidWrite with integration to ---- thunderbird-91.11.0/python/mozbuild/mozbuild/preprocessor.py.python-open-U 2022-06-28 04:37:20.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/preprocessor.py 2022-07-11 19:19:30.677239685 +0200 -@@ -531,7 +531,7 @@ class Preprocessor: - - if args: - for f in args: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - self.processFile(input=input, output=out) - if depfile: - mk = Makefile() -@@ -860,7 +860,7 @@ class Preprocessor: - args = self.applyFilters(args) - if not os.path.isabs(args): - args = os.path.join(self.curdir, args) -- args = io.open(args, "rU", encoding="utf-8") -+ args = io.open(args, "r", encoding="utf-8") - except Preprocessor.Error: - raise - except Exception: -@@ -914,7 +914,7 @@ class Preprocessor: - def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"): - pp = Preprocessor(defines=defines, marker=marker) - for f in includes: -- with io.open(f, "rU", encoding="utf-8") as input: -+ with io.open(f, "r", encoding="utf-8") as input: - pp.processFile(input=input, output=output) - return pp.includes - ---- thunderbird-91.11.0/python/mozbuild/mozbuild/util.py.python-open-U 2022-06-28 04:37:40.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozbuild/util.py 2022-07-11 19:19:19.903268374 +0200 -@@ -225,7 +225,7 @@ class FileAvoidWrite(BytesIO): - still occur, as well as diff capture if requested. - """ - -- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"): -+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"): - BytesIO.__init__(self) - self.name = filename - assert type(capture_diff) == bool -@@ -1447,7 +1447,7 @@ def patch_main(): - - def my_get_command_line(): - with open( -- os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "rU" -+ os.path.join(os.path.dirname(__file__), "fork_interpose.py"), "r" - ) as fork_file: - fork_code = fork_file.read() - # Add our relevant globals. ---- thunderbird-91.11.0/python/mozbuild/mozpack/files.py.python-open-U 2022-06-28 04:37:40.000000000 +0200 -+++ thunderbird-91.11.0/python/mozbuild/mozpack/files.py 2022-07-11 19:19:40.372213866 +0200 -@@ -574,7 +574,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - with _open(os.devnull, "w") as output: - pp.processFile(input=input, output=output) - -@@ -631,7 +631,7 @@ class PreprocessedFile(BaseFile): - pp = Preprocessor(defines=self.defines, marker=self.marker) - pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings) - -- with _open(self.path, "rU") as input: -+ with _open(self.path, "r") as input: - pp.processFile(input=input, output=dest, depfile=deps_out) - - dest.close() diff --git a/user/thunderbird/python3.11-regex-inline-flags.patch b/user/thunderbird/python3.11-regex-inline-flags.patch deleted file mode 100644 index 39481ec01..000000000 --- a/user/thunderbird/python3.11-regex-inline-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py.python-inline-flags 2022-06-28 04:39:56.000000000 +0200 -+++ thunderbird-91.11.0/xpcom/idl-parser/xpidl/xpidl.py 2022-07-11 21:55:05.287553042 +0200 -@@ -1563,13 +1563,13 @@ class IDLParser(object): - t_ignore = " \t" - - def t_multilinecomment(self, t): -- r"/\*(?s).*?\*/" -+ r"/\*(?s:.*?)\*/" - t.lexer.lineno += t.value.count("\n") - if t.value.startswith("/**"): - self._doccomments.append(t.value) - - def t_singlelinecomment(self, t): -- r"(?m)//.*?$" -+ r"(?m://.*?$)" - - def t_IID(self, t): - return t -@@ -1582,7 +1582,7 @@ class IDLParser(object): - return t - - def t_LCDATA(self, t): -- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?" -+ r"(?s:%\{[ ]*C\+\+[ ]*\n(?P<cdata>.*?\n?)%\}[ ]*(C\+\+)?)" - t.type = "CDATA" - t.value = t.lexer.lexmatch.group("cdata") - t.lexer.lineno += t.value.count("\n") diff --git a/user/thunderbird/rust-32bit.patch b/user/thunderbird/rust-32bit.patch index cff36e90b..4829e44bf 100644 --- a/user/thunderbird/rust-32bit.patch +++ b/user/thunderbird/rust-32bit.patch @@ -1,32 +1,30 @@ ---- firefox-91.13.0/config/makefiles/rust.mk.old 2022-08-15 13:04:32.000000000 -0500 -+++ firefox-91.13.0/config/makefiles/rust.mk 2022-11-15 01:35:10.150096648 -0600 -@@ -64,19 +64,19 @@ +LTO kills the build on 32-bit architectures. + +--- firefox-128.0/config/makefiles/rust.mk.old 2024-07-04 11:20:25.000000000 -0500 ++++ firefox-128.0/config/makefiles/rust.mk 2024-08-04 03:20:25.375459833 -0500 +@@ -82,25 +82,6 @@ # These flags are passed via `cargo rustc` and only apply to the final rustc # invocation (i.e., only the top-level crate, not its dependencies). cargo_rustc_flags = $(CARGO_RUSTCFLAGS) -ifndef DEVELOPER_OPTIONS -ifndef MOZ_DEBUG_RUST -+#ifndef DEVELOPER_OPTIONS -+#ifndef MOZ_DEBUG_RUST - # Enable link-time optimization for release builds, but not when linking - # gkrust_gtest. And not when doing cross-language LTO. +-# Enable link-time optimization for release builds, but not when linking +-# gkrust_gtest. And not when doing cross-language LTO. -ifndef MOZ_LTO_RUST_CROSS +-# Never enable when sancov is enabled to work around https://github.com/rust-lang/rust/issues/90300. +-ifndef rustflags_sancov +-# Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. +-ifndef MOZ_CODE_COVERAGE -ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) --cargo_rustc_flags += -Clto +-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) -endif -+#ifndef MOZ_LTO_RUST_CROSS -+#ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) -+#cargo_rustc_flags += -Clto -+#endif - # We need -Cembed-bitcode=yes for all crates when using -Clto. +-# We need -Cembed-bitcode=yes for all crates when using -Clto. -RUSTFLAGS += -Cembed-bitcode=yes -endif -endif -endif -+#RUSTFLAGS += -Cembed-bitcode=yes -+#endif -+#endif -+#endif +-endif +-endif ifdef CARGO_INCREMENTAL export CARGO_INCREMENTAL diff --git a/user/thunderbird/shut-up-warning.patch b/user/thunderbird/shut-up-warning.patch index 8df045af1..bc90b6e2b 100644 --- a/user/thunderbird/shut-up-warning.patch +++ b/user/thunderbird/shut-up-warning.patch @@ -1,6 +1,6 @@ --- firefox-68.0.1/gfx/2d/HelpersCairo.h.old 2019-07-17 20:51:26.000000000 +0000 +++ firefox-68.0.1/gfx/2d/HelpersCairo.h 2019-08-10 11:38:36.047380153 +0000 -@@ -147,7 +147,7 @@ +@@ -149,7 +149,7 @@ case SurfaceFormat::R5G6B5_UINT16: return CAIRO_FORMAT_RGB16_565; default: diff --git a/user/thunderbird/skia-endian.patch b/user/thunderbird/skia-endian.patch new file mode 100644 index 000000000..7a88b0869 --- /dev/null +++ b/user/thunderbird/skia-endian.patch @@ -0,0 +1,112 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=1888396 + +--- firefox-128.0/gfx/skia/skia/include/private/SkColorData.h ++++ firefox-128.0/gfx/skia/skia/include/private/SkColorData.h +@@ -12,6 +12,13 @@ #include "include/core/SkColor.h" + #include "include/core/SkColorPriv.h" + #include "include/private/base/SkTo.h" + ++/* Macro to covert between big endian and little endian memory order. */ ++#ifdef SK_CPU_BENDIAN ++#define BE_CONVERT(c) ((((c) & 0xff)<<24) | (((c) & 0xff00)<<8) | (((c) & 0xff0000)>>8) | (((c) & 0xff000000)>>24)) ++#else ++#define BE_CONVERT(c) c ++#endif ++ + //////////////////////////////////////////////////////////////////////////////////////////// + // Convert a 16bit pixel to a 32bit pixel + +--- firefox-128.0/gfx/skia/skia/src/core/SkBlitRow_D32.cpp ++++ firefox-128.0/gfx/skia/skia/src/core/SkBlitRow_D32.cpp +@@ -555,7 +555,7 @@ } + void SkBlitRow::Color32(SkPMColor dst[], int count, SkPMColor color) { + switch (SkGetPackedA32(color)) { + case 0: /* Nothing to do */ return; +- case 255: SkOpts::memset32(dst, color, count); return; ++ case 255: SkOpts::memset32(dst, BE_CONVERT(color), count); return; + } +- return SkOpts::blit_row_color32(dst, count, color); ++ return SkOpts::blit_row_color32(dst, count, BE_CONVERT(color)); + } +--- firefox-128.0/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp ++++ firefox-128.0/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp +@@ -1487,7 +1487,7 @@ } + unsigned aa = antialias[0]; + if (aa) { + if ((opaqueMask & aa) == 255) { +- SkOpts::memset32(device, color, count); ++ SkOpts::memset32(device, BE_CONVERT(color), count); + } else { + uint32_t sc = SkAlphaMulQ(color, SkAlpha255To256(aa)); + SkBlitRow::Color32(device, count, sc); +@@ -1503,17 +1503,17 @@ void SkARGB32_Blitter::blitAntiH2(int x, + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x + 1, y);) + +- device[0] = SkBlendARGB32(fPMColor, device[0], a0); +- device[1] = SkBlendARGB32(fPMColor, device[1], a1); ++ device[0] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[0]), a0)); ++ device[1] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[1]), a1)); + } + + void SkARGB32_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x, y + 1);) + +- device[0] = SkBlendARGB32(fPMColor, device[0], a0); ++ device[0] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[0]), a0)); + device = (uint32_t*)((char*)device + fDevice.rowBytes()); +- device[0] = SkBlendARGB32(fPMColor, device[0], a1); ++ device[0] = BE_CONVERT(SkBlendARGB32(fPMColor, BE_CONVERT(device[0]), a1)); + } + + ////////////////////////////////////////////////////////////////////////////////////// +@@ -1604,17 +1604,17 @@ void SkARGB32_Opaque_Blitter::blitAntiH2 + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x + 1, y);) + +- device[0] = SkFastFourByteInterp(fPMColor, device[0], a0); +- device[1] = SkFastFourByteInterp(fPMColor, device[1], a1); ++ device[0] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[0]), a0)); ++ device[1] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[1]), a1)); + } + + void SkARGB32_Opaque_Blitter::blitAntiV2(int x, int y, U8CPU a0, U8CPU a1) { + uint32_t* device = fDevice.writable_addr32(x, y); + SkDEBUGCODE((void)fDevice.writable_addr32(x, y + 1);) + +- device[0] = SkFastFourByteInterp(fPMColor, device[0], a0); ++ device[0] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[0]), a0)); + device = (uint32_t*)((char*)device + fDevice.rowBytes()); +- device[0] = SkFastFourByteInterp(fPMColor, device[0], a1); ++ device[0] = BE_CONVERT(SkFastFourByteInterp(fPMColor, BE_CONVERT(device[0]), a1)); + } + + /////////////////////////////////////////////////////////////////////////////// +@@ -1634,7 +1634,7 @@ } + unsigned dst_scale = SkAlpha255To256(255 - SkGetPackedA32(color)); + size_t rowBytes = fDevice.rowBytes(); + while (--height >= 0) { +- device[0] = color + SkAlphaMulQ(device[0], dst_scale); ++ device[0] = BE_CONVERT(color + SkAlphaMulQ(BE_CONVERT(device[0]), dst_scale)); + device = (uint32_t*)((char*)device + rowBytes); + } + } +@@ -1651,7 +1651,7 @@ uint32_t color = fPMColor; + size_t rowBytes = fDevice.rowBytes(); + + if (SkGetPackedA32(fPMColor) == 0xFF) { +- SkOpts::rect_memset32(device, color, width, rowBytes, height); ++ SkOpts::rect_memset32(device, BE_CONVERT(color), width, rowBytes, height); + } else { + while (height --> 0) { + SkBlitRow::Color32(device, width, color); +@@ -1680,7 +1680,7 @@ } + unsigned aa = antialias[0]; + if (aa) { + if (aa == 255) { +- SkOpts::memset32(device, black, count); ++ SkOpts::memset32(device, BE_CONVERT(black), count); + } else { + SkPMColor src = aa << SK_A32_SHIFT; + unsigned dst_scale = 256 - aa; diff --git a/user/thunderbird/skia-unified.patch b/user/thunderbird/skia-unified.patch index 77bc56299..cacfe3451 100644 --- a/user/thunderbird/skia-unified.patch +++ b/user/thunderbird/skia-unified.patch @@ -1,69 +1,786 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1344659 +This patch is not complete. ---- firefox-102.1.0/gfx/2d/Types.h -+++ firefox-102.1.0/gfx/2d/Types.h -@@ -91,15 +91,8 @@ UNKNOWN, - // The following values are endian-independent synonyms. The _UINT32 suffix - // indicates that the name reflects the layout when viewed as a uint32_t - // value. --#if MOZ_LITTLE_ENDIAN() - A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB - X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB --#elif MOZ_BIG_ENDIAN() -- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB -- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB --#else --# error "bad endianness" --#endif +It attempts to completely remove endian-specific surface formats from the +entire tree, then replace it with a single swizzle in Skia. - // The following values are OS and endian-independent synonyms. - // +Most things are working, including most Web sites and graphics. However, +notably, native widgets (like menus, or 'Remember password?' popups) cause +an assertion failure. +We need to ship beta6 and this gets people a browser with many unfortunate +caveats, which is better than no browser at all. -https://bugzilla.mozilla.org/show_bug.cgi?id=1325259 +I intend to remain working with upstream on finding a way forward with the +overall idea of this patch and hope to land something eventually. ---- firefox-102.1.0/gfx/2d/DrawTargetSkia.cpp -+++ firefox-102.1.0/gfx/2d/DrawTargetSkia.cpp -@@ -154,8 +154,12 @@ } - return surfaceBounds.Intersect(bounds); +diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp +--- a/dom/canvas/CanvasRenderingContext2D.cpp ++++ b/dom/canvas/CanvasRenderingContext2D.cpp +@@ -383,7 +383,7 @@ class AdjustedTargetForFilter { + } + + if (!mFinalTarget->CanCreateSimilarDrawTarget(mSourceGraphicRect.Size(), +- SurfaceFormat::B8G8R8A8)) { ++ SurfaceFormat::OS_RGBA)) { + mTarget = mFinalTarget; + mCtx = nullptr; + mFinalTarget = nullptr; +@@ -391,7 +391,7 @@ class AdjustedTargetForFilter { + } + + mTarget = mFinalTarget->CreateSimilarDrawTarget(mSourceGraphicRect.Size(), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + + if (mTarget) { + // See bug 1524554. +@@ -419,7 +419,7 @@ class AdjustedTargetForFilter { + } + + RefPtr<DrawTarget> dt = mFinalTarget->CreateSimilarDrawTarget( +- aRect.Size(), SurfaceFormat::B8G8R8A8); ++ aRect.Size(), SurfaceFormat::OS_RGBA); + + if (dt) { + // See bug 1524554. +@@ -516,7 +516,7 @@ class AdjustedTargetForShadow { + bounds.RoundOut(); + if (!bounds.ToIntRect(&mTempRect) || + !mFinalTarget->CanCreateSimilarDrawTarget(mTempRect.Size(), +- SurfaceFormat::B8G8R8A8)) { ++ SurfaceFormat::OS_RGBA)) { + mTarget = mFinalTarget; + mCtx = nullptr; + mFinalTarget = nullptr; +@@ -524,7 +524,7 @@ class AdjustedTargetForShadow { + } + + mTarget = mFinalTarget->CreateShadowDrawTarget( +- mTempRect.Size(), SurfaceFormat::B8G8R8A8, mSigma); ++ mTempRect.Size(), SurfaceFormat::OS_RGBA, mSigma); + + if (mTarget) { + // See bug 1524554. +@@ -2117,7 +2117,7 @@ CanvasRenderingContext2D::GetOptimizedSn + } + + SurfaceFormat CanvasRenderingContext2D::GetSurfaceFormat() const { +- return mOpaque ? SurfaceFormat::B8G8R8X8 : SurfaceFormat::B8G8R8A8; ++ return mOpaque ? SurfaceFormat::OS_RGBX : SurfaceFormat::OS_RGBA; } -+#if __sparc -+static const int kARGBAlphaOffset = 0; -+#else - static const int kARGBAlphaOffset = - SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; + // +@@ -5295,7 +5295,7 @@ static already_AddRefed<SourceSurface> E + } + + RefPtr<DrawTarget> subrectDT = aTargetDT->CreateSimilarDrawTarget( +- roundedOutSourceRectInt.Size(), SurfaceFormat::B8G8R8A8); ++ roundedOutSourceRectInt.Size(), SurfaceFormat::OS_RGBA); + + if (subrectDT) { + // See bug 1524554. +@@ -6061,7 +6061,7 @@ void CanvasRenderingContext2D::DrawWindo + } + } + drawDT = gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- dtSize, SurfaceFormat::B8G8R8A8); ++ dtSize, SurfaceFormat::OS_RGBA); + if (!drawDT || !drawDT->IsValid()) { + aError.Throw(NS_ERROR_FAILURE); + return; +@@ -6315,7 +6315,7 @@ void CanvasRenderingContext2D::EnsureErr + + RefPtr<DrawTarget> errorTarget = + gfxPlatform::GetPlatform()->CreateOffscreenCanvasDrawTarget( +- IntSize(1, 1), SurfaceFormat::B8G8R8A8); ++ IntSize(1, 1), SurfaceFormat::OS_RGBA); + MOZ_ASSERT(errorTarget, "Failed to allocate the error target!"); + + sErrorTarget.set(errorTarget.forget().take()); +@@ -6437,7 +6437,7 @@ void CanvasRenderingContext2D::PutImageD + dstData = lockedBits + dirtyRect.y * dstStride + dirtyRect.x * 4; + } else { + sourceSurface = Factory::CreateDataSourceSurface( +- dirtyRect.Size(), SurfaceFormat::B8G8R8A8, false); ++ dirtyRect.Size(), SurfaceFormat::OS_RGBA, false); + + // In certain scenarios, requesting larger than 8k image fails. Bug + // 803568 covers the details of how to run into it, but the full +diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp +--- a/dom/canvas/ImageBitmap.cpp ++++ b/dom/canvas/ImageBitmap.cpp +@@ -227,7 +227,7 @@ static already_AddRefed<DataSourceSurfac + // this rectangle are outside the area where the input bitmap was placed, then + // they will be transparent black in output." + // So, instead, we force the output format to be SurfaceFormat::B8G8R8A8. +- const SurfaceFormat format = SurfaceFormat::B8G8R8A8; ++ const SurfaceFormat format = SurfaceFormat::OS_RGBA; + const int bytesPerPixel = BytesPerPixel(format); + const IntSize dstSize = + IntSize(positiveCropRect.width, positiveCropRect.height); +@@ -500,6 +500,11 @@ static already_AddRefed<layers::Image> C + + // Convert RGBA to BGRA + RefPtr<DataSourceSurface> rgbaDataSurface = rgbaSurface->GetDataSurface(); ++ ++ if (SurfaceFormat::OS_RGBA == SurfaceFormat::R8G8B8A8) { ++ return CreateImageFromSurface(rgbaDataSurface); ++ } ++ + DataSourceSurface::ScopedMap rgbaMap(rgbaDataSurface, + DataSourceSurface::READ); + if (NS_WARN_IF(!rgbaMap.IsMapped())) { +@@ -724,7 +729,7 @@ SurfaceFromElementResult ImageBitmap::Su + bool requiresCrop = !allowUncropped && hasCropRect; + if (wantExactSize || requiresPremult || requiresCrop || mSurface) { + RefPtr<DrawTarget> dt = Factory::CreateDrawTarget( +- BackendType::SKIA, IntSize(1, 1), SurfaceFormat::B8G8R8A8); ++ BackendType::SKIA, IntSize(1, 1), SurfaceFormat::OS_RGBA); + sfer.mSourceSurface = PrepareForDrawTarget(dt); + + if (!sfer.mSourceSurface) { +@@ -831,7 +836,7 @@ already_AddRefed<SourceSurface> ImageBit + // black, even if the surface is opaque, so force to an alpha format in + // that case. + if (!surfPortion.IsEqualEdges(mPictureRect) && isOpaque) { +- format = SurfaceFormat::B8G8R8A8; ++ format = SurfaceFormat::OS_RGBA; + } + + // If we need to pre-multiply the alpha, then we need to be able to +diff --git a/dom/canvas/OffscreenCanvasDisplayHelper.cpp b/dom/canvas/OffscreenCanvasDisplayHelper.cpp +--- a/dom/canvas/OffscreenCanvasDisplayHelper.cpp ++++ b/dom/canvas/OffscreenCanvasDisplayHelper.cpp +@@ -181,7 +181,7 @@ bool OffscreenCanvasDisplayHelper::Commi + + MutexAutoLock lock(mMutex); + +- gfx::SurfaceFormat format = gfx::SurfaceFormat::B8G8R8A8; ++ gfx::SurfaceFormat format = gfx::SurfaceFormat::OS_RGBA; + layers::TextureFlags flags = layers::TextureFlags::IMMUTABLE; + + if (!mCanvasElement) { +@@ -207,7 +207,7 @@ bool OffscreenCanvasDisplayHelper::Commi + + if (mData.mIsOpaque) { + flags |= layers::TextureFlags::IS_OPAQUE; +- format = gfx::SurfaceFormat::B8G8R8X8; ++ format = gfx::SurfaceFormat::OS_RGBX; + } else if (!mData.mIsAlphaPremult) { + flags |= layers::TextureFlags::NON_PREMULTIPLIED; + } +diff --git a/gfx/2d/HelpersSkia.h b/gfx/2d/HelpersSkia.h +--- a/gfx/2d/HelpersSkia.h ++++ b/gfx/2d/HelpersSkia.h +@@ -26,6 +26,9 @@ namespace gfx { + static inline SkColorType GfxFormatToSkiaColorType(SurfaceFormat format) { + switch (format) { + case SurfaceFormat::B8G8R8A8: ++#if MOZ_BIG_ENDIAN() ++ //MOZ_DIAGNOSTIC_ASSERT(false, "wrong way unsupported by Skia"); ++#endif + return kBGRA_8888_SkColorType; + case SurfaceFormat::B8G8R8X8: + // We probably need to do something here. +@@ -37,7 +40,9 @@ static inline SkColorType GfxFormatToSki + case SurfaceFormat::R8G8B8A8: + return kRGBA_8888_SkColorType; + case SurfaceFormat::A8R8G8B8: ++#if MOZ_LITTLE_ENDIAN() + MOZ_DIAGNOSTIC_ASSERT(false, "A8R8G8B8 unsupported by Skia"); +#endif + return kRGBA_8888_SkColorType; + default: + MOZ_DIAGNOSTIC_ASSERT(false, "Unknown surface format"); +@@ -49,20 +54,20 @@ static inline SurfaceFormat SkiaColorTyp + SkColorType aColorType, SkAlphaType aAlphaType = kPremul_SkAlphaType) { + switch (aColorType) { + case kBGRA_8888_SkColorType: +- return aAlphaType == kOpaque_SkAlphaType ? SurfaceFormat::B8G8R8X8 +- : SurfaceFormat::B8G8R8A8; ++ return aAlphaType == kOpaque_SkAlphaType ? SurfaceFormat::OS_RGBX ++ : SurfaceFormat::OS_RGBA; + case kRGB_565_SkColorType: + return SurfaceFormat::R5G6B5_UINT16; + case kAlpha_8_SkColorType: + return SurfaceFormat::A8; + default: +- return SurfaceFormat::B8G8R8A8; ++ return SurfaceFormat::OS_RGBA; + } + } - static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, - const int32_t aStride, SurfaceFormat aFormat) { -# HG changeset patch -# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec -Problem description: Tab-titles that are too long to fit into a tab get faded out. - On big endian this is broken and instead of fading out, the - tab gets white and the font transparent, leading to an unreadable - tab-title -Solution: This is not a real solution, but a hack. The real solution would have been - to byte-swap the correct buffer, but I could not find it. - So the next best thing is to deactivate the fading-effect. Now all tab-titles - are readable, albeit not as pretty to look at as they could be. -Side-effects: I have not yet found an unwanted side-effect. - -diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp ---- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 -+++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 -@@ -1861,6 +1861,14 @@ - SkCanvas::kPreserveLCDText_SaveLayerFlag | - (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); - -+#if MOZ_BIG_ENDIAN -+ // Pushing a layer where an aMask is defined produces wrong output. -+ // We _should_ endian swap the data, but I couldn't find a workable way to do so -+ // Therefore I deactivate those layers in the meantime. -+ // The result is: Tab-titles that are longer than the available space should be faded out. -+ // The fading doesn't work, so we deactivate the fading-effect here. -+ if (!aMask) + static inline SkAlphaType GfxFormatToSkiaAlphaType(SurfaceFormat format) { + switch (format) { +- case SurfaceFormat::B8G8R8X8: ++ case SurfaceFormat::OS_RGBX: + case SurfaceFormat::R5G6B5_UINT16: + return kOpaque_SkAlphaType; + default: +diff --git a/gfx/ipc/CrossProcessPaint.cpp b/gfx/ipc/CrossProcessPaint.cpp +--- a/gfx/ipc/CrossProcessPaint.cpp ++++ b/gfx/ipc/CrossProcessPaint.cpp +@@ -107,7 +107,7 @@ PaintFragment PaintFragment::Record(dom: + nsContentUtils::FlushLayoutForTree(ds->GetWindow()); + + // Initialize the recorder +- SurfaceFormat format = SurfaceFormat::B8G8R8A8; ++ SurfaceFormat format = SurfaceFormat::OS_RGBA; + RefPtr<DrawTarget> referenceDt = Factory::CreateDrawTarget( + gfxPlatform::GetPlatform()->GetSoftwareBackend(), IntSize(1, 1), format); + +@@ -254,7 +254,7 @@ bool CrossProcessPaint::Start(dom::Windo + // Create the destination draw target + RefPtr<DrawTarget> drawTarget = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- root->mSize, SurfaceFormat::B8G8R8A8); ++ root->mSize, SurfaceFormat::OS_RGBA); + if (!drawTarget || !drawTarget->IsValid()) { + CPP_LOG("Couldn't create (%d x %d) surface for fragment %" PRIu64 + ".\n", +diff --git a/gfx/ipc/GfxMessageUtils.h b/gfx/ipc/GfxMessageUtils.h +--- a/gfx/ipc/GfxMessageUtils.h ++++ b/gfx/ipc/GfxMessageUtils.h +@@ -677,7 +677,7 @@ struct ParamTraits<GeckoProcessType> + template <> + struct ParamTraits<mozilla::gfx::SurfaceFormat> + : public ContiguousEnumSerializer<mozilla::gfx::SurfaceFormat, +- mozilla::gfx::SurfaceFormat::B8G8R8A8, ++ mozilla::gfx::SurfaceFormat::OS_RGBA, + mozilla::gfx::SurfaceFormat::UNKNOWN> {}; + + template <> +diff --git a/gfx/layers/Compositor.cpp b/gfx/layers/Compositor.cpp +--- a/gfx/layers/Compositor.cpp ++++ b/gfx/layers/Compositor.cpp +@@ -36,7 +36,7 @@ class CompositorRecordedFrame final : pu + gfx::IntSize size = mBuffer->GetSize(); + + mSurface = gfx::Factory::CreateDataSourceSurface( +- size, gfx::SurfaceFormat::B8G8R8A8, ++ size, gfx::SurfaceFormat::OS_RGBA, + /* aZero = */ false); + + if (!mBuffer->MapAndCopyInto(mSurface, size)) { +diff --git a/gfx/layers/ImageDataSerializer.cpp b/gfx/layers/ImageDataSerializer.cpp +--- a/gfx/layers/ImageDataSerializer.cpp ++++ b/gfx/layers/ImageDataSerializer.cpp +@@ -288,16 +288,16 @@ already_AddRefed<DataSourceSurface> Data + RefPtr<DataSourceSurface> result; + if (aSurface) { + MOZ_ASSERT(aSurface->GetSize() == size); +- MOZ_ASSERT(aSurface->GetFormat() == gfx::SurfaceFormat::B8G8R8X8); ++ MOZ_ASSERT(aSurface->GetFormat() == gfx::SurfaceFormat::OS_RGBX); + if (aSurface->GetSize() == size && +- aSurface->GetFormat() == gfx::SurfaceFormat::B8G8R8X8) { ++ aSurface->GetFormat() == gfx::SurfaceFormat::OS_RGBX) { + result = aSurface; + } + } + + if (!result) { + result = +- Factory::CreateDataSourceSurface(size, gfx::SurfaceFormat::B8G8R8X8); ++ Factory::CreateDataSourceSurface(size, gfx::SurfaceFormat::OS_RGBX); + } + if (NS_WARN_IF(!result)) { + return nullptr; +@@ -320,7 +320,7 @@ already_AddRefed<DataSourceSurface> Data + ycbcrData.mChromaSubsampling = aDescriptor.chromaSubsampling(); + +- gfx::ConvertYCbCrToRGB(ycbcrData, gfx::SurfaceFormat::B8G8R8X8, size, ++ gfx::ConvertYCbCrToRGB(ycbcrData, gfx::SurfaceFormat::OS_RGBX, size, + map.mData, map.mStride); + + result->Unmap(); + return result.forget(); +diff --git a/gfx/layers/composite/TextureHost.cpp b/gfx/layers/composite/TextureHost.cpp +--- a/gfx/layers/composite/TextureHost.cpp ++++ b/gfx/layers/composite/TextureHost.cpp +@@ -182,7 +182,7 @@ already_AddRefed<TextureHost> CreateDumm + aFlags &= ~TextureFlags::DEALLOCATE_CLIENT; + aFlags |= TextureFlags::DUMMY_TEXTURE; + UniquePtr<TextureData> textureData(BufferTextureData::Create( +- gfx::IntSize(1, 1), gfx::SurfaceFormat::B8G8R8A8, gfx::BackendType::SKIA, ++ gfx::IntSize(1, 1), gfx::SurfaceFormat::OS_RGBA, gfx::BackendType::SKIA, + aBackend, aFlags, TextureAllocationFlags::ALLOC_DEFAULT, nullptr)); + SurfaceDescriptor surfDesc; + textureData->Serialize(surfDesc); +diff --git a/gfx/layers/ipc/SharedSurfacesChild.cpp b/gfx/layers/ipc/SharedSurfacesChild.cpp +--- a/gfx/layers/ipc/SharedSurfacesChild.cpp ++++ b/gfx/layers/ipc/SharedSurfacesChild.cpp +@@ -241,7 +241,7 @@ nsresult SharedSurfacesChild::ShareInter + + SurfaceFormat format = aSurface->GetFormat(); + MOZ_RELEASE_ASSERT( +- format == SurfaceFormat::B8G8R8X8 || format == SurfaceFormat::B8G8R8A8, ++ format == SurfaceFormat::OS_RGBX || format == SurfaceFormat::OS_RGBA, + "bad format"); + + data->MarkShared(manager->GetNextExternalImageId()); +diff --git a/gfx/layers/wr/WebRenderLayerManager.cpp b/gfx/layers/wr/WebRenderLayerManager.cpp +--- a/gfx/layers/wr/WebRenderLayerManager.cpp ++++ b/gfx/layers/wr/WebRenderLayerManager.cpp +@@ -512,7 +512,7 @@ void WebRenderLayerManager::MakeSnapshot + #ifdef MOZ_WIDGET_ANDROID + SurfaceFormat::R8G8B8A8; + #else +- SurfaceFormat::B8G8R8A8; ++ SurfaceFormat::OS_RGBA; + #endif + RefPtr<TextureClient> texture = TextureClient::CreateForRawBufferAccess( + WrBridge(), format, aSize.ToUnknownSize(), BackendType::SKIA, +diff --git a/gfx/layers/wr/WebRenderTextureHost.cpp b/gfx/layers/wr/WebRenderTextureHost.cpp +--- a/gfx/layers/wr/WebRenderTextureHost.cpp ++++ b/gfx/layers/wr/WebRenderTextureHost.cpp +@@ -159,7 +159,7 @@ int32_t WebRenderTextureHost::GetRGBStri + // XXX this stride is used until yuv image rendering by webrender is used. + // Software converted RGB buffers strides are aliened to 16 + return gfx::GetAlignedStride<16>( +- GetSize().width, BytesPerPixel(gfx::SurfaceFormat::B8G8R8A8)); ++ GetSize().width, BytesPerPixel(gfx::SurfaceFormat::OS_RGBA)); + } + return ImageDataSerializer::ComputeRGBStride(format, GetSize().width); + } +diff --git a/gfx/thebes/gfx2DGlue.h b/gfx/thebes/gfx2DGlue.h +--- a/gfx/thebes/gfx2DGlue.h ++++ b/gfx/thebes/gfx2DGlue.h +@@ -68,9 +68,9 @@ inline gfxRect ThebesRect(const RectDoub + + inline gfxImageFormat SurfaceFormatToImageFormat(SurfaceFormat aFormat) { + switch (aFormat) { +- case SurfaceFormat::B8G8R8A8: ++ case SurfaceFormat::OS_RGBA: + return SurfaceFormat::A8R8G8B8_UINT32; +- case SurfaceFormat::B8G8R8X8: ++ case SurfaceFormat::OS_RGBX: + return SurfaceFormat::X8R8G8B8_UINT32; + case SurfaceFormat::R5G6B5_UINT16: + return SurfaceFormat::R5G6B5_UINT16; +@@ -84,16 +84,16 @@ inline gfxImageFormat SurfaceFormatToIma + inline SurfaceFormat ImageFormatToSurfaceFormat(gfxImageFormat aFormat) { + switch (aFormat) { + case SurfaceFormat::A8R8G8B8_UINT32: +- return SurfaceFormat::B8G8R8A8; ++ return SurfaceFormat::OS_RGBA; + case SurfaceFormat::X8R8G8B8_UINT32: +- return SurfaceFormat::B8G8R8X8; ++ return SurfaceFormat::OS_RGBX; + case SurfaceFormat::R5G6B5_UINT16: + return SurfaceFormat::R5G6B5_UINT16; + case SurfaceFormat::A8: + return SurfaceFormat::A8; + default: + case SurfaceFormat::UNKNOWN: +- return SurfaceFormat::B8G8R8A8; ++ return SurfaceFormat::OS_RGBA; + } + } + +@@ -102,9 +102,11 @@ inline gfxContentType ContentForFormat(c + case SurfaceFormat::R5G6B5_UINT16: + case SurfaceFormat::B8G8R8X8: + case SurfaceFormat::R8G8B8X8: ++ case SurfaceFormat::X8R8G8B8: + return gfxContentType::COLOR; + case SurfaceFormat::A8: + return gfxContentType::ALPHA; ++ case SurfaceFormat::A8R8G8B8: + case SurfaceFormat::B8G8R8A8: + case SurfaceFormat::R8G8B8A8: + default: +diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp +--- a/gfx/thebes/gfxPlatform.cpp ++++ b/gfx/thebes/gfxPlatform.cpp +@@ -987,7 +987,7 @@ void gfxPlatform::Init() { + + gPlatform->mScreenReferenceDrawTarget = + gPlatform->CreateOffscreenContentDrawTarget(IntSize(1, 1), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + if (!gPlatform->mScreenReferenceDrawTarget || + !gPlatform->mScreenReferenceDrawTarget->IsValid()) { + // If TDR is detected, create a draw target with software backend +diff --git a/gfx/thebes/gfxPlatformWorker.cpp b/gfx/thebes/gfxPlatformWorker.cpp +--- a/gfx/thebes/gfxPlatformWorker.cpp ++++ b/gfx/thebes/gfxPlatformWorker.cpp +@@ -64,7 +64,7 @@ RefPtr<mozilla::gfx::DrawTarget> + gfxPlatformWorker::ScreenReferenceDrawTarget() { + if (!mScreenReferenceDrawTarget) { + mScreenReferenceDrawTarget = Factory::CreateDrawTarget( +- BackendType::SKIA, IntSize(1, 1), SurfaceFormat::B8G8R8A8); ++ BackendType::SKIA, IntSize(1, 1), SurfaceFormat::OS_RGBA); + } + return mScreenReferenceDrawTarget; + } +diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp +--- a/gfx/thebes/gfxUtils.cpp ++++ b/gfx/thebes/gfxUtils.cpp +@@ -1082,10 +1082,10 @@ nsresult gfxUtils::EncodeSourceSurfaceAs + } + + RefPtr<DataSourceSurface> dataSurface; +- if (aSurface->GetFormat() != SurfaceFormat::B8G8R8A8) { ++ if (aSurface->GetFormat() != SurfaceFormat::OS_RGBA) { + // FIXME bug 995807 (B8G8R8X8), bug 831898 (R5G6B5) + dataSurface = gfxUtils::CopySurfaceToDataSourceSurfaceWithFormat( +- aSurface, SurfaceFormat::B8G8R8A8); ++ aSurface, SurfaceFormat::OS_RGBA); + } else { + dataSurface = aSurface->GetDataSurface(); + } +diff --git a/gfx/webrender_bindings/RenderCompositorSWGL.cpp b/gfx/webrender_bindings/RenderCompositorSWGL.cpp +--- a/gfx/webrender_bindings/RenderCompositorSWGL.cpp ++++ b/gfx/webrender_bindings/RenderCompositorSWGL.cpp +@@ -7,6 +7,7 @@ + #include "RenderCompositorSWGL.h" + + #include "mozilla/gfx/Logging.h" ++#include "mozilla/gfx/Swizzle.h" + #include "mozilla/widget/CompositorWidget.h" + + #ifdef MOZ_WIDGET_GTK +@@ -92,8 +93,8 @@ bool RenderCompositorSWGL::AllocateMappe + gfx::SurfaceFormat format = gfx::SurfaceFormat::UNKNOWN; + if (bufferMode != layers::BufferMode::BUFFERED && !mSurface && + mDT->LockBits(&data, &size, &stride, &format) && +- (format != gfx::SurfaceFormat::B8G8R8A8 && +- format != gfx::SurfaceFormat::B8G8R8X8)) { ++ (format != gfx::SurfaceFormat::OS_RGBA && ++ format != gfx::SurfaceFormat::OS_RGBX)) { + // We tried to lock the DT and it succeeded, but the size or format + // of the data is not compatible, so just release it and fall back below... + mDT->ReleaseBits(data); +@@ -127,7 +128,7 @@ bool RenderCompositorSWGL::AllocateMappe + size = bounds.Size().ToUnknownSize(); + if (!mSurface || mSurface->GetSize() != size) { + mSurface = gfx::Factory::CreateDataSourceSurface( +- size, gfx::SurfaceFormat::B8G8R8A8); ++ size, gfx::SurfaceFormat::OS_RGBA); + } + gfx::DataSourceSurface::MappedSurface map = {nullptr, 0}; + if (!mSurface || !mSurface->Map(gfx::DataSourceSurface::READ_WRITE, &map)) { +@@ -242,6 +243,12 @@ void RenderCompositorSWGL::CommitMappedB + } + mDT->Flush(); + ++#if MOZ_BIG_ENDIAN() ++ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8, ++ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8, ++ mDT->GetSize()); +#endif - mCanvas->saveLayer(saveRec); ++ + // Done with the DT. Hand it back to the widget and clear out any trace of it. + mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion); + mDirtyRegion.SetEmpty(); +diff --git a/gfx/webrender_bindings/RenderTextureHostSWGL.cpp b/gfx/webrender_bindings/RenderTextureHostSWGL.cpp +--- a/gfx/webrender_bindings/RenderTextureHostSWGL.cpp ++++ b/gfx/webrender_bindings/RenderTextureHostSWGL.cpp +@@ -36,8 +36,8 @@ bool RenderTextureHostSWGL::UpdatePlanes + } + GLenum internalFormat = 0; + switch (format) { +- case gfx::SurfaceFormat::B8G8R8A8: +- case gfx::SurfaceFormat::B8G8R8X8: ++ case gfx::SurfaceFormat::OS_RGBA: ++ case gfx::SurfaceFormat::OS_RGBX: + MOZ_ASSERT(colorDepth == gfx::ColorDepth::COLOR_8); + internalFormat = LOCAL_GL_RGBA8; + break; +diff --git a/gfx/webrender_bindings/WebRenderTypes.h b/gfx/webrender_bindings/WebRenderTypes.h +--- a/gfx/webrender_bindings/WebRenderTypes.h ++++ b/gfx/webrender_bindings/WebRenderTypes.h +@@ -105,7 +105,7 @@ inline Maybe<wr::ImageFormat> SurfaceFor + inline gfx::SurfaceFormat ImageFormatToSurfaceFormat(ImageFormat aFormat) { + switch (aFormat) { + case ImageFormat::BGRA8: +- return gfx::SurfaceFormat::B8G8R8A8; ++ return gfx::SurfaceFormat::OS_RGBA; + case ImageFormat::R8: + return gfx::SurfaceFormat::A8; + case ImageFormat::R16: +diff --git a/image/imgTools.cpp b/image/imgTools.cpp +--- a/image/imgTools.cpp ++++ b/image/imgTools.cpp +@@ -425,8 +425,8 @@ static nsresult EncodeImageData(DataSour + const nsACString& aMimeType, + const nsAString& aOutputOptions, + nsIInputStream** aStream) { +- MOZ_ASSERT(aDataSurface->GetFormat() == SurfaceFormat::B8G8R8A8 || +- aDataSurface->GetFormat() == SurfaceFormat::B8G8R8X8, ++ MOZ_ASSERT(aDataSurface->GetFormat() == SurfaceFormat::OS_RGBA || ++ aDataSurface->GetFormat() == SurfaceFormat::OS_RGBX, + "We're assuming B8G8R8A8/X8"); + + // Get an image encoder for the media type +@@ -474,13 +474,13 @@ imgTools::EncodeImage(imgIContainer* aCo + + RefPtr<DataSourceSurface> dataSurface; + +- if (frame->GetFormat() == SurfaceFormat::B8G8R8A8 || +- frame->GetFormat() == SurfaceFormat::B8G8R8X8) { ++ if (frame->GetFormat() == SurfaceFormat::OS_RGBA || ++ frame->GetFormat() == SurfaceFormat::OS_RGBX) { + dataSurface = frame->GetDataSurface(); + } else { + // Convert format to SurfaceFormat::B8G8R8A8 + dataSurface = gfxUtils::CopySurfaceToDataSourceSurfaceWithFormat( +- frame, SurfaceFormat::B8G8R8A8); ++ frame, SurfaceFormat::OS_RGBA); + } + + NS_ENSURE_TRUE(dataSurface, NS_ERROR_FAILURE); +@@ -522,8 +522,8 @@ imgTools::EncodeScaledImage(imgIContaine + + // If the given surface is the right size/format, we can encode it directly. + if (scaledSize == frame->GetSize() && +- (frame->GetFormat() == SurfaceFormat::B8G8R8A8 || +- frame->GetFormat() == SurfaceFormat::B8G8R8X8)) { ++ (frame->GetFormat() == SurfaceFormat::OS_RGBA || ++ frame->GetFormat() == SurfaceFormat::OS_RGBX)) { + RefPtr<DataSourceSurface> dataSurface = frame->GetDataSurface(); + if (dataSurface) { + return EncodeImageData(dataSurface, aMimeType, aOutputOptions, aStream); +@@ -533,7 +533,7 @@ imgTools::EncodeScaledImage(imgIContaine + // Otherwise we need to scale it using a draw target. + // Ensure the surface is initialized to clear in case we need to blend to it. + RefPtr<DataSourceSurface> dataSurface = Factory::CreateDataSourceSurface( +- scaledSize, SurfaceFormat::B8G8R8A8, true); ++ scaledSize, SurfaceFormat::OS_RGBA, true); + if (NS_WARN_IF(!dataSurface)) { + return NS_ERROR_FAILURE; + } +@@ -545,7 +545,7 @@ imgTools::EncodeScaledImage(imgIContaine + + RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData( + BackendType::SKIA, map.GetData(), dataSurface->GetSize(), map.GetStride(), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + if (!dt) { + gfxWarning() << "imgTools::EncodeImage failed in CreateDrawTargetForData"; + return NS_ERROR_OUT_OF_MEMORY; +@@ -603,7 +603,7 @@ imgTools::EncodeCroppedImage(imgIContain + frameHeight >= aOffsetY + aHeight); + + RefPtr<DataSourceSurface> dataSurface = Factory::CreateDataSourceSurface( +- IntSize(aWidth, aHeight), SurfaceFormat::B8G8R8A8, ++ IntSize(aWidth, aHeight), SurfaceFormat::OS_RGBA, + /* aZero = */ true); + if (NS_WARN_IF(!dataSurface)) { + return NS_ERROR_FAILURE; +@@ -616,7 +616,7 @@ imgTools::EncodeCroppedImage(imgIContain + + RefPtr<DrawTarget> dt = Factory::CreateDrawTargetForData( + BackendType::SKIA, map.GetData(), dataSurface->GetSize(), map.GetStride(), +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + if (!dt) { + gfxWarning() + << "imgTools::EncodeCroppedImage failed in CreateDrawTargetForData"; +diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp +--- a/layout/base/PresShell.cpp ++++ b/layout/base/PresShell.cpp +@@ -5124,7 +5124,7 @@ already_AddRefed<SourceSurface> PresShel + + RefPtr<DrawTarget> dt = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- IntSize(pixelArea.width, pixelArea.height), SurfaceFormat::B8G8R8A8); ++ IntSize(pixelArea.width, pixelArea.height), SurfaceFormat::OS_RGBA); + if (!dt || !dt->IsValid()) { + return nullptr; + } +diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp +--- a/layout/base/nsLayoutUtils.cpp ++++ b/layout/base/nsLayoutUtils.cpp +@@ -7022,9 +7022,9 @@ SurfaceFromElementResult nsLayoutUtils:: + result.mAlphaType = gfxAlphaType::Opaque; + RefPtr<DrawTarget> ref = + aTarget ? aTarget : gfxPlatform::ThreadLocalScreenReferenceDrawTarget(); +- if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8)) { ++ if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA)) { + RefPtr<DrawTarget> dt = +- ref->CreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8); ++ ref->CreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA); + if (dt) { + result.mSourceSurface = dt->Snapshot(); + } +@@ -7102,12 +7102,12 @@ SurfaceFromElementResult nsLayoutUtils:: + : gfxPlatform::GetPlatform() + ->ThreadLocalScreenReferenceDrawTarget(); + if (!ref->CanCreateSimilarDrawTarget(displaySize, +- SurfaceFormat::B8G8R8A8)) { ++ SurfaceFormat::OS_RGBA)) { + return result; + } + + RefPtr<DrawTarget> dt = +- ref->CreateSimilarDrawTarget(displaySize, SurfaceFormat::B8G8R8A8); ++ ref->CreateSimilarDrawTarget(displaySize, SurfaceFormat::OS_RGBA); + if (!dt) { + return result; + } +@@ -7380,9 +7380,9 @@ SurfaceFromElementResult nsLayoutUtils:: + RefPtr<DrawTarget> ref = + aTarget ? aTarget + : gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget(); +- if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8)) { ++ if (ref->CanCreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA)) { + RefPtr<DrawTarget> dt = +- ref->CreateSimilarDrawTarget(size, SurfaceFormat::B8G8R8A8); ++ ref->CreateSimilarDrawTarget(size, SurfaceFormat::OS_RGBA); + if (dt) { + result.mSourceSurface = dt->Snapshot(); + } +diff --git a/layout/painting/nsCSSRenderingGradients.cpp b/layout/painting/nsCSSRenderingGradients.cpp +--- a/layout/painting/nsCSSRenderingGradients.cpp ++++ b/layout/painting/nsCSSRenderingGradients.cpp +@@ -1160,7 +1160,7 @@ bool nsCSSGradientRenderer::TryPaintTile + { + RefPtr<gfx::DrawTarget> tileTarget = + aContext.GetDrawTarget()->CreateSimilarDrawTarget( +- tileSize, gfx::SurfaceFormat::B8G8R8A8); ++ tileSize, gfx::SurfaceFormat::OS_RGBA); + if (!tileTarget || !tileTarget->IsValid()) { + return false; + } +diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp +--- a/layout/painting/nsDisplayList.cpp ++++ b/layout/painting/nsDisplayList.cpp +@@ -5043,7 +5043,7 @@ void nsDisplayBlendMode::Paint(nsDisplay + // we're going to draw to. This will include the same transform as + // is currently on |dt|. + RefPtr<DrawTarget> temp = +- dt->CreateClippedDrawTarget(rect, SurfaceFormat::B8G8R8A8); ++ dt->CreateClippedDrawTarget(rect, SurfaceFormat::OS_RGBA); + if (!temp) { + return; + } +@@ -6870,7 +6870,7 @@ void nsDisplayTransform::Paint(nsDisplay + RefPtr<DrawTarget> untransformedDT = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( + IntSize(pixelBounds.Width(), pixelBounds.Height()), +- SurfaceFormat::B8G8R8A8, true); ++ SurfaceFormat::OS_RGBA, true); + if (!untransformedDT || !untransformedDT->IsValid()) { + return; + } +diff --git a/layout/painting/nsImageRenderer.cpp b/layout/painting/nsImageRenderer.cpp +--- a/layout/painting/nsImageRenderer.cpp ++++ b/layout/painting/nsImageRenderer.cpp +@@ -469,7 +469,7 @@ ImgDrawResult nsImageRenderer::Draw(nsPr + return ImgDrawResult::SUCCESS; + } + RefPtr<DrawTarget> tempDT = ctx->GetDrawTarget()->CreateSimilarDrawTarget( +- tmpDTRect.Size(), SurfaceFormat::B8G8R8A8); ++ tmpDTRect.Size(), SurfaceFormat::OS_RGBA); + if (!tempDT || !tempDT->IsValid()) { + gfxDevCrash(LogReason::InvalidContext) + << "ImageRenderer::Draw problem " << gfx::hexa(tempDT); +diff --git a/layout/svg/FilterInstance.cpp b/layout/svg/FilterInstance.cpp +--- a/layout/svg/FilterInstance.cpp ++++ b/layout/svg/FilterInstance.cpp +@@ -666,7 +666,7 @@ void FilterInstance::BuildSourcePaint(So + + RefPtr<DrawTarget> offscreenDT = + gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget( +- neededRect.Size(), SurfaceFormat::B8G8R8A8); ++ neededRect.Size(), SurfaceFormat::OS_RGBA); + if (!offscreenDT || !offscreenDT->IsValid()) { + return; + } +@@ -714,7 +714,7 @@ void FilterInstance::BuildSourceImage(Dr + } + + RefPtr<DrawTarget> offscreenDT; +- SurfaceFormat format = SurfaceFormat::B8G8R8A8; ++ SurfaceFormat format = SurfaceFormat::OS_RGBA; + if (aDest->CanCreateSimilarDrawTarget(neededRect.Size(), format)) { + offscreenDT = aDest->CreateSimilarDrawTargetForFilter( + neededRect.Size(), format, aFilter, aSource, aSourceRect, Point(0, 0)); +diff --git a/layout/svg/SVGMaskFrame.cpp b/layout/svg/SVGMaskFrame.cpp +--- a/layout/svg/SVGMaskFrame.cpp ++++ b/layout/svg/SVGMaskFrame.cpp +@@ -68,7 +68,7 @@ already_AddRefed<SourceSurface> SVGMaskF + RefPtr<DrawTarget> maskDT; + if (maskType == StyleMaskType::Luminance) { + maskDT = aParams.dt->CreateClippedDrawTarget(maskSurfaceRect, +- SurfaceFormat::B8G8R8A8); ++ SurfaceFormat::OS_RGBA); + } else { + maskDT = + aParams.dt->CreateClippedDrawTarget(maskSurfaceRect, SurfaceFormat::A8); +diff --git a/layout/svg/SVGPatternFrame.cpp b/layout/svg/SVGPatternFrame.cpp +--- a/layout/svg/SVGPatternFrame.cpp ++++ b/layout/svg/SVGPatternFrame.cpp +@@ -370,7 +370,7 @@ already_AddRefed<SourceSurface> SVGPatte + } + + RefPtr<DrawTarget> dt = aDrawTarget->CreateSimilarDrawTargetWithBacking( +- surfaceSize, SurfaceFormat::B8G8R8A8); ++ surfaceSize, SurfaceFormat::OS_RGBA); + if (!dt || !dt->IsValid()) { + return nullptr; + } +diff --git a/layout/svg/SVGUtils.cpp b/layout/svg/SVGUtils.cpp +--- a/layout/svg/SVGUtils.cpp ++++ b/layout/svg/SVGUtils.cpp +@@ -488,7 +488,7 @@ class MixModeBlender { + + RefPtr<DrawTarget> targetDT = + mSourceCtx->GetDrawTarget()->CreateSimilarDrawTarget( +- drawRect.Size(), SurfaceFormat::B8G8R8A8); ++ drawRect.Size(), SurfaceFormat::OS_RGBA); + if (!targetDT || !targetDT->IsValid()) { + return nullptr; + } +diff --git a/widget/gtk/DMABufSurface.cpp b/widget/gtk/DMABufSurface.cpp +--- a/widget/gtk/DMABufSurface.cpp ++++ b/widget/gtk/DMABufSurface.cpp +@@ -948,8 +948,8 @@ bool DMABufSurfaceRGBA::HasAlpha() { + } + + gfx::SurfaceFormat DMABufSurfaceRGBA::GetFormat() { +- return HasAlpha() ? gfx::SurfaceFormat::B8G8R8A8 +- : gfx::SurfaceFormat::B8G8R8X8; ++ return HasAlpha() ? gfx::SurfaceFormat::OS_RGBA ++ : gfx::SurfaceFormat::OS_RGBX; + } + + // GL uses swapped R and B components so report accordingly. +@@ -1662,7 +1662,7 @@ DMABufSurfaceYUV::GetAsSourceSurface() { + LOGDMABUF(("DMABufSurfaceYUV::GetAsSourceSurface UID %d", mUID)); + + gfx::IntSize size(GetWidth(), GetHeight()); +- const auto format = gfx::SurfaceFormat::B8G8R8A8; ++ const auto format = gfx::SurfaceFormat::OS_RGBA; + RefPtr<gfx::DataSourceSurface> source = + gfx::Factory::CreateDataSourceSurface(size, format); + if (NS_WARN_IF(!source)) { +@@ -1692,7 +1692,7 @@ nsresult DMABufSurfaceYUV::BuildSurfaceD + LOGDMABUF(("DMABufSurfaceYUV::BuildSurfaceDescriptorBuffer UID %d", mUID)); + + gfx::IntSize size(GetWidth(), GetHeight()); +- const auto format = gfx::SurfaceFormat::B8G8R8A8; ++ const auto format = gfx::SurfaceFormat::OS_RGBA; - SetPermitSubpixelAA(aOpaque); + uint8_t* buffer = nullptr; + int32_t stride = 0; +diff --git a/widget/gtk/WindowSurfaceX11.cpp b/widget/gtk/WindowSurfaceX11.cpp +--- a/widget/gtk/WindowSurfaceX11.cpp ++++ b/widget/gtk/WindowSurfaceX11.cpp +@@ -24,13 +24,13 @@ gfx::SurfaceFormat WindowSurfaceX11::Get + case 32: + if (aVisual->red_mask == 0xff0000 && aVisual->green_mask == 0xff00 && + aVisual->blue_mask == 0xff) { +- return gfx::SurfaceFormat::B8G8R8A8; ++ return gfx::SurfaceFormat::OS_RGBA; + } + break; + case 24: + if (aVisual->red_mask == 0xff0000 && aVisual->green_mask == 0xff00 && + aVisual->blue_mask == 0xff) { +- return gfx::SurfaceFormat::B8G8R8X8; ++ return gfx::SurfaceFormat::OS_RGBX; + } + break; + case 16: diff --git a/user/thunderbird/stackwalk-x86-ppc.patch b/user/thunderbird/stackwalk-x86-ppc.patch index eed7a0956..df9ebfd94 100644 --- a/user/thunderbird/stackwalk-x86-ppc.patch +++ b/user/thunderbird/stackwalk-x86-ppc.patch @@ -1,16 +1,16 @@ --- thunderbird-52.6.0/mozglue/misc/StackWalk.cpp +++ thunderbird-52.6.0/mozglue/misc/StackWalk.cpp -@@ -41,13 +41,7 @@ static CriticalAddress gCriticalAddress; - #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 +@@ -50,13 +50,6 @@ static CriticalAddress gCriticalAddress; + # define HAVE___LIBC_STACK_END 0 #endif -#if (defined(linux) && \ - ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ -- defined(HAVE__UNWIND_BACKTRACE))) +- defined(HAVE__UNWIND_BACKTRACE)) && \ +- (HAVE___LIBC_STACK_END || ANDROID)) -# define MOZ_STACKWALK_SUPPORTS_LINUX 1 -#else # define MOZ_STACKWALK_SUPPORTS_LINUX 0 -#endif - - #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) - #define HAVE___LIBC_STACK_END 1 + + #if HAVE___LIBC_STACK_END diff --git a/user/thunderbird/triplet-vendor-support.patch b/user/thunderbird/triplet-vendor-support.patch deleted file mode 100644 index 84236b8ba..000000000 --- a/user/thunderbird/triplet-vendor-support.patch +++ /dev/null @@ -1,316 +0,0 @@ -Squashed version of https://github.com/bytecodealliance/target-lexicon/pull/35 - -diff -Naur thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/build.rs thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/build.rs ---- thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/build.rs 2022-08-15 13:05:59.000000000 -0500 -+++ thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/build.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -32,6 +32,7 @@ - } - } - -+use self::targets::Vendor; - use self::triple::Triple; - - fn main() { -@@ -52,6 +53,8 @@ - writeln!(out, "use crate::Aarch64Architecture::*;")?; - writeln!(out, "#[allow(unused_imports)]")?; - writeln!(out, "use crate::ArmArchitecture::*;")?; -+ writeln!(out, "#[allow(unused_imports)]")?; -+ writeln!(out, "use crate::CustomVendor;")?; - writeln!(out)?; - writeln!(out, "/// The `Triple` of the current host.")?; - writeln!(out, "pub const HOST: Triple = Triple {{")?; -@@ -60,7 +63,7 @@ - " architecture: Architecture::{:?},", - triple.architecture - )?; -- writeln!(out, " vendor: Vendor::{:?},", triple.vendor)?; -+ writeln!(out, " vendor: {},", vendor_display(&triple.vendor))?; - writeln!( - out, - " operating_system: OperatingSystem::{:?},", -@@ -90,7 +93,7 @@ - writeln!(out, "impl Vendor {{")?; - writeln!(out, " /// Return the vendor for the current host.")?; - writeln!(out, " pub const fn host() -> Self {{")?; -- writeln!(out, " Vendor::{:?}", triple.vendor)?; -+ writeln!(out, " {}", vendor_display(&triple.vendor))?; - writeln!(out, " }}")?; - writeln!(out, "}}")?; - writeln!(out)?; -@@ -138,7 +141,11 @@ - " architecture: Architecture::{:?},", - triple.architecture - )?; -- writeln!(out, " vendor: Vendor::{:?},", triple.vendor)?; -+ writeln!( -+ out, -+ " vendor: {},", -+ vendor_display(&triple.vendor) -+ )?; - writeln!( - out, - " operating_system: OperatingSystem::{:?},", -@@ -160,3 +167,13 @@ - - Ok(()) - } -+ -+fn vendor_display(vendor: &Vendor) -> String { -+ match vendor { -+ Vendor::Custom(custom) => format!( -+ "Vendor::Custom(CustomVendor::Static({:?}))", -+ custom.as_str() -+ ), -+ known => format!("Vendor::{:?}", known), -+ } -+} -diff -Naur thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/lib.rs thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/src/lib.rs ---- thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/lib.rs 2022-08-15 13:05:37.000000000 -0500 -+++ thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/src/lib.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -28,7 +28,7 @@ - pub use self::host::HOST; - pub use self::parse_error::ParseError; - pub use self::targets::{ -- Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, Environment, OperatingSystem, -- Vendor, -+ Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, CustomVendor, Environment, -+ OperatingSystem, Vendor, - }; - pub use self::triple::{CallingConvention, Endianness, PointerWidth, Triple}; -diff -Naur thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/targets.rs thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/src/targets.rs ---- thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/targets.rs 2022-08-15 13:05:42.000000000 -0500 -+++ thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/src/targets.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -1,7 +1,10 @@ - // This file defines all the identifier enums and target-aware logic. - - use crate::triple::{Endianness, PointerWidth, Triple}; -+use alloc::boxed::Box; -+use alloc::string::String; - use core::fmt; -+use core::hash::{Hash, Hasher}; - use core::str::FromStr; - - /// The "architecture" field, which in some cases also specifies a specific -@@ -290,9 +293,42 @@ - } - } - -+/// A string for a `Vendor::Custom` that can either be used in `const` -+/// contexts or hold dynamic strings. -+#[derive(Clone, Debug, Eq)] -+pub enum CustomVendor { -+ /// An owned `String`. This supports the general case. -+ Owned(Box<String>), -+ /// A static `str`, so that `CustomVendor` can be constructed in `const` -+ /// contexts. -+ Static(&'static str), -+} -+ -+impl CustomVendor { -+ /// Extracts a string slice. -+ pub fn as_str(&self) -> &str { -+ match self { -+ CustomVendor::Owned(s) => s, -+ CustomVendor::Static(s) => s, -+ } -+ } -+} -+ -+impl PartialEq for CustomVendor { -+ fn eq(&self, other: &Self) -> bool { -+ self.as_str() == other.as_str() -+ } -+} -+ -+impl Hash for CustomVendor { -+ fn hash<H: Hasher>(&self, state: &mut H) { -+ self.as_str().hash(state) -+ } -+} -+ - /// The "vendor" field, which in practice is little more than an arbitrary - /// modifier. --#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] -+#[derive(Clone, Debug, PartialEq, Eq, Hash)] - #[allow(missing_docs)] - pub enum Vendor { - Unknown, -@@ -306,6 +342,15 @@ - Sun, - Uwp, - Wrs, -+ -+ /// A custom vendor. "Custom" in this context means that the vendor is -+ /// not specifically recognized by upstream Autotools, LLVM, Rust, or other -+ /// relevant authorities on triple naming. It's useful for people building -+ /// and using locally patched toolchains. -+ /// -+ /// Outside of such patched environments, users of `target-lexicon` should -+ /// treat `Custom` the same as `Unknown` and ignore the string. -+ Custom(CustomVendor), - } - - /// The "operating system" field, which sometimes implies an environment, and -@@ -717,6 +762,7 @@ - Vendor::Sun => "sun", - Vendor::Uwp => "uwp", - Vendor::Wrs => "wrs", -+ Vendor::Custom(ref name) => name.as_str(), - }; - f.write_str(s) - } -@@ -738,7 +784,43 @@ - "sun" => Vendor::Sun, - "uwp" => Vendor::Uwp, - "wrs" => Vendor::Wrs, -- _ => return Err(()), -+ custom => { -+ use alloc::borrow::ToOwned; -+ -+ // A custom vendor. Since triple syntax is so loosely defined, -+ // be as conservative as we can to avoid potential ambiguities. -+ // We err on the side of being too strict here, as we can -+ // always relax it if needed. -+ -+ // Don't allow empty string names. -+ if custom.is_empty() { -+ return Err(()); -+ } -+ -+ // Don't allow any other recognized name as a custom vendor, -+ // since vendors can be omitted in some contexts. -+ if Architecture::from_str(custom).is_ok() -+ || OperatingSystem::from_str(custom).is_ok() -+ || Environment::from_str(custom).is_ok() -+ || BinaryFormat::from_str(custom).is_ok() -+ { -+ return Err(()); -+ } -+ -+ // Require the first character to be an ascii lowercase. -+ if !custom.chars().nth(0).unwrap().is_ascii_lowercase() { -+ return Err(()); -+ } -+ -+ // Restrict the set of characters permitted in a custom vendor. -+ if custom.chars().any(|c: char| { -+ !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.') -+ }) { -+ return Err(()); -+ } -+ -+ Vendor::Custom(CustomVendor::Owned(Box::new(custom.to_owned()))) -+ } - }) - } - } -@@ -1120,4 +1202,87 @@ - assert_eq!(t.environment, Environment::Eabihf); - assert_eq!(t.binary_format, BinaryFormat::Elf); - } -+ -+ #[test] -+ fn custom_vendors() { -+ // Test various invalid cases. -+ assert!(Triple::from_str("x86_64--linux").is_err()); -+ assert!(Triple::from_str("x86_64-42-linux").is_err()); -+ assert!(Triple::from_str("x86_64-__customvendor__-linux").is_err()); -+ assert!(Triple::from_str("x86_64-^-linux").is_err()); -+ assert!(Triple::from_str("x86_64- -linux").is_err()); -+ assert!(Triple::from_str("x86_64-CustomVendor-linux").is_err()); -+ assert!(Triple::from_str("x86_64-linux-linux").is_err()); -+ assert!(Triple::from_str("x86_64-x86_64-linux").is_err()); -+ assert!(Triple::from_str("x86_64-elf-linux").is_err()); -+ assert!(Triple::from_str("x86_64-gnu-linux").is_err()); -+ assert!(Triple::from_str("x86_64-linux-customvendor").is_err()); -+ assert!(Triple::from_str("customvendor").is_err()); -+ assert!(Triple::from_str("customvendor-x86_64").is_err()); -+ assert!(Triple::from_str("x86_64-").is_err()); -+ assert!(Triple::from_str("x86_64--").is_err()); -+ -+ // Test various Unicode things. -+ assert!( -+ Triple::from_str("x86_64-𝓬𝓾𝓼𝓽𝓸𝓶𝓿𝓮𝓷𝓭𝓸𝓻-linux").is_err(), -+ "unicode font hazard" -+ ); -+ assert!( -+ Triple::from_str("x86_64-ćúśtőḿvéńdőŕ-linux").is_err(), -+ "diacritical mark stripping hazard" -+ ); -+ assert!( -+ Triple::from_str("x86_64-customvendοr-linux").is_err(), -+ "homoglyph hazard" -+ ); -+ assert!(Triple::from_str("x86_64-customvendor-linux").is_ok()); -+ assert!( -+ Triple::from_str("x86_64-ffi-linux").is_err(), -+ "normalization hazard" -+ ); -+ assert!(Triple::from_str("x86_64-ffi-linux").is_ok()); -+ assert!( -+ Triple::from_str("x86_64-customvendor-linux").is_err(), -+ "zero-width character hazard" -+ ); -+ assert!( -+ Triple::from_str("x86_64-customvendor-linux").is_err(), -+ "BOM hazard" -+ ); -+ -+ // Test some valid cases. -+ let t = Triple::from_str("x86_64-customvendor-linux") -+ .expect("can't parse target with custom vendor"); -+ assert_eq!(t.architecture, Architecture::X86_64); -+ assert_eq!( -+ t.vendor, -+ Vendor::Custom(CustomVendor::Static("customvendor")) -+ ); -+ assert_eq!(t.operating_system, OperatingSystem::Linux); -+ assert_eq!(t.environment, Environment::Unknown); -+ assert_eq!(t.binary_format, BinaryFormat::Elf); -+ assert_eq!(t.to_string(), "x86_64-customvendor-linux"); -+ -+ let t = -+ Triple::from_str("x86_64-customvendor").expect("can't parse target with custom vendor"); -+ assert_eq!(t.architecture, Architecture::X86_64); -+ assert_eq!( -+ t.vendor, -+ Vendor::Custom(CustomVendor::Static("customvendor")) -+ ); -+ assert_eq!(t.operating_system, OperatingSystem::Unknown); -+ assert_eq!(t.environment, Environment::Unknown); -+ assert_eq!(t.binary_format, BinaryFormat::Unknown); -+ -+ assert_eq!( -+ Triple::from_str("unknown-foo"), -+ Ok(Triple { -+ architecture: Architecture::Unknown, -+ vendor: Vendor::Custom(CustomVendor::Static("foo")), -+ operating_system: OperatingSystem::Unknown, -+ environment: Environment::Unknown, -+ binary_format: BinaryFormat::Unknown, -+ }) -+ ); -+ } - } -diff -Naur thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/triple.rs thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/src/triple.rs ---- thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/src/triple.rs 2022-08-15 13:05:59.000000000 -0500 -+++ thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/src/triple.rs 2022-11-23 00:35:04.697192794 -0600 -@@ -323,10 +323,6 @@ - Err(ParseError::UnrecognizedArchitecture("foo".to_owned())) - ); - assert_eq!( -- Triple::from_str("unknown-foo"), -- Err(ParseError::UnrecognizedVendor("foo".to_owned())) -- ); -- assert_eq!( - Triple::from_str("unknown-unknown-foo"), - Err(ParseError::UnrecognizedOperatingSystem("foo".to_owned())) - ); -diff -Naur thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/.cargo-checksum.json thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json ---- thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0_orig/.cargo-checksum.json 2022-08-15 13:05:38.000000000 -0500 -+++ thunderbird-91.13.0/third_party/rust/target-lexicon-0.9.0/.cargo-checksum.json 2022-11-23 01:16:14.304912521 -0600 -@@ -1 +1 @@ --{"files":{"Cargo.lock":"a1a162e6ce8fc2234a6ddf7090410006a1920ace8738772e32a5b50e4780c19d","Cargo.toml":"f3b545fa0f184fd0d3624e6e5c205fcbdf1ad0934a2e08406549ad53c2a62ac3","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"723100e9cdc30cd8c48407233c2cffa10f5b10703a0a11bac1230d8b86e49ccf","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","newlist":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","src/host.rs":"fb543df4f362e9119a58523563e453110f4e3a426f0995911d0ca386657cf1d9","src/lib.rs":"4414353c30f25d44df6cc14f7f9eea9991222289c6aa662b74406f6923235970","src/parse_error.rs":"b3735eabc0fd0a9dfdd6375662f20ec96a79852a00a05a98fb2e421545285e53","src/targets.rs":"9ccc0849cff06d8906dacbdc15136cc47fab85ccd795033ddfdde1397dfcfe32","src/triple.rs":"949bd83b043b53b18f643ebc3fbebbfe02a13998b787fda432a5d36aa27d20bd","test.sh":"22e3c630a6c84e90d5c70c367a6712be8eeca1e7682c00d1f65bf53e330e9191"},"package":"6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"} -\ No newline at end of file -+{"files":{"Cargo.lock":"a1a162e6ce8fc2234a6ddf7090410006a1920ace8738772e32a5b50e4780c19d","Cargo.toml":"f3b545fa0f184fd0d3624e6e5c205fcbdf1ad0934a2e08406549ad53c2a62ac3","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c3467056d91be3f59562158ee9604c729b5b5f473efbefb036032803eb76809e","build.rs":"85d6a1b6392b56946f48c0ff1526736a37fe012951bf3855709da1d6cfb4baa0","examples/host.rs":"503bafddfb372123fe4dc0e7b8037808beb5bfe6df60c00d3315922bd3792c6c","examples/misc.rs":"49a579845450b7b020ed5c97dca142fc548725893cbc82f6f750ee0caab2beca","newlist":"89564342916321c5bc35e772d374a7f0af22cc9ae6dcc0027eca48d2269f18cb","src/host.rs":"fb543df4f362e9119a58523563e453110f4e3a426f0995911d0ca386657cf1d9","src/lib.rs":"89986c98b9a04e0f1e957e0127e23a53048a1f0d597493723c4bba031c2ca32d","src/parse_error.rs":"b3735eabc0fd0a9dfdd6375662f20ec96a79852a00a05a98fb2e421545285e53","src/targets.rs":"f2048f06e3e2151a8181d8c92651fa45e64b8bfdfd18ead4b6c18ee7c9fb9003","src/triple.rs":"4704266fec8763bc70d230aad3608bdb790b51e41149056daa2ce0d5fdaef5a3","test.sh":"22e3c630a6c84e90d5c70c367a6712be8eeca1e7682c00d1f65bf53e330e9191"},"package":"6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"} diff --git a/user/thunderbird/webrender.patch b/user/thunderbird/webrender.patch index a2457e576..cfc920cfd 100644 --- a/user/thunderbird/webrender.patch +++ b/user/thunderbird/webrender.patch @@ -6,35 +6,9 @@ # Parent 20d81e68da033746bf81acbb08490f16679853da Bug 1716707 [s390x] Software WebRender does not support big endian -diff -r 20d81e68da03 -r 903e5f164c0e gfx/webrender_bindings/RenderCompositorSWGL.cpp ---- a/gfx/webrender_bindings/RenderCompositorSWGL.cpp Thu Mar 24 06:57:58 2022 +0000 -+++ b/gfx/webrender_bindings/RenderCompositorSWGL.cpp Thu Mar 24 02:36:16 2022 -0700 -@@ -7,6 +7,7 @@ - #include "RenderCompositorSWGL.h" - - #include "mozilla/gfx/Logging.h" -+#include "mozilla/gfx/Swizzle.h" - #include "mozilla/widget/CompositorWidget.h" - - #ifdef MOZ_WIDGET_GTK -@@ -235,6 +237,13 @@ - } - mDT->Flush(); - -+#if MOZ_BIG_ENDIAN() -+ // One swizzle to rule them all. -+ gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8, -+ mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8, -+ mDT->GetSize()); -+#endif -+ - // Done with the DT. Hand it back to the widget and clear out any trace of it. - mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion); - mDirtyRegion.SetEmpty(); -diff -r 20d81e68da03 -r 903e5f164c0e image/imgFrame.cpp ---- a/image/imgFrame.cpp Thu Mar 24 06:57:58 2022 +0000 -+++ b/image/imgFrame.cpp Thu Mar 24 02:36:16 2022 -0700 -@@ -372,6 +372,17 @@ +--- firefox-128.0/image/imgFrame.cpp ++++ firefox-128.0/image/imgFrame.cpp +@@ -382,6 +382,17 @@ mAborted = true; return NS_ERROR_OUT_OF_MEMORY; } diff --git a/user/thunderbird/without-jit.patch b/user/thunderbird/without-jit.patch new file mode 100644 index 000000000..dff372ec0 --- /dev/null +++ b/user/thunderbird/without-jit.patch @@ -0,0 +1,28 @@ +diff -r 81fc811c3c39 toolkit/components/translations/actors/TranslationsParent.sys.mjs +--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs Thu Aug 08 21:26:29 2024 -0700 ++++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs Sat Aug 10 16:45:13 2024 -0700 +@@ -618,16 +618,25 @@ + * Detect if Wasm SIMD is supported, and cache the value. It's better to check + * for support before downloading large binary blobs to a user who can't even + * use the feature. This function also respects mocks and simulating unsupported + * engines. + * + * @type {boolean} + */ + static getIsTranslationsEngineSupported() { ++ try { ++ // Ensure WebAssembly is supported and enabled (may not be on tier-3). ++ if (!WebAssembly) { ++ return false; ++ } ++ } catch(e) { ++ return false; ++ } ++ + if (lazy.simulateUnsupportedEnginePref) { + // Use the non-lazy console.log so that the user is always informed as to why + // the translations engine is not working. + console.log( + "Translations: The translations engine is disabled through the pref " + + '"browser.translations.simulateUnsupportedEngine".' + ); diff --git a/user/tinyfugue/APKBUILD b/user/tinyfugue/APKBUILD index b6c72ecf6..e4c0a604a 100644 --- a/user/tinyfugue/APKBUILD +++ b/user/tinyfugue/APKBUILD @@ -1,17 +1,19 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=tinyfugue -pkgver=5.1.4 +pkgver=5.1.6 pkgrel=0 pkgdesc="Powerful curses-based MUD client" url="https://github.com/ingwarsw/tinyfugue" arch="all" -options="!check" # no testsuite +options="!check" # no testsuite license="GPL-2.0+" -makedepends="openssl-dev ncurses-dev pcre-dev icu-dev python3-dev" +depends="" +makedepends="openssl-dev ncurses-dev pcre-dev icu-dev python3-dev zlib-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/ingwarsw/tinyfugue/archive/refs/tags/$pkgver.tar.gz" build() { + export CFLAGS="$CFLAGS -D_BSD_SOURCE" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,4 +35,4 @@ package() { sha512sums=" 5bc7103408bf52551f8439867695a5173130f5a5a4916be131a860e64337bc44c250e48973323dbce6b113bb9a61baede8aee1d66f2f437ac5abc7e82c522967 tinyfugue-5.1.3.tar.gz " -sha512sums="5732b3f96bc5e09e1eadd89994a25161d765ecaa0c72e5fd1d546b12028eb873faeb178fefbe3262aa790660a509fbf5de6dc74a50c23040005ab42d4a46ae14 tinyfugue-5.1.4.tar.gz" +sha512sums="1213795f5604d4c99cb43c3336f378eaf9a4e1b57e6831a7c14a9d1bce8de3540d7a6c4e35502c27a50dcd15b3afa1b9d06c35433ded57c7f3384ba362d036fe tinyfugue-5.1.6.tar.gz" diff --git a/user/tinywl/APKBUILD b/user/tinywl/APKBUILD new file mode 100644 index 000000000..f3ea5459e --- /dev/null +++ b/user/tinywl/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=tinywl +pkgver=0.18.0 +_pkgver=${pkgver%.*} +pkgrel=0 +pkgdesc="Minimum-viable wlroots-based Wayland compositor" +url="https://gitlab.freedesktop.org/wlroots/wlroots" +arch="all" +options="!check" # no tests +license="MIT" +depends="wlroots-$_pkgver" +makedepends="wayland-protocols wlroots-$_pkgver-dev" +subpackages="" +source="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz" +builddir="$srcdir/wlroots-$pkgver/tinywl" + +build() { + make +} + +package() { + mkdir -p "$pkgdir"/usr/bin + install -m755 tinywl "$pkgdir"/usr/bin/tinywl +} + +sha512sums="2cf848aa67f41089b60cc7d01c3a344ebaf7f5bbced459675fef885cd4b3e6b99d9a49d6b127518314d0ae38e52e9aff7991611592b2add4cba96f15aa0bf1c6 wlroots-0.18.0.tar.gz" diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD index 473818fd7..a4b9a855b 100644 --- a/user/tipidee/APKBUILD +++ b/user/tipidee/APKBUILD @@ -1,15 +1,17 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=tipidee -pkgver=0.0.5.0 +pkgver=0.0.6.0 pkgrel=0 pkgdesc="The skarnet.org web server" url="https://skarnet.org/software/tipidee/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.1.1 -depends="execline s6 s6-networking" +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6net_version=2.7.1 +depends="execline>=$_execline_version s6>=$_s6_version s6-networking>=$_s6net_version" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" subpackages="tipidee-dev tipidee-libs tipidee-doc tipidee-openrc" @@ -32,16 +34,13 @@ pkgusers="tipideelog tipideed" build() { ./configure \ - --build=$CBUILD \ - --host=$CHOST \ --enable-shared \ - --enable-static \ --disable-allstatic \ --prefix=/usr \ --sysconfdir=/etc \ - --libdir=/usr/lib \ - --libexecdir="/usr/lib/$pkgname" \ - --with-dynlib=/lib + --with-pkgconfig \ + --enable-pkgconfig \ + --libexecdir="/usr/lib/$pkgname" make } @@ -80,9 +79,9 @@ dev() { mv "$subpkgdir/usr/bin/tipidee-config" "$pkgdir/usr/bin/tipidee-config" } -sha512sums="861d5509a00d3943e9a483d191d92df91be1aead519b16d1fac96740357670ff9f32cf0ff2b8dd08d0cac059732c59233632379562a508ab3705fd68103f370c tipidee-0.0.5.0.tar.gz -0de0d6bd39adfd6e65694335e9cf06cec7625032e6af5cf5e54ced5c009707ca4e27b2dbdff8b7825575fbef7cd98ac0333e07b1924f24fda23019c92c08023f httpd.run -65cdbfb5a6485aed0203ed910af124b202994d5253cb365ed25432f0c906471dd30f96eb862b6f25004c6ec8ec4cb38a5b49cde717e7a00d7c9d7fd07025f225 httpsd.run +sha512sums="1a8ae1f7293fc7a1db1f0f4dd0752388f58e134c3f0847a768cf56e2e5a21b7d037f71f3d9e4ff16ab986c699d39827e53b467c8b13b0b9dad41b6fd742c9a5c tipidee-0.0.6.0.tar.gz +560048b2b767053770e37ce3fd69540f2fad23236f012da115c1f985240f42d0bb7809630d8991e39169e255e3d36ebfdc85f895d16675119a95d3a6e64fd2b2 httpd.run +1c9333785c63662039580504dd36af21d05eb9972e6770af17e87e062bd7d9fa67695f4120221e241e10503ca0fb3b5347f032b6c1eef309f2ff8cd636266f2b httpsd.run b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run bb2681a3000133724bb8fd4918bc3209ea676c2e4f96ad8b298d8e7302aeebd6876341ea205f2d808f34e4c9b5c138bba032694c6069c17026b0ddf23702f9ba tipidee.conf 7a999200ad21b2b0737ce82136bc8e055d7ab4a865b7727e6dc8df0eaeea6ace11eb5756b64231ce7938d11b5ec218944173ea1df3db059d033bf3f848c9a608 tipidee.confd diff --git a/user/tipidee/httpd.run b/user/tipidee/httpd.run index 356ad9952..8619bd856 100644 --- a/user/tipidee/httpd.run +++ b/user/tipidee/httpd.run @@ -8,10 +8,10 @@ unexport HTTP unexport HTTPS multisubstitute { - importas -ui TIPIDEED_IPv@V@ TIPIDEED_IPv@V@ - importas -ui TIPIDEED_ROOT TIPIDEED_ROOT - importas -u -D1000 TIPIDEED_CONCURRENCY TIPIDEED_CONCURRENCY - importas -u -D10 TIPIDEED_LOCAL_CONCURRENCY TIPIDEED_LOCAL_CONCURRENCY + importas -uSi TIPIDEED_IPv@V@ + importas -uSi TIPIDEED_ROOT + importas -uSD1000 TIPIDEED_CONCURRENCY + importas -uSD10 TIPIDEED_LOCAL_CONCURRENCY } s6-envuidgid tipideed cd ${TIPIDEED_ROOT} diff --git a/user/tipidee/httpsd.run b/user/tipidee/httpsd.run index 9d710158a..bfc3eebd0 100644 --- a/user/tipidee/httpsd.run +++ b/user/tipidee/httpsd.run @@ -8,12 +8,12 @@ unexport HTTP unexport HTTPS multisubstitute { - importas -ui TIPIDEED_IPv@V@ TIPIDEED_IPv@V@ - importas -ui TIPIDEED_ROOT TIPIDEED_ROOT - importas -ui KEYFILE KEYFILE - importas -ui CERTFILE CERTFILE - importas -u -D1000 TIPIDEED_CONCURRENCY TIPIDEED_CONCURRENCY - importas -u -D10 TIPIDEED_LOCAL_CONCURRENCY TIPIDEED_LOCAL_CONCURRENCY + importas -uSi TIPIDEED_IPv@V@ + importas -uSi TIPIDEED_ROOT + importas -uSi KEYFILE + importas -uSi CERTFILE + importas -uSD1000 TIPIDEED_CONCURRENCY + importas -uSD10 TIPIDEED_LOCAL_CONCURRENCY } s6-envuidgid tipideed export TLS_UID 65534 diff --git a/user/tmux/APKBUILD b/user/tmux/APKBUILD index e2aa2b0f3..5edfa97f5 100644 --- a/user/tmux/APKBUILD +++ b/user/tmux/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Zach van Rijn <me@zv.io> pkgname=tmux -pkgver=3.3a +pkgver=3.5a pkgrel=0 pkgdesc="Tool to control multiple terminals from a single terminal" url="https://github.com/tmux/tmux/wiki" @@ -10,7 +10,14 @@ license="MIT" depends="ncurses-terminfo" makedepends="bsd-compat-headers libevent-dev libutempter-dev ncurses-dev" subpackages="$pkgname-doc" -source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz + no-yacc-needed.patch + " + +prepare() { + default_prepare + autoreconf -fiv +} build() { ./configure \ @@ -36,4 +43,5 @@ package() { install -m644 "README" "$pkgdir"/usr/share/doc/$pkgname/ } -sha512sums="29a846df7d93601c42a22f84f606931dc65da1f70b67d351d0425f77ea3affe3e8218b2940d42cd3dadf3cd1aa95032daad3ecb14fbff0f69939d1beae0498c7 tmux-3.3a.tar.gz" +sha512sums="2383e99aec2dcdb1d899793d5ecab40a68b921194f84770d3f4d19712bfc85590657a99d2a9a7bec36d4ba5ab39fa713f13937b0acad3b61cd9b2302dba61d43 tmux-3.5a.tar.gz +54494c910f361e23433f276c49e6257b1ccb028ffba1af032e5494e786eb35506d495714916774956db875306e090edd0c2bf8433b2cffc50c4a25d45dfb0594 no-yacc-needed.patch" diff --git a/user/tmux/no-yacc-needed.patch b/user/tmux/no-yacc-needed.patch new file mode 100644 index 000000000..1e6c706b3 --- /dev/null +++ b/user/tmux/no-yacc-needed.patch @@ -0,0 +1,26 @@ +From 00812c9053a0b1067f833925b726086a67d8528d Mon Sep 17 00:00:00 2001 +From: Nicholas Marriott <nicholas.marriott@gmail.com> +Date: Tue, 2 Aug 2022 11:52:09 +0100 +Subject: [PATCH] Check for $YACC, from Wei Shih in GitHub issue 3267. + +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 276f71c8bf..8e84604289 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -267,12 +267,6 @@ if test "x$found_libevent" = xno; then + AC_MSG_ERROR("libevent not found") + fi + +-# Look for yacc. +-AC_CHECK_PROG(found_yacc, $YACC, yes, no) +-if test "x$found_yacc" = xno; then +- AC_MSG_ERROR("yacc not found") +-fi +- + # Look for ncurses or curses. Try pkg-config first then directly for the + # library. + PKG_CHECK_MODULES( diff --git a/user/torcs/APKBUILD b/user/torcs/APKBUILD index d8470bf18..efb66c3bd 100644 --- a/user/torcs/APKBUILD +++ b/user/torcs/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=torcs pkgver=1.3.7 -pkgrel=0 +pkgrel=1 pkgdesc="The Open Racing Car Simulator" url="http://torcs.sourceforge.net/" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="freealut-dev freeglut-dev libogg-dev libpng-dev libsm-dev - libvorbis-dev libxmu-dev libxrandr-dev libxrender-dev libxt-dev mesa-dev - openal-soft-dev plib-dev zlib-dev autoconf automake" +makedepends="freealut-dev freeglut-dev libglvnd-dev libogg-dev libpng-dev + libsm-dev libvorbis-dev libxmu-dev libxrandr-dev libxrender-dev + libxt-dev openal-soft-dev plib-dev zlib-dev autoconf automake" subpackages="$pkgname-data::noarch" source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$pkgver.tar.bz2 torcs-1.3.6-as-needed.patch diff --git a/user/transset/APKBUILD b/user/transset/APKBUILD index f5b9ba519..2b387fd02 100644 --- a/user/transset/APKBUILD +++ b/user/transset/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=transset -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="Transparency / opacity manipulation for X11 windows" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libx11-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/transset-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/transset-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874 transset-1.0.2.tar.bz2" +sha512sums="5e46713653f1c50676381aebe6bcb0adaa4c5d51217f54a3e73fec69a3f201871f0d3b65759e30bd871f439eb3ccf037203d5efc9b26a60a4f6fa02d0ffdca41 transset-1.0.3.tar.xz" diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 45b49ae6f..d7198fc2a 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=tumbler -pkgver=4.18.2 +pkgver=4.20.0 pkgrel=0 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="043e4e7058d1bf0eb4f037924161387042111c7a1bfbf78f8417d0b6463d6b7e72506741f395ca14d6150e2cc0b79d97b2ee3270a30e0d18a0161f639627e255 tumbler-4.18.2.tar.bz2" +sha512sums="9de43565099c61c8a5227fb69e99f432d44435e717524f71a2c8751ef67d23d0aa06ed63aec15f035fcdbb0940a9a583bb724e59d27d600814c983269b937783 tumbler-4.20.0.tar.bz2" diff --git a/user/tyrquake/APKBUILD b/user/tyrquake/APKBUILD new file mode 100644 index 000000000..84a5087f8 --- /dev/null +++ b/user/tyrquake/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Ermine <mustela@erminea.space> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=tyrquake +pkgver=0.71 +pkgrel=0 +pkgdesc="SDL port of Quake" +url="https://disenchant.net/tyrquake" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +makedepends="sdl2-dev imagemagick libglvnd-dev" +install="$pkgname.pre-install" +subpackages="$pkgname-openrc $pkgname-server" +source="https://disenchant.net/files/engine/tyrquake-$pkgver.tar.gz + tyrquake.initd + " + +build() { + make USE_SDL=Y USE_X86_ASM=N +} + +package() { + # no install target + install -m755 -D "$builddir"/bin/tyr-quake "$pkgdir"/usr/bin/tyr-quake + install -m755 -D "$builddir"/bin/tyr-glquake "$pkgdir"/usr/bin/tyr-glquake + install -m755 -D "$builddir"/bin/tyr-qwcl "$pkgdir"/usr/bin/tyr-qwcl + install -m755 -D "$builddir"/bin/tyr-glqwcl "$pkgdir"/usr/bin/tyr-glqwcl + install -m755 -D "$builddir"/bin/tyr-qwsv "$pkgdir"/usr/bin/tyr-qwsv + + install -m755 -D "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname +} + +server() { + pkgdesc="$pkgdesc (QuakeWorld server)" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/tyr-qwsv "$subpkgdir"/usr/bin/ +} + +openrc() { + default_openrc + install_if="openrc $pkgname-server=$pkgver-r$pkgrel" +} + +sha512sums="ecceeecb43866c10c0669b4362ce2eda7a790c502764b3d644566e7637ffbde0548676c9dcea07963db0d91d83c248e3497603c0a3a2e1a12a1418a82c07179a tyrquake-0.71.tar.gz +eff93a1df0f6492c4063332c73382f8893c8a94f26e387ecd102e32a3f6a2f154a1abedecb26ccae7c25c1356ef77cc129508e1215b8320a94c4a55cea1d4aff tyrquake.initd" diff --git a/user/tyrquake/tyrquake.initd b/user/tyrquake/tyrquake.initd new file mode 100644 index 000000000..25231e8d2 --- /dev/null +++ b/user/tyrquake/tyrquake.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run + +name="tyrquake" +description="TyrQuake QuakeWorld server" + +supervisor=supervise-daemon + +command="/usr/bin/tyr-qwsv" +command_user="tyrquake:tyrquake" + +depend() { + need net + after firewall +} diff --git a/user/tyrquake/tyrquake.pre-install b/user/tyrquake/tyrquake.pre-install new file mode 100644 index 000000000..73f8ebcd3 --- /dev/null +++ b/user/tyrquake/tyrquake.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +groupadd -r -- tyrquake 2>/dev/null +useradd -r -M -N -s /sbin/nologin -g tyrquake -c tyrquake -- tyrquake 2>/dev/null + +exit 0 diff --git a/user/usbutils/APKBUILD b/user/usbutils/APKBUILD index 71386fa2b..f83165da5 100644 --- a/user/usbutils/APKBUILD +++ b/user/usbutils/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=usbutils pkgver=012 -pkgrel=0 +pkgrel=1 pkgdesc="USB utilities" url="http://linux-usb.sourceforge.net/" arch="all" license="GPL-2.0+ AND GPL-2.0-only" -depends="hwids-udev" +depends="hwdata" makedepends="autoconf automake eudev-dev libtool libusb-dev" subpackages="$pkgname-doc" source="https://mirrors.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz diff --git a/user/userspace-rcu/APKBUILD b/user/userspace-rcu/APKBUILD new file mode 100644 index 000000000..e36f0f6bf --- /dev/null +++ b/user/userspace-rcu/APKBUILD @@ -0,0 +1,36 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=userspace-rcu +pkgver=0.14.0 +pkgrel=0 +pkgdesc="Userspace RCU (read-copy-update) library" +url="https://liburcu.org" +arch="all" +license="LGPL-2.1-only" +depends="" +makedepends="" +subpackages="$pkgname-doc $pkgname-dev" +source="https://lttng.org/files/urcu/userspace-rcu-$pkgver.tar.bz2 + endian.patch + " + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f userspace-rcu-0.14.0.tar.bz2 +07935ed9741554b2cbc343fdd6218172deca4d4167b31b92f2be82623c5d83191472da2b4bee5adcd59e3d4bec3751d3e793cc720b822b6060dc588b8ee58f16 endian.patch" diff --git a/user/userspace-rcu/endian.patch b/user/userspace-rcu/endian.patch new file mode 100644 index 000000000..d80495c8a --- /dev/null +++ b/user/userspace-rcu/endian.patch @@ -0,0 +1,11 @@ +--- userspace-rcu-0.14.0/doc/examples/rculfhash/jhash.h.old 2023-02-13 11:51:12.000000000 -0600 ++++ userspace-rcu-0.14.0/doc/examples/rculfhash/jhash.h 2024-08-10 18:35:07.651374111 -0500 +@@ -51,7 +51,7 @@ + c ^= b; c -= rot(b, 24); \ + } + +-#if (BYTE_ORDER == LITTLE_ENDIAN) ++#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + #define HASH_LITTLE_ENDIAN 1 + #else + #define HASH_LITTLE_ENDIAN 0 diff --git a/user/util-macros/APKBUILD b/user/util-macros/APKBUILD index e4e14d198..2866ab043 100644 --- a/user/util-macros/APKBUILD +++ b/user/util-macros/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=util-macros -pkgver=1.19.3 +pkgver=1.20.1 pkgrel=0 pkgdesc="X.Org Autotools macros" url="https://www.X.Org/" @@ -8,7 +8,7 @@ arch="noarch" license="MIT" depends="" makedepends="" -source="https://www.X.Org/releases/individual/util/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/util/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2" +sha512sums="5f44d73c18ff87459cd94a68a961465b3970a36f0b55be65c0ec228320a675561eb24a1b1359745124302446a1a3fadc2f50d3378f439df5bd3e866cb8015286 util-macros-1.20.1.tar.xz" diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD index 2c6857f78..4387a4c1a 100644 --- a/user/v4l-utils/APKBUILD +++ b/user/v4l-utils/APKBUILD @@ -1,55 +1,37 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=v4l-utils -pkgver=1.18.0 +pkgver=1.26.1 pkgrel=0 pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="https://www.linuxtv.org/wiki/index.php/V4l-utils" arch="all" license="LGPL-2.0+" depends="" -makedepends="qt5-qtbase-dev libjpeg-turbo-dev argp-standalone linux-headers - eudev-dev alsa-lib-dev" +makedepends="qt5-qtbase-dev libjpeg-turbo-dev argp-standalone-dev linux-headers + eudev-dev alsa-lib-dev meson" subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-libs ir_keytable" -source="https://www.linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2 - qv4l2.svg - qv4l2.desktop - getsubopt.patch - time64.patch - types.patch - " +source="https://www.linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.xz" build() { - export CFLAGS="$CFLAGS -D__off_t=off_t" - LIBS="-largp -lintl" ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --disable-libdvbv5 \ - --disable-static - make + meson setup -Dlibdvbv5=disabled -Dprefix=/usr build + meson compile -C build } check() { - make check + meson test -C build } package() { - make -j1 DESTDIR="$pkgdir" install - install -Dm644 "$srcdir"/qv4l2.desktop \ - "$pkgdir"/usr/share/applications/qv4l2.desktop - install -Dm644 "$srcdir"/qv4l2.svg \ - "$pkgdir"/usr/share/icons/hicolor/scalable/apps/qv4l2.svg + DESTDIR="$pkgdir" meson install -C build } qv4l2() { pkgdesc="Qt V4L2 test control and streaming test application" + install_if="qt5-qtbase-x11 v4l-utils" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/qv4l2 "$subpkgdir"/usr/bin/ + mv "$pkgdir"/usr/bin/qvidcap "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/share "$subpkgdir"/usr/ } @@ -62,23 +44,17 @@ libs() { ir_keytable() { pkgdesc="Alter keymaps of Remote Controller devices" - mkdir -p "$subpkgdir"/lib/udev/rc_keymaps \ - "$subpkgdir"/lib/udev/rules.d \ + mkdir -p "$subpkgdir"/lib/udev \ "$subpkgdir"/usr/bin \ "$subpkgdir"/etc - mv "$pkgdir"/lib/udev/rc_keymaps/* \ - "$subpkgdir"/lib/udev/rc_keymaps - mv "$pkgdir"/lib/udev/rules.d/* \ - "$subpkgdir"/lib/udev/rules.d + mv "$pkgdir"/lib/udev/rc_keymaps \ + "$subpkgdir"/lib/udev/ + mv "$pkgdir"/lib/udev/rules.d \ + "$subpkgdir"/lib/udev/ mv "$pkgdir"/usr/bin/ir-keytable \ "$subpkgdir"/usr/bin mv "$pkgdir"/etc/rc_maps.cfg \ "$subpkgdir"/etc } -sha512sums="749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49 v4l-utils-1.18.0.tar.bz2 -bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg -6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop -a09554deebd7597355c688e52180e0f4030842ccb26a144d1ac8a426836374237725d7b6b555027ca72e10c11e37bd596c7d69d87ee2f6b6d951daf4e50137f8 getsubopt.patch -16154d57ea0b2e231217894495ef4ecf55d45e97c936034d4bbb0dab88f2d3e8779073302fbba759bd60e124a2cefe2b83675952cd50c413d957c81c9b0b8b53 time64.patch -ee1228cc06e399923953e5121a683347a7fe881c80c55faae0adf6ed836251da1b2c4d1561454daa6f42220c1171f827ca3e2b72cdac31b379495f23ff6c56bb types.patch" +sha512sums="a3b12b311977afec410db8b430696e923a24e04f003a5891cc77ddeb667d0b98666a06d31a439c95ce57d9e9c9c2593c5e9dd9e7cf2be002adb95db5b8f00ac8 v4l-utils-1.26.1.tar.xz" diff --git a/user/v4l-utils/getsubopt.patch b/user/v4l-utils/getsubopt.patch deleted file mode 100644 index 6ad142ae0..000000000 --- a/user/v4l-utils/getsubopt.patch +++ /dev/null @@ -1,35 +0,0 @@ -POSIX says that behavior when subopts list is empty is undefined. -musl libs will set value to NULL which leads to crash. - -Simply avoid getsubopt, since we cannot rely on it. - -diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp -index 3ea6cd3..291fb3e 100644 ---- a/utils/v4l2-ctl/v4l2-ctl-common.cpp -+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -782,15 +782,17 @@ static bool parse_subset(char *optarg) - - static bool parse_next_subopt(char **subs, char **value) - { -- static char *const subopts[] = { -- NULL -- }; -- int opt = getsubopt(subs, subopts, value); -+ char *p = *subs; -+ *value = *subs; - -- if (opt < 0 || *value) -- return false; -- fprintf(stderr, "Missing suboption value\n"); -- return true; -+ while (*p && *p != ',') -+ p++; -+ -+ if (*p) -+ *p++ = '\0'; -+ -+ *subs = p; -+ return false; - } - - void common_cmd(const std::string &media_bus_info, int ch, char *optarg) diff --git a/user/v4l-utils/qv4l2.desktop b/user/v4l-utils/qv4l2.desktop deleted file mode 100644 index 55e369c7c..000000000 --- a/user/v4l-utils/qv4l2.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=QT V4L2 test Utility -Name[pt]=Utilitário de teste V4L2 -Comment=Allow testing Video4Linux devices -Comment[pt]=Permite testar dispositivos Video4Linux -Exec=qv4l2 -Icon=qv4l2 -Terminal=false -Type=Application -Categories=Application;AudioVideo; - diff --git a/user/v4l-utils/qv4l2.svg b/user/v4l-utils/qv4l2.svg deleted file mode 100644 index 3d4f375cc..000000000 --- a/user/v4l-utils/qv4l2.svg +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:version="0.47 r22583" version="1.1" id="svg2839" height="297mm" width="210mm" sodipodi:docname="Novo documento 3"> - <defs id="defs2841"> - <linearGradient id="linearGradient2963"> - <stop style="stop-color: rgb(255, 236, 187); stop-opacity: 1;" offset="0" id="stop2965"/> - <stop id="stop2971" offset="1" style="stop-color: rgb(0, 0, 0); stop-opacity: 0.498039;"/> - </linearGradient> - <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective2847"/> - <inkscape:perspective id="perspective2935" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/> - <linearGradient inkscape:collect="always" xlink:href="#linearGradient2963" id="linearGradient2969" x1="-719.14288" y1="494.69958" x2="-324.21902" y2="968.98529" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0512, 0, 0, 1.05137, 651.058, -25.2444)"/> - <inkscape:perspective id="perspective2992" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/> - </defs> - <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.7" inkscape:cx="376.9721" inkscape:cy="468.42546" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1513" inkscape:window-height="1044" inkscape:window-x="1941" inkscape:window-y="0" inkscape:window-maximized="0"/> - <metadata id="metadata2844"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <g inkscape:label="Camada 1" inkscape:groupmode="layer" id="layer1"> - <rect style="fill: rgb(173, 160, 127); fill-opacity: 1;" id="rect2959" width="498.57132" height="402.52496" x="101.42867" y="345.21906" ry="15.848869"/> - <rect style="fill: rgb(214, 207, 189); fill-opacity: 1; fill-rule: evenodd; stroke: rgb(0, 0, 0); stroke-width: 1.09651px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" id="rect2955" width="366.37466" height="268.80539" x="172.03215" y="409.8259" ry="24.860613"/> - <path style="fill: url("#linearGradient2969") rgb(0, 0, 0); fill-opacity: 1;" d="m 111.92284,745.80915 c -1.7443,-0.70488 -4.61634,-3.11878 -6.38231,-5.3642 l -3.21086,-4.08259 0,-189.14299 c 0,-136.34795 0.46823,-190.05871 1.67748,-192.42365 0.92263,-1.80438 3.11889,-4.44845 4.8806,-5.87571 3.00442,-2.43405 17.98923,-2.5971 241.57759,-2.62843 l 238.37448,-0.0334 4.90427,4.38251 4.90429,4.3825 0.39257,189.41161 c 0.43575,210.24489 1.09242,196.30432 -9.4544,200.71175 -4.34407,1.81535 -40.20923,2.12038 -239.80015,2.0394 -129.08065,-0.0523 -236.11926,-0.67193 -237.86356,-1.37681 z m 413.94314,-69.49552 c 4.39946,-2.22093 7.85143,-5.43895 10.06966,-9.38725 l 3.37535,-6.00784 -0.36571,-118.16973 c -0.36124,-116.72035 -0.4037,-118.22058 -3.46195,-122.31682 -4.69144,-6.28374 -10.15101,-9.79936 -17.39001,-11.19809 -8.54594,-1.65125 -316.90144,-1.65125 -325.4474,0 -7.68,1.48394 -13.16379,5.20817 -17.88452,12.146 l -3.40519,5.00442 0.40173,119.03503 c 0.39878,118.15286 0.42505,119.06645 3.54637,123.27494 1.72955,2.33195 5.7842,5.74954 9.01033,7.59462 l 5.8657,3.35471 164.49565,0.0248 164.49566,0.0246 6.69433,-3.3794 z" id="path2961"/> - <rect style="fill: rgb(25, 20, 8); fill-opacity: 1;" id="rect2980" width="63.072273" height="39.050926" x="499.38467" y="744.74005" ry="0"/> - <rect style="fill: rgb(25, 20, 8); fill-opacity: 1;" id="rect2980-1" width="63.072273" height="39.050926" x="130.56888" y="744.74005" ry="0"/> - </g> -</svg>
\ No newline at end of file diff --git a/user/v4l-utils/time64.patch b/user/v4l-utils/time64.patch deleted file mode 100644 index 42092a773..000000000 --- a/user/v4l-utils/time64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- v4l-utils-1.18.0/utils/keytable/keytable.c.old 2019-09-22 09:22:54.000000000 +0000 -+++ v4l-utils-1.18.0/utils/keytable/keytable.c 2020-01-20 02:38:23.659004998 +0000 -@@ -1533,7 +1533,7 @@ - - for (i = 0; i < rd / sizeof(struct input_event); i++) { - printf(_("%ld.%06ld: event type %s(0x%02x)"), -- ev[i].time.tv_sec, ev[i].time.tv_usec, -+ ev[i].input_event_sec, ev[i].input_event_usec, - get_event_name(events_type, ev[i].type), ev[i].type); - - switch (ev[i].type) { diff --git a/user/v4l-utils/types.patch b/user/v4l-utils/types.patch deleted file mode 100644 index 56eb991a3..000000000 --- a/user/v4l-utils/types.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- v4l-utils-1.18.0/utils/keytable/keymap.h.old 2019-09-22 09:22:54.000000000 +0000 -+++ v4l-utils-1.18.0/utils/keytable/keymap.h 2019-10-05 03:45:16.795852895 +0000 -@@ -2,6 +2,10 @@ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -+#include <stdint.h> -+typedef uint32_t u_int32_t; -+typedef int error_t; -+ - struct keymap { - struct keymap *next; - char *name; ---- v4l-utils-1.18.0/utils/ir-ctl/keymap.h.old 2019-09-22 09:22:54.000000000 +0000 -+++ v4l-utils-1.18.0/utils/ir-ctl/keymap.h 2019-10-05 03:44:27.651163483 +0000 -@@ -2,6 +2,10 @@ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -+#include <stdint.h> -+typedef uint32_t u_int32_t; -+typedef int error_t; -+ - struct keymap { - struct keymap *next; - char *name; diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD index 7a038a2bd..b64d13df7 100644 --- a/user/valgrind/APKBUILD +++ b/user/valgrind/APKBUILD @@ -18,6 +18,7 @@ subpackages="$pkgname-dev $pkgname-doc" source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 0001-Ensure-ELFv2-is-supported-on-PPC64.patch arm.patch + ppc32.patch ppc64-support-tkill.patch " @@ -62,4 +63,5 @@ package() { sha512sums="3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd valgrind-3.21.0.tar.bz2 f90aa3cef5d3561d4602ff63b8f355b8427cbe6bb2ecd6bfc2e2bb063915fa40a70d923dbc60a643ee3fb7bcfbbddac049c6f6133c541189dd82b891f7ad9dbc 0001-Ensure-ELFv2-is-supported-on-PPC64.patch 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch +25804fafe2372808c29233ec7415a94633ef17c72c9bd1d78a5c1da53fad2ed8e76da2d0923ff0a73fad8a86b7709c5ea3774b35be6a5b4c1ef1a55bc86b2c18 ppc32.patch daf819d0f9bbbaf4243c7bf931fed840f1f55304df1b45d4a72ceaf8403b8e0e1fc8079343b86106f0741aa812560a466389d7d3878c5547f3ff7a9e46e63df7 ppc64-support-tkill.patch" diff --git a/user/valgrind/ppc32.patch b/user/valgrind/ppc32.patch new file mode 100644 index 000000000..093eae132 --- /dev/null +++ b/user/valgrind/ppc32.patch @@ -0,0 +1,15 @@ +--- valgrind-3.21.0/VEX/priv/main_main.c.old 2023-01-07 14:48:48.000000000 +0000 ++++ valgrind-3.21.0/VEX/priv/main_main.c 2024-10-01 21:53:47.879017945 +0000 +@@ -2047,10 +2047,10 @@ + } + + /* ISA 3.0 not supported on 32-bit machines */ +- if ((hwcaps & VEX_HWCAPS_PPC32_ISA3_0) != 0) { ++ /*if ((hwcaps & VEX_HWCAPS_PPC32_ISA3_0) != 0) { + invalid_hwcaps(arch, hwcaps, + "ISA 3.0 not supported in 32-bit mode \n"); +- } ++ }*/ + return; + } + diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index edd6a5f91..bd23a9899 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.17.3 +pkgver=3.0.20 pkgrel=1 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" @@ -23,7 +23,7 @@ makedepends="autoconf automake bison eudev-dev flex libarchive-dev libjpeg-turbo-dev libsm-dev libx11-dev libxext-dev libxinerama-dev libxpm-dev libxv-dev mesa-dev qt5-qtbase-dev qt5-qtsvg-dev sdl2-dev qt5-qtx11extras-dev xcb-util-keysyms-dev xcb-util-renderutil-dev - xdg-utils + xdg-utils libglvnd-dev a52dec-dev alsa-lib-dev faad2-dev ffmpeg-dev flac-dev fluidsynth-dev gstreamer-dev gst-plugins-base-dev libaacs-dev libavc1394-dev @@ -79,6 +79,7 @@ build() { arm*) _arch_opts="--enable-omxil --enable-omxil-vout --enable-rpi-omxil" ;; aarch64) _arch_opts="--enable-neon" ;; ppc64*) _arch_opts="--enable-altivec" ;; + ppc) _arch_opts="--disable-altivec" ;; x86* | pmmx) _arch_opts="--disable-mmx --disable-sse" ;; esac @@ -206,7 +207,7 @@ libs() { default_libs } -sha512sums="99095b39ed600c3a89ebc0d377a2fc2522b3623a56b0f6de2df50a3c6e0148c67c28c0f2d8dec28bbdf5c62cf29b3579429a79ed00440570643778a9871022b6 vlc-3.0.17.3.tar.xz +sha512sums="02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406 vlc-3.0.20.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch diff --git a/user/volume_key/APKBUILD b/user/volume_key/APKBUILD index d6d22c271..69da50792 100644 --- a/user/volume_key/APKBUILD +++ b/user/volume_key/APKBUILD @@ -21,13 +21,15 @@ prepare() { } build() { - ./configure \ + PYTHON3=python3.11 ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --with-python=no \ + --with-python3 make } diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index a5539de34..749f9b859 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -2,16 +2,17 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=vte pkgver=0.62.0 -pkgrel=0 +pkgrel=2 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" arch="all" license="LGPL-2.1+ AND GPL-3.0+ AND LGPL-3.0+ AND MIT AND LGPL-2.0+" -makedepends="gnutls-dev gtk+3.0-dev gnutls-dev gobject-introspection-dev +makedepends="gnutls-dev gtk+3.0-dev gnutls-dev gobject-introspection-dev icu-dev libxml2-utils meson ninja pcre2-dev vala vala-dev zlib-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz exitcode.patch + gcc-volatile.patch " build() { @@ -28,4 +29,5 @@ package() { } sha512sums="8942809d20ff845142dce8cf48b4eb6f9e4f333dc2647cceb0538112d5e10096ff836f24da1f0c34cc4bbee4f6c585c3feab33934c257887a82d6c67bce11402 vte-0.62.0.tar.xz -4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" +4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch +8d45f85a451868ec49fc263e60a1ab943ecea172ec32091ac9e2b85f0e9c7091423313eb4bbe037eac2b75086cd8c9d307bd0c37d58d4051742d9e2c579340a4 gcc-volatile.patch" diff --git a/user/vte/gcc-volatile.patch b/user/vte/gcc-volatile.patch new file mode 100644 index 000000000..924d4e16b --- /dev/null +++ b/user/vte/gcc-volatile.patch @@ -0,0 +1,45 @@ +From 89e9230dc1a27b89cca16de32e903918a27b8e42 Mon Sep 17 00:00:00 2001 +From: Christian Persch <chpe@src.gnome.org> +Date: Mon, 16 Nov 2020 20:27:48 +0100 +Subject: [PATCH] lib: Drop wrong use of volatile + +--- + src/vtetypebuiltins.cc.template | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/vtetypebuiltins.cc.template b/src/vtetypebuiltins.cc.template +index dade41de7..3a50d4011 100644 +--- a/src/vtetypebuiltins.cc.template ++++ b/src/vtetypebuiltins.cc.template +@@ -11,9 +11,9 @@ + GType + @enum_name@_get_type (void) + { +- static volatile gsize g_define_type_id__volatile = 0; ++ static gsize g_define_type_id = 0; + +- if (g_once_init_enter (&g_define_type_id__volatile)) { ++ if (g_once_init_enter (&g_define_type_id)) { + static const G@Type@Value values[] = { + /*** END value-header ***/ + +@@ -24,13 +24,13 @@ GType + /*** BEGIN value-tail ***/ + { 0, NULL, NULL } + }; +- GType g_define_type_id = \ ++ GType type_id = \ + g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); + +- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); ++ g_once_init_leave (&g_define_type_id, type_id); + } + +- return g_define_type_id__volatile; ++ return g_define_type_id; + } + + /*** END value-tail ***/ +-- +GitLab + diff --git a/user/vulkan-headers/APKBUILD b/user/vulkan-headers/APKBUILD new file mode 100644 index 000000000..90cb90654 --- /dev/null +++ b/user/vulkan-headers/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=vulkan-headers +pkgver=1.3.294 +pkgrel=0 +pkgdesc="Development files for Vulkan" +url="https://www.vulkan.org/" +arch="noarch" +options="!check !dev" # no testsuite, headers-only project +license="Apache-2.0 AND MIT" +depends="" +makedepends="cmake" +subpackages="" +source="vulkan-headers-$pkgver.tar.gz::https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/Vulkan-Headers-$pkgver" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="a2a2ccd2fa64acebb2ed3d54b9954d3a465b30542b72cff71d321ba49c75f1396519b8510159140d48e4ebae94169a6dccf21a85586079a10b22c4affd0944b4 vulkan-headers-1.3.294.tar.gz" diff --git a/user/vulkan-loader/APKBUILD b/user/vulkan-loader/APKBUILD new file mode 100644 index 000000000..6ba3c9ee6 --- /dev/null +++ b/user/vulkan-loader/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=vulkan-loader +pkgver=1.3.294 +pkgrel=0 +pkgdesc="Client driver loader for Vulkan" +url="https://www.vulkan.org/" +arch="all" +license="Apache-2.0 AND MIT" +depends="" +depends_dev="vulkan-headers" +makedepends="$depends_dev cmake libx11-dev libxcb-dev libxrandr-dev + wayland-dev wayland-protocols" +subpackages="$pkgname-dev" +source="vulkan-loader-$pkgver.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/Vulkan-Loader-$pkgver" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="ab040f54bacb0694ba373c8d2d2cdf450c7b74467d8deb62fb3c47340156eb5c77e6122d6450cbe6db9e66100a6000ad677acfd45a391fdb4c157bd9c0736e07 vulkan-loader-1.3.294.tar.gz" diff --git a/user/wayfire/APKBUILD b/user/wayfire/APKBUILD new file mode 100644 index 000000000..b1f8ab2d1 --- /dev/null +++ b/user/wayfire/APKBUILD @@ -0,0 +1,37 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=wayfire +pkgver=0.9.0 +pkgrel=0 +pkgdesc="A modular and extensible Wayland compositor" +url="https://wayfire.org/" +arch="all" +license="MIT" +depends="" +makedepends="cairo-dev freetype-dev glm libdrm-dev libevdev-dev libglvnd-dev + libinput-dev libjpeg-turbo-dev libpng-dev libxkbcommon-dev libxml2-dev + meson pango-dev pixman-dev wayland-dev wayland-protocols wf-config-dev + wlroots-0.17-dev json" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/WayfireWM/wayfire/releases/download/v$pkgver/wayfire-$pkgver.tar.xz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="572bfbe1821490842eae33285a0a5607f70b96b0d5b994246ffe6f0bd74ef03d8d699f3f429bff4d376a0a9390312aa67332e8f614fefa2400e0b844b2d74ab9 wayfire-0.9.0.tar.xz" diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD index 469919725..b5af36542 100644 --- a/user/wayland-protocols/APKBUILD +++ b/user/wayland-protocols/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sile Ekaterin Liszka <sheila@vulpine.house> pkgname=wayland-protocols -pkgver=1.31 +pkgver=1.42 pkgrel=0 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol" url="https://wayland.freedesktop.org" @@ -12,7 +12,7 @@ makedepends="wayland-dev meson" subpackages="" provides="$pkgname-dev" source="https://gitlab.freedesktop.org/wayland/$pkgname/-/releases/$pkgver/downloads/$pkgname-$pkgver.tar.xz - test.patch + tests.patch " build() { @@ -35,5 +35,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="402ce1915300e29afe554d77965ee0a28a5f22fdb5b901c4c640e59b9f3a9c11094e1edae87eea1e76eea557f6faf0c34a0c28ee7f6babb4dc3719329c4e25bf wayland-protocols-1.31.tar.xz -659220b5e3fab4a2e6bb017d6fde33fd2cb1424e9e8778829c089e2f422abcdbaae44661ab9c62160046ccf8c3b397da055478194690de057758563d18c62610 test.patch" +sha512sums="ce85fecbe886264eaeb34c7992d4e493295f57f6213d5a2ec04b3471daee04a4225b1a7e77a27ccf39306074780553ec1383c55af30cc2c78942b40cc5777c1b wayland-protocols-1.42.tar.xz +adf31ede543514317d57dbd4966034ffbd03e0745701d69c9a852d4b8388542fbb350ce3b32020192dfdbe90fe3a9a1e0ce1d472d9a8be695006652b704ab3f6 tests.patch" diff --git a/user/wayland-protocols/test.patch b/user/wayland-protocols/test.patch deleted file mode 100644 index b7a5e26ea..000000000 --- a/user/wayland-protocols/test.patch +++ /dev/null @@ -1,66 +0,0 @@ -xdg-decoration-unstable-v1 needs xdg-toplevel but does not define it. -This leads to a linker failure on at least ppc64. - ---- wayland-protocols-1.25/tests/meson.build.old 2022-01-28 10:00:40.731421000 -0600 -+++ wayland-protocols-1.25/tests/meson.build 2022-07-02 20:09:54.653454716 -0500 -@@ -88,32 +88,34 @@ - ] - - # Check that header can be included by a pedantic C99 compiler -- test_name = 'test-build-pedantic-@0@'.format(protocol_file.underscorify()) -- test_name_source = '@0@.c'.format(test_name) -- test_source = custom_target( -- test_name_source, -- input: 'build-pedantic.c.in', -- output: test_name_source, -- command: replace_command, -- ) -- pedantic_test_executable = executable( -- test_name, -- [ -- test_source, -- client_header, -- server_header, -- code -- ], -- link_args: extra_linker_flags, -- dependencies: libwayland, -- c_args: [ -- '-std=c99', -- '-pedantic', -- '-Wall', -- '-Werror' ], -- install: false, -- ) -- test(test_name, pedantic_test_executable) -+ if not protocol_file.contains('xdg-decoration-unstable-v1') -+ test_name = 'test-build-pedantic-@0@'.format(protocol_file.underscorify()) -+ test_name_source = '@0@.c'.format(test_name) -+ test_source = custom_target( -+ test_name_source, -+ input: 'build-pedantic.c.in', -+ output: test_name_source, -+ command: replace_command, -+ ) -+ pedantic_test_executable = executable( -+ test_name, -+ [ -+ test_source, -+ client_header, -+ server_header, -+ code -+ ], -+ link_args: extra_linker_flags, -+ dependencies: libwayland, -+ c_args: [ -+ '-std=c99', -+ '-pedantic', -+ '-Wall', -+ '-Werror' ], -+ install: false, -+ ) -+ test(test_name, pedantic_test_executable) -+ endif - - # Check that the header - if not protocol_file.contains('xdg-foreign-unstable-v1') diff --git a/user/wayland-protocols/tests.patch b/user/wayland-protocols/tests.patch new file mode 100644 index 000000000..d8d5dc3ca --- /dev/null +++ b/user/wayland-protocols/tests.patch @@ -0,0 +1,53 @@ +Upstream-URL: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/363 + +From 8b4c76275fa1b6e0a99a53494151d9a2c907144d Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Fri, 8 Nov 2024 11:27:25 -0600 +Subject: [PATCH] tests: Make build-only tests actually build-only + +The goal behind the pedantic compiler tests are to ensure that the code +that wayland-scanner is generating can be compiled in pedantic mode by +the system C compiler. + +Trying to execute the built tests may fail because of undefined symbols. +This affects certain platforms more than others; Linux/musl and Darwin +are examples of platforms that cannot execute binaries with undefined +symbols. This meant tests needlessly failed on these platforms. + +Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> +Closes: #48, #228 +--- + tests/meson.build | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index aa216ec..5a93bb3 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -1,4 +1,5 @@ + prog_scan_sh = find_program('scan.sh') ++prog_true = find_program('true') + + libwayland = [ + dependency('wayland-client'), +@@ -100,7 +101,7 @@ foreach protocol_file : protocol_files + test_source, + client_header, + server_header, +- code ++ code, + ], + link_args: extra_linker_flags, + dependencies: libwayland, +@@ -111,7 +112,7 @@ foreach protocol_file : protocol_files + '-Werror' ], + install: false, + ) +- test(test_name, pedantic_test_executable) ++ test(test_name, prog_true, depends : [pedantic_test_executable]) + + # Check that the header + if not protocol_file.contains('xdg-foreign-unstable-v1') +-- +2.40.0 + diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD index 33388f451..09dfc1f45 100644 --- a/user/wayland/APKBUILD +++ b/user/wayland/APKBUILD @@ -2,15 +2,16 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=wayland -pkgver=1.21.0 +pkgver=1.23.1 pkgrel=0 pkgdesc="A computer display server protocol" url="https://wayland.freedesktop.org" arch="all" license="MIT" depends="" -depends_dev="libffi-dev expat-dev" -makedepends="$depends_dev doxygen xmlto graphviz grep libxml2-dev bash meson" +depends_dev="expat-dev" +makedepends="$depends_dev doxygen xmlto graphviz grep libffi-dev libxml2-dev + bash meson" subpackages="$pkgname-dev" replaces="wayland-libs-client wayland-libs-cursor wayland-libs-server" source="https://gitlab.freedesktop.org/wayland/wayland/-/releases/$pkgver/downloads/$pkgname-$pkgver.tar.xz" @@ -45,4 +46,4 @@ dev() { default_dev } -sha512sums="5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3 wayland-1.21.0.tar.xz" +sha512sums="818eda003e3f7aa15690eedb1ff227a6056b2ce54bf23d45ffe573dc40a914623c5a1358218b59444dcdc483db0503324f0d27091d0ea954412a8b290de5f50a wayland-1.23.1.tar.xz" diff --git a/user/waypipe/0.9.2-fix-compile.patch b/user/waypipe/0.9.2-fix-compile.patch new file mode 100644 index 000000000..096e4851b --- /dev/null +++ b/user/waypipe/0.9.2-fix-compile.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -Nurd waypipe-v0.9.2/src/secctx.c waypipe-v0.9.2.new/src/secctx.c +--- waypipe-v0.9.2/src/secctx.c 2024-11-18 14:29:20.000000000 -0800 ++++ waypipe-v0.9.2.new/src/secctx.c 2024-11-25 10:20:47.643421280 -0800 +@@ -2,6 +2,7 @@ + #include "util.h" + #include <sys/socket.h> + #include <sys/un.h> ++#include <string.h> + #include <unistd.h> + #include <wayland-client.h> + diff --git a/user/waypipe/APKBUILD b/user/waypipe/APKBUILD new file mode 100644 index 000000000..311c4e8c6 --- /dev/null +++ b/user/waypipe/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=waypipe +pkgver=0.9.2 +pkgrel=0 +pkgdesc="proxy for Wayland clients" +url="https://gitlab.freedesktop.org/mstoeckl/waypipe" +arch="all" +license="MIT" +depends="" +makedepends="ffmpeg-dev libdrm-dev libva-dev lz4-dev mesa-dev meson scdoc wayland-dev wayland-protocols" +subpackages="$pkgname-doc" +source="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2 + 0.9.2-fix-compile.patch" +builddir="$srcdir/$pkgname-v$pkgver" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="0ffdb49cb5dbee717798721505e4661710fcd234a55bbfe2452888024d4a8b99a0e0e99cdce23ba0b92ee456aeb9f14324baba1c7c5724cb8cca7bb6e9c276bb waypipe-v0.9.2.tar.bz2 +30c818075c95b198d351cad94e48e3d7eb3dc18f9b38964c2090483131365bf37f7eeb12ba89f17822c8cab9dbb658e7e2efcc81f0433e79c9a2cdb8bbf92dc6 0.9.2-fix-compile.patch" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index d99af8283..72991c3c7 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,7 +2,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=weechat -pkgver=4.2.1 +pkgver=4.5.1 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" @@ -12,7 +12,7 @@ license="GPL-3.0+" depends="" depends_dev="cmake aspell-dev curl-dev gnutls-dev libgcrypt-dev lua5.3-dev ncurses-dev perl-dev python3-dev ruby-dev tcl-dev zlib-dev guile-dev - tk-dev zstd-dev" + tk-dev zstd-dev cjson-dev" checkdepends="cpputest" makedepends="$depends_dev asciidoctor" subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin @@ -63,4 +63,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="0f26ea34480f6388c51eb18c9f08b893cc1e16a27b02c30ef2642a93806f94ca58ccc5aebd7c06711ab77d7d1693653e00873340da38bd555f60adb13557d768 weechat-4.2.1.tar.gz" +sha512sums="686eb0a57f6def4826ad88b6bfdef6d1e074375d756289f9f3a8046828d22eeb9313278398a619e6c18b16b4baa87753ae9fac82c7fff52ed4d0906570514d06 weechat-4.5.1.tar.gz" diff --git a/user/wf-config/APKBUILD b/user/wf-config/APKBUILD new file mode 100644 index 000000000..8cbb8b130 --- /dev/null +++ b/user/wf-config/APKBUILD @@ -0,0 +1,34 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=wf-config +pkgver=0.9.0 +pkgrel=0 +pkgdesc="A library for managing configuration files, written for Wayfire" +url="https://wayfire.org" +arch="all" +license="MIT" +depends="" +makedepends="glm libevdev-dev libxml2-dev meson" +subpackages="$pkgname-dev" +source="https://github.com/WayfireWM/wf-config/releases/download/v$pkgver/wf-config-$pkgver.tar.xz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="ac2ca69b7d96b9b145a4789f004705a2d7b323e6724e429a1e5a4544cd56828165a01f48a9863ceb92004c51c8f05729468f4a32c37545716f8d537d39e3236b wf-config-0.9.0.tar.xz" diff --git a/user/wf-shell/APKBUILD b/user/wf-shell/APKBUILD new file mode 100644 index 000000000..309aceafe --- /dev/null +++ b/user/wf-shell/APKBUILD @@ -0,0 +1,36 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=wf-shell +pkgver=0.9.0 +pkgrel=0 +pkgdesc="A GTK3-based panel for Wayfire" +url="https://wayfire.org/" +arch="all" +license="MIT" +depends="" +makedepends="alsa-lib-dev gtk-layer-shell-dev gtkmm+3.0-dev libdbusmenu-dev + meson pulseaudio-dev wayfire-dev wayland-dev wayland-protocols" +subpackages="$pkgname-dev $pkgname-doc" +install_if="wayfire=$pkgver" # Wayfire wants this, but this needs Wayfire to build. +source="https://github.com/WayfireWM/wf-shell/releases/download/v$pkgver/wf-shell-$pkgver.tar.xz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="dceb0234302ceb51ac23576752d65cf122755bd044bc98e4ca92e0b8e6715063cdebdf35e82e5dc033effc288228622886e1a0e25b4bd788f6d32f8b189c1cfe wf-shell-0.9.0.tar.xz" diff --git a/user/wget/APKBUILD b/user/wget/APKBUILD index 967995609..53803f238 100644 --- a/user/wget/APKBUILD +++ b/user/wget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Nathan <ndowens@artixlinux.org> # Maintainer: Zach van Rijn <me@zv.io> pkgname=wget -pkgver=1.20.3 +pkgver=1.24.5 pkgrel=0 pkgdesc="Network utility to retrieve files from the Web" url="https://www.gnu.org/software/wget/wget.html" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c wget-1.20.3.tar.gz" +sha512sums="572aa54717e51a9eb9959e127c7afb696645088f32ff7df2cfe9d243957e34ee235e98988fa94649df023d2e3d62b6973e8c9f2eb92beba820dd96d5de2a950d wget-1.24.5.tar.gz" diff --git a/user/wimlib/APKBUILD b/user/wimlib/APKBUILD index 76e26f88e..a4e365ea6 100644 --- a/user/wimlib/APKBUILD +++ b/user/wimlib/APKBUILD @@ -1,16 +1,25 @@ # Contributor: CyberLeo <cyberleo@cyberleo.net> # Maintainer: CyberLeo <cyberleo@cyberleo.net> pkgname=wimlib -pkgver=1.13.4 +pkgver=1.14.4 pkgrel=0 pkgdesc="Windows Imaging (WIM) archive manipulation library and tools" url="https://wimlib.net/" arch="all" +# If the test suite crosses a clock-second boundary, the test will fail +# because the mtime of the src and dest will vary by 1s. The test suite +# then hangs waiting for the mount to umount, requiring manual operator +# intervention. The tests pass on ppc64, ppc, x86_64 for me when timed +# correctly, so for now we disable tests. +options="!check" license="(GPL-2.0 OR LGPL-2.1) AND CC0" depends="" -makedepends="libxml2-dev fuse-dev ntfs-3g ntfs-3g-dev" +makedepends="fuse3-dev ntfs-3g ntfs-3g-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" -source="https://wimlib.net/downloads/wimlib-$pkgver.tar.gz" +source="https://wimlib.net/downloads/wimlib-$pkgver.tar.gz + header.patch + pc-fuse3.patch + " build() { ./configure \ @@ -26,4 +35,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="480fe6fa6c6e8f1bf9c3960f5e1671f3266535b18dc72e9d7c4c05c7fb833d9b00db5ae9fb49154da6e71e536cae8b562cbf81ab5a124e2a79326927e2cf7344 wimlib-1.13.4.tar.gz" +sha512sums="f3c25ee14fe849f452f004ce8137ef040410ea048555ae71180086f010858b6ed593c8881b805bac65f9ee878bf11661a7f17677c6c24e2c77149c35ee0cd853 wimlib-1.14.4.tar.gz +25a410614b4d4a16f16149c09bb1107a5678d49b729ecb55fe5641727556f6eb8a0e3473331ae738e3747652674d78c32be0d6da57c2aa414bd9fc636c27997e header.patch +e58429f3256e85e39558920be295c93645ec0584cf71282e01102c62b05b51fab1c3c1b62a8edb7be8bfc2427d2464400154ca05ad07e02548cad140f781aa7f pc-fuse3.patch" diff --git a/user/wimlib/header.patch b/user/wimlib/header.patch new file mode 100644 index 000000000..71255d446 --- /dev/null +++ b/user/wimlib/header.patch @@ -0,0 +1,29 @@ +This patch should be removed once the following musl commit lands: + +https://git.musl-libc.org/cgit/musl/commit\ +/include/stdio.h?id=05ce67fea99ca09cd4b6625cff7aec9cc222dd5a + +These macros are also exposed via <linux/fs.h>. + +diff -ur a/src/mount_image.c b/src/mount_image.c +--- a/src/mount_image.c 2024-12-11 21:13:37.806412788 -0600 ++++ b/src/mount_image.c 2024-12-11 21:18:32.528640110 -0600 +@@ -53,6 +53,18 @@ + #include <unistd.h> + #include <utime.h> + ++#if defined(_GNU_SOURCE) ++#ifndef RENAME_NOREPLACE ++#define RENAME_NOREPLACE (1 << 0) ++#endif ++#ifndef RENAME_EXCHANGE ++#define RENAME_EXCHANGE (1 << 1) ++#endif ++#ifndef RENAME_WHITEOUT ++#define RENAME_WHITEOUT (1 << 2) ++#endif ++#endif ++ + #include "wimlib/blob_table.h" + #include "wimlib/dentry.h" + #include "wimlib/encoding.h" diff --git a/user/wimlib/pc-fuse3.patch b/user/wimlib/pc-fuse3.patch new file mode 100644 index 000000000..9c8743b31 --- /dev/null +++ b/user/wimlib/pc-fuse3.patch @@ -0,0 +1,31 @@ +The pkgconfig file for fuse3 is called fuse3, not fuse. + +Otherwise, we get: + +>>> WARNING: wimlib-dev*: Could not find any provider for pc:fuse + +We can't patch the .ac file because it hardcodes the git version and decides +that this is wimlib 1.0-BETA6 (or whatever). + +#--- wimlib-1.14.4/configure.ac.old 2024-02-09 17:36:25.000000000 -0600 +#+++ wimlib-1.14.4/configure.ac 2024-12-11 21:27:27.638385598 -0600 +#@@ -156,7 +156,7 @@ +# disable this feature. If your operating system packages +# development files separately, the package you need to install +# may be called libfuse3-dev, fuse-devel, or similar.])]) +#- PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse" +#+ PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse3" +# AC_DEFINE([WITH_FUSE], [1], [Define to 1 if using FUSE support]) +# +# AC_CHECK_LIB([rt], [mq_open], [], +--- wimlib-1.14.4/configure.old 2024-02-24 12:41:27.000000000 -0600 ++++ wimlib-1.14.4/configure 2024-12-11 21:27:48.176175338 -0600 +@@ -16032,7 +16032,7 @@ + printf "%s\n" "yes" >&6; } + + fi +- PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse" ++ PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse3" + + printf "%s\n" "#define WITH_FUSE 1" >>confdefs.h + diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index ece7397aa..a874bdf9e 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=wireguard-tools -pkgver=1.0.20210424 +pkgver=1.0.20210914 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -29,4 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59 wireguard-tools-1.0.20210424.tar.xz" +sha512sums="6727ea65551dbb064457449b93a943bd6534ca93bc7fa5704c2f6826266c98688ee9ea28731fda57a5245d5f63c05f3899fcca54e40c0b6251b7c4796e957445 wireguard-tools-1.0.20210914.tar.xz" diff --git a/user/wlroots-0.17/APKBUILD b/user/wlroots-0.17/APKBUILD new file mode 100644 index 000000000..1da1122f5 --- /dev/null +++ b/user/wlroots-0.17/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=wlroots-0.17 +pkgver=0.17.0 +pkgrel=0 +pkgdesc="Library for building Wayland compositors" +url="https://swaywm.org/" +arch="all" +license="MIT" +depends="wayland>=1.19.0" +makedepends="cmake elogind-dev eudev-dev ffmpeg-dev glslang-dev hwdata + lcms2-dev libdisplay-info-dev libinput-dev libglvnd-dev libxkbcommon-dev + mesa-dev meson ninja pixman-dev seatd-dev vulkan-loader-dev + wayland-dev>=1.19.0 wayland-protocols>=1.21 xcb-util-errors-dev + xcb-util-renderutil-dev xcb-util-wm-dev xwayland-dev" +subpackages="$pkgname-dev" +source="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz" +builddir="$srcdir/wlroots-$pkgver" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + meson compile -C output +} + +check() { + ninja -C output test +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="ca7314d7dca3ddac3e6970476b4145a0a2566a6632054f406c6e74ea7280a805cdf9b6972cca15c3170a5f41c83677768843b648b6b98ab6428e4ecde43aa4de wlroots-0.17.0.tar.gz" diff --git a/user/wlroots-0.18/APKBUILD b/user/wlroots-0.18/APKBUILD new file mode 100644 index 000000000..b320ab773 --- /dev/null +++ b/user/wlroots-0.18/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=wlroots-0.18 +pkgver=0.18.0 +pkgrel=0 +pkgdesc="Library for building Wayland compositors" +url="https://swaywm.org/" +arch="all" +license="MIT" +depends="wayland>=1.19.0" +makedepends="cmake elogind-dev eudev-dev ffmpeg-dev glslang-dev hwdata + lcms2-dev libdisplay-info-dev libinput-dev libliftoff-dev libglvnd-dev + libxkbcommon-dev mesa-dev meson ninja pixman-dev seatd-dev + vulkan-loader-dev wayland-dev>=1.19.0 wayland-protocols>=1.21 + xcb-util-errors-dev xcb-util-renderutil-dev xcb-util-wm-dev + xwayland-dev" +subpackages="$pkgname-dev" +source="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$pkgver/downloads/wlroots-$pkgver.tar.gz" +builddir="$srcdir/wlroots-$pkgver" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="2cf848aa67f41089b60cc7d01c3a344ebaf7f5bbced459675fef885cd4b3e6b99d9a49d6b127518314d0ae38e52e9aff7991611592b2add4cba96f15aa0bf1c6 wlroots-0.18.0.tar.gz" diff --git a/user/wlroots/APKBUILD b/user/wlroots/APKBUILD deleted file mode 100644 index 3ca92c838..000000000 --- a/user/wlroots/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> -# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> -pkgname=wlroots -pkgver=0.14.1 -pkgrel=0 -pkgdesc="Library for building Wayland compositors" -url="https://swaywm.org/" -arch="all" -license="MIT" -depends="wayland>=1.19.0" -makedepends="cmake elogind-dev eudev-dev ffmpeg-dev libinput-dev - libxkbcommon-dev mesa-dev meson ninja pixman-dev seatd-dev - wayland-dev>=1.19.0 wayland-protocols>=1.21 xcb-util-errors-dev - xcb-util-renderutil-dev xcb-util-wm-dev xorg-server-xwayland" -subpackages="$pkgname-dev" -source="https://github.com/swaywm/wlroots/releases/download/$pkgver/wlroots-$pkgver.tar.gz" - -build() { - meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --buildtype=release \ - . output - ninja -C output -} - -check() { - ninja -C output test -} - -package() { - DESTDIR="$pkgdir" ninja -C output install -} - -sha512sums="4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0 wlroots-0.14.1.tar.gz" diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD index 254d32057..1fdf5b8c4 100644 --- a/user/wxwidgets/APKBUILD +++ b/user/wxwidgets/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wxwidgets pkgver=3.1.4 -pkgrel=0 +pkgrel=1 pkgdesc="C++ library for creating applications" url="https://www.wxwidgets.org/" arch="all" @@ -12,7 +12,7 @@ depends="" checkdepends="adwaita-icon-theme ttf-liberation" makedepends="glu-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev libexecinfo-dev libjpeg-turbo-dev libnotify-dev libsecret-dev libsm-dev - mesa-dev tiff-dev zlib-dev" + libglvnd-dev tiff-dev zlib-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2" builddir="$srcdir/wxWidgets-$pkgver" diff --git a/user/x11perf/APKBUILD b/user/x11perf/APKBUILD index 58de9c176..af91f6759 100644 --- a/user/x11perf/APKBUILD +++ b/user/x11perf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=x11perf -pkgver=1.6.2 +pkgver=1.7.0 pkgrel=0 pkgdesc="X11 server benchmarking utility" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5be9e601071a42d103adbab5f30c1900a3779a5b2c06c709df99a85487c9790d36b835d43f5c6d74cc7d950cc3ad06927210d7b1f58939cfd0b4a6f3e5e32112 x11perf-1.6.2.tar.xz" +sha512sums="de8185bfbac15fb5eb15c18ba8450d8e383e1356675e0368c9a443d4c2d14245fab87ac0aa4ddcc5ebf731af0ad1173f53c6937104c1be824bfda5b58112fd5e x11perf-1.7.0.tar.xz" diff --git a/user/x11vnc/APKBUILD b/user/x11vnc/APKBUILD index b9154729b..497c6f127 100644 --- a/user/x11vnc/APKBUILD +++ b/user/x11vnc/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=x11vnc pkgver=0.9.16 -pkgrel=0 +pkgrel=2 pkgdesc="VNC server for X11 sessions" -url="http://www.karlrunge.com/x11vnc/" +url=" " arch="all" license="GPL-2.0-only" depends="" @@ -14,6 +14,8 @@ subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz time64.patch utmps.patch + gcc10.patch + CVE-2020-29074.patch " prepare() { @@ -43,4 +45,6 @@ package() { sha512sums="69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec x11vnc-0.9.16.tar.gz 764dc0d22f4b167b7683b1551a6d8cc8ea6745fdd9791422404ef604186930615b52ef1bf66fd03dd9c6eed18845ff4a1e5a235eee80810177e082359a8c4766 time64.patch -8aaa6d1fd9e795a60cad162f2b21fe96cd3a7076a0c4fae6e6b0021881bd019312a678fa3ed69b694da36ee64cc0601812da5df96c6461baf68b7e70adf6cd4e utmps.patch" +8aaa6d1fd9e795a60cad162f2b21fe96cd3a7076a0c4fae6e6b0021881bd019312a678fa3ed69b694da36ee64cc0601812da5df96c6461baf68b7e70adf6cd4e utmps.patch +b7b774c155f326bca1fee4bed22609f1e0236dae5cb2fea96bab18301bc6ae8f9c7fb11ba1950eb9488683bd2d3158b7b16a71948f2c8d483594e36625b3d470 gcc10.patch +7e038a13c18933532725e73769ec44a325064165e7d041e697cb28e8b19c4471ea19e598cb3f59a55375ac0ebebd11c618ecc085a0112f733fdaa3f702ffa444 CVE-2020-29074.patch" diff --git a/user/x11vnc/CVE-2020-29074.patch b/user/x11vnc/CVE-2020-29074.patch new file mode 100644 index 000000000..2982c59b1 --- /dev/null +++ b/user/x11vnc/CVE-2020-29074.patch @@ -0,0 +1,11 @@ +--- x11vnc-0.9.16/src/scan.c 2024-07-23 04:47:17.680000000 +0000 ++++ x11vnc-0.9.16/src/scan.c 2024-07-23 04:48:25.080000000 +0000 +@@ -320,7 +320,7 @@ + + #if HAVE_XSHM + shm->shmid = shmget(IPC_PRIVATE, +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); + + if (shm->shmid == -1) { + rfbErr("shmget(%s) failed.\n", name); diff --git a/user/x11vnc/gcc10.patch b/user/x11vnc/gcc10.patch new file mode 100644 index 000000000..a32d5785d --- /dev/null +++ b/user/x11vnc/gcc10.patch @@ -0,0 +1,42 @@ +From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Tue, 28 Jan 2020 22:21:01 +0300 +Subject: [PATCH] Fix build with -fno-common + +GCC 10 defaults to -fno-common +--- + src/util.c | 3 +++ + src/util.h | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/util.c b/src/util.c +index a82a1a42..6a52ebf4 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -47,6 +47,9 @@ int hxl = 0; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + MUTEX(x11Mutex); + MUTEX(scrollMutex); ++MUTEX(clientMutex); ++MUTEX(inputMutex); ++MUTEX(pointerMutex); + #endif + + int nfix(int i, int n); +diff --git a/src/util.h b/src/util.h +index 35c1afd2..99b5dd1d 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -102,9 +102,9 @@ extern struct timeval _mysleep; + #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD + extern MUTEX(x11Mutex); + extern MUTEX(scrollMutex); +-MUTEX(clientMutex); +-MUTEX(inputMutex); +-MUTEX(pointerMutex); ++extern MUTEX(clientMutex); ++extern MUTEX(inputMutex); ++extern MUTEX(pointerMutex); + #endif + + #define X_INIT INIT_MUTEX(x11Mutex) diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index 85f8f8f89..54298c775 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=xapian-core -pkgver=1.4.17 +pkgver=1.4.25 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" arch="all" -options="!check" # sortableserialise1 is still broken license="GPL-2.0+" depends="" depends_dev="zlib-dev util-linux-dev" makedepends="$depends_dev libtool" subpackages="$pkgname-dev $pkgname-doc libxapian" -source="http://oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.xz +source="https://oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.xz + sortable-serialise.patch timeval-t.patch " @@ -46,5 +46,6 @@ libxapian() { mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7 xapian-core-1.4.17.tar.xz +sha512sums="e8069f2cb75554978716a99580fb57fc73bbdd607c82394f53d07205d8c78fb59265004be0c676a6806bb2840a3933499dfc867e36a28855278569a0676d469d xapian-core-1.4.25.tar.xz +d5c6dac118b96ed66ce7d01c0d8c41b4765397e56fec5ea64cd1d223e4d152c9bb9171bbd8bd804d1285103850ae8a1d21fe137e906da94c42b421b0e6e2a49a sortable-serialise.patch 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" diff --git a/user/xapian-core/sortable-serialise.patch b/user/xapian-core/sortable-serialise.patch new file mode 100644 index 000000000..d7cb9209a --- /dev/null +++ b/user/xapian-core/sortable-serialise.patch @@ -0,0 +1,15 @@ +Discussing with upstream, but for now, this does fix both the test suite +and operationally the ability to serialise +Inf values. +--- xapian-core-1.4.25/api/sortable-serialise.cc.old 2024-03-07 16:57:54.000000000 -0600 ++++ xapian-core-1.4.25/api/sortable-serialise.cc 2024-05-30 00:49:54.835053392 -0500 +@@ -55,6 +55,10 @@ + + // Negative infinity. + if (value < -DBL_MAX) return 0; ++ if (value == HUGE_VAL) { ++ memset(buf, '\xff', 9); ++ return 9; ++ } + + mantissa = frexp(value, &exponent); + diff --git a/user/xauth/APKBUILD b/user/xauth/APKBUILD index bd3540f68..0699d73ae 100644 --- a/user/xauth/APKBUILD +++ b/user/xauth/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xauth -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="X.Org authorisation settings program" url="https://www.X.Org/" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ac23fcd166b45abf7b030994ff3332c9906023dc1ddfa9b9d3000e6a914dc5e0213c4a2aa409cb3ddb93e1f9f4f6374376109241a95ef8c36af842de1f6f76e8 xauth-1.1.2.tar.xz" +sha512sums="536434f6c607673c00b9658ea591bf32419cc151d138f991ea38167220563519a6a84a5504003da15820f2a7ed50ea2449c6ce9c991d1446ee9a7305c647d694 xauth-1.1.3.tar.xz" diff --git a/user/xbiff/APKBUILD b/user/xbiff/APKBUILD index d6567461e..c0b637644 100644 --- a/user/xbiff/APKBUILD +++ b/user/xbiff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xbiff -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Local email notification applet for X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="xbitmaps" makedepends="libx11-dev libxaw-dev libxext-dev libxmu-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xbiff-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/xbiff-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac xbiff-1.0.4.tar.bz2" +sha512sums="4dd8943daf670dffb6e108b192977f6ad313d6b0535da0c809699e05f0509aba45be81c72af341e1fef31f59d0a5f209d87441230b3fdcecb4a7a8fe7a9c0658 xbiff-1.0.5.tar.xz" diff --git a/user/xbitmaps/APKBUILD b/user/xbitmaps/APKBUILD index 3052984ef..1c37e85fe 100644 --- a/user/xbitmaps/APKBUILD +++ b/user/xbitmaps/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xbitmaps -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="Built-in bitmaps for X11" url="https://www.X.Org/" @@ -9,7 +9,7 @@ license="X11" depends="util-macros" makedepends="" subpackages="" -source="https://www.X.Org/releases/individual/data/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/data/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d xbitmaps-1.1.2.tar.bz2" +sha512sums="b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814 xbitmaps-1.1.3.tar.xz" diff --git a/user/xcalc/APKBUILD b/user/xcalc/APKBUILD index 658e4c4a5..54b715405 100644 --- a/user/xcalc/APKBUILD +++ b/user/xcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcalc -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=0 pkgdesc="Graphical scientific calculator for X11" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb xcalc-1.1.1.tar.xz" +sha512sums="51da677dc88bcd7299ed8d678cb26b048fdb82a1983e1496a06253ee2dceefca4ac87d1a74432b4a76dcc11921a61339bb3d292607be46228164140b430bbad2 xcalc-1.1.2.tar.xz" diff --git a/user/xcb-proto/APKBUILD b/user/xcb-proto/APKBUILD index 9a148819f..99152ef05 100644 --- a/user/xcb-proto/APKBUILD +++ b/user/xcb-proto/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcb-proto -pkgver=1.15.2 +pkgver=1.17.0 pkgrel=0 pkgdesc="XCB protocol descriptions" url="https://xcb.freedesktop.org/" @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d xcb-proto-1.15.2.tar.xz" +sha512sums="34c3795e5a48a66d89b72ee1777fb0bede489d5ec07018e6c9ef3c13bdd60b0358fc2c04a1f0ed0acb5b681aeeb92033db579036e4f5edd967fe56714c03acdf xcb-proto-1.17.0.tar.xz" diff --git a/user/xcb-util-cursor/APKBUILD b/user/xcb-util-cursor/APKBUILD index cc8cd63c5..10f5c19e6 100644 --- a/user/xcb-util-cursor/APKBUILD +++ b/user/xcb-util-cursor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcb-util-cursor -pkgver=0.1.4 +pkgver=0.1.5 pkgrel=0 pkgdesc="X C-language Binding - cursor library" url="https://xcb.freedesktop.org/" @@ -12,7 +12,9 @@ depends_dev="xcb-util-dev" checkdepends="check-dev" makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev" subpackages="$pkgname-dev" -source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.xz" +# TODO: temporarily fetching this tarball from x.org mirror. Maybe should +# change back to freedesktop.org once up-to-date tarballs are available there +source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -34,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d27dd59a4d7ded9994dca77774421dd9533e3ee823b880af35d3219bd7340c89fbc61d1d0fa10e2991de2cac9e6395e09497769d7b8728eedc691e76649107b1 xcb-util-cursor-0.1.4.tar.xz" +sha512sums="e2d14c3f0ab117524ba90d1a992b61717ccee04bc9e66c587a6a0f10571f15e89fc5db3413882ca7ce14ebc07b6b7b0a4ddecd59ba910e6ca654ea9b1c705ed5 xcb-util-cursor-0.1.5.tar.xz" diff --git a/user/xcb-util/APKBUILD b/user/xcb-util/APKBUILD index cb0f0046e..4f7e85e59 100644 --- a/user/xcb-util/APKBUILD +++ b/user/xcb-util/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcb-util -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=0 pkgdesc="Utility libraries for X C-language Binding" url="https://xcb.freedesktop.org/" arch="all" @@ -11,7 +11,7 @@ depends_dev="libxcb-dev util-macros" checkdepends="check-dev" makedepends="$depends_dev m4 gperf" subpackages="$pkgname-dev" -source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2" +source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e xcb-util-0.4.0.tar.bz2" +sha512sums="da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b xcb-util-0.4.1.tar.xz" diff --git a/user/xclipboard/APKBUILD b/user/xclipboard/APKBUILD index e58b5c608..779314f2a 100644 --- a/user/xclipboard/APKBUILD +++ b/user/xclipboard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xclipboard -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=0 pkgdesc="Clipboard viewer for X11" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="efa7800e0c4fb0242362c4263d80182d591bded07d1064a36b157b6202b15b0c82f083658ced2b82392eca905fb57c04a537d67e75c1237a1667ed2ce0cb09fe xclipboard-1.1.4.tar.xz" +sha512sums="9962b8d19e6387c9af87a47d66d81577ec3e2ba1d0aa6f6ca8fa89664ccfb0dd20906e143a4d19a303a4eded4f29c4bd40868477fbf754a79cdb48256846a8d3 xclipboard-1.1.5.tar.xz" diff --git a/user/xconsole/APKBUILD b/user/xconsole/APKBUILD index 6f1636986..97f9e39fe 100644 --- a/user/xconsole/APKBUILD +++ b/user/xconsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xconsole -pkgver=1.0.8 +pkgver=1.1.0 pkgrel=0 pkgdesc="Console monitor for X11" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="93fd8527abed4faaf0f6a3804ab08dbcb926b0aaf67fd814c003b6b1102e2f643be5362a020c7028ae928925ffd423df6eb456d4ed48cf30a4c5f00a7ce648fa xconsole-1.0.8.tar.xz" +sha512sums="1b5b1e1e15e3b988c159e924ac5c51734c4e37ed112815fc6bf6e36f80e840ccd904a4f0b0f27191e0dbf656d367a38873fd493a266887daa111e5266eebf37e xconsole-1.1.0.tar.xz" diff --git a/user/xcursor-themes/APKBUILD b/user/xcursor-themes/APKBUILD index 72a65a9b9..ddc786c62 100644 --- a/user/xcursor-themes/APKBUILD +++ b/user/xcursor-themes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcursor-themes -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Built-in cursor themes for X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libxcursor-dev util-macros xcursorgen" subpackages="" -source="https://www.X.Org/releases/individual/data/xcursor-themes-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/data/xcursor-themes-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2" +sha512sums="910925dd17c576028ae0d9dfe5683888648b941806b53cd9ff74ed18ff2de537664b07ab4c647a55290aeba37f6051f322b29e8ecd54f348e32abe2ccea1c902 xcursor-themes-1.0.7.tar.xz" diff --git a/user/xcursorgen/APKBUILD b/user/xcursorgen/APKBUILD index 7e00406e0..a376a16ef 100644 --- a/user/xcursorgen/APKBUILD +++ b/user/xcursorgen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcursorgen -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Cursor generator for X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="libpng-dev libx11-dev libxcursor-dev util-macros" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/xcursorgen-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xcursorgen-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2 xcursorgen-1.0.7.tar.bz2" +sha512sums="dede5b9e1e09f9253365bbb83fdab26c681641913f3586cef52d4802db9cecc7e252344911cd969a873c3a5c5ebbd4b862f786de263f92ea1bcb2df90236f9c4 xcursorgen-1.0.8.tar.xz" diff --git a/user/xditview/APKBUILD b/user/xditview/APKBUILD index 597d27906..3ab4ee644 100644 --- a/user/xditview/APKBUILD +++ b/user/xditview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xditview -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="X11 ditroff viewer" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="249769d27980e9a69ac8f056f329dfa514f3ab6267d6ed69814c5695f315d2a7021c560a0e26fdd2568290a071793d7f2eafdd92f9981ed556047deb244ebf5a xditview-1.0.6.tar.xz" +sha512sums="da7e80cd9fbb5da0ec4949c6fed0bad135a2490767f030e60f1c51a9f5a62379572bf8b4dd6dec2fe824152d090470e62fce12c9144aaa1be1b48ddbc3b2910b xditview-1.0.7.tar.xz" diff --git a/user/xdpyinfo/APKBUILD b/user/xdpyinfo/APKBUILD index dd551f29c..a496d8251 100644 --- a/user/xdpyinfo/APKBUILD +++ b/user/xdpyinfo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xdpyinfo -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=0 pkgdesc="X11 display information viewer" url="https://www.X.Org/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442 xdpyinfo-1.3.3.tar.xz" +sha512sums="9ef9f5c10e15a40895e8f008896b960fdd438277657c7159d16f05db79cd2374cfaca4af2f4e59335824bfd2f74a045ef89dd99ea4130ed436ea59fbbb1cbe12 xdpyinfo-1.3.4.tar.xz" diff --git a/user/xdriinfo/APKBUILD b/user/xdriinfo/APKBUILD index fe20244c0..073432f4c 100644 --- a/user/xdriinfo/APKBUILD +++ b/user/xdriinfo/APKBUILD @@ -1,16 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xdriinfo -pkgver=1.0.6 -pkgrel=0 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X11 DRI information viewer" url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="libx11-dev mesa-dev util-macros xorgproto-dev" +makedepends="libglvnd-dev libx11-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xdriinfo-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/xdriinfo-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2" +sha512sums="a368cf32c606ca78f3a23bc5d88fb57b9c1a3827d0fec3e48cee153703135e47cecd3db8ee0eba93f309d7f03b4306c3f2e7f46f36d0d2970671c5e5b78093ad xdriinfo-1.0.7.tar.xz" diff --git a/user/xedit/APKBUILD b/user/xedit/APKBUILD index 23a16a71b..b93a2a764 100644 --- a/user/xedit/APKBUILD +++ b/user/xedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xedit -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="Simple text editor for X11" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1089c35ef961e53f74cc7d892960e1ee7f0da17529e3173e7f7764b0eb4ee94d1e068cb177d8502ca55c1dd6808962d4b1427e303adc7e6db80be8828557f45a xedit-1.2.3.tar.xz" +sha512sums="30819ec491f9a02db95c20eb8653389b29bf4a4a5c54701d156db67fcb8fade5276dcb3a656dca245c958d75d0ee6fe50ab207e040ce0065d9d9a1bd58d5b24c xedit-1.2.4.tar.xz" diff --git a/user/xev/APKBUILD b/user/xev/APKBUILD index d4c16f234..acec66ec4 100644 --- a/user/xev/APKBUILD +++ b/user/xev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xev -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=0 pkgdesc="X11 input event monitor" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9fbfb78c9547974c2256a678948bf4a694a40b1c2bd5c5dec5f365a713e6d938c6039f055a9629f49de27f02f3d7cb912f07c035df129798a4b2ddc20febe66a xev-1.2.5.tar.xz" +sha512sums="aaabb635622abfbf0b7ef2a1978070a918ea94480f375dd0798375274cf378ddb25007cc42426bb2292ed65c8af922f88e6a04c5a2f6cff3fadb0194b53eb7e7 xev-1.2.6.tar.xz" diff --git a/user/xeyes/APKBUILD b/user/xeyes/APKBUILD index 665660ddb..b2658c35b 100644 --- a/user/xeyes/APKBUILD +++ b/user/xeyes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xeyes -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=0 pkgdesc="Feel like somebody's watching you" url="https://www.X.Org/" @@ -11,7 +11,7 @@ depends="" makedepends="libx11-dev libxext-dev libxmu-dev libxrender-dev libxt-dev libxi-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2d1614614b3ba3d1ebaa0e9801a2e159389b94aaacafb962d326b7e6dc712c1eb2c12a50ceb10b3135cf0eee6ae86bbf84e73098deb08e73792f14a60616b4d8 xeyes-1.2.0.tar.bz2" +sha512sums="6108a476cd0807ce2a522d905894817f7f14f653f928c218c96c078f0822d9abef5fb941d3e7163a1cadaa7d74f1bd09bbf60345a7ac0fe906667af5a0490906 xeyes-1.3.0.tar.xz" diff --git a/user/xf86-input-joystick/APKBUILD b/user/xf86-input-joystick/APKBUILD index d2816b435..36e59b8f6 100644 --- a/user/xf86-input-joystick/APKBUILD +++ b/user/xf86-input-joystick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-joystick -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=0 pkgdesc="X.Org joystick driver" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/driver/xf86-input-joystick-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/driver/xf86-input-joystick-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5 xf86-input-joystick-1.6.3.tar.bz2" +sha512sums="4e9127f125543060f9e6bc4b0aa384bc98a92acc52bfb240c9a114c565e0b24d2e9dcbc0e866845abc8aeb1e1a6c78cd5e3f0c0f22007aa93460b6a1910d67ef xf86-input-joystick-1.6.4.tar.xz" diff --git a/user/xf86-input-libinput/APKBUILD b/user/xf86-input-libinput/APKBUILD index 0d0a26619..e6a91616a 100644 --- a/user/xf86-input-libinput/APKBUILD +++ b/user/xf86-input-libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-libinput -pkgver=1.2.1 +pkgver=1.4.0 pkgrel=0 pkgdesc="X.Org generic input driver using libinput" url="https://www.X.Org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7 xf86-input-libinput-1.2.1.tar.xz" +sha512sums="b286b5425aeda5cfecd1de7f59663d169b95ffc55474dfbf28c2e13e5221cbeecd472d40b6094c0a937f83db67bf58a7fe0e07d25b6a6945d3fd669e717fc0bf xf86-input-libinput-1.4.0.tar.xz" diff --git a/user/xf86-input-mouse/APKBUILD b/user/xf86-input-mouse/APKBUILD index 40cdb92b2..624281462 100644 --- a/user/xf86-input-mouse/APKBUILD +++ b/user/xf86-input-mouse/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-mouse -pkgver=1.9.4 +pkgver=1.9.5 pkgrel=0 pkgdesc="X.Org mouse driver" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7dfde3b1e0c1291c4d78ee920942771808b007f743bfc6eed20de12579383745858673dd874a4b5cf4ab8d9d15f6f7ca2db81ee831547a488d64848a7fe5e16c xf86-input-mouse-1.9.4.tar.xz" +sha512sums="ed9bd9cb9a05dac0ff1bfb4e4704cb2e94117afb400aa9e0b7ccdbb102bc6db1b0d3af7cb6f99d0892f8fc306f1643286291c0fa7114af8e65864412bd6c1afa xf86-input-mouse-1.9.5.tar.xz" diff --git a/user/xf86-video-amdgpu/APKBUILD b/user/xf86-video-amdgpu/APKBUILD index 2a0effefa..c8df25305 100644 --- a/user/xf86-video-amdgpu/APKBUILD +++ b/user/xf86-video-amdgpu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-amdgpu -pkgver=19.1.0 +pkgver=23.0.0 pkgrel=0 pkgdesc="X.Org driver for brand new AMD GPUs" url="https://www.X.Org/" @@ -11,7 +11,7 @@ depends="" makedepends="eudev-dev libdrm-dev mesa-dev util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/driver/xf86-video-amdgpu-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/driver/xf86-video-amdgpu-$pkgver.tar.xz" build() { ./configure \ @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173 xf86-video-amdgpu-19.1.0.tar.bz2" +sha512sums="bf26f147629a34e84a0ae8435119e170b9c95edafcab1995b63bb8f55abef32f2efbf4536eb070e64b2ae1460424b1b27a4206cb9836d33ddc6dfbee404f718b xf86-video-amdgpu-23.0.0.tar.xz" diff --git a/user/xf86-video-ast/APKBUILD b/user/xf86-video-ast/APKBUILD index 2ba078de0..ec34729eb 100644 --- a/user/xf86-video-ast/APKBUILD +++ b/user/xf86-video-ast/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ast -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=0 pkgdesc="ASPEED video driver for X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT" depends="" makedepends="util-macros xorgproto-dev xorg-server-dev" subpackages="" -source="https://www.x.org/releases/individual/driver/xf86-video-ast-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/driver/xf86-video-ast-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e xf86-video-ast-1.1.5.tar.bz2" +sha512sums="8482fec8d6be577f293cb820e623544475163f713fd74ec415f899bf5e9cf9453ffe4f96e141da3671437ebf616b47395d30d4b10858053c5893f5f5b7575ef1 xf86-video-ast-1.1.6.tar.xz" diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD index 15029c507..fc2090f95 100644 --- a/user/xf86-video-ati/APKBUILD +++ b/user/xf86-video-ati/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ati -pkgver=19.1.0 -pkgrel=2 +pkgver=22.0.0 +pkgrel=0 pkgdesc="ATI video driver for X11" url="https://www.X.Org/" arch="all" @@ -11,9 +11,7 @@ depends="mesa-dri" makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros xorg-server-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2 - null-deref-exa.patch - " +source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.xz" build() { export LDFLAGS="$LDFLAGS -Wl,-z,lazy" @@ -29,5 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2 -f9c6928f741014b47b302c2f2cf6a0110fcc0935cb3a2725e37f8b48e9cd778639231110b9a4ce67ad38174b21b47864ff0793f9181347c21ef694bedbc44b0b null-deref-exa.patch" +sha512sums="fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe xf86-video-ati-22.0.0.tar.xz" diff --git a/user/xf86-video-ati/null-deref-exa.patch b/user/xf86-video-ati/null-deref-exa.patch deleted file mode 100644 index dd13e9b60..000000000 --- a/user/xf86-video-ati/null-deref-exa.patch +++ /dev/null @@ -1,77 +0,0 @@ -From a8168153037f2cfb9739285b92896c0e24872518 Mon Sep 17 00:00:00 2001 -From: Alexey Sheplyakov <asheplyakov@altlinux.org> -Date: Wed, 27 Nov 2019 20:50:58 +0400 -Subject: [PATCH] Don't crash X server if GPU acceleration is not available - -Commit d1d8e3c8d0a0a0394d395eba171460501745209b causes X server -to fail on startup when GPU acceleration is not working (or is -disabled). The reason is that `radeon_get_pixmap_bo` function -gets called too early (before EXA has been initialized) and -fails with an assert: - - #0 __GI_raise (sig=<optimized out>) at ../sysdeps/unix/sysv/linux/raise.c:50 - #1 0x76ab1c6c in __GI_abort () at abort.c:79 - #2 0x76ac0b64 in __assert_fail_base (fmt=0x76bfbce4 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x7658c80c "key->initialized", file=<optimized out>, line=121, - function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:92 - #3 0x76ac0c0c in __GI___assert_fail (assertion=0x7658c80c "key->initialized", file=0x7658c9d0 "../include/privates.h", line=121, - function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:101 - #4 0x76579e6c in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at ../include/privates.h:121 - #5 0x7657a954 in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at exa.c:70 - #6 dixGetPrivate (key=<optimized out>, privates=<optimized out>) at ../include/privates.h:136 - #7 exaGetPixmapDriverPrivate (pPix=<optimized out>) at exa.c:68 - #8 0x7623d460 in radeon_get_pixmap_bo (pPix=0x71c1b8) at radeon.h:804 - #9 radeon_get_pixmap_handle (pixmap=0x71c1b8, handle=0x7fa22328) at radeon_bo_helper.c:357 - #10 0x76244458 in radeon_pixmap_get_fb (pix=0x71c1b8) at radeon.h:886 - #11 drmmode_set_mode_major (crtc=0x691860, mode=0x69191c, rotation=<optimized out>, x=<optimized out>, y=<optimized out>) at drmmode_display.c:918 - #12 0x762467e8 in drmmode_set_desired_modes (pScrn=0x67c678, drmmode=<optimized out>, set_hw=1) at drmmode_display.c:3128 - #13 0x0047bfa4 in MapWindow (client=0x669ec8, pWin=0x7206c0) at window.c:2722 - #14 MapWindow (pWin=0x7206c0, client=0x669ec8) at window.c:2665 - #15 0x00449650 in dix_main (argc=3, argv=0x7fa22604, envp=<optimized out>) at main.c:247 - #16 0x76ab2198 in __libc_start_main (main=0x42db10 <main>, argc=3, argv=0x7fa22604, init=<optimized out>, fini=0x606434 <__libc_csu_fini>, rtld_fini=0x77229930 <_dl_fini>, - stack_end=0x7fa225e0) at libc-start.c:308 - #17 0x0042db80 in __start () at ../sysdeps/mips/start.S:110 - -Don't call `exaGetPixmapDriverPrivate` if the acceleration (EXA) is not -enabled [yet] to avoid the problem. - -Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/issues/188 -Closes: https://bugzilla.altlinux.org/show_bug.cgi?id=37539 ---- - src/radeon.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/radeon.h b/src/radeon.h -index 2c913466..e4a2ba66 100644 ---- a/src/radeon.h -+++ b/src/radeon.h -@@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_buffer *bo - - static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix) - { --#ifdef USE_GLAMOR - RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen)); -+#ifdef USE_GLAMOR - - if (info->use_glamor) { - struct radeon_pixmap *priv; -@@ -799,7 +799,7 @@ static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix) - return priv ? priv->bo : NULL; - } else - #endif -- { -+ if (info->accelOn) { - struct radeon_exa_pixmap_priv *driver_priv; - driver_priv = exaGetPixmapDriverPrivate(pPix); - return driver_priv ? driver_priv->bo : NULL; -@@ -896,7 +896,7 @@ radeon_pixmap_get_fb(PixmapPtr pix) - handle); - } - -- return *fb_ptr; -+ return fb_ptr ? *fb_ptr : NULL; - } - - --- -2.24.1 - diff --git a/user/xf86-video-dummy/APKBUILD b/user/xf86-video-dummy/APKBUILD index 1391ef444..fa974d45f 100644 --- a/user/xf86-video-dummy/APKBUILD +++ b/user/xf86-video-dummy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-dummy -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=0 pkgdesc="Null video driver for X11" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9 xf86-video-dummy-0.4.0.tar.xz" +sha512sums="ff7fd8b668e5e9f40a5d27f82599b7a455a8162fc1a247195335c17980f00ce10ae6b2c062239cbaa67d8684c86174f85b398dd7f7065d36f69294bd6f2469de xf86-video-dummy-0.4.1.tar.xz" diff --git a/user/xf86-video-geode/APKBUILD b/user/xf86-video-geode/APKBUILD index 71749e608..22a81e7df 100644 --- a/user/xf86-video-geode/APKBUILD +++ b/user/xf86-video-geode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-geode -pkgver=2.11.19 +pkgver=2.11.21 pkgrel=0 pkgdesc="AMD Geode video driver for X11" url="https://www.X.Org/" @@ -10,10 +10,7 @@ license="X11" depends="" makedepends="util-macros xorgproto-dev xorg-server-dev" subpackages="" -source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.tar.bz2 - loader.patch - randr.patch - " +source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.tar.xz" build() { ./configure \ @@ -34,6 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0b1c5edf1c226a4379aa9a4983e69cbaced0618868a7902de41a7754c148324c2a4ea73704aefd96f48d36f035fb2c8063604c26e21e986e4f90c3716578d41 xf86-video-geode-2.11.19.tar.bz2 -a6703c78f2790ff67eb812de3afcdff0a86b6dee8469318ed21e8a50af0a286a087739917e7559d920085563b62eaf9874d54397e88bc810e65bd6ffa7d0830f loader.patch -c4b1d09b17e84a3aa842e37f6710fcfe420c2cd9a3efeac5ea50c0d3eb7ebbdb370536a86e1741c89fe50ae38b22d9aecf1d6919077a1579209f2f70c2e0b099 randr.patch" +sha512sums="e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61 xf86-video-geode-2.11.21.tar.xz" diff --git a/user/xf86-video-geode/loader.patch b/user/xf86-video-geode/loader.patch deleted file mode 100644 index f318fbb17..000000000 --- a/user/xf86-video-geode/loader.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 09aaa3d1fae4aeb099b16e7a046151761bcdea95 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 24 Jan 2017 09:53:06 -0500 -Subject: Remove call to LoaderGetOS - -On OSes that don't have a /dev/videox we'll just fail the open() and not -initialize the Xv adaptor. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - src/z4l.c | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/src/z4l.c b/src/z4l.c -index eccefe8..be0d345 100644 ---- a/src/z4l.c -+++ b/src/z4l.c -@@ -1709,7 +1709,6 @@ _X_EXPORT XF86ModuleData ztvModuleData = { &z4lVersionRec, z4lSetup, NULL }; - static pointer - z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - { -- const char *osname; - static Bool setupDone = FALSE; - - if (setupDone != FALSE) { -@@ -1719,19 +1718,7 @@ z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) - } - - setupDone = TRUE; -- LoaderGetOS(&osname, NULL, NULL, NULL); -- -- if (osname == NULL || strcmp(osname, "linux") != 0) { -- if (errmaj) -- *errmaj = LDR_BADOS; -- if (errmin) -- *errmin = 0; -- -- return NULL; -- } -- - xf86AddDriver(&Z4l, module, 0); -- - return (pointer) 1; - } - --- -cgit v1.1 - diff --git a/user/xf86-video-geode/randr.patch b/user/xf86-video-geode/randr.patch deleted file mode 100644 index 9c2b34ac9..000000000 --- a/user/xf86-video-geode/randr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 5 Mar 2018 10:28:15 -0500 -Subject: gx: Fix RANDR initialization for xserver 1.20 - -xf86DisableRandR() doesn't exist anymore, and we don't need it anyway, -the core code will notice that we set up RANDR ourselves. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - src/gx_driver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gx_driver.c b/src/gx_driver.c -index ab57df1..4de336e 100644 ---- a/src/gx_driver.c -+++ b/src/gx_driver.c -@@ -1426,7 +1426,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) - - /* Set up RandR */ - -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24 - xf86DisableRandR(); /* We provide our own RandR goodness */ -+#endif - - /* Try to set up the shadow FB for rotation */ - --- -cgit v1.1 - diff --git a/user/xf86-video-glint/APKBUILD b/user/xf86-video-glint/APKBUILD deleted file mode 100644 index c3f2b0303..000000000 --- a/user/xf86-video-glint/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=xf86-video-glint -pkgver=1.2.9 -pkgrel=0 -pkgdesc="X.Org driver for GLINT/Permedia GPUs" -url="https://www.X.Org/" -arch="all" -license="X11" -depends="" -makedepends="util-macros xorg-server-dev xorgproto-dev" -subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/xf86-video-glint-$pkgver.tar.bz2" - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12 xf86-video-glint-1.2.9.tar.bz2" diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD index a7eb064bb..2679c69a5 100644 --- a/user/xf86-video-intel/APKBUILD +++ b/user/xf86-video-intel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xf86-video-intel verbase=2.99.917 -pkgver=${verbase}_git20200224 +pkgver=${verbase}_git20230318 pkgrel=0 pkgdesc="Legacy X.Org driver for Intel graphics cards" url="https://xorg.freedesktop.org" @@ -15,9 +15,9 @@ makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev libxv-dev " subpackages="$pkgname-doc" -source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.gz" +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz" giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git" -reporev="f66d39544bb8339130c96d282a80f87ca1606caf" +reporev="ce811e78882d9f31636351dfe65351f4ded52c74" prepare() { default_prepare @@ -42,4 +42,4 @@ package() { rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper } -sha512sums="cb853076238cbde61faeb7dd1a07c5edc5325361dc3109acd9c142c1bf66566ee8c19f8e709bde34456e4198353ac72d337bc6a43dbcc80a4546762541be6eb9 xf86-video-intel-2.99.917_git20200224.tar.gz" +sha512sums="b8663b30d3aba74964ea8509ce1e7bf6ef5c9d95c500900d2a88e71abe48dbe7f96650e115566673e982d0923b5a7aacce3b56def8c75c37e59542fae5c44b20 xf86-video-intel-2.99.917_git20230318.tar.gz" diff --git a/user/xf86-video-intel/fno-common.patch b/user/xf86-video-intel/fno-common.patch new file mode 100644 index 000000000..5c0640f9f --- /dev/null +++ b/user/xf86-video-intel/fno-common.patch @@ -0,0 +1,24 @@ +From 7ca3a0d0d9a2de49db30708d38195b6585df4ed8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <hanno@gentoo.org> +Date: Sun, 2 Feb 2020 14:18:39 +0100 +Subject: [PATCH] Avoid duplicate definition of I810CopyROP in i810.h and + i810_accel.c, fixes compilation with -fno-common/gcc-10. + +--- + src/legacy/i810/i810.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h +index 347188c9..901b7e64 100644 +--- a/src/legacy/i810/i810.h ++++ b/src/legacy/i810/i810.h +@@ -322,6 +322,5 @@ extern void I810InitMC(ScreenPtr pScreen); + extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid); + + extern const int I810CopyROP[16]; +-const int I810PatternROP[16]; + + #endif /* _I810_H_ */ +-- +2.24.1 + diff --git a/user/xf86-video-mach64/APKBUILD b/user/xf86-video-mach64/APKBUILD index 1aee30dab..87a878e55 100644 --- a/user/xf86-video-mach64/APKBUILD +++ b/user/xf86-video-mach64/APKBUILD @@ -8,7 +8,7 @@ url="https://www.X.Org/" arch="all" license="MIT AND X11" depends="" -makedepends="util-macros xorgproto-dev xorg-server-dev" +makedepends="libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="" source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.xz" diff --git a/user/xf86-video-mga/APKBUILD b/user/xf86-video-mga/APKBUILD index dbd2102a0..9af9c5ece 100644 --- a/user/xf86-video-mga/APKBUILD +++ b/user/xf86-video-mga/APKBUILD @@ -8,7 +8,7 @@ url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="util-macros xorgproto-dev xorg-server-dev" +makedepends="libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.xz" diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index 2f812fc77..c626524b6 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-nouveau -pkgver=1.0.16 -pkgrel=1 +pkgver=1.0.18 +pkgrel=0 pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" @@ -10,7 +10,7 @@ license="MIT" depends="mesa-dri" makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.xz" build() { export LDFLAGS="$LDFLAGS -Wl,-z,lazy" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0 xf86-video-nouveau-1.0.16.tar.bz2" +sha512sums="1330fa72f76a6fdc13e7bfa932627091d2735ddb277f6a24d4fefa79fad5f354c6bb661093f26b33770275deca435c3b018f451a6e6254fe35892c59c13e28dc xf86-video-nouveau-1.0.18.tar.xz" diff --git a/user/xf86-video-openchrome/APKBUILD b/user/xf86-video-openchrome/APKBUILD index 3d32b7dff..7846e5efc 100644 --- a/user/xf86-video-openchrome/APKBUILD +++ b/user/xf86-video-openchrome/APKBUILD @@ -18,6 +18,7 @@ prepare() { } build() { + export CFLAGS="$CFLAGS -fcommon" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/xf86-video-qxl/APKBUILD b/user/xf86-video-qxl/APKBUILD index 17de825f4..312448601 100644 --- a/user/xf86-video-qxl/APKBUILD +++ b/user/xf86-video-qxl/APKBUILD @@ -1,17 +1,17 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-qxl -pkgver=0.1.5 -pkgrel=1 +pkgver=0.1.6 +pkgrel=0 pkgdesc="QXL video driver for X11" url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="eudev-dev libxfont2-dev spice-protocol util-macros xorgproto-dev - xorg-server-dev" +makedepends="eudev-dev libdrm-dev libxfont2-dev spice-protocol util-macros + xorgproto-dev xorg-server-dev" subpackages="" -source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2 +source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.xz libdrm.patch " @@ -34,5 +34,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782 xf86-video-qxl-0.1.5.tar.bz2 +sha512sums="f6a42355915d2e8f8a842dc24fe6d012d123aa6d23eedea1a4771fb08f88e0298d76741755b88304d76c66b3aae15f9fca74d062be395e499a82ee8f4507c7e0 xf86-video-qxl-0.1.6.tar.xz 9f8bc0c32fa1633c95dfdfba630c3bfa766d4d137a37e28900256223b0a0b31d9cd368981d8b95392ef9ace8db4e11ef62fa1e7c4fcc895ff206e3e35b32c853 libdrm.patch" diff --git a/user/xf86-video-r128/APKBUILD b/user/xf86-video-r128/APKBUILD index 80d5a6922..cbd4bccf7 100644 --- a/user/xf86-video-r128/APKBUILD +++ b/user/xf86-video-r128/APKBUILD @@ -8,7 +8,7 @@ url="https://www.X.Org/" arch="all" license="X11 AND MIT" depends="" -makedepends="util-macros xorgproto-dev xorg-server-dev" +makedepends="libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/driver/xf86-video-r128-$pkgver.tar.xz 0001-Fix-output-detection-on-non-x86-and-allow-override.patch diff --git a/user/xf86-video-rendition/APKBUILD b/user/xf86-video-rendition/APKBUILD index 7174d96a7..47a6ca4c6 100644 --- a/user/xf86-video-rendition/APKBUILD +++ b/user/xf86-video-rendition/APKBUILD @@ -6,6 +6,7 @@ pkgrel=0 pkgdesc="X.Org driver for Rendition graphics" url="https://www.X.Org/" arch="all" +options="!archcheck !strip" # Includes ELF firmware files. license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" diff --git a/user/xf86-video-siliconmotion/APKBUILD b/user/xf86-video-siliconmotion/APKBUILD index 0f8fcc546..d7e9725e6 100644 --- a/user/xf86-video-siliconmotion/APKBUILD +++ b/user/xf86-video-siliconmotion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-siliconmotion -pkgver=1.7.9 +pkgver=1.7.10 pkgrel=0 pkgdesc="X.Org driver for Silicon Motion video cards" url="https://www.X.Org/" @@ -11,7 +11,7 @@ license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/xf86-video-siliconmotion-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/xf86-video-siliconmotion-$pkgver.tar.xz" build() { ./configure \ @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63 xf86-video-siliconmotion-1.7.9.tar.bz2" +sha512sums="d8bb90e636598ed20a32bdc049fe42420d9e6093429f09c3a886a7e78d3813c8533abf67c4fed084be97dd7553a1934c49aa9f94d1083dfa64ab36867ae55fca xf86-video-siliconmotion-1.7.10.tar.xz" diff --git a/user/xf86-video-sis/APKBUILD b/user/xf86-video-sis/APKBUILD index f07e35f35..60f1503f0 100644 --- a/user/xf86-video-sis/APKBUILD +++ b/user/xf86-video-sis/APKBUILD @@ -8,7 +8,7 @@ url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="util-macros xorg-server-dev xorgproto-dev" +makedepends="libdrm-dev util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/driver/xf86-video-sis-$pkgver.tar.bz2" diff --git a/user/xf86-video-sunffb/APKBUILD b/user/xf86-video-sunffb/APKBUILD index 37a3147fb..98d5bec50 100644 --- a/user/xf86-video-sunffb/APKBUILD +++ b/user/xf86-video-sunffb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-sunffb -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="X.Org driver for Sun framebuffers" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/xf86-video-sunffb-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/xf86-video-sunffb-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a812cfdb43527e97993d1ce8b62324a5ee442c0bbf695d45582f10d7d428606ac9a546c80cd401e41e2f198c94fa84762ec4e545b53b8d1cb074bfb13ab45ff0 xf86-video-sunffb-1.2.2.tar.bz2" +sha512sums="114f46c284278aa4683cd057015f66634992dc9e104ccb3a0f4f070c10cb7b2e1c656657e9aebaa8dbb9ab3391b2928ec673757ecaae00be8da0a62ee4a86166 xf86-video-sunffb-1.2.3.tar.xz" diff --git a/user/xf86-video-sunleo/APKBUILD b/user/xf86-video-sunleo/APKBUILD index 0233842b5..b77dbc884 100644 --- a/user/xf86-video-sunleo/APKBUILD +++ b/user/xf86-video-sunleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-sunleo -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="X.Org driver for the Sun LEO 3D accelerator" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/xf86-video-sunleo-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/xf86-video-sunleo-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="467559e608b59dcf2a50cbaddc218ad0778e88515906fed9d6346db09187f3f7645482113882bcf81428d4af3d3f2cccec7f24663c12c23a411f8a87551ef23f xf86-video-sunleo-1.2.2.tar.bz2" +sha512sums="9ba8da706e77ed781ed7a59aae6152609c9f3dcad74c5b1b5b40d82b75b67b8a252beb175c7b4449d18d0d77694b17a1adfa17f96d9d61d79f336bc49f19e06c xf86-video-sunleo-1.2.3.tar.xz" diff --git a/user/xf86-video-tdfx/APKBUILD b/user/xf86-video-tdfx/APKBUILD index 7f8252934..67a98da9c 100644 --- a/user/xf86-video-tdfx/APKBUILD +++ b/user/xf86-video-tdfx/APKBUILD @@ -8,7 +8,7 @@ url="https://www.X.Org/" arch="all" license="MIT" depends="" -makedepends="util-macros xorgproto-dev xorg-server-dev" +makedepends="libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/driver/xf86-video-tdfx-$pkgver.tar.bz2" diff --git a/user/xf86-video-trident/APKBUILD b/user/xf86-video-trident/APKBUILD index 560447424..82c0bfe8e 100644 --- a/user/xf86-video-trident/APKBUILD +++ b/user/xf86-video-trident/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-trident -pkgver=1.3.8 +pkgver=1.4.0 pkgrel=0 pkgdesc="X.Org driver for Trident video cards" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/xf86-video-trident-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/xf86-video-trident-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f971e9441c9ff7374d53d30f6746232903221665ae52560d5716762c2233cc6d0065b631a4fed98bf194d9827572cc42da577a2e6e06ba014e6ce42343b63f66 xf86-video-trident-1.3.8.tar.bz2" +sha512sums="86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz" diff --git a/user/xf86-video-vboxvideo/APKBUILD b/user/xf86-video-vboxvideo/APKBUILD index 5a5288f9b..1fdaf50e2 100644 --- a/user/xf86-video-vboxvideo/APKBUILD +++ b/user/xf86-video-vboxvideo/APKBUILD @@ -1,16 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-vboxvideo -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=0 pkgdesc="X.Org driver for the VirtualBox video adaptor" url="https://www.X.Org/" -arch="all" +arch="i528 pmmx x86 x86_64" license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/xf86-video-vboxvideo-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/xf86-video-vboxvideo-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc xf86-video-vboxvideo-1.0.0.tar.bz2" +sha512sums="a0428e81e2861d59d0cc0e75fee14ba320322f057257568e10eb6347a55d85bcc1ba8973e5a2dfda7f5f24bbefefad7f7a555d4af2823a7b0ccad2c18105139c xf86-video-vboxvideo-1.0.1.tar.xz" diff --git a/user/xf86-video-vesa/APKBUILD b/user/xf86-video-vesa/APKBUILD index f6e8bf1f7..ad4440802 100644 --- a/user/xf86-video-vesa/APKBUILD +++ b/user/xf86-video-vesa/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-vesa -pkgver=2.5.0 +pkgver=2.6.0 pkgrel=0 pkgdesc="X.Org driver for VESA-compatible video adaptors" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b xf86-video-vesa-2.5.0.tar.bz2" +sha512sums="494e117c1e6e0ce4c66ac7798de54667862c62605bfd76dd9373447d40dcd0521100810c9285cbe9c159440e217954c0cad6d5219c5894e075509c7c0bc353c7 xf86-video-vesa-2.6.0.tar.xz" diff --git a/user/xf86-video-vmware/APKBUILD b/user/xf86-video-vmware/APKBUILD index 511336412..a4c0b399a 100644 --- a/user/xf86-video-vmware/APKBUILD +++ b/user/xf86-video-vmware/APKBUILD @@ -1,19 +1,17 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-vmware -pkgver=13.3.0 -pkgrel=1 +pkgver=13.4.0 +pkgrel=0 pkgdesc="X.Org driver for VMware's SVGA adaptor" url="https://www.X.Org/" # Requires kernel interfaces unavailable on ARM. arch="all !aarch64 !aarch64_be !armel !armeb !armhf !armv7" license="X11" depends="" -makedepends="eudev-dev util-macros xorg-server-dev xorgproto-dev" +makedepends="eudev-dev libxext-dev util-macros xorg-server-dev xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/driver/xf86-video-vmware-$pkgver.tar.bz2 - fix-stdbool-includes.patch - " +source="https://www.X.Org/releases/individual/driver/xf86-video-vmware-$pkgver.tar.xz" build() { ./configure \ @@ -34,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca xf86-video-vmware-13.3.0.tar.bz2 -b607f875143213015a839336b453131a477387ca9c8422957697628b3b7d1667b1a196f6aa41ea93f262589a8bea560d3e1f2337aea5fbf466610191a78ad5f4 fix-stdbool-includes.patch" +sha512sums="7cacde21a490501dd9c2e9121040274c1f6ef64e6dc0ef49946b400f6297fab73a6e9548e45fe8930cee9028e65e45aaff9ba489dd69ac75a5133114726bf55d xf86-video-vmware-13.4.0.tar.xz" diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD index c3165fee2..53d876d1a 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfburn -pkgver=0.7.0 +pkgver=0.7.2 pkgrel=0 pkgdesc="CD burning utility for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5ac679926809839d36c94d918ebc9bb409b9940127eba1cae6daf6614288f5d18181be5b7b4d249f0f0e973c2a4a22b8b3ce5709a2d23e5d4dd3b412cf5846d1 xfburn-0.7.0.tar.bz2" +sha512sums="7966fc32a71b029f3e511565bcb751b06a9b87c2b434c9d546cccc1ba43479b1d1b17c9afe743babd08192e39907e4967e755a7b5fd72df3906645cce50db9a9 xfburn-0.7.2.tar.bz2" diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD index 3182ade61..3c74251c8 100644 --- a/user/xfce-desktop/APKBUILD +++ b/user/xfce-desktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce-desktop -pkgver=4.13 -pkgrel=1 +pkgver=4.20 +pkgrel=0 arch="noarch" pkgdesc="Complete XFCE desktop environment" url="https://xfce.org" diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 52aeb2207..34126ef9e 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-appfinder -pkgver=4.18.1 +pkgver=4.20.0 pkgrel=0 pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ebdf1e189e3c7d8b738d9be502124ac5e05664713e53d9e9c2f758717c409d0dc50506cd488383ba7c96aa981050a5623a957e961b9da8f486e3c189899a378 xfce4-appfinder-4.18.1.tar.bz2" +sha512sums="eae593d075cfe091680fc0093236e95172fddab88a251765e1c6574688a5456fb03f3547eede1d2c6766f8b05b18f0bcbeae607e61d97ac92a927dbe2283790f xfce4-appfinder-4.20.0.tar.bz2" diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 7b326d63b..16e92c6af 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-cpugraph-plugin -pkgver=1.2.8 +pkgver=1.2.10 pkgrel=0 pkgdesc="Graphical CPU monitor plugin for the XFCE panel" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0f4201d0572997e8c610a25fcb957ebe4dd224204421aeba4e8ca54da71bdd97fa147dd7af7097b9e09ce6e1317836622a0bcbfec9589858010942993e27940 xfce4-cpugraph-plugin-1.2.8.tar.bz2" +sha512sums="414c2a5da9576d2ed1f5478a07ff5c51c45eaa0a8432a31b6fb2408b81f5ab4485e3b10486af26cf33a18d23e2dc3afe21bf88630e4db91adcfa3e0f80468cf3 xfce4-cpugraph-plugin-1.2.10.tar.bz2" diff --git a/user/xfce4-dev-tools/APKBUILD b/user/xfce4-dev-tools/APKBUILD index 11107699d..f474b5120 100644 --- a/user/xfce4-dev-tools/APKBUILD +++ b/user/xfce4-dev-tools/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-dev-tools -pkgver=4.18.1 +pkgver=4.20.0 pkgrel=0 pkgdesc="Developer tools for XFCE" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="glib-dev libxslt-dev" +makedepends="glib-dev libxslt-dev meson" subpackages="$pkgname-dev $pkgname-doc" source="https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fa65aa57450d3e65ef55bf86e8a113c06e64289a9f71875049b422da2a8bdfcdd36c3a3e94a3c0e7c602a3e9577eca14d63318489f81fd88d6743e188636304 xfce4-dev-tools-4.18.1.tar.bz2" +sha512sums="2ee8d0e4512c326ad404310f15081a8c6eec026634bcc2e76873cecc5b4356c3425d883c07f05e5a76a500c135d62809e6323f318ac6fc33d16023a9c5bd5441 xfce4-dev-tools-4.20.0.tar.bz2" diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD index b8fe50843..32824a9f9 100644 --- a/user/xfce4-dict/APKBUILD +++ b/user/xfce4-dict/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-dict -pkgver=0.8.6 +pkgver=0.8.8 pkgrel=0 pkgdesc="Dictionary application for the XFCE desktop environment" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bbb5926121e31c5adbd8f4c3ceb479759ee07b902e690245087213668fade48b92f9ffc7f4cabdfaa3ee1c02db8847468dd0bbd11e240017cd3c2b9901b81485 xfce4-dict-0.8.6.tar.bz2" +sha512sums="db1919f3d29245cc02ea8e4f898e8d389c426a574f6227bcb0504f2f4506220617bf6ac4b8544e85e00c8d7818ad06a61e2daaea1883a6badf9b394d2b481398 xfce4-dict-0.8.8.tar.bz2" diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index c4e8a8e5f..adf0a6f81 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-notifyd -pkgver=0.9.4 +pkgver=0.9.6 pkgrel=0 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0-only AND GPL-2.0+" depends="" -makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev - xfce4-panel-dev libnotify-dev dbus-glib-dev sqlite-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +makedepends="intltool gtk-layer-shell-dev gtk+3.0-dev libcanberra-dev + libice-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev libnotify-dev + dbus-glib-dev sqlite-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd" source="https://archive.xfce.org/src/apps/xfce4-notifyd/${pkgver%.*}/xfce4-notifyd-$pkgver.tar.bz2" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3339ec3555f27e624e643b52ce4de2a0834d38f675b286976abcb4e143cbbb32665b1f36fbff23791c152e1f0616b752a7f049045fc32829c27c0a87d82df94 xfce4-notifyd-0.9.4.tar.bz2" +sha512sums="deef625fdb7828ac25a3eeb2c5e5813f285310354b33a81e1c7943024d9dee9e9b5765f94f7e7ccedd1998dab77eb2c62a2803864d56aed6f831f08b910f0071 xfce4-notifyd-0.9.6.tar.bz2" diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index cc455a49a..b622fc195 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-panel -pkgver=4.18.6 +pkgver=4.20.0 pkgrel=0 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.1+ AND GPL-2.0+" depends="" -makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev>=${pkgver%.*} - garcon-dev>=${pkgver%.*} exo-dev>=${pkgver%.*} libwnck-dev - wayland-protocols" +makedepends="intltool gobject-introspection-dev gtk-doc gtk-layer-shell-dev + gtk+3.0-dev libdbusmenu-dev libice-dev libxfce4util-dev>=${pkgver%.*} + libxfce4windowing-dev>=${pkgver%.*} garcon-dev>=${pkgver%.*} + exo-dev>=${pkgver%.*} libwnck-dev wayland-protocols vala-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-panel/${pkgver%.*}/xfce4-panel-$pkgver.tar.bz2" @@ -21,7 +22,9 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --enable-dbusmenu-gtk3 \ + --enable-gtk-doc make } @@ -33,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1c4597bbbb72d2f3ef90abe0082abe3404e0ea7fa6027e26ca50e31e03645464ce3e0a72f4d927e84c5775a775e3a70f70e25bd3d2e4358da869f9c474e6174 xfce4-panel-4.18.6.tar.bz2" +sha512sums="431ff1736a62bdee4a7a9a5e7b8aa9f0cf779ce5454503c33fc0ffb82b6cd4bbcbc5e1fc99c092e31f0f702f459cf31336eff914a41b618043f83d2a40c9b049 xfce4-panel-4.20.0.tar.bz2" diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index 23839e0fe..6efc54433 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-power-manager -pkgver=4.18.3 +pkgver=4.20.0 pkgrel=0 pkgdesc="Power management support for the XFCE desktop environment" url="https://xfce.org" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0+" depends="" makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev - upower-dev xfce4-panel-dev" + polkit-dev upower-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-power-manager/${pkgver%.*}/xfce4-power-manager-$pkgver.tar.bz2" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="97f198ed78c3a13c5e64f0551d49533ac2efe0c719f4360eab94736790b225411b347a8524e8a2d7e28b14e546df6133df5273c80d8e0eb5766145782e1412fb xfce4-power-manager-4.18.3.tar.bz2" +sha512sums="e61762b4ff374562fa3d70b1eb7c9928a1a7197df5b597763adf16435183fd693307267f37f0eb7dd08b573664a397d2fd22674b5db7e07ee9302089772ff6e7 xfce4-power-manager-4.20.0.tar.bz2" diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index 27e3e473f..afe52ae23 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-pulseaudio-plugin -pkgver=0.4.8 +pkgver=0.4.9 pkgrel=0 pkgdesc="Pulseaudio plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="exo-dev intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev - keybinder-3.0-dev libnotify-dev dbus-glib-dev" +makedepends="dbus-glib-dev exo-dev intltool keybinder-3.0-dev libcanberra-dev + libnotify-dev libxfce4ui-dev pulseaudio-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8f6f06a65295ff53bd18a32dc302b2d12fb722bcfacd549c79dbc88e8ab6890888f158ea02ce5a21b261fa681068d68f18eb076f1dc2cb9135b7fc1e77fa7ce8 xfce4-pulseaudio-plugin-0.4.8.tar.bz2" +sha512sums="7fa29e85146e8cbbd420aed11050924fbb9c1a93657da1a4d3e207f5a7cc7fc99acdc41b467420a8948535a7f45e2a8e6d63f79df3cef228ada810566f15c263 xfce4-pulseaudio-plugin-0.4.9.tar.bz2" diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD index d845da586..d1d14bc33 100644 --- a/user/xfce4-screenshooter/APKBUILD +++ b/user/xfce4-screenshooter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-screenshooter -pkgver=1.10.5 +pkgver=1.11.1 pkgrel=0 pkgdesc="Screenshot tool for the XFCE desktop environment" url="https://xfce.org" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0+" depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libsoup-dev exo-dev pango-dev>=1.44" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2" build() { @@ -28,7 +28,7 @@ check() { } package() { - make DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install } -sha512sums="0040b28514ffc77473b2d9f182c1bc162f8ac21aac97f2e28eb2b5556255dd74f7d4545f049b4060a8db6c0d415831fe5988da581857f22894bed01136aee677 xfce4-screenshooter-1.10.5.tar.bz2" +sha512sums="aee31311faea2bb08d5e29722da190b0c7e2b37948a688a49212cd57cc4efc3f43b3c1588d9326f97eb174771412c60707cc88ae2ee0596546e9750a06112588 xfce4-screenshooter-1.11.1.tar.bz2" diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index bbae1d1cc..b8d637ab4 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-session -pkgver=4.18.3 +pkgver=4.20.0 pkgrel=0 pkgdesc="Session management for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" depends="iceauth polkit cmd:which xdg-user-dirs" -makedepends="intltool gtk+3.0-dev libice-dev libsm-dev libxfce4util-dev>=${pkgver%.*} - libxfce4ui-dev>=${pkgver%.*} libwnck-dev iceauth dbus-glib-dev polkit-dev" +makedepends="intltool gtk-layer-shell-dev gtk+3.0-dev libice-dev libsm-dev + libxfce4util-dev>=${pkgver%.*} libxfce4ui-dev>=${pkgver%.*} + libxfce4windowing-dev>=${pkgver%.*} libwnck-dev iceauth dbus-glib-dev + polkit-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-session/${pkgver%.*}/xfce4-session-$pkgver.tar.bz2" @@ -32,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65314472049c973af4b7553ec969691dfe701af2addb8cb63aebb49ff1b61ddb9e1418b2969e5eac69fd32096dd3163b7bf28fefe1d8c130c46bd5dd2bfe126c xfce4-session-4.18.3.tar.bz2" +sha512sums="2e3b1280830fe3b26d39e87fcc26fd2be6df5f1328b64529c46cc51fe80abcc07b2996fd07af331ee2a502f025f40576cfb49a7ddaa9cc82b1f3cf17484f1dd6 xfce4-session-4.20.0.tar.bz2" diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index d0cae3f1d..6da8c83e8 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,14 +1,15 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-settings -pkgver=4.18.4 +pkgver=4.20.0 pkgrel=0 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND MIT AND LGPL-2.0+" depends="" -makedepends="intltool exo-dev>=${pkgver%.*} garcon-dev>=${pkgver%.*} libnotify-dev upower-dev +makedepends="intltool exo-dev>=${pkgver%.*} garcon-dev>=${pkgver%.*} + gtk-layer-shell-dev libnotify-dev upower-dev libxklavier-dev xf86-input-libinput-dev wayland-protocols" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-settings/${pkgver%.*}/xfce4-settings-$pkgver.tar.bz2" @@ -26,6 +27,7 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --enable-pluggable-dialogs \ + --enable-upower-glib \ --enable-sound-settings make } @@ -38,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f9e2de4a3a0cc59b4701b44899464532fbae8805270485d2821b65b9d78be54bb636c4cd4205de97e18c13b20912fcd1f4ca0b3baa561bf1a783829f53a06a0 xfce4-settings-4.18.4.tar.bz2" +sha512sums="ab728bfce9aefe14c59dce0f93a84d395826ffc37d3a7bafc40fce61055ce4b7d9265c65460bf7ee69e4c8f4efd7e0b88b3670d859d48d4602c17acc20556528 xfce4-settings-4.20.0.tar.bz2" diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index b2d5bcbe5..bcbf0223a 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-taskmanager -pkgver=1.4.2 +pkgver=1.5.7 pkgrel=0 pkgdesc="Process manager for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd7f26c7ab0e0557be52155d58c677258da8479c2a09b0e1dd4006fe0ecb2a3c82d68ecdf72c10e8b8977eac5a158fcb606027229e973edb6ea7570d040c2444 xfce4-taskmanager-1.4.2.tar.bz2" +sha512sums="b9c8a3d088b116ba51e3db8685052f68702283509d7a7a9e7a54c079fcdfefa22b019bc0f1572546907da1c8fcd0a98ae4320f7b99a3e77f49ed1a8e86f41a80 xfce4-taskmanager-1.5.7.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index cf7a5b2bf..4ab3cebc2 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfconf -pkgver=4.18.3 +pkgver=4.20.0 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" arch="all" -options="!check" # Tests require X11. +options="checkx11" license="LGPL-2.1+ AND GPL-2.0+" depends="dbus" makedepends="intltool gtk+3.0-dev libxfce4util-dev>=${pkgver%.*}" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd" source="https://archive.xfce.org/src/xfce/xfconf/${pkgver%.*}/xfconf-$pkgver.tar.bz2" build() { @@ -39,4 +39,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="e1aa133f79ea584af067369f6fd059cd444c4743270ed90a8b0dfe158f7ae6fbc78af62fab67c64674060c2fd1404f06602ac8c019b0db8b70779a17fde4a327 xfconf-4.18.3.tar.bz2" +sha512sums="87ae4e9366cccb6c2f13229539e8317d26bfb3fc5333e769ec2de1b596e04348595bb2e85ca90fb63c6c64968e5108e59490700028aeb077b32b9cd03062d9e9 xfconf-4.20.0.tar.bz2" diff --git a/user/xfd/APKBUILD b/user/xfd/APKBUILD index ca4f5188d..7d2bca476 100644 --- a/user/xfd/APKBUILD +++ b/user/xfd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfd -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Display all characters in X11 fonts" url="https://www.X.Org/" @@ -11,7 +11,7 @@ depends="" makedepends="fontconfig-dev libxaw-dev libxft-dev libxkbfile-dev libxmu-dev libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/xfd-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xfd-$pkgver.tar.xz" build() { ./configure \ @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2" +sha512sums="fa1f8a7b5d89be20fb2b1e3e0e8f4d7f9463e91fd385d21e1403a398c2e263112043b568417c420c5ee33bec60e06658498dd55df6d7ac19da3af0844f932209 xfd-1.1.4.tar.xz" diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index f779a326c..f01be7143 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfdesktop -pkgver=4.18.1 +pkgver=4.20.0 pkgrel=0 pkgdesc="Desktop manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev - exo-dev garcon-dev libnotify-dev thunar-dev>=${pkgver%.*}" +makedepends="intltool gtk-layer-shell-dev gtk+3.0-dev libwnck-dev + libxfce4util-dev libxfce4ui-dev libxfce4windowing-dev yaml-dev exo-dev + garcon-dev libnotify-dev thunar-dev>=${pkgver%.*}" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfdesktop/${pkgver%.*}/xfdesktop-$pkgver.tar.bz2" @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cafb1e274bbabf1704a6452532fc79657af26eaf92a58374f87a70f31c35fbf213319c6658b3d18bfca2d555b69e07e46949407d1f80e5a37f48e76bbde9dc3e xfdesktop-4.18.1.tar.bz2" +sha512sums="84b0c87c9678d3d6170af3d6edabe983282b0bd4d696e32d3a1eaaca99651d56387a9767645d5b48afdc517a18503e42fdaf0a72af9a73144475fb3b6183219c xfdesktop-4.20.0.tar.bz2" diff --git a/user/xfontsel/APKBUILD b/user/xfontsel/APKBUILD index c9c4ebbc4..28f7e071a 100644 --- a/user/xfontsel/APKBUILD +++ b/user/xfontsel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfontsel -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="X11 font chooser and exploration tool" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be67d223668431c9b5dd2ef74032d2f087be5f8f0ccc427bc7ee43e7ce42214edddb07d8c3d6d6de93ea35314392d384f1ab1ae5c48b2cfbce418610e3945a52 xfontsel-1.1.0.tar.xz" +sha512sums="fdb1f20dc86e2e74da77ef5e62d9465ea24d1af965f1ff3a6334ffefb239130fcf28f7cde9b4e7d7e6c9cf12fcb637784e7af209cffcee3dbe304025d33abcdd xfontsel-1.1.1.tar.xz" diff --git a/user/xfs/APKBUILD b/user/xfs/APKBUILD index ea9e2c305..1c60c0b96 100644 --- a/user/xfs/APKBUILD +++ b/user/xfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfs -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=0 pkgdesc="The X11 Font Server" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f8b019e0d922b3d859110154e0ec58493f66507f9787cd41a6c03ad7a05b3293f088f1004e4aaa81e017a524c06d23915669f91ed5e1c2679b33c43de15e70d xfs-1.2.1.tar.xz" +sha512sums="e8983ddade7015c87db1278093701b9e62c7d09003150ed7347a9b83b8f245e8ac9fe2d86d61bb4469bbbea86a71366ef299541793326d9dbbb1b9c0572bcba9 xfs-1.2.2.tar.xz" diff --git a/user/xfsprogs/APKBUILD b/user/xfsprogs/APKBUILD new file mode 100644 index 000000000..8d717f51e --- /dev/null +++ b/user/xfsprogs/APKBUILD @@ -0,0 +1,54 @@ +# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfsprogs +pkgver=6.9.0 +pkgrel=0 +pkgdesc="XFS filesystem utilities" +url="https://xfs.org/index.php/Main_Page" +arch="all" +options="!check" # No test suite. +license="GPL-1.0-only" +depends="$pkgname-base" +makedepends="attr-dev bash icu-dev inih-dev libedit-dev linux-headers + userspace-rcu-dev util-linux-dev" +subpackages="$pkgname-base $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" +source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.tar.gz + no-utmp-header.patch + scrub.patch + " + +build() { + export DEBUG=-DNDEBUG + export OPTIMIZER="$CFLAGS" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sbindir=/sbin \ + --libexecdir=/usr/lib \ + --enable-editline + make SHELL=/bin/bash +} + +check() { + make check +} + +package() { + make -j1 DIST_ROOT="$pkgdir" install install-dev + find "$pkgdir" -name *.la -delete + chown -R 0:0 "$pkgdir" +} + +base() { + # Everything except xfs_scrub, which pulls in 50 MiB of icu libs. + pkgdesc="Base $pkgdesc" + mkdir "$subpkgdir" + mv "$pkgdir"/sbin "$subpkgdir"/ + mkdir "$pkgdir"/sbin + mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ +} + +sha512sums="bfb3c98e7571180f1c5c130ca9aece5dde97bc6c628dc3d6560b0da75e5b43e8febe3eec193d3db2ec877b3a27258c53c033c7ed3d881efd2d4e3216033aaf2b xfsprogs-6.9.0.tar.gz +29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch +d83e2ae819a338273fae7999a0ae1376faa593308974f93abc6db140b134ec98f855a2ea5585583f739b041fbb5d4b8a0d4d27ecd73df6c34cd799b2cee55b9a scrub.patch" diff --git a/user/xfsprogs/no-utmp-header.patch b/user/xfsprogs/no-utmp-header.patch new file mode 100644 index 000000000..f272bc152 --- /dev/null +++ b/user/xfsprogs/no-utmp-header.patch @@ -0,0 +1,20 @@ +--- xfsprogs-4.17.0/quota/report.c.old 2018-06-28 12:00:43.000000000 -0500 ++++ xfsprogs-4.17.0/quota/report.c 2018-07-04 00:50:44.940000000 -0500 +@@ -8,7 +8,6 @@ + #include <sys/types.h> + #include <pwd.h> + #include <grp.h> +-#include <utmp.h> + #include "init.h" + #include "quota.h" + +--- xfsprogs-4.17.0/quota/util.c.old 2018-06-28 12:00:43.000000000 -0500 ++++ xfsprogs-4.17.0/quota/util.c 2018-07-04 00:53:25.470000000 -0500 +@@ -8,7 +8,6 @@ + #include <stdbool.h> + #include <pwd.h> + #include <grp.h> +-#include <utmp.h> + #include "init.h" + #include "quota.h" + diff --git a/user/xfsprogs/scrub.patch b/user/xfsprogs/scrub.patch new file mode 100644 index 000000000..a466aab34 --- /dev/null +++ b/user/xfsprogs/scrub.patch @@ -0,0 +1,49 @@ +From da3ad6ffc9ecf75ebb734bbb863c1412d11b9beb Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sat, 10 Aug 2024 21:26:57 -0500 +Subject: [PATCH] xfs_scrub: Use POSIX-conformant strerror_r + +When building xfsprogs with musl libc, strerror_r returns int as +specified in POSIX. This differs from the glibc extension that returns +char*. Successful calls will return 0, which will be dereferenced as a +NULL pointer by (v)fprintf. + +Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> +--- + scrub/common.c | 3 ++- + scrub/inodes.c | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/scrub/common.c b/scrub/common.c +index 283ac84e..bd8bde35 100644 +--- a/scrub/common.c ++++ b/scrub/common.c +@@ -122,7 +122,8 @@ __str_out( + fprintf(stream, "%s%s: %s: ", stream_start(stream), + _(err_levels[level].string), descr); + if (error) { +- fprintf(stream, _("%s."), strerror_r(error, buf, DESCR_BUFSZ)); ++ strerror_r(error, buf, DESCR_BUFSZ); ++ fprintf(stream, _("%s."), buf); + } else { + va_start(args, format); + vfprintf(stream, format, args); +diff --git a/scrub/inodes.c b/scrub/inodes.c +index 16c79cf4..f0e7289c 100644 +--- a/scrub/inodes.c ++++ b/scrub/inodes.c +@@ -65,9 +65,9 @@ bulkstat_for_inumbers( + error = -xfrog_bulkstat(&ctx->mnt, breq); + if (error) { + char errbuf[DESCR_BUFSZ]; ++ strerror_r(error, errbuf, DESCR_BUFSZ); + +- str_info(ctx, descr_render(dsc), "%s", +- strerror_r(error, errbuf, DESCR_BUFSZ)); ++ str_info(ctx, descr_render(dsc), "%s", errbuf); + } + + /* +-- +2.40.0 + diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 3fec1283b..7c269a647 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfwm4 -pkgver=4.18.0 +pkgver=4.20.0 pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="intltool gtk+3.0-dev libxfce4util-dev>=${pkgver%.*} libxfce4ui-dev - libwnck-dev gobject-introspection-dev vala-dev" +makedepends="intltool gobject-introspection-dev gtk-layer-shell-dev gtk+3.0-dev + libwnck-dev libxfce4util-dev>=${pkgver%.*} libxfce4ui-dev libxi-dev + libxpresent-dev vala-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/xfce/xfwm4/${pkgver%.*}/xfwm4-$pkgver.tar.bz2" @@ -20,7 +21,9 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --enable-xi2 \ + --enable-poswin make } @@ -32,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1003bb1ca5254221a5d56ffcb51c12cdef1b17b9d252622c6b18f3d3fbcf9d6e0e66b5f61e0f6eae6601ea3e50a70be98320e60d6738b04e44879e6f4e6da34d xfwm4-4.18.0.tar.bz2" +sha512sums="1fa22d5bdf44d5907cbe362d20b7a99a610cfd38954a6cb5b7efad3481de5b450deb4fbf14ae2c1642ab5f7a39179016bb0f1558fe2941997cd931e9f8cc8dc8 xfwm4-4.20.0.tar.bz2" diff --git a/user/xgamma/APKBUILD b/user/xgamma/APKBUILD index f6f49a5cb..c0af0c45a 100644 --- a/user/xgamma/APKBUILD +++ b/user/xgamma/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xgamma -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Tools for manipulating gamma on X11 displays" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libx11-dev libxxf86vm-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xgamma-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/xgamma-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a xgamma-1.0.6.tar.bz2" +sha512sums="9eeee9b537dcae9e4d153774eb632a6a5e8dd32bebadc9bbd897a773e5b56f76848f32a1699b8c921d3094760c42b5083365d853b89ab31fd85c7a0d46feeceb xgamma-1.0.7.tar.xz" diff --git a/user/xhost/APKBUILD b/user/xhost/APKBUILD index 39be52023..56236a6b7 100644 --- a/user/xhost/APKBUILD +++ b/user/xhost/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=xhost -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=0 pkgdesc="Controls host and/or user access to a running X server" url="https://www.X.Org/" @@ -11,7 +11,7 @@ license="MIT X11" subpackages="$pkgname-doc" depends="" makedepends="libx11-dev libxmu-dev libxau-dev util-macros" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -26,4 +26,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2" +sha512sums="d281a0df0a036d693ce7dbe0d1d53839110d203f42454bf4d33a49fbfddec078149969b6ad76641e40e207ddc8317ea563088c59025fc57d8245e5ed27f79818 xhost-1.0.9.tar.xz" diff --git a/user/xinit/06_move_serverauthfile_into_tmp.patch b/user/xinit/06_move_serverauthfile_into_tmp.patch index 99e8a6754..d128e1141 100644 --- a/user/xinit/06_move_serverauthfile_into_tmp.patch +++ b/user/xinit/06_move_serverauthfile_into_tmp.patch @@ -7,14 +7,14 @@ The trap patch didn't seem to work on reboot. Index: xinit/startx.cpp =================================================================== ---- xinit.orig/startx.cpp -+++ xinit/startx.cpp -@@ -273,7 +273,7 @@ +--- xinit-1.4.2.orig/startx.cpp 2022-12-03 22:18:43.000000000 +0000 ++++ xinit-1.4.2/startx.cpp 2024-08-30 09:47:01.763977101 +0000 +@@ -272,7 +272,7 @@ if [ x"$enable_xauth" = x1 ] ; then dummy=0 XCOMM create a file with auth information for the server. ':0' is a dummy. - xserverauthfile=$HOME/.serverauth.$$ + xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie diff --git a/user/xinit/APKBUILD b/user/xinit/APKBUILD index 9ec540564..6fc1441a1 100644 --- a/user/xinit/APKBUILD +++ b/user/xinit/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xinit -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=0 pkgdesc="X.Org initialisation program" url="https://www.X.Org/" @@ -9,7 +9,7 @@ license="X11" depends="cmd:mcookie xauth xmodmap xrdb" makedepends="libx11-dev util-macros" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/xinit-$pkgver.tar.bz2 +source="https://www.X.Org/releases/individual/app/xinit-$pkgver.tar.xz 06_move_serverauthfile_into_tmp.patch xinitrc xsession.skel @@ -43,8 +43,8 @@ package() { mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d } -sha512sums="6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 -2296c10a5d74bff42d9642a4787dc3f2b77492fc81174af48dc88cd3c8fa49c7f70147b790d8c82c2df6c910d9d412965999e7a342ca28697a97b5d522669edd 06_move_serverauthfile_into_tmp.patch +sha512sums="4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0 xinit-1.4.2.tar.xz +2c4527cdb7d56b129266c7ba68018eb1b0b794a8a1c0b0e532b11afc243fca36e2f94595b79cf65b6e69d89640edaef94b14295d163cf49d076456ece654d9fb 06_move_serverauthfile_into_tmp.patch 1b19f800d1f64e49b533929ea6b9580d6dc24b680e1461edcc5784ba9fbb387fef57576b1e3d4bc67cb0ff2b248b670c148a3c7a350e1062bb9b95e9a2ba7805 xinitrc 448bc6c7987a4735b6584e307cd5c53092b1a338043293f5f110d11818dd1b80508401a3b6f09525c82a16a88f293b37011d8ca112460b0f95d26897e3e0619e xsession.skel b311032a751bb21d6c49ffe1dfc67beb577b5d5bec4a4c12612c4c0f9b9d6d2a07f7435c7d2fe9ab4c318546ee0cb9d4ff3f7ef908e756a818da529e913e667d Xsession diff --git a/user/xinput/APKBUILD b/user/xinput/APKBUILD index 7e4014048..a22c54024 100644 --- a/user/xinput/APKBUILD +++ b/user/xinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xinput -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=0 pkgdesc="Utility to configure and test XInput devices" url="https://www.X.Org/" @@ -12,7 +12,7 @@ depends="" makedepends="util-macros libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/archive/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/archive/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076 xinput-1.6.3.tar.bz2" +sha512sums="6734860852715e5cb9d26259a173e42413fc037546ed7fa4173ffa802c2619ee0322bed228a28cd1911be759d860070867d9b89b115f37323cca1c9ef75354b9 xinput-1.6.4.tar.xz" diff --git a/user/xkbcomp/APKBUILD b/user/xkbcomp/APKBUILD index 2c883600d..5476a4d5e 100644 --- a/user/xkbcomp/APKBUILD +++ b/user/xkbcomp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkbcomp -pkgver=1.4.5 +pkgver=1.4.7 pkgrel=0 pkgdesc="Keyboard layout compiler for X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="MIT AND X11" depends="" makedepends="libx11-dev libxkbfile-dev util-macros" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154 xkbcomp-1.4.5.tar.bz2" +sha512sums="6f468dce9d2499ab1022f4288d46f66af149dac0a161fb5b9dc0c262bc70c2c3d254db2c6fb5df1e2793c822e2d55c6da5fd037ce523a555b7c3de23e35c49ef xkbcomp-1.4.7.tar.xz" diff --git a/user/xkbutils/APKBUILD b/user/xkbutils/APKBUILD index 24270a745..e8d9375e0 100644 --- a/user/xkbutils/APKBUILD +++ b/user/xkbutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkbutils -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Utilities for managing keyboards using XKB" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77 xkbutils-1.0.5.tar.xz" +sha512sums="78fb7ab4ef6642040992529444944080aca7a2ec4118f9a64c45dacc37e4041181df7bcd1f4270e11b9fbc8bd60a131b4702d2aa95741d89c54582ff8a8f896e xkbutils-1.0.6.tar.xz" diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index 63d9e1f64..fd865dcac 100644 --- a/user/xkeyboard-config/APKBUILD +++ b/user/xkeyboard-config/APKBUILD @@ -1,35 +1,30 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkeyboard-config -pkgver=2.30 +pkgver=2.42 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" arch="noarch" +options="!check" # requires gawk license="X11 AND MIT" depends="" -makedepends="intltool libx11-dev python3 xkbcomp libxslt" +makedepends="intltool libx11-dev python3 xkbcomp libxslt meson" subpackages="$pkgname-doc $pkgname-lang" -source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --with-xkb-base=/usr/share/X11/xkb \ - --with-xkb-rules-symlink=xorg \ - --enable-compat-rules=yes - make -} - -check() { - make check + meson setup \ + -Dprefix=/usr \ + -Dxkb-base=/usr/share/X11/xkb \ + -Dxorg-rules-symlinks=true \ + build + meson compile -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build rm -f "$pkgdir"/usr/share/X11/xkb/compiled install -m755 -d "$pkgdir"/var/lib/xkb } -sha512sums="2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4 xkeyboard-config-2.30.tar.bz2" +sha512sums="654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9 xkeyboard-config-2.42.tar.xz" diff --git a/user/xlsfonts/APKBUILD b/user/xlsfonts/APKBUILD index 6f180bf49..dcb6ef99a 100644 --- a/user/xlsfonts/APKBUILD +++ b/user/xlsfonts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xlsfonts -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="List available fonts on an X11 server" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0 xlsfonts-1.0.7.tar.xz" +sha512sums="401c86d902f173c440c08a22067a51e7238949c8d3c71eba7a8df11955edfec27525c8cbbcf2e96ed444fa20b15f98cf65a01343215d1ed9ba84fce849d02927 xlsfonts-1.0.8.tar.xz" diff --git a/user/xman/APKBUILD b/user/xman/APKBUILD index 5ea0f6068..be5a3f303 100644 --- a/user/xman/APKBUILD +++ b/user/xman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xman -pkgver=1.1.5 +pkgver=1.2.0 pkgrel=0 pkgdesc="Read manual pages from the comfort of X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="groff" makedepends="libxaw-dev libxt-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xman-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/xman-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400 xman-1.1.5.tar.bz2" +sha512sums="072dba172fd30606c1e185c6e50b3b9a9ec5e430eb2ac7f0c476e1c2de998e8c0b5fbf53de20a7339d39a8990255e77fe72d3928b43d055e8463f8069389d192 xman-1.2.0.tar.xz" diff --git a/user/xmessage/APKBUILD b/user/xmessage/APKBUILD index a81a71a86..544ee0c8b 100644 --- a/user/xmessage/APKBUILD +++ b/user/xmessage/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xmessage -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Display a message or query in a window" url="https://www.X.Org/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89deb7a81bd047027f99cb92cd16a47f94479c61a6f9fbac4638e6d642037b3e9bbac2313db59ac8c5544175947c693f6a210537c6df2b88dc3de1c67498cba8 xmessage-1.0.6.tar.xz" +sha512sums="0c44f7973f7ed8d7993aaeb457a8921301cb0de905e45d92bd99d49463223b54c704a28bef376fe6038b4aec7156be873a34294741c8537bb7a5a57e1f152cce xmessage-1.0.7.tar.xz" diff --git a/user/xmh/APKBUILD b/user/xmh/APKBUILD index e1c7416f2..541b1c716 100644 --- a/user/xmh/APKBUILD +++ b/user/xmh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xmh -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="X11 integration for MH message handling system" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="03bba7d3e7c2070b03378335aed0188dd0fd0a488f19dc5ad3f26674a9b38e6599377d082328041dd3ab72123ed60acae32cff19d7149517545b80e1339db26a xmh-1.0.4.tar.xz" +sha512sums="fbf5c7e7994832b1df0db9464aacddba6a445c6fe6b8d2e09c311dc27edb96f6e198816ee21b5ee361fb9637302ce54da2691c784e03ab5c1af8590f00b48bab xmh-1.0.5.tar.xz" diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD index 0d56de411..b8edc8b29 100644 --- a/user/xmlsec/APKBUILD +++ b/user/xmlsec/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xmlsec -pkgver=1.3.4 +pkgver=1.3.6 _pkgname="$pkgname${pkgver%%.*}" pkgrel=0 pkgdesc="C-based XML signature and encryption syntax and processing library" @@ -70,5 +70,5 @@ nss() { mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/ } -sha512sums="959a97ed7d7cbdc3e5ef037b2cb4f05bda299274c09ed3dfe24f7203d97e3dfc13bf480e15a2d15bcc7893569d341204884de58cc9b462b6c29306b67672e9c7 xmlsec1-1.3.4.tar.gz +sha512sums="f38ccc7af0026973a94b1b6f95accd70a2a2c4398985a0002c66d7b43bff6d6bcfb09ae62046cbdac82a0890622aead2df710cb0ab373c3bdf6159797613cdaa xmlsec1-1.3.6.tar.gz d29fad9689d6c8d9583802143bdfa38b27fbcc2e54232a052138da08f495b40de677849e3c1062070ef2d2efe59357d6efa6b7df429ea6563ea6b6cb126c3b6f testrun.patch" diff --git a/user/xmore/APKBUILD b/user/xmore/APKBUILD index 75514d1f1..02d05f7be 100644 --- a/user/xmore/APKBUILD +++ b/user/xmore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xmore -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Display text files using X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libxaw-dev util-macros" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/xmore-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xmore-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3 xmore-1.0.3.tar.bz2" +sha512sums="52ac9bca78431f5f830b4607ff2cc375ab90e11380e0d4d3e591689359806cc7c7ec92c713d4d65742f40407e4f407c372759e5d03e30a30dfd866e6d5c6f6f7 xmore-1.0.4.tar.xz" diff --git a/user/xmoto/APKBUILD b/user/xmoto/APKBUILD index f13b7d68d..280fc3dd5 100644 --- a/user/xmoto/APKBUILD +++ b/user/xmoto/APKBUILD @@ -4,16 +4,16 @@ pkgname=xmoto pkgver=0.5.11 pkgrel=0 pkgdesc="Challenging 2D motocross platform game" -url="https://xmoto.tuxfamily.org/" +url=" " arch="all" license="GPL-2.0+" depends="" makedepends="bzip2-dev curl-dev glu-dev libjpeg-turbo-dev libpng-dev - libxdg-basedir-dev libxml2-dev lua5.3-dev mesa-dev ode-dev sdl-dev + libglvnd-dev libxdg-basedir-dev libxml2-dev lua5.3-dev ode-dev sdl-dev sdl_mixer-dev sdl_net-dev sdl_ttf-dev sqlite-dev zlib-dev autoconf automake" subpackages="$pkgname-doc $pkgname-lang" -source="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-$pkgver-src.tar.gz +source="https://distfiles.adelielinux.org/source/archive/$pkgname-$pkgver/$pkgname-$pkgver-src.tar.gz stupid-lua.patch utf8.patch " diff --git a/user/xorg-cf-files/APKBUILD b/user/xorg-cf-files/APKBUILD index 81f83d774..dbd076a7c 100644 --- a/user/xorg-cf-files/APKBUILD +++ b/user/xorg-cf-files/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=xorg-cf-files -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Data files for the imake utility" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="util-macros" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2" +source="https://www.X.Org/releases/individual/util/${pkgname}-${pkgver}.tar.xz" build() { ./configure \ @@ -30,4 +30,4 @@ package() { install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/ } -sha512sums="0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e xorg-cf-files-1.0.7.tar.bz2" +sha512sums="cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9 xorg-cf-files-1.0.8.tar.xz" diff --git a/user/xorg-drivers/APKBUILD b/user/xorg-drivers/APKBUILD index cbefb4780..2a12b0087 100644 --- a/user/xorg-drivers/APKBUILD +++ b/user/xorg-drivers/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-drivers pkgver=1.1 -pkgrel=0 +pkgrel=2 pkgdesc="Drivers for X.Org systems" url="https://www.X.Org/" arch="all" @@ -12,11 +12,10 @@ depends="xf86-input-evdev xf86-input-joystick xf86-input-libinput xf86-input-mouse xf86-input-synaptics xf86-input-void xf86-input-wacom xf86-video-amdgpu xf86-video-ast xf86-video-ati xf86-video-cirrus - xf86-video-dummy xf86-video-fbdev xf86-video-glint xf86-video-mach64 - xf86-video-mga xf86-video-nouveau xf86-video-openchrome xf86-video-qxl - xf86-video-r128 xf86-video-rendition xf86-video-sis xf86-video-sisusb - xf86-video-tdfx xf86-video-trident xf86-video-v4l xf86-video-vboxvideo - xf86-video-vesa" + xf86-video-dummy xf86-video-fbdev xf86-video-mach64 xf86-video-mga + xf86-video-nouveau xf86-video-openchrome xf86-video-qxl xf86-video-r128 + xf86-video-rendition xf86-video-sis xf86-video-sisusb xf86-video-tdfx + xf86-video-trident xf86-video-v4l xf86-video-vesa" case $CTARGET_ARCH in pmmx) depends="$depends xf86-video-geode xf86-video-intel" ;; @@ -28,6 +27,8 @@ esac case $CTARGET_ARCH in aarch64*|arm*) depends="$depends xf86-video-freedreno";; + pmmx|x86*|i528) + depends="$depends xf86-video-vboxvideo";; *) depends="$depends xf86-video-siliconmotion xf86-video-vmware";; esac diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 0bca19339..2c64a7c54 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,34 +1,66 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=1.20.9 +pkgver=21.1.16 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" arch="all" options="suid" license="MIT" -depends="font-cursor-misc font-misc-misc xkeyboard-config xkbcomp xinit" -depends_dev="libepoxy-dev libxfont2-dev mesa-dev" -makedepends="$depends_dev autoconf automake libtool util-macros - eudev-dev libpciaccess-dev libdrm-dev libepoxy-dev pixman-dev - libx11-dev libxdamage-dev libxinerama-dev libxkbfile-dev libxkbui-dev - libxv-dev libxxf86dga-dev libxxf86misc-dev xcb-util-dev - xcb-util-image-dev xcb-util-keysyms-dev xcb-util-renderutil-dev - xcb-util-wm-dev xorgproto-dev - xtrans - openssl-dev perl wayland-dev wayland-protocols zlib-dev +depends="font-cursor-misc font-misc-misc xkeyboard-config xkbcomp xinit + xorg-server-protocol + " +depends_dev="libepoxy-dev libglvnd-dev libpciaccess-dev libxfont2-dev" +makedepends="$depends_dev meson eudev-dev libdrm-dev + libepoxy-dev pixman-dev libx11-dev libxdamage-dev libxinerama-dev + libxkbfile-dev libxkbui-dev libxv-dev libxxf86dga-dev libxxf86misc-dev + libxcvt-dev mesa-dev xkbcomp-dev xcb-util-dev xcb-util-image-dev + xcb-util-keysyms-dev xcb-util-renderutil-dev xcb-util-wm-dev xorgproto-dev + xtrans openssl-dev perl zlib-dev " # the modesetting driver is now shipped with xorg server replaces="xf86-video-modesetting" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr - $pkgname-xnest $pkgname-xwayland" -source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 + $pkgname-xnest $pkgname-protocol" +source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.xz autoconfig-sis.patch fix-musl-arm.patch " # secfixes: +# 21.1.12-r0: +# - CVE-2024-31080 +# - CVE-2024-31081 +# - CVE-2024-31082 +# - CVE-2024-31083 +# - CVE-2023-6816 +# - CVE-2024-0229 +# - CVE-2024-21885 +# - CVE-2024-21886 +# - CVE-2024-0408 +# - CVE-2024-0409 +# - CVE-2023-6377 +# - CVE-2023-6478 +# - CVE-2023-5367 +# - CVE-2023-5380 +# - CVE-2023-5574 +# - CVE-2023-0494 +# - CVE-2022-4283 +# - CVE-2022-46340 +# - CVE-2022-46341 +# - CVE-2022-46342 +# - CVE-2022-46343 +# - CVE-2022-46344 +# - CVE-2022-2319 +# - CVE-2022-2320 +# - CVE-2021-4008 +# - CVE-2021-4009 +# - CVE-2021-4010 +# - CVE-2021-4011 +# - CVE-2021-3472 +# - CVE-2020-14360 +# - CVE-2020-25712 # 1.20.9-r0: # - CVE-2020-14345 # - CVE-2020-14346 @@ -65,45 +97,41 @@ build() { export CFLAGS="$CFLAGS -D_GNU_SOURCE" [ "$CLIBC" = musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" + _fontroot="/usr/share/fonts" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --without-systemd-daemon \ - --enable-composite \ - --enable-config-udev \ - --enable-dri \ - --enable-dri2 \ - --enable-glamor \ - --enable-ipv6 \ - --enable-kdrive \ - --enable-xace \ - --enable-xcsecurity \ - --enable-xephyr \ - --enable-xnest \ - --enable-xorg \ - --enable-xres \ - --enable-xv \ - --enable-xwayland \ - --disable-config-hal \ - --disable-dmx \ - --disable-systemd-logind \ - --with-os-vendor="${DISTRO_NAME:-Adélie Linux}" + -Dxkb_dir=/usr/share/X11/xkb \ + -Dxkb_output_dir=/var/lib/xkb \ + -Dsystemd_logind=false \ + -Ddri1=true \ + -Ddri2=true \ + -Ddri3=true \ + -Dglamor=true \ + -Dipv6=true \ + -Dxace=true \ + -Dxcsecurity=true \ + -Dxephyr=true \ + -Dxnest=true \ + -Dxorg=true \ + -Dxres=true \ + -Dhal=false \ + -Dsecure-rpc=false \ + -Dpciaccess=true \ + -Ddefault_font_path=$_fontroot/misc,$_fontroot/100dpi:unscaled,$_fontroot/75dpi:unscaled,$_fontroot/TTF,$_fontroot/Type1 \ + build - make + meson compile -C build } check() { - make check + meson test --no-rebuild --print-errorlogs -C build } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install --no-rebuild -C build chmod u+s "$pkgdir"/usr/bin/Xorg # Don't conflict with xf86-input-evdev @@ -134,12 +162,14 @@ xnest() { mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/ } -xwayland() { - pkgdesc="X.Org server for Wayland" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ +protocol() { + pkgdesc="Xorg server protocol file" + depends="" + + mkdir -p "$subpkgdir"/usr/lib/xorg + mv "$pkgdir"/usr/lib/xorg/protocol.txt "$subpkgdir"/usr/lib/xorg/ } -sha512sums="d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 xorg-server-1.20.9.tar.bz2 +sha512sums="38fd4232a293a497d13f8b57e85e84cf6a531453a7d8d5de1a77d67ceaf8714d5770951a8a21f1b3f519e83be1fc0926dce269846e75a8b11aa1062dd507f67d xorg-server-21.1.16.tar.xz d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch -a5f910e72ff9abd4e4a0c6806cdbe48d1b0b6cc0586f36568da5864a8dedc46a3112fe86d7a1969033f4d5b0def4dc6e5c11b656fbcc964732b417e6c9577f22 fix-musl-arm.patch" +c68d6299928032806ade94b4848f147757d6571a2f8830922a20c9e1053fe42700e5c9e196ad58ce5e5536cf034260f973edd6e2792c9bacf4e2d70660949a4a fix-musl-arm.patch" diff --git a/user/xorg-server/fix-musl-arm.patch b/user/xorg-server/fix-musl-arm.patch index b5a64a4e7..7d6cc3762 100644 --- a/user/xorg-server/fix-musl-arm.patch +++ b/user/xorg-server/fix-musl-arm.patch @@ -1,11 +1,12 @@ ---- ./hw/xfree86/common/compiler.h.orig -+++ ./hw/xfree86/common/compiler.h -@@ -518,7 +518,7 @@ +diff -Nurp xorg-server-21.1.3.orig/hw/xfree86/common/compiler.h xorg-server-21.1.3/hw/xfree86/common/compiler.h +--- xorg-server-21.1.3.orig/hw/xfree86/common/compiler.h 2022-01-02 22:41:56.000000000 +0000 ++++ xorg-server-21.1.3/hw/xfree86/common/compiler.h 2024-08-28 09:24:45.059582654 +0000 +@@ -518,7 +518,7 @@ xf86WriteMmio32Le(__volatile__ void *bas barrier(); } --#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) -+#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__)) - #if defined(__arm32__) || defined(__mips64) +-#elif defined(__arm32__) && !defined(__linux__) ++#elif defined(__arm32__) && !defined(__GLIBC__) #define PORT_SIZE long - #else + + extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ diff --git a/user/xorgproto/APKBUILD b/user/xorgproto/APKBUILD index 14671157b..460afcecb 100644 --- a/user/xorgproto/APKBUILD +++ b/user/xorgproto/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorgproto -pkgver=2022.2 +pkgver=2024.1 pkgrel=0 pkgdesc="X11 protocol headers (combination)" url="https://www.X.Org/" @@ -16,14 +16,15 @@ provides="bigreqsproto=1.1.2 compositeproto=0.4.2 damageproto=1.2.1 dmxproto=2.3.1 + dpmsproto=1.2 dri2proto=2.8 - dri3proto=1.3 - fixesproto=6.0 + dri3proto=1.4 + fixesproto=6.1 fontsproto=2.1.3 glproto=1.4.17 inputproto=2.3.99.2 kbproto=1.0.7 - presentproto=1.2 + presentproto=1.4 printproto=1.0.5 randrproto=1.6.0 recordproto=1.14.2 @@ -79,5 +80,5 @@ package() { rm "$pkgdir"/usr/include/X11/extensions/vldXvMC.h } -sha512sums="8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9 xorgproto-2022.2.tar.xz +sha512sums="63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f xorgproto-2024.1.tar.xz 18fc5228bb53eb15cfa0018f718e06faba0384a41e3aa0006fbf63e2a98779fdab527ea9eb8e22bb6a6f1ca02340ad8dad1260ee16e75f0416461ccefaa6df73 xprint.patch" diff --git a/user/xpr/APKBUILD b/user/xpr/APKBUILD index 14901a8b2..a95c7c202 100644 --- a/user/xpr/APKBUILD +++ b/user/xpr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xpr -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=0 pkgdesc="Format an X11 window dump from xwd(1) for printing" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="53eb896cf1844036a13b1018ffcecbc6a0a56eebe0d7cb6331dbe691207498d2c41f3791655b7fc081acfef2ed9904987f363b710bf0eeff6c8d33f819a951cb xpr-1.1.0.tar.xz" +sha512sums="49538a757aa60e754ecd39273510a6e49ebb77b730be62e3fa60f00261c9c1e208d39e1ca3c61889a5ad7fc7c2255fa1f669fd19ecf98e18cb8aa9189cadc15d xpr-1.2.0.tar.xz" diff --git a/user/xprop/APKBUILD b/user/xprop/APKBUILD index ecd9c37e8..22a4175f5 100644 --- a/user/xprop/APKBUILD +++ b/user/xprop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xprop -pkgver=1.2.5 +pkgver=1.2.7 pkgrel=0 pkgdesc="X11 property inspector" url="https://cgit.freedesktop.org/xorg/app/xprop/" @@ -10,7 +10,7 @@ license="X11 AND MIT" depends="" makedepends="libx11-dev util-macros" subpackages="$pkgname-doc" -source="https://www.X.Org/archive/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/archive/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559 xprop-1.2.5.tar.bz2" +sha512sums="84ada23660e2aef7024352e1a774f920e86c55fbfda486c087b9f41f8da30a84734fe753b62432f3df16913e86da4a18ce04ca018091d444cef727de97bf94f1 xprop-1.2.7.tar.xz" diff --git a/user/xrandr/APKBUILD b/user/xrandr/APKBUILD index 59ffef0ec..dd72ee662 100644 --- a/user/xrandr/APKBUILD +++ b/user/xrandr/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=xrandr -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=0 pkgdesc="Command line interface to X RandR extension" url="https://www.X.Org/" @@ -28,4 +28,4 @@ package() { rm "$pkgdir"/usr/bin/xkeystone } -sha512sums="3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922 xrandr-1.5.1.tar.xz" +sha512sums="b536e8f1e04094894aa52ae496725c58691b043860b3327c41d737b07b642a939733321b62f698032b11ba857208a6177600a3ca3295ff1be6ade4341cdc2747 xrandr-1.5.2.tar.xz" diff --git a/user/xrdb/APKBUILD b/user/xrdb/APKBUILD index 06d97ab51..25b720ead 100644 --- a/user/xrdb/APKBUILD +++ b/user/xrdb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xrdb -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=0 pkgdesc="Utility to manipulate the X11 server resources database" url="https://www.X.Org/" @@ -11,7 +11,7 @@ license="MIT AND X11" depends="mcpp" makedepends="libx11-dev libxmu-dev util-macros" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d88135cdfea8536523dfb986249ee42761d5363c936352f12f55b4d0c849f21236f7d74d39869c5ec5b549019d6ed89d9096cde4b3c2b4816c2778a8e370b5c9 xrdb-1.2.1.tar.bz2" +sha512sums="c8a6fc94e270e9cb5602e055150553de103d545298285157ecd8924f163a10ebeb9acfff56d1fafbf48d339809c76340213792478cdf3270012d3cd05486001c xrdb-1.2.2.tar.xz" diff --git a/user/xrefresh/APKBUILD b/user/xrefresh/APKBUILD index c6e7f29cb..d24725975 100644 --- a/user/xrefresh/APKBUILD +++ b/user/xrefresh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xrefresh -pkgver=1.0.7 +pkgver=1.1.0 pkgrel=0 pkgdesc="Refresh an X11 screen" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fcbb01aa368944ca536f050ab194b21bbd6b2a56265a7ed5807882e5c2f9660105283cdba0ea35b3e4a17a015586aeb82906e081da030332dfc49169a191c31 xrefresh-1.0.7.tar.xz" +sha512sums="d46988c0423c3c6efb21a2eec0df427934d041afa6dcbbfd33f2dff19bf5e077baf10bd96780d98326d3a3e34cbf5824da822b6cb0091873cc1baade0aa05c26 xrefresh-1.1.0.tar.xz" diff --git a/user/xsane/APKBUILD b/user/xsane/APKBUILD index 3c17b6f6d..73df03ca5 100644 --- a/user/xsane/APKBUILD +++ b/user/xsane/APKBUILD @@ -12,7 +12,7 @@ depends="" makedepends="gtk+2.0-dev lcms2-dev libjpeg-turbo-dev libpng-dev sane-dev tiff-dev" subpackages="$pkgname-doc $pkgname-lang" -source="http://distfiles.gentoo.org/distfiles/xsane-$pkgver.tar.gz +source="https://distfiles.adelielinux.org/source/archive/$pkgname-$pkgver/xsane-$pkgver.tar.gz xsane-0.999-lcms2.patch xsane-0.999-libpng16.patch " diff --git a/user/xscope/APKBUILD b/user/xscope/APKBUILD index 3d0013081..a7e5a5dd0 100644 --- a/user/xscope/APKBUILD +++ b/user/xscope/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xscope -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=0 pkgdesc="Monitor communication between an X11 client and server" url="https://www.X.Org/" @@ -10,9 +10,7 @@ license="X11" depends="" makedepends="util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz - disable-xtrans.patch - " +source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -33,5 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="588a3668d07cc42fd44dc9cea55cd31bc67bfeddf3d07b0b0a39202304b2502dc322ff3bf5310eb689622485390fa8851ffe68b672c9b13742b9ab89d9495327 xscope-1.4.3.tar.xz -2816a136d874af7e0b0892e601c8cf556f46d75d6c39e3411bfcbcf8ef5432c8413c14dd1e68b3be7ba27d221c73c473d0fd6d23eaded98bfb2633b665409b96 disable-xtrans.patch" +sha512sums="3a9fe1e58fa7671a91a2364d7b50cf005c9b1aac18b958e8356d5733e0758534d0974c6b982935270f17277224d4efe9b2e4553f45fdb7b3aab0cbf059a8b843 xscope-1.4.4.tar.xz" diff --git a/user/xscope/disable-xtrans.patch b/user/xscope/disable-xtrans.patch deleted file mode 100644 index ebc44ca66..000000000 --- a/user/xscope/disable-xtrans.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4e297db3cf54a629a2c8f38b068cd4f8434afa4c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Wed, 13 Jul 2022 15:51:58 -0700 -Subject: [PATCH] fd.h: fix build when not building with xtrans - -Always include <X11/Xfuncproto.h> for the definition of _X_NORETURN, -instead of relying on Xtrans.h to include it indirectly for us. - -Fixes: #2 -Fixes: commit cc298d1f559240976344588f9f765ee60ca3d6f3 - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- - fd.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fd.h b/fd.h -index c317aa4..55c5b01 100644 ---- a/fd.h -+++ b/fd.h -@@ -65,6 +65,7 @@ - typedef void *XtransConnInfo; - #endif - #include <sys/select.h> -+#include <X11/Xfuncproto.h> - - typedef int FD; - --- -GitLab - diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD index 17202200f..b54cc04a7 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/APKBUILD @@ -11,7 +11,7 @@ license="MIT" depends="" makedepends="bc gtk+3.0-dev intltool libice-dev libjpeg-turbo-dev libx11-dev libxft-dev libxi-dev libxinerama-dev libxml2-dev libxml2-utils glu-dev - libxrandr-dev libxt-dev linux-pam-dev mesa-dev mesa-glapi xorgproto-dev + libxrandr-dev libxt-dev linux-pam-dev mesa-dev libglvnd-dev xorgproto-dev desktop-file-utils elogind-dev xdg-utils" subpackages="$pkgname-doc $pkgname-elogind" source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz" diff --git a/user/xset/APKBUILD b/user/xset/APKBUILD index e751862c2..958f94dfb 100644 --- a/user/xset/APKBUILD +++ b/user/xset/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xset -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=0 pkgdesc="User preference utility for X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libx11-dev libxext-dev libxmu-dev util-macros" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d xset-1.2.4.tar.bz2" +sha512sums="12b53d7cd6b7ccf6515c03f68151490fce6b2629e99b8d85ac5d760f4ed93394a457213c3947533809fbbb04acd1ed260aeea1256099a10397660eef3088150d xset-1.2.5.tar.xz" diff --git a/user/xsm/APKBUILD b/user/xsm/APKBUILD index 714f927d4..c5031732e 100644 --- a/user/xsm/APKBUILD +++ b/user/xsm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xsm -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Session manager for X11" url="https://www.X.Org/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df3777b3aab813ec8aa906f5a03f93b8ca645978970290cf7baf732e175c36c00ae19baeb45ea7404d35838c21e6f8fca28f0da3e2f398d17adac5f2acb7b351 xsm-1.0.5.tar.xz" +sha512sums="ee4e9b4ab6be6773e53685540f807b03d553bfecc26c4e85fe12daca486fdeb66c594c6eab54043a8c149112c7a3ed18e463d68d7aee62e93a06c091ce39c268 xsm-1.0.6.tar.xz" diff --git a/user/xstdcmap/APKBUILD b/user/xstdcmap/APKBUILD index 076ac3256..101cd793f 100644 --- a/user/xstdcmap/APKBUILD +++ b/user/xstdcmap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xstdcmap -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Define standard X11 colour map properties" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/xstdcmap-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xstdcmap-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2" +sha512sums="3f2047af1d328a34d38ededc13de00298db3300eab1d1dbdff7d2aa4a3cd543a79305bfbd2e6424c5e023cf866a4f7a70aa9a3014444d543268d2f812a322a49 xstdcmap-1.0.5.tar.xz" diff --git a/user/xtrans/APKBUILD b/user/xtrans/APKBUILD index a65dd7dc3..69731a797 100644 --- a/user/xtrans/APKBUILD +++ b/user/xtrans/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xtrans -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=0 pkgdesc="X transport library" url="https://www.X.Org/" @@ -9,7 +9,7 @@ license="X11 AND MIT" depends="" makedepends="util-macros xmlto" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 xtrans-1.4.0.tar.bz2" +sha512sums="e8091f11d4ad2b14e01de3eac56bdf2267ea26687ce66e3056374d0d02e049480c0b27c482f8828a0efd086f1e4c485108ca4dce3f83d66c1896effa3b38b228 xtrans-1.5.0.tar.xz" diff --git a/user/xvidtune/APKBUILD b/user/xvidtune/APKBUILD index bcdcb69eb..14bfd27d2 100644 --- a/user/xvidtune/APKBUILD +++ b/user/xvidtune/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xvidtune -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Tune video modes on an X11 display" url="https://www.X.Org/" @@ -10,13 +10,7 @@ license="X11" depends="" makedepends="libxaw-dev libxmu-dev libxxf86vm-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xvidtune-$pkgver.tar.bz2" - -prepare() { - default_prepare - chmod a+w config.sub - update_config_sub -} +source="https://www.x.org/releases/individual/app/xvidtune-$pkgver.tar.xz" build() { ./configure \ @@ -37,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352 xvidtune-1.0.3.tar.bz2" +sha512sums="747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz" diff --git a/user/xvinfo/APKBUILD b/user/xvinfo/APKBUILD index 311f48b01..34ddb8aaf 100644 --- a/user/xvinfo/APKBUILD +++ b/user/xvinfo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xvinfo -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=0 pkgdesc="View information about video adaptors attached to X11" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11" depends="" makedepends="libxv-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/releases/individual/app/xvinfo-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xvinfo-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2" +sha512sums="18467161b248c68f6bde15e1c1b4b8cf812daf46777602558aee5fb7cb4d2649218de88fa93842fea4f316d954440f03a37d71fa4fda92eda3c7d80970e19cbb xvinfo-1.1.5.tar.xz" diff --git a/user/xwayland/APKBUILD b/user/xwayland/APKBUILD new file mode 100644 index 000000000..1b2959de2 --- /dev/null +++ b/user/xwayland/APKBUILD @@ -0,0 +1,53 @@ +# Contributor: Łukasz Jendrysik <scadu@yandex.com> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Contributor: Simon Zeni <simon@bl4ckb0ne.ca> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=xwayland +pkgver=24.1.6 +pkgrel=0 +pkgdesc="X11 server for Wayland" +url="https://www.X.Org/" +arch="all" +options="!check" # requires piglit, which has no stable releases +license="MIT AND X11" +subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc" +depends="xorg-server-protocol xkbcomp" +depends_dev="dbus-dev font-util-dev libdrm-dev libepoxy-dev libglvnd-dev + libxcvt-dev libxfont2-dev libxkbfile-dev libxshmfence-dev mesa-dev + openssl-dev pixman-dev wayland-dev wayland-protocols xorgproto xtrans" +makedepends="$depends_dev meson" +source="https://xorg.freedesktop.org/archive/individual/xserver/xwayland-$pkgver.tar.xz" + +replaces="xorg-server-xwayland" + +build() { + meson setup \ + -Dprefix=/usr \ + -Dipv6=true \ + -Dxvfb=false \ + -Dxdmcp=false \ + -Dxcsecurity=true \ + -Ddri3=true \ + -Dglamor=true \ + -Dsecure-rpc=false \ + -Dxkb_dir=/usr/share/X11/xkb \ + -Dxkb_output_dir=/var/lib/xkb \ + . output + meson compile -C output +} + +check() { + meson test --no-rebuild --print-errorlogs -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output + + # Part of xorg-server-doc + rm -f "$pkgdir"/usr/share/man/man1/Xserver.1 + + # Part of xorg-server-protocol + rm -f "$pkgdir"/usr/lib/xorg/protocol.txt +} + +sha512sums="b6dcc87f5c4d880cb23216518171a704c2a501803ac2efd9d01760895d755a617cd82313c6516f27a888b0581c64d74e3f8db5c238e1ae0d13da6cc1a547c02f xwayland-24.1.6.tar.xz" diff --git a/user/xwd/APKBUILD b/user/xwd/APKBUILD index 831fe5bcd..7c219156f 100644 --- a/user/xwd/APKBUILD +++ b/user/xwd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xwd -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=0 pkgdesc="Dump the contents of an X11 window to a file" url="https://www.X.Org/" @@ -10,7 +10,7 @@ license="X11 AND MIT" depends="" makedepends="libx11-dev libxkbfile-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d2aaf42c60d20c4b09f4947d3702058dbfad4633b2c5c8ea62e8897fc9ced1ab3417ce99255a223286d21a731f543019470737e3074f1bc68033b4eb47bc773e xwd-1.0.8.tar.bz2" +sha512sums="ae59661b05160f5658920fd79031b6b8548cb7bbfc734194edb0acef5c95f76b210ca4443e9506fc1a0cb9df47ee7c22948502971afe578b44c75aa2a1138d56 xwd-1.0.9.tar.xz" diff --git a/user/xwininfo/APKBUILD b/user/xwininfo/APKBUILD index d9cbd984f..1d8d7c717 100644 --- a/user/xwininfo/APKBUILD +++ b/user/xwininfo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=xwininfo -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=0 pkgdesc="Window information utility for X" url="https://cgit.freedesktop.org/xorg/app/xwininfo" @@ -11,7 +11,7 @@ license="MIT AND X11" depends="" makedepends="libx11-dev libxext-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xwininfo-$pkgver.tar.bz2" +source="https://www.x.org/releases/individual/app/xwininfo-$pkgver.tar.xz" build() { ./configure \ @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6 xwininfo-1.1.5.tar.bz2" +sha512sums="c6df4ed3dcf97772450612f2786ecab8313a43bb78e0b8020cc9ec228b3f466f55090313ad02c8159a73a6892d117322ad85e28d9d76e38bb84c9750712c20bc xwininfo-1.1.6.tar.xz" diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD index b4db9bdd2..5f01b39bd 100644 --- a/user/yubikey-personalization/APKBUILD +++ b/user/yubikey-personalization/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=yubikey-personalization pkgver=1.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform library & tools for personalizing YubiKey devices" url="https://developers.yubico.com/yubikey-personalization/" arch="all" @@ -14,6 +14,9 @@ subpackages="$pkgname-dev $pkgname-doc" source="yubikey-personalization-$pkgver.tar.gz::https://github.com/Yubico/yubikey-personalization/archive/v$pkgver.tar.gz use-asciidoctor.patch json_c.patch + gcc10.patch + uninit.patch + wipe-mem.patch " prepare() { @@ -42,4 +45,7 @@ package() { sha512sums="a38b26700793f0a801e5f5889bbbce4a3f728d22aaecf8d0890f1b5135e67bed16a78b7a36dbc323c5d296901f6dd420fa658a982492a0cd9f0bbf95a5fbc823 yubikey-personalization-1.20.0.tar.gz d6777a43e5e57430268bb50ab704641465a7314b15fc821d8bfa7f0c6510829d0118ced426cd5f8730589efe6264df6b82fc70e8bfe3d8b7d735e51339a25af2 use-asciidoctor.patch -a8bc7ae71d0a05476688abfaea070ca7dc2eaa68e033524d4a1b2b6240eec2932d867e9eeaa248874a04f254618cd79bf9ebaa17421938b0c2e62502bf90c055 json_c.patch" +a8bc7ae71d0a05476688abfaea070ca7dc2eaa68e033524d4a1b2b6240eec2932d867e9eeaa248874a04f254618cd79bf9ebaa17421938b0c2e62502bf90c055 json_c.patch +063acafb26941bc061d8613187bcbffe3fd1ca19a7c5346b0c347e052a30e4b4c750f4a40bb59b479173dbc7b5458383f5d5e25e385539b127cf4d9636caa549 gcc10.patch +1d29331994f43a99e2cb854ff3ff8302800102e7c9eaef30228efa8ddf9a188279fdb4981b28f64141cfa5659af11af9325ecd249041b745c1cd0d55fe5fbd69 uninit.patch +cca0729be2337923ab758fcf4a225d40cf12ac79fce609904e536ff811abec4231ecf58d47096587c974223335b35ec6c63ab4fc872cbfabf1f49f76313c8541 wipe-mem.patch" diff --git a/user/yubikey-personalization/gcc10.patch b/user/yubikey-personalization/gcc10.patch new file mode 100644 index 000000000..0e09e821e --- /dev/null +++ b/user/yubikey-personalization/gcc10.patch @@ -0,0 +1,25 @@ +From 09ea16d9e2030e4da6ad00c1e5147e962aa7ff84 Mon Sep 17 00:00:00 2001 +From: Klas Lindfors <klas@yubico.com> +Date: Mon, 17 Feb 2020 08:58:33 +0100 +Subject: [PATCH] make header declarations extern + +fixes #155 +--- + ykpers-args.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ykpers-args.h b/ykpers-args.h +index 2a63268d..9ff455a7 100644 +--- a/ykpers-args.h ++++ b/ykpers-args.h +@@ -33,8 +33,8 @@ + + #include "ykpers.h" + +-const char *usage; +-const char *optstring; ++extern const char *usage; ++extern const char *optstring; + + int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, char *oathid, + size_t oathid_len, const char **infname, diff --git a/user/yubikey-personalization/uninit.patch b/user/yubikey-personalization/uninit.patch new file mode 100644 index 000000000..713ce1699 --- /dev/null +++ b/user/yubikey-personalization/uninit.patch @@ -0,0 +1,204 @@ +From f86b334504693afe9ee6ec61416182d23c66e1ad Mon Sep 17 00:00:00 2001 +From: Gabriel Kihlman <g.kihlman@yubico.com> +Date: Mon, 27 Apr 2020 14:52:53 +0200 +Subject: [PATCH] Initialize bufs to 0 to avoid potentially leaking + uninitialized memory + +Based on a report from Christian Reitter doing fuzzing with MSAN. + +Extracts of logs: + +==16111==WARNING: MemorySanitizer: use-of-uninitialized-value + #0 0x4d59d4 in yk_write_to_key +/yubikey-personalization/ykcore/ykcore.c:715:8 + #1 0x4d9c00 in _yk_write /yubikey-personalization/ykcore/ykcore.c:233:7 + #2 0x4dc74d in yk_write_scan_map +/yubikey-personalization/ykcore/ykcore.c:357:9 + #3 0x4ce352 in ykpersonalize_main +/yubikey-personalization/ykpersonalize.c:423:9 +[...] + + Uninitialized value was stored to memory at + #0 0x45392b in __msan_memcpy +(/yubikey-personalization/.libs/ykpersonalize+0x45392b) + #1 0x4d52f7 in yk_write_to_key +/yubikey-personalization/ykcore/ykcore.c:689:2 + #2 0x4d9c00 in _yk_write /yubikey-personalization/ykcore/ykcore.c:233:7 + #3 0x4dc74d in yk_write_scan_map +/yubikey-personalization/ykcore/ykcore.c:357:9 + #4 0x4ce352 in ykpersonalize_main +/yubikey-personalization/ykpersonalize.c:423:9 +[...] + + Uninitialized value was created by an allocation of 'scan_codes' in +the stack frame of function 'ykpersonalize_main' +==18180==WARNING: MemorySanitizer: use-of-uninitialized-value + #0 0x4d5a24 in yk_write_to_key /yubikey-personalization/ykcore/ykcore.c:715:8 + #1 0x4d9c50 in _yk_write /yubikey-personalization/ykcore/ykcore.c:233:7 + #2 0x4dae6c in yk_write_command /yubikey-personalization/ykcore/ykcore.c:288:8 + #3 0x4cec93 in ykpersonalize_main /yubikey-personalization/ykpersonalize.c:440:10 + + Uninitialized value was stored to memory at + #0 0x45392b in __msan_memcpy (/yubikey-personalization/.libs/ykpersonalize+0x45392b) + #1 0x4d5347 in yk_write_to_key /yubikey-personalization/ykcore/ykcore.c:689:2 + #2 0x4d9c50 in _yk_write /yubikey-personalization/ykcore/ykcore.c:233:7 + #3 0x4dae6c in yk_write_command /yubikey-personalization/ykcore/ykcore.c:288:8 + #4 0x4cec93 in ykpersonalize_main /yubikey-personalization/ykpersonalize.c:440:10 + + Uninitialized value was stored to memory at + #0 0x45392b in __msan_memcpy (/yubikey-personalization/.libs/ykpersonalize+0x45392b) + #1 0x4dacdb in yk_write_command /yubikey-personalization/ykcore/ykcore.c:280:3 + #2 0x4cec93 in ykpersonalize_main /yubikey-personalization/ykpersonalize.c:440:10 + + Uninitialized value was stored to memory at + #0 0x45392b in __msan_memcpy (/yubikey-personalization/.libs/ykpersonalize+0x45392b) + #1 0x7f6fd2ea32f9 in ykp_set_fixed /yubikey-personalization/ykpers.c:787:1 + #2 0x50193c in _set_fixed /yubikey-personalization/ykpers-args.c:900:2 + #3 0x4ed040 in args_to_config /yubikey-personalization/ykpers-args.c:558:9 + #4 0x4c865c in ykpersonalize_main /yubikey-personalization/ykpersonalize.c:167:8 + + Uninitialized value was created by an allocation of 'fixedbin' in the stack frame of function '_set_fixed' + #0 0x501130 in _set_fixed /yubikey-personalization/ykpers-args.c:889 +--- + ykpers-args.c | 8 ++++---- + ykpers.c | 12 ++++++------ + ykpersonalize.c | 13 +++++++------ + 3 files changed, 17 insertions(+), 16 deletions(-) + +diff --git a/ykpers-args.c b/ykpers-args.c +index 53f7c22b..62ff7b2f 100644 +--- a/ykpers-args.c ++++ b/ykpers-args.c +@@ -548,7 +548,7 @@ int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, char *oathid, + else if (strncmp(optarg, "uid", 3) == 0) { + char *uid = optarg+4; + size_t uidlen; +- unsigned char uidbin[256]; ++ unsigned char uidbin[256] = {0}; + size_t uidbinlen = 0; + int rc; + char *uidtmp = NULL; +@@ -787,7 +787,7 @@ int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, char *oathid, + size_t key_bytes = (size_t)ykp_get_supported_key_length(cfg); + int res = 0; + char *key_tmp = NULL; +- char keybuf[20]; ++ char keybuf[20] = {0}; + + if(keylocation == 2) { + const char *prompt = " AES key, 16 bytes (32 characters hex) : "; +@@ -865,7 +865,7 @@ int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, char *oathid, + static int _set_fixed(char *opt, YKP_CONFIG *cfg) { + const char *fixed = opt; + size_t fixedlen = strlen (fixed); +- unsigned char fixedbin[256]; ++ unsigned char fixedbin[256] = {0}; + size_t fixedbinlen = 0; + int rc = hex_modhex_decode(fixedbin, &fixedbinlen, + fixed, fixedlen, +@@ -898,7 +898,7 @@ static int _format_decimal_as_hex(uint8_t *dst, size_t dst_len, uint8_t *src) + /* For details, see YubiKey Manual 2010-09-16 section 5.3.4 - OATH-HOTP Token Identifier */ + static int _format_oath_id(uint8_t *dst, size_t dst_len, uint8_t vendor, uint8_t type, uint32_t mui) + { +- uint8_t buf[8 + 1]; ++ uint8_t buf[8 + 1] = {0}; + + if (mui > 99999999) + return 0; +diff --git a/ykpers.c b/ykpers.c +index 7941d0e3..81cb0dff 100644 +--- a/ykpers.c ++++ b/ykpers.c +@@ -264,7 +264,7 @@ int ykp_get_supported_key_length(const YKP_CONFIG *cfg) + + /* Decode 128 bit AES key into cfg->ykcore_config.key */ + int ykp_AES_key_from_hex(YKP_CONFIG *cfg, const char *hexkey) { +- char aesbin[256]; ++ char aesbin[256] = {0}; + + /* Make sure that the hexkey is exactly 32 characters */ + if (strlen(hexkey) != 32) { +@@ -311,7 +311,7 @@ int ykp_HMAC_key_from_raw(YKP_CONFIG *cfg, const char *key) { + * and 32 bits into the first four bytes of cfg->ykcore_config.uid. + */ + int ykp_HMAC_key_from_hex(YKP_CONFIG *cfg, const char *hexkey) { +- char aesbin[256]; ++ char aesbin[256] = {0}; + size_t i; + + /* Make sure that the hexkey is exactly 40 characters */ +@@ -351,9 +351,9 @@ int ykp_AES_key_from_passphrase(YKP_CONFIG *cfg, const char *passphrase, + 0 + }; + const char **random_place; +- uint8_t _salt[8]; ++ uint8_t _salt[8] = {0}; + size_t _salt_len = 0; +- unsigned char buf[sizeof(cfg->ykcore_config.key) + 4]; ++ unsigned char buf[sizeof(cfg->ykcore_config.key) + 4] = {0}; + int rc; + int key_bytes = ykp_get_supported_key_length(cfg); + YK_PRF_METHOD prf_method = {20, yk_hmac_sha1}; +@@ -931,7 +931,7 @@ static const char str_extended_flags[] = "extended_flags"; + + static int _ykp_legacy_export_config(const YKP_CONFIG *cfg, char *buf, size_t len) { + if (cfg) { +- char buffer[256]; ++ char buffer[256] = {0}; + struct map_st *p; + unsigned char t_flags; + bool key_bits_in_uid = false; +@@ -1131,7 +1131,7 @@ int ykp_write_config(const YKP_CONFIG *cfg, + void *userdata), + void *userdata) { + if(cfg) { +- char buffer[1024]; ++ char buffer[1024] = {0}; + int ret = _ykp_legacy_export_config(cfg, buffer, 1024); + if(ret) { + writer(buffer, strlen(buffer), userdata); +diff --git a/ykpersonalize.c b/ykpersonalize.c +index 15338c6a..2c991e32 100644 +--- a/ykpersonalize.c ++++ b/ykpersonalize.c +@@ -48,17 +48,17 @@ int main(int argc, char **argv) + FILE *outf = NULL; const char *outfname = NULL; + int data_format = YKP_FORMAT_LEGACY; + bool verbose = false; +- unsigned char access_code[256]; ++ unsigned char access_code[256] = {0}; + char *acc_code = NULL; + char *new_acc_code = NULL; +- unsigned char scan_codes[sizeof(SCAN_MAP)]; +- unsigned char device_info[128]; ++ unsigned char scan_codes[sizeof(SCAN_MAP)] = {0}; ++ unsigned char device_info[128] = {0}; + size_t device_info_len = 0; + YK_KEY *yk = 0; + YKP_CONFIG *cfg = ykp_alloc(); + YK_STATUS *st = ykds_alloc(); + bool autocommit = false; +- char data[1024]; ++ char data[1024] = {0}; + bool dry_run = false; + + /* Options */ +@@ -184,7 +184,7 @@ int main(int argc, char **argv) + } + } + if(new_acc_code) { +- unsigned char accbin[256]; ++ unsigned char accbin[256] = {0}; + size_t accbinlen = 0; + int rc = hex_modhex_decode (accbin, &accbinlen, + new_acc_code, strlen(new_acc_code), +@@ -261,7 +261,8 @@ int main(int argc, char **argv) + goto err; + } + } else { +- char commitbuf[256]; size_t commitlen; ++ char commitbuf[256] = {0}; ++ size_t commitlen; + + if (ykp_command(cfg) == SLOT_SWAP) { + fprintf(stderr, "Configuration in slot 1 and 2 will be swapped\n"); diff --git a/user/yubikey-personalization/wipe-mem.patch b/user/yubikey-personalization/wipe-mem.patch new file mode 100644 index 000000000..a5ef05e8d --- /dev/null +++ b/user/yubikey-personalization/wipe-mem.patch @@ -0,0 +1,29 @@ +From 13f69440ac7cca05a94bd9cf9011e2ea352dad68 Mon Sep 17 00:00:00 2001 +From: Gabriel Kihlman <g.kihlman@yubico.com> +Date: Mon, 27 Apr 2020 14:56:00 +0200 +Subject: [PATCH] Wipe stack memory containing key material before returning + +--- + ykpers.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ykpers.c b/ykpers.c +index 81cb0df..2413b35 100644 +--- a/ykpers.c ++++ b/ykpers.c +@@ -280,6 +280,7 @@ int ykp_AES_key_from_hex(YKP_CONFIG *cfg, const char *hexkey) { + + yubikey_hex_decode(aesbin, hexkey, sizeof(aesbin)); + memcpy(cfg->ykcore_config.key, aesbin, sizeof(cfg->ykcore_config.key)); ++ insecure_memzero (aesbin, sizeof(aesbin)); + + return 0; + } +@@ -330,6 +331,7 @@ int ykp_HMAC_key_from_hex(YKP_CONFIG *cfg, const char *hexkey) { + i = sizeof(cfg->ykcore_config.key); + memcpy(cfg->ykcore_config.key, aesbin, i); + memcpy(cfg->ykcore_config.uid, aesbin + i, 20 - i); ++ insecure_memzero (aesbin, sizeof(aesbin)); + + return 0; + } diff --git a/user/zola/APKBUILD b/user/zola/APKBUILD index 402b2f0fe..d9f6e7103 100644 --- a/user/zola/APKBUILD +++ b/user/zola/APKBUILD @@ -2,349 +2,553 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: Samuel Holland <samuel@sholland.org> pkgname=zola -pkgver=0.9.0 -pkgrel=1 +pkgver=0.19.1 +pkgrel=0 pkgdesc="A fast static site generator in a single binary with everything built in" url="https://github.com/getzola/zola" arch="all" license="BSD-3-Clause AND MIT" depends="" makedepends="cargo oniguruma-dev openssl-dev zlib-dev" -subpackages=" - $pkgname-doc - $pkgname-bash-completion:bashcomp:noarch - $pkgname-fish-completion:fishcomp:noarch - $pkgname-zsh-completion:zshcomp:noarch" -source="$pkgname-$pkgver.tar.gz::https://github.com/getzola/zola/archive/v$pkgver.tar.gz" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/getzola/zola/archive/v$pkgver.tar.gz + ring-use-generic-implementation-on-non-sse2-x86.patch + " # dependencies taken from Cargo.lock cargo_deps=" -actix-codec-0.1.2 -actix-connect-0.2.5 -actix-files-0.1.4 -actix-http-0.2.10 -actix-router-0.1.5 -actix-rt-0.2.5 -actix-server-0.6.0 -actix-server-config-0.1.2 -actix-service-0.4.2 -actix-threadpool-0.1.2 -actix-utils-0.4.5 -actix-web-1.0.7 -actix-web-codegen-0.1.2 -adler32-1.0.4 -aho-corasick-0.7.6 -ammonia-3.0.0 -ansi_term-0.11.0 -arc-swap-0.4.3 -arrayvec-0.4.11 -atty-0.2.13 -autocfg-0.1.6 -backtrace-0.3.38 -backtrace-sys-0.1.31 -base64-0.10.1 -bincode-1.2.0 -bitflags-1.2.0 -block-buffer-0.7.3 -block-padding-0.1.4 -bstr-0.2.8 -byte-tools-0.3.1 -byteorder-1.3.2 -bytes-0.4.12 -c2-chacha-0.2.2 -cc-1.0.45 -cfg-if-0.1.10 -chrono-0.4.9 -chrono-tz-0.5.1 -clap-2.33.0 -cloudabi-0.0.3 -color_quant-1.0.1 -cookie-0.12.0 -cookie_store-0.7.0 -copyless-0.1.4 -core-foundation-0.6.4 -core-foundation-sys-0.6.2 -crc32fast-1.2.0 -crossbeam-channel-0.3.9 -crossbeam-deque-0.7.1 -crossbeam-epoch-0.7.2 -crossbeam-queue-0.1.2 -crossbeam-utils-0.6.6 -csv-1.1.1 -csv-core-0.1.6 -ctrlc-3.1.3 -deflate-0.7.20 -derive_more-0.15.0 -deunicode-0.4.3 -digest-0.8.1 -dtoa-0.4.4 -either-1.5.3 -elasticlunr-rs-2.3.6 -encoding_rs-0.8.20 -enum-as-inner-0.2.1 -error-chain-0.12.1 -failure-0.1.5 -failure_derive-0.1.5 -fake-simd-0.1.2 -filetime-0.2.7 -flate2-1.0.11 -fnv-1.0.6 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fs_extra-1.1.0 -fsevent-0.4.0 -fsevent-sys-2.0.1 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futf-0.1.4 -futures-0.1.29 -futures-cpupool-0.1.8 -generic-array-0.12.3 -getopts-0.2.21 -getrandom-0.1.12 -gif-0.10.3 -glob-0.3.0 -globset-0.4.4 -globwalk-0.7.1 -h2-0.1.26 -hashbrown-0.5.0 -heck-0.3.1 -hostname-0.1.5 -html5ever-0.24.1 -http-0.1.18 -http-body-0.1.0 -httparse-1.3.4 -humansize-1.1.0 -humantime-1.3.0 -hyper-0.12.35 -hyper-tls-0.3.2 -idna-0.1.5 -idna-0.2.0 -ignore-0.4.10 -image-0.22.2 -indexmap-1.2.0 -inflate-0.4.5 -inotify-0.6.1 -inotify-sys-0.1.3 -iovec-0.1.2 -ipconfig-0.2.1 -itoa-0.4.4 -jpeg-decoder-0.1.16 -kernel32-sys-0.2.2 -language-tags-0.2.2 -lazy_static-1.4.0 -lazycell-1.2.1 -libc-0.2.62 -line-wrap-0.1.1 -linked-hash-map-0.5.2 -lock_api-0.1.5 -lock_api-0.3.1 -log-0.4.8 -lru-cache-0.1.2 -lzw-0.10.0 -mac-0.1.1 -maplit-1.0.2 -markup5ever-0.9.0 -matches-0.1.8 -memchr-2.2.1 -memoffset-0.5.1 -mime-0.3.14 -mime_guess-2.0.1 -miniz-sys-0.1.12 -miniz_oxide-0.3.2 -mio-0.6.19 -mio-extras-2.0.5 -mio-uds-0.6.7 -miow-0.2.1 -native-tls-0.2.3 -net2-0.2.33 -new_debug_unreachable-1.0.3 -nix-0.14.1 -nodrop-0.1.13 -nom-4.2.3 -notify-4.0.13 -num-derive-0.2.5 -num-integer-0.1.41 -num-iter-0.1.39 -num-rational-0.2.2 -num-traits-0.2.8 -num_cpus-1.10.1 -onig-4.3.3 -onig_sys-69.1.0 -opaque-debug-0.2.3 -open-1.3.2 -openssl-0.10.24 -openssl-probe-0.1.2 -openssl-sys-0.9.49 -owning_ref-0.4.0 -parking_lot-0.7.1 -parking_lot-0.9.0 -parking_lot_core-0.4.0 -parking_lot_core-0.6.2 -parse-zoneinfo-0.2.0 -percent-encoding-1.0.1 -percent-encoding-2.1.0 -pest-2.1.2 -pest_derive-2.1.0 -pest_generator-2.1.1 -pest_meta-2.1.2 -phf-0.7.24 -phf_codegen-0.7.24 -phf_generator-0.7.24 -phf_shared-0.7.24 -pkg-config-0.3.16 -plist-0.4.2 -png-0.15.0 -ppv-lite86-0.2.5 -precomputed-hash-0.1.1 -proc-macro2-0.4.30 -proc-macro2-1.0.4 -publicsuffix-1.5.3 -pulldown-cmark-0.6.0 -quick-error-1.2.2 -quote-0.6.13 -quote-1.0.2 -rand-0.6.5 -rand-0.7.2 -rand_chacha-0.1.1 -rand_chacha-0.2.1 -rand_core-0.3.1 -rand_core-0.4.2 -rand_core-0.5.1 -rand_hc-0.1.0 -rand_hc-0.2.0 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rayon-1.2.0 -rayon-core-1.6.0 -rdrand-0.4.0 -redox_syscall-0.1.56 -regex-1.3.1 -regex-automata-0.1.8 -regex-syntax-0.6.12 -remove_dir_all-0.5.2 -reqwest-0.9.20 -resolv-conf-0.6.2 -rust-stemmers-1.1.0 -rustc-demangle-0.1.16 -rustc_version-0.2.3 -ryu-1.0.0 -safemem-0.3.2 -same-file-1.0.5 -sass-rs-0.2.2 -sass-sys-0.4.13 -schannel-0.1.16 -scoped_threadpool-0.1.9 -scopeguard-0.3.3 -scopeguard-1.0.0 -security-framework-0.3.1 -security-framework-sys-0.3.1 -semver-0.9.0 -semver-parser-0.7.0 -serde-1.0.101 -serde_derive-1.0.101 -serde_json-1.0.40 -serde_urlencoded-0.5.5 -serde_urlencoded-0.6.1 -sha-1-0.8.1 -sha1-0.6.0 -signal-hook-0.1.10 -signal-hook-registry-1.1.1 -siphasher-0.2.3 -slab-0.4.2 -slotmap-0.4.0 -slug-0.1.4 -smallvec-0.6.10 -socket2-0.3.11 -stable_deref_trait-1.1.1 -string-0.2.1 -string_cache-0.7.3 -string_cache_codegen-0.4.4 -string_cache_shared-0.3.0 -strsim-0.8.0 -strum-0.15.0 -strum_macros-0.15.0 -syn-0.15.44 -syn-1.0.5 -synstructure-0.10.2 -syntect-3.2.0 -tempfile-3.1.0 -tendril-0.4.1 -tera-1.0.0-beta.16 -termcolor-1.0.5 -textwrap-0.11.0 -thread_local-0.3.6 -threadpool-1.7.1 -tiff-0.3.1 -time-0.1.42 -tokio-0.1.22 -tokio-buf-0.1.1 -tokio-codec-0.1.1 -tokio-current-thread-0.1.6 -tokio-executor-0.1.8 -tokio-io-0.1.12 -tokio-reactor-0.1.9 -tokio-signal-0.2.7 -tokio-sync-0.1.6 -tokio-tcp-0.1.3 -tokio-threadpool-0.1.15 -tokio-timer-0.2.11 -tokio-udp-0.1.5 -toml-0.5.3 -trust-dns-proto-0.7.4 -trust-dns-resolver-0.11.1 -try-lock-0.2.2 -try_from-0.3.2 -typenum-1.11.2 -ucd-trie-0.1.2 -unic-char-property-0.9.0 -unic-char-range-0.9.0 -unic-common-0.9.0 -unic-segment-0.9.0 -unic-ucd-segment-0.9.0 -unic-ucd-version-0.9.0 -unicase-2.5.1 -unicode-bidi-0.3.4 -unicode-normalization-0.1.8 -unicode-segmentation-1.3.0 -unicode-width-0.1.6 -unicode-xid-0.1.0 -unicode-xid-0.2.0 -url-1.7.2 -url-2.1.0 -utf-8-0.7.5 -uuid-0.7.4 -v_escape-0.7.4 -v_escape_derive-0.5.5 -v_htmlescape-0.4.5 -vcpkg-0.2.7 -vec_map-0.8.1 -version_check-0.1.5 -void-1.0.2 -walkdir-2.2.9 -want-0.2.0 -wasi-0.7.0 -widestring-0.4.0 -winapi-0.2.8 -winapi-0.3.8 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.2 -winapi-x86_64-pc-windows-gnu-0.4.0 -wincolor-1.0.2 -winreg-0.6.2 -winutil-0.1.1 -ws-0.9.0 -ws2_32-sys-0.2.1 -xml-rs-0.8.0 -yaml-rust-0.4.3 +addr2line 0.22.0 +adler 1.0.2 +ahash 0.7.8 +ahash 0.8.11 +aho-corasick 0.7.20 +aho-corasick 1.1.3 +aligned-vec 0.5.0 +ammonia 4.0.0 +android-tzdata 0.1.1 +android_system_properties 0.1.5 +anstream 0.6.14 +anstyle 1.0.7 +anstyle-parse 0.2.4 +anstyle-query 1.1.0 +anstyle-wincon 3.0.3 +any_ascii 0.1.7 +anyhow 1.0.86 +arbitrary 1.3.2 +arg_enum_proc_macro 0.3.4 +arrayvec 0.7.4 +assert-json-diff 2.0.2 +atty 0.2.14 +autocfg 1.3.0 +av1-grain 0.2.3 +avif-serialize 0.8.1 +backtrace 0.3.73 +base64 0.21.7 +base64 0.22.1 +base64-simd 0.7.0 +bincode 1.3.3 +bit_field 0.10.2 +bitflags 1.3.2 +bitflags 2.5.0 +bitstream-io 2.4.1 +bitvec 1.0.1 +block-buffer 0.10.4 +block-buffer 0.7.3 +block-padding 0.1.5 +bstr 1.9.1 +build_const 0.2.2 +built 0.7.3 +bumpalo 3.16.0 +byte-tools 0.3.1 +bytecheck 0.6.12 +bytecheck_derive 0.6.12 +bytecount 0.6.8 +bytemuck 1.16.0 +byteorder 1.5.0 +byteorder-lite 0.1.0 +bytes 0.4.12 +bytes 1.6.0 +cc 1.0.99 +cedarwood 0.4.6 +cfg-expr 0.15.8 +cfg-if 0.1.10 +cfg-if 1.0.0 +cfg_aliases 0.1.1 +chrono 0.4.38 +chrono-tz 0.9.0 +chrono-tz-build 0.3.0 +clap 3.2.25 +clap 4.5.7 +clap_builder 4.5.7 +clap_complete 4.5.5 +clap_derive 3.2.25 +clap_derive 4.5.5 +clap_lex 0.2.4 +clap_lex 0.7.1 +codemap 0.1.3 +color_quant 1.1.0 +colorchoice 1.0.1 +colored 2.1.0 +console 0.15.8 +const-str 0.3.2 +const-str-proc-macro 0.3.2 +core-foundation 0.9.4 +core-foundation-sys 0.8.6 +cpufeatures 0.2.12 +crc 1.8.1 +crc32fast 1.4.2 +crossbeam-channel 0.5.13 +crossbeam-deque 0.8.5 +crossbeam-epoch 0.9.18 +crossbeam-utils 0.8.20 +crunchy 0.2.2 +crypto-common 0.1.6 +cssparser 0.33.0 +cssparser-color 0.1.0 +cssparser-macros 0.6.1 +csv 1.3.0 +csv-core 0.1.11 +ctrlc 3.4.4 +dashmap 5.5.3 +data-encoding 2.6.0 +data-url 0.1.1 +deranged 0.3.11 +deunicode 1.6.0 +digest 0.10.7 +digest 0.8.1 +displaydoc 0.2.4 +doc-comment 0.3.3 +dtoa 1.0.9 +dtoa-short 0.3.5 +either 1.12.0 +elasticlunr-rs 3.0.2 +encode_unicode 0.3.6 +encoding 0.2.33 +encoding-index-japanese 1.20141219.5 +encoding-index-korean 1.20141219.5 +encoding-index-simpchinese 1.20141219.5 +encoding-index-singlebyte 1.20141219.5 +encoding-index-tradchinese 1.20141219.5 +encoding_index_tests 0.1.4 +encoding_rs 0.8.34 +env_logger 0.9.3 +equivalent 1.0.1 +errno 0.3.9 +exr 1.72.0 +fake-simd 0.1.2 +fastrand 2.1.0 +fdeflate 0.3.4 +file-id 0.2.1 +filetime 0.2.23 +flate2 1.0.30 +flume 0.11.0 +fnv 1.0.7 +foreign-types 0.3.2 +foreign-types-shared 0.1.1 +form_urlencoded 1.2.1 +fsevent-sys 4.1.0 +fuchsia-zircon 0.3.3 +fuchsia-zircon-sys 0.3.3 +funty 2.0.0 +futf 0.1.5 +futures-channel 0.3.30 +futures-core 0.3.30 +futures-io 0.3.30 +futures-sink 0.3.30 +futures-task 0.3.30 +futures-util 0.3.30 +fxhash 0.2.1 +generic-array 0.12.4 +generic-array 0.14.7 +getrandom 0.1.16 +getrandom 0.2.15 +gh-emoji 1.0.8 +gif 0.13.1 +gimli 0.29.0 +glob 0.3.1 +globset 0.4.14 +globwalk 0.9.1 +grass 0.13.3 +grass_compiler 0.13.3 +h2 0.3.26 +half 2.4.1 +hashbrown 0.12.3 +hashbrown 0.13.2 +hashbrown 0.14.5 +heck 0.4.1 +heck 0.5.0 +hermit-abi 0.1.19 +html5ever 0.27.0 +http 0.2.12 +http-body 0.4.6 +httparse 1.9.3 +httpdate 1.0.3 +humansize 2.1.3 +humantime 2.1.0 +hyper 0.14.29 +hyper-rustls 0.24.2 +hyper-tls 0.5.0 +iana-time-zone 0.1.60 +iana-time-zone-haiku 0.1.2 +icu_collections 1.5.0 +icu_locid 1.5.0 +icu_locid_transform 1.5.0 +icu_locid_transform_data 1.5.0 +icu_normalizer 1.5.0 +icu_normalizer_data 1.5.0 +icu_properties 1.5.0 +icu_properties_data 1.5.0 +icu_provider 1.5.0 +icu_provider_macros 1.5.0 +idna 1.0.0 +ignore 0.4.22 +image 0.25.1 +image-webp 0.1.2 +imgref 1.10.1 +indexmap 1.9.3 +indexmap 2.2.6 +inotify 0.9.6 +inotify-sys 0.1.5 +insta 1.39.0 +interpolate_name 0.2.4 +iovec 0.1.4 +ipnet 2.9.0 +is-docker 0.2.0 +is-wsl 0.4.0 +is_terminal_polyfill 1.70.0 +itertools 0.10.5 +itertools 0.12.1 +itoa 1.0.11 +jieba-rs 0.6.8 +jobserver 0.1.31 +jpeg-decoder 0.3.1 +js-sys 0.3.69 +kamadak-exif 0.5.5 +kernel32-sys 0.2.2 +kqueue 1.0.8 +kqueue-sys 1.0.4 +lasso 0.7.2 +lazy_static 1.4.0 +lazycell 1.3.0 +lebe 0.5.2 +lexical-sort 0.3.1 +libc 0.2.155 +libfuzzer-sys 0.4.7 +libm 0.2.8 +libwebp-sys 0.9.5 +lightningcss 1.0.0-alpha.57 +lindera 0.14.0 +lindera-cc-cedict-builder 0.13.5 +lindera-core 0.13.5 +lindera-decompress 0.13.5 +lindera-dictionary 0.13.5 +lindera-ipadic 0.13.5 +lindera-ipadic-builder 0.13.5 +lindera-ko-dic-builder 0.13.5 +lindera-unidic-builder 0.13.5 +line-wrap 0.2.0 +linked-hash-map 0.5.6 +linux-raw-sys 0.4.14 +litemap 0.7.3 +lock_api 0.4.12 +log 0.4.21 +loop9 0.1.5 +lzma-rs 0.2.0 +mac 0.1.1 +maplit 1.0.2 +markup5ever 0.12.1 +matches 0.1.10 +maybe-rayon 0.1.1 +memchr 2.7.4 +mime 0.3.17 +mime_guess 2.0.4 +minidom 0.12.0 +minify-html 0.15.0 +minify-html-common 0.0.2 +minify-js 0.5.6 +minimal-lexical 0.2.1 +miniz_oxide 0.7.3 +mio 0.6.23 +mio 0.8.11 +mio-extras 2.0.6 +miow 0.2.2 +mockito 0.31.1 +mutate_once 0.1.1 +native-tls 0.2.12 +net2 0.2.39 +new_debug_unreachable 1.0.6 +nix 0.28.0 +nom 7.1.3 +nom-bibtex 0.5.0 +nom-tracable 0.9.1 +nom-tracable-macros 0.9.1 +nom_locate 4.2.0 +noop_proc_macro 0.3.0 +notify 6.1.1 +notify-debouncer-full 0.3.1 +num-bigint 0.4.5 +num-conv 0.1.0 +num-derive 0.4.2 +num-format 0.4.4 +num-integer 0.1.46 +num-rational 0.4.2 +num-traits 0.2.19 +num_threads 0.1.7 +object 0.36.0 +once_cell 1.19.0 +onig 6.4.0 +onig_sys 69.8.1 +opaque-debug 0.2.3 +open 5.1.4 +openssl 0.10.64 +openssl-macros 0.1.1 +openssl-probe 0.1.5 +openssl-sys 0.9.102 +os_str_bytes 6.6.1 +outref 0.1.0 +parcel_selectors 0.26.5 +parcel_sourcemap 2.1.1 +parking_lot 0.12.3 +parking_lot_core 0.9.10 +parse-js 0.17.0 +parse-zoneinfo 0.3.1 +paste 1.0.15 +path-slash 0.2.1 +pathdiff 0.2.1 +percent-encoding 2.3.1 +pest 2.7.10 +pest_derive 2.7.10 +pest_generator 2.7.10 +pest_meta 2.7.10 +phf 0.10.1 +phf 0.11.2 +phf_codegen 0.10.0 +phf_codegen 0.11.2 +phf_generator 0.10.0 +phf_generator 0.11.2 +phf_macros 0.11.2 +phf_shared 0.10.0 +phf_shared 0.11.2 +pin-project-lite 0.2.14 +pin-utils 0.1.0 +pkg-config 0.3.30 +plist 1.6.1 +png 0.17.13 +powerfmt 0.2.0 +ppv-lite86 0.2.17 +precomputed-hash 0.1.1 +proc-macro-error 1.0.4 +proc-macro-error-attr 1.0.4 +proc-macro2 1.0.85 +profiling 1.0.15 +profiling-procmacros 1.0.15 +ptr_meta 0.1.4 +ptr_meta_derive 0.1.4 +pulldown-cmark 0.11.0 +pulldown-cmark-escape 0.11.0 +pure-rust-locales 0.8.1 +qoi 0.4.1 +quick-error 2.0.1 +quick-xml 0.17.2 +quick-xml 0.31.0 +quickxml_to_serde 0.6.0 +quote 1.0.36 +radium 0.7.0 +rand 0.7.3 +rand 0.8.5 +rand_chacha 0.2.2 +rand_chacha 0.3.1 +rand_core 0.5.1 +rand_core 0.6.4 +rand_hc 0.2.0 +rav1e 0.7.1 +ravif 0.11.7 +rayon 1.10.0 +rayon-core 1.12.1 +redox_syscall 0.4.1 +redox_syscall 0.5.2 +regex 1.10.5 +regex-automata 0.4.7 +regex-syntax 0.8.4 +relative-path 1.9.3 +rend 0.4.2 +reqwest 0.11.27 +rgb 0.8.37 +ring 0.17.8 +rkyv 0.7.44 +rkyv_derive 0.7.44 +roxmltree 0.20.0 +rust-stemmers 1.2.0 +rustc-demangle 0.1.24 +rustc-hash 1.1.0 +rustix 0.38.34 +rustls 0.21.12 +rustls-pemfile 1.0.4 +rustls-webpki 0.101.7 +ryu 1.0.18 +same-file 1.0.6 +schannel 0.1.23 +scopeguard 1.2.0 +sct 0.7.1 +seahash 4.1.0 +security-framework 2.11.0 +security-framework-sys 2.11.0 +serde 1.0.203 +serde_derive 1.0.203 +serde_json 1.0.117 +serde_spanned 0.6.6 +serde_urlencoded 0.7.1 +serde_yaml 0.9.34+deprecated +sha-1 0.8.2 +sha2 0.10.8 +simd-abstraction 0.7.1 +simd-adler32 0.3.7 +simd_helpers 0.1.0 +simdutf8 0.1.4 +similar 2.5.0 +siphasher 0.3.11 +slab 0.4.9 +slug 0.1.5 +smallvec 1.13.2 +socket2 0.5.7 +spin 0.9.8 +stable_deref_trait 1.2.0 +string_cache 0.8.7 +string_cache_codegen 0.5.2 +strsim 0.10.0 +strsim 0.11.1 +svg_metadata 0.5.1 +syn 1.0.109 +syn 2.0.66 +sync_wrapper 0.1.2 +synstructure 0.13.1 +syntect 5.2.0 +system-configuration 0.5.1 +system-configuration-sys 0.5.0 +system-deps 6.2.2 +tap 1.0.1 +tar 0.4.41 +target-lexicon 0.12.14 +tempfile 3.10.1 +tendril 0.4.3 +tera 1.20.0 +termcolor 1.4.1 +test-case 3.3.1 +test-case-core 3.3.1 +test-case-macros 3.3.1 +textwrap 0.16.1 +thiserror 1.0.61 +thiserror-impl 1.0.61 +tiff 0.9.1 +time 0.3.36 +time-core 0.1.2 +time-macros 0.2.18 +tinystr 0.7.6 +tinyvec 1.6.0 +tinyvec_macros 0.1.1 +tokio 1.38.0 +tokio-native-tls 0.3.1 +tokio-rustls 0.24.1 +tokio-util 0.7.11 +toml 0.5.11 +toml 0.8.14 +toml_datetime 0.6.6 +toml_edit 0.22.14 +tower-service 0.3.2 +tracing 0.1.40 +tracing-core 0.1.32 +try-lock 0.2.5 +typenum 1.17.0 +ucd-trie 0.1.6 +unic-char-property 0.9.0 +unic-char-range 0.9.0 +unic-common 0.9.0 +unic-langid 0.9.5 +unic-langid-impl 0.9.5 +unic-segment 0.9.0 +unic-ucd-segment 0.9.0 +unic-ucd-version 0.9.0 +unicase 2.7.0 +unicode-ident 1.0.12 +unicode-segmentation 1.11.0 +unsafe-libyaml 0.2.11 +untrusted 0.9.0 +url 2.5.1 +utf-8 0.7.6 +utf16_iter 1.0.5 +utf8_iter 1.0.4 +utf8parse 0.2.2 +uuid 1.8.0 +v_frame 0.3.8 +vcpkg 0.2.15 +version-compare 0.2.0 +version_check 0.9.4 +vlq 0.5.1 +walkdir 2.5.0 +want 0.3.1 +wasi 0.11.0+wasi-snapshot-preview1 +wasi 0.9.0+wasi-snapshot-preview1 +wasm-bindgen 0.2.92 +wasm-bindgen-backend 0.2.92 +wasm-bindgen-futures 0.4.42 +wasm-bindgen-macro 0.2.92 +wasm-bindgen-macro-support 0.2.92 +wasm-bindgen-shared 0.2.92 +web-sys 0.3.69 +webp 0.3.0 +webpki-roots 0.25.4 +weezl 0.1.8 +winapi 0.2.8 +winapi 0.3.9 +winapi-build 0.1.1 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-util 0.1.8 +winapi-x86_64-pc-windows-gnu 0.4.0 +windows-core 0.52.0 +windows-sys 0.48.0 +windows-sys 0.52.0 +windows-targets 0.48.5 +windows-targets 0.52.5 +windows_aarch64_gnullvm 0.48.5 +windows_aarch64_gnullvm 0.52.5 +windows_aarch64_msvc 0.48.5 +windows_aarch64_msvc 0.52.5 +windows_i686_gnu 0.48.5 +windows_i686_gnu 0.52.5 +windows_i686_gnullvm 0.52.5 +windows_i686_msvc 0.48.5 +windows_i686_msvc 0.52.5 +windows_x86_64_gnu 0.48.5 +windows_x86_64_gnu 0.52.5 +windows_x86_64_gnullvm 0.48.5 +windows_x86_64_gnullvm 0.52.5 +windows_x86_64_msvc 0.48.5 +windows_x86_64_msvc 0.52.5 +winnow 0.6.13 +winreg 0.50.0 +winres 0.1.12 +write16 1.0.0 +writeable 0.5.5 +ws 0.9.2 +ws2_32-sys 0.2.1 +wyz 0.5.1 +xattr 1.3.1 +yada 0.5.1 +yaml-rust 0.4.5 +yoke 0.7.4 +yoke-derive 0.7.4 +zerocopy 0.7.34 +zerocopy-derive 0.7.34 +zerofrom 0.1.4 +zerofrom-derive 0.1.4 +zerovec 0.10.2 +zerovec-derive 0.10.2 +zune-core 0.4.12 +zune-inflate 0.2.54 +zune-jpeg 0.4.11 " -source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" prepare() { export CARGO_HOME="$srcdir/cargo-home" @@ -353,16 +557,19 @@ prepare() { (builddir=$srcdir; default_prepare) mkdir -p "$CARGO_VENDOR" - cat <<- EOF > "$CARGO_HOME/config" + cat <<- EOF > "$CARGO_HOME/config.toml" [source.adelie] directory = "${CARGO_VENDOR}" [source.crates-io] replace-with = "adelie" local-registry = "/nonexistant" + + [profile.release] + lto = false # Adélie bug #1256 EOF - for _dep in $cargo_deps; do + for _dep in $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2#g'); do ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" @@ -398,357 +605,534 @@ doc() { "$subpkgdir"/usr/share/doc/$pkgname } -bashcomp() { - pkgdesc="Bash completions for $pkgname" - depends="" - install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - - mkdir -p "$subpkgdir"/usr/share/bash-completion/completions - cp "$builddir"/completions/$pkgname.bash \ - "$subpkgdir"/usr/share/bash-completion/completions -} - -fishcomp() { - pkgdesc="Fish completions for $pkgname" - depends="" - install_if="$pkgname=$pkgver-r$pkgrel fish" - - mkdir -p "$subpkgdir"/usr/share/fish/completions - cp "$builddir"/completions/$pkgname.fish \ - "$subpkgdir"/usr/share/fish/completions -} - -zshcomp() { - pkgdesc="Zsh completions for $pkgname" - depends="" - install_if="$pkgname=$pkgver-r$pkgrel zsh" - - mkdir -p "$subpkgdir/usr/share/zsh/site-functions" - cp "$builddir"/completions/_$pkgname \ - "$subpkgdir"/usr/share/zsh/site-functions -} - -sha512sums="e9496b57e005a751e85533807f6be275d187baa3f4371a29416dd7d2373d9214ee3469b032102c0544782527f93692d9d71a40d20e34cfe776be058777374756 zola-0.9.0.tar.gz -2d1658901c383003ff8181f366b1c691754de50fdf74a07a89001c97dbf9320864238797cbd20a44643e8ea8ec107c3b226c8573c4a6379f94ffd286fe8db025 actix-codec-0.1.2.tar.gz -13ac8e3a7759c55dad12055f93f5eab9e9b692cc3d6439888359de3e386b9838485e2478cfee8601f48ab03f5ffcaa662774ba039995e625d4ddc4ccdbb8432a actix-connect-0.2.5.tar.gz -45e2cc4ca1a41d74e5e6f051912ec0b98b76115eb988e7aeb5374d110a9fefdcb0976b3e2cd9ab74f03f184e99fdf1f1779162f167418bcd0a7eec4e96aa4f79 actix-files-0.1.4.tar.gz -3b225984dac2e601b8b9d37d0a2ed348e9d74487c9422a12c855d5fc347e2fb7bec5c16eb7e5f473734fe38acb40943a05a15ca38357aa3690bb16791efe3d28 actix-http-0.2.10.tar.gz -a01be9391df3227764ca3445301b82bd85dacf502edb6233fd0bdac1447cc1a4a7514952effbbce0c1b267088db3ac17ae4455a2232232aed056f1efff562e5f actix-router-0.1.5.tar.gz -289570966576600dc3c1d2641aaa6e858c7caa4e7b4c6474a6e459792a7d2914e0871127934e030e90635d3f00b42cfdb121b72f14e235a703561dfcbb37f149 actix-rt-0.2.5.tar.gz -3f8c8285f8a36b56f8775bf56c4d708955deacc162df8e3b198f7ec78dcd7107195ba84b9fa20799efd1a8325d2163f7c3683b4b92fbaa3135610a30c001af0c actix-server-0.6.0.tar.gz -69042aba68e57529719611d139e6793332830dd215c2f8d9dfd1f8db68590479295ed9bedcc764b06d3db24b8433a78e28b8253af3f23833f8c7cfecda3e0e2b actix-server-config-0.1.2.tar.gz -53497632a2dcb7ad4f3fc2fedabad735cabd0ff855983cba72bd844f5f5a34813b75fffd6809826f97fa3d373940e2b11470db16ee61de5c61d4102a4c6f84f4 actix-service-0.4.2.tar.gz -2b2dcabe2101cfdcd502de02a782275d23dea8a86fb594a6009bbfff59278dbf8b9344682f9c555432297b3847bbe60aaec1de39a0265fe52d810eafc474d4f4 actix-threadpool-0.1.2.tar.gz -7b657ca0c73ab897ea71223da65deaa8f000f16a33f5e31ba35146b449a0ae9db7cbdc6cbc885b4daf786352a33317ffbc59ce1c19132be680efe7cd16007f53 actix-utils-0.4.5.tar.gz -7870a3bb022904a4a030f6c0ae3ea5c34deb91ee483aa1144e3a9da5c5c2095da3b02119a81c58188696b3dbcaa718fa7682c4f501dd117c21f60f436794187d actix-web-1.0.7.tar.gz -28c445b11556be5a482adade25fa67431b0557b620aa51cf76552a441171c854c66c2db889210d8cd0a09382795a76524b5a60f1fa93a531dcec07e03cf3f4a0 actix-web-codegen-0.1.2.tar.gz -5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123 adler32-1.0.4.tar.gz -120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1 aho-corasick-0.7.6.tar.gz -743aa0e68db8bd2f636ba75a6683e02c581dab74ddd14b8f3abaef5e55be3d3a58ba361bfe4bf6ad00da20c232011239c9b6a2622818f4a86a290aa628e74186 ammonia-3.0.0.tar.gz -a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz -3e5ec14c30c2a061dde5bf1b61ffa753745d1b0fc31081c3a52e3c6b83593f790ce7c25d25bc35a50768a31e8f4dcbe63dd12a1606d2d6939f0096a5bdb6c877 arc-swap-0.4.3.tar.gz -6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4 arrayvec-0.4.11.tar.gz -4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz -ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe autocfg-0.1.6.tar.gz -a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe backtrace-0.3.38.tar.gz -6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0 backtrace-sys-0.1.31.tar.gz -674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 base64-0.10.1.tar.gz -9b599115ff33531eaad003e2c928e83211373101a5ad6cac0dcc09af0b97a0cb157abfc432c1a8c68f303e07732ebd6e0ab776c771250356da9f50187e92b1d9 bincode-1.2.0.tar.gz -bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa bitflags-1.2.0.tar.gz +sha512sums="0d3cc7733e01e4fb5ca73969d04484c4525e9d6175ff555fbf521d6793071dc6797de0c519b1a06704e88291ed0e849530ef0786630370f806113b791b692cda zola-0.19.1.tar.gz +79b474e02e0ecec86615e371879c6386cded892a988b3d94beb6bd471ea833f5832a26404c1d34efc7c0227c043b60d37304ab1c5f9a2c2fe4a1e704cc1fadfa ring-use-generic-implementation-on-non-sse2-x86.patch +b334f51bd369348b4446805b4f624ec9b4cc8eefcc53ceb57b523ff55bf018d1dfe23259daf48d1878170ad4fcb44181d4738456eb5e35ede6932ff29686268e addr2line-0.22.0.tar.gz +7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 adler-1.0.2.tar.gz +63677b2001d633ecabb36c08bd92e00b5fa71f24aed1c4601d12d846ea06aeaf093c37cfe1f6642147800caa6c749e9a202aa21f9ab4799efa379ad0d952a2ee ahash-0.7.8.tar.gz +47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d ahash-0.8.11.tar.gz +ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5 aho-corasick-0.7.20.tar.gz +ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 aho-corasick-1.1.3.tar.gz +aa091f85a361f512e18453a55c847825f43ae672e5b11e47cf9b8b413df9fc37732653d89c076309ec567a6136274aeac5ae1339fe441ebb0e98339dcec524f9 aligned-vec-0.5.0.tar.gz +84f523eaf7db9d98e44c7d1198fae40e59e838dcc9fc256ca7ef3f3d243a767755f318e516411b4feba4ecb26e30e77d501e9163f996b4d113804e5f2c41a65e ammonia-4.0.0.tar.gz +4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 android-tzdata-0.1.1.tar.gz +b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 android_system_properties-0.1.5.tar.gz +65ece20958e3fb1ed4a5ff1d45f5bfdcb942c64994a3d14eefb0dfd5b04f433f6e1b06ebff240c67ed8ff7cc01d93ca0acf8c8ea29cb41309c6c882e7c192b34 anstream-0.6.14.tar.gz +e20d49f7d148e03f7b127be7802e0b6b7a2b05720614d46c2ade5e440ce322b44ddd3a9239b897886faa03ed1cb30f947ee27d3811fa83dffba10b3975eba7ed anstyle-1.0.7.tar.gz +c1dac475df77d090a4d2041ba40ff418abe66e93e4ddda54653bf024fb4995e431166684343509a2337bc813fe06f362d3df8a1d7d05d177cec1a488bcb9942a anstyle-parse-0.2.4.tar.gz +321ddfa7b090142116c96bc8c70d81cec3e816922249ae0f07389e2d1b62c8b40636675ccfdfd23d52e29c162ae7d929637dfc7d697dafb79e596d04eb8cd90b anstyle-query-1.1.0.tar.gz +55217c65fc9ec674e5b4dd70716a221bd108b507dce9baaeb542f0e0a47027ec7fe61f9cd3cccfda43e4a4cd785b42f13400daf89884c32d3768e48bdff2d179 anstyle-wincon-3.0.3.tar.gz +3fe4e0c10c32983c3c725a5930f0bf7c752942c6dd0818b93bae9808e72d5a87725733a85b11cabb8fea630f524fd4b7a13160112f8bb7cc24515bcc384d6dbc any_ascii-0.1.7.tar.gz +3853da32a2c53d73969bb29a1e622f3a6d5832d8888dc6bc8eedb76394b392f983aa3fcb1f542933e238841486106f0f38e9a2400c12c7699baba0ebe1d8193a anyhow-1.0.86.tar.gz +faab26c44f25d2c7298add2a657e4010d9fe24b3a61e2270bc6feac05cf2a82895fe225d2fb1c6b63e6c7da54e061955503f39322b96dbdbc4916601bd5e5ccf arbitrary-1.3.2.tar.gz +d9d48c48eea230cb0d246857e0ba60316a76c0e214ba8fabdd42573559ff574b6867bab67880f1b8b7107ae9980fc026410020c3d3265309950c671b4faef582 arg_enum_proc_macro-0.3.4.tar.gz +91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac arrayvec-0.7.4.tar.gz +73aaf6411a552b24ab69d2f13e1c5880a96f84cb1b62dcf67a15f4889f80947c085826e4ed2fffd5cc28351842538d0de91ede45397d349099602c4719f559e8 assert-json-diff-2.0.2.tar.gz +d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 atty-0.2.14.tar.gz +a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635 autocfg-1.3.0.tar.gz +61c0dfe3e6e26210ac9c44616111f4200cdd473c68bb2424de6654637cb09a7089e958076efa69b35b351e5ee0fc7d45e580ce7ab51d5953b924cf208439ddb6 av1-grain-0.2.3.tar.gz +baf7c88c5de8fae4d6066baa43684ad7bab684baec7125f850c4f668ee232eedbc0a9c4d802fcba23be3aa735a6dcafb8e6954e6f753d1b3b2482f80cf990d2e avif-serialize-0.8.1.tar.gz +dacedfd32cb91fe408e4f395441baf09c0a4b3bc4ba8f79d088359455cc903c93d24969567c7c5b2feb806433ffbb63a526d73f53caa4bee9c51961b61f831d9 backtrace-0.3.73.tar.gz +c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 base64-0.21.7.tar.gz +91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20 base64-0.22.1.tar.gz +bc612e61f649515b451cff062e94142650083fa148307660125ddee6c48b7775bf704a659d693d8b36c1a7b5b5f474bcda5f841b6d643896c48755c5f76d25db base64-simd-0.7.0.tar.gz +49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3 bincode-1.3.3.tar.gz +99bacb002aa9ef89cef1403429807042135898614df85e59475772b90d2d21972ddc77ef9b129ca931355ff11bfb3de66b55b828bbf792f76300fc5cfef066a8 bit_field-0.10.2.tar.gz +3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz +75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 bitflags-2.5.0.tar.gz +86f0fbc327c4d0ed142dd5b0f62a8e2ae23a5060520c700fe1356d0416f8883328a7d029c9d6093336774c172aba67b372b57219a896831c79198c5f2fb5c7cd bitstream-io-2.4.1.tar.gz +83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e bitvec-1.0.1.tar.gz +b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb block-buffer-0.10.4.tar.gz 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf block-buffer-0.7.3.tar.gz -db06c66edf77b0a6860d75e053b84b74b3f168a320598a7f1de0e55fa6801dda22010328c5b50a56a27aafb09ed61e3e27ad7221d650b546b3798652b767b02b block-padding-0.1.4.tar.gz -9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d bstr-0.2.8.tar.gz +acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a block-padding-0.1.5.tar.gz +67e9f76719310de60f46adf3c39768b4dc078d4c32dc6bdcec1a94cd9f630c5238e427ed84cd6ec25a44f54e84adeb795a0e92060a5372d9fb9ad9f0914e3172 bstr-1.9.1.tar.gz +47a9949b7196791af2507d6e3a28843da67621e5b56177d3b13477e070487cdd1059207588a55bf1a393df9118e71e3024b439a3c6281b6c12b5bdee66b237a6 build_const-0.2.2.tar.gz +1833cd69a22d495643fbc04319cca6dc1909c980eca67bfb3aff08af50166dd88aa1210a331353469e3b614613f590e10aea63d7f196e96a3da355b1988f5325 built-0.7.3.tar.gz +a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1 bumpalo-3.16.0.tar.gz 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa byte-tools-0.3.1.tar.gz -2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f byteorder-1.3.2.tar.gz +49a85f9bbfe8bccceffcd94e3eac1f4407d93159358428ea07652714e06e97fbcb41f22f72d9d10318bc9a019be8afc99727764162f18e8de01ea4069f44dda6 bytecheck-0.6.12.tar.gz +57f8480ddb76d8620095962acd203231fb7938c0caf9c216d89466f22464a6970f13adca5f4d5b10c9e1ec99d6e0b260ba7586c2bb895fad0380f8f9ac9a4fc8 bytecheck_derive-0.6.12.tar.gz +5984dbb71fe22371db00ca56675f409cefcf7c093f406ce1abc330a0b1535f30a43a520fb64d66c04a181a4f05d956300e35f77b43aceeb161eaf8a2c64df614 bytecount-0.6.8.tar.gz +09677bedb7c480a8abd345cdb710765ddc332fe675e64591cca05d73adc281a29475feff954e4c5eaa9fc55f2508ac44b44007c34593c71b255d6c4b4d92781a bytemuck-1.16.0.tar.gz +96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f byteorder-1.5.0.tar.gz +d38837acc5926fe98ddf4336a603412f678b5f46d53a7eb926a8885d28aa24d51e3968f0eb2e6d2d7711e5ba30b8006a27076ea596b0699e93ad3d9e05483c4c byteorder-lite-0.1.0.tar.gz 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250 bytes-0.4.12.tar.gz -d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14 c2-chacha-0.2.2.tar.gz -cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e cc-1.0.45.tar.gz +6507bc4274204d0a19b6a95c3284c52245c71cbf5f2dfb5cd372193d989e49869ec557c0c4e449e96ed4e3028c90606dfb0dcdc1d72bb234a36bc5f344c0a7a8 bytes-1.6.0.tar.gz +2f6c9a0869b3b636b011390efade0085ed5fe616ecb33ff586c948779b9c9bea9169cb1c31441b0aeb63dbaa35cdb76b6e67ace38d561e2c150e06853a2b1757 cc-1.0.99.tar.gz +9c05863b5f35bd8652ae08d432f9abca8ce7fae5784496e1e46081bfea4efbd1b045283c4eb20062b76294f89f1970b337730111d638e65d731b16daba6e8d2e cedarwood-0.4.6.tar.gz +1077d113dfe080e0e78e25c40f32c9f14988d2dbb76bb783ed3e8ce13c58e5dc0dd549362d2f197b69cfbffcfa3ebed385a0247f5928dcff8be7d0b055be1041 cfg-expr-0.15.8.tar.gz 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz -d68fdcc255a2b967ea3e18d30dba7bba76929fcfa216c2081426b4fd3846bed660bcec8f92eeccb3de88f6e08aae9ade1c5e5d14f36d0853fe9a4499bcd5a57f chrono-0.4.9.tar.gz -fddb6a5015fa87ce5d6d1024f73a497928233b0125ba31fe651cb03e6f9587e7664b360a27ae023bebfd7fbb29796d48a3c499255179d943fea372ce3e7b03dc chrono-tz-0.5.1.tar.gz -f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz -691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz -690b0aecf48e5102efca22d4f25821159d4c3f726f5eac08159467bc586ab9f83eacd64aeab79162c006d434002930ceb1519037c846edd84745eda289a592b9 color_quant-1.0.1.tar.gz -4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821 cookie-0.12.0.tar.gz -40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4 cookie_store-0.7.0.tar.gz -2d170f9629030fda5fa964704330ae3200e51cd13d0b07d019ea01efddbf89a55a64c3df3e9f1440b6bfa807c4f7b619d3618602c32c8f954eac81fce71747d3 copyless-0.1.4.tar.gz -5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632 core-foundation-0.6.4.tar.gz -bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07 core-foundation-sys-0.6.2.tar.gz -2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0 crc32fast-1.2.0.tar.gz -4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919 crossbeam-channel-0.3.9.tar.gz -6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2 crossbeam-deque-0.7.1.tar.gz -672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8 crossbeam-epoch-0.7.2.tar.gz -f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444 crossbeam-queue-0.1.2.tar.gz -771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5 crossbeam-utils-0.6.6.tar.gz -de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6 csv-1.1.1.tar.gz -91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8 csv-core-0.1.6.tar.gz -b77b0ccfe31110c514795b390b0500cb7349d4dfa2367f6d6b9612cce3d9dfa4cbbf96018da71ff4488258a0aeb2911e0436df35ea52c3e6a464bcbe027f12e8 ctrlc-3.1.3.tar.gz -3ed98605cb073c178052336a2ffa535e69480046f12a9152edaef9f10520123c013126f30767097e30047689fb2c25f27e9745d6269bbb0e04e644b00fc19682 deflate-0.7.20.tar.gz -dd68892b97f104427a3df896680616b002c7f0cf2809279f7f6ed34287ce387fc7c41d95e91380ac93a8c3342645467af70e656d2515db0beba24ce456e2a8bb derive_more-0.15.0.tar.gz -f3b9ca2055cd64d2f3035799f809976a0909e59b38ebec62b56e9037f32582f5cc99b72b1774dfbcc72e4d978570946cec46eb034fe71145c67e2241b9f84cd5 deunicode-0.4.3.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880 cfg_aliases-0.1.1.tar.gz +858e47e3facebd5383e71898f26b27d92fe4a69027e2cc47da2af59975ead7767355e0b699f4228eabe76a3eff8b2519c7cecf8b60dc3fc60fbf9b28e2f3d4d9 chrono-0.4.38.tar.gz +a0c281985ec81d722583e412d5d9c4235e550ce01b9bf36cb9d6a2a37370d0c0a194a1818e6779fde1bd0107c06dceca624cdbca2aa094821b80ed91f53fb5c6 chrono-tz-0.9.0.tar.gz +4aab68db4cfe816c8de21165858b969cdf8ede3c6f19be5150ebcc3237e40d052716650bb0cded7867e8e6d78e5fcf37e274b961108e3a025dc312078edcb0ba chrono-tz-build-0.3.0.tar.gz +557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea clap-3.2.25.tar.gz +f126132811696d5fcac0242264121a08c1f7c59b4830d73b6b95b8c5b31a2c11928b0d7026151a5d1a0108aa912d7c6157652193ea1ef5a980669bdf388d5bfb clap-4.5.7.tar.gz +df0ef9adabb61538619d94ead0768fb8291cdef48c0cf47b323aa366fa2564d89ddf65cd0ef0b7162ef5e590be26a357cc775ae5278abf8048c05a5fbf58b5cc clap_builder-4.5.7.tar.gz +b127163fa81c3934436481805179ae198b932ec3fd6bf0453b75c0d3672a7c3aa5d022411e88c7284de843c944da633aa566078714a495233eea9b992de4a609 clap_complete-4.5.5.tar.gz +c98098bfedb8b681d72eaedb946d9867fd068d9be31137fe1fb5d821cd68afec48e7d2963adb2099aa760c702d5b75fb0ed45fc62b83d7f26edc8cecc03ea5d3 clap_derive-3.2.25.tar.gz +90c2110445c832d81cf66287ebe32155c6bd72a0a75cdbceef4e411d4b9d83268af244adab6755379b6970b5d40b39a9f89df9ef8786429fe73d95a3eee1c134 clap_derive-4.5.5.tar.gz +6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f clap_lex-0.2.4.tar.gz +4cdede5eb9fa527567e9f3f94fd8fe7e1022d9e9236e78d30b3068befbaadedd778b5464f800e74bf187c44af9df582365f4d41a0113f8ab0fe9abc936171fc2 clap_lex-0.7.1.tar.gz +58cf60c2161f4c208bc98e8377104be4ca4b2827444a8c1310f2d60cb13775d7158a6d30a88321b308938d635ae92c5a41c5d4fb73a3d86499c29ddf6f86eebb codemap-0.1.3.tar.gz +690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201 color_quant-1.1.0.tar.gz +3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd colorchoice-1.0.1.tar.gz +fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e colored-2.1.0.tar.gz +b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 console-0.15.8.tar.gz +8fa8bd982f13c304d4e04eeece975045657706a3cafed8655a4a4b6e3996304c63be6d88f625d7218246c1e30b5eb228449dcd5ff81d5eb2e106f0e5214bcb3a const-str-0.3.2.tar.gz +5ec41cd39f82276aeb831d498908bc472b10a1f198e526a0242bc8f8d9525897654d444801c2650ebec5ef309f9fb2d3d249b40c1bd71ff607dfd1fb6f241862 const-str-proc-macro-0.3.2.tar.gz +82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33 core-foundation-0.9.4.tar.gz +24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 core-foundation-sys-0.8.6.tar.gz +52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6 cpufeatures-0.2.12.tar.gz +db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a crc-1.8.1.tar.gz +c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266 crc32fast-1.4.2.tar.gz +0f31223a7099f84e39e6b76b19cf26736e0c3907fffc2ed3eb0012c7984b1993570bf6d155eba5bfb82897ef0e4fc93b89096071410bbac256ca6be9a9568ff8 crossbeam-channel-0.5.13.tar.gz +0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864 crossbeam-deque-0.8.5.tar.gz +0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 crossbeam-epoch-0.9.18.tar.gz +7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa crossbeam-utils-0.8.20.tar.gz +36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025 crunchy-0.2.2.tar.gz +471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f crypto-common-0.1.6.tar.gz +a84048742745953365ae57c9189da7885d58d58ae4f9682a4be61a9d39285b586cb421c3a53989143052629969c96bac155fb04a4f20af97967756bc3150ddee cssparser-0.33.0.tar.gz +afc79c4028ab81864cb36c752902f36839c97a043f31f0ba3eaa6d81509dbdaa515c9433a0aa81122388975cc9a8f8930f6b0282ed5f428261f7e04637d546bf cssparser-color-0.1.0.tar.gz +21d2f8bcaad0a8fff865b23bb2b59dcc5165f8861c4b9d7d70e9f302b58e2cc5ef8555bcab97889bfe81889a2b27863c755494baa64a52c65cd74687fe58b124 cssparser-macros-0.6.1.tar.gz +1b9e870c433e4d37e61cd604d2712c59ccd392cab55b8c88596a7094245072dcae02ecc80d3ee7cdaaa083ec2c2865b71712330c55e93715917a86106a2230ed csv-1.3.0.tar.gz +0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee csv-core-0.1.11.tar.gz +c09c5bb87e4116e4f2604023d9a94afb9985678a4d02aac17baf5b5d13d0ac7321e07dd7b20ed620af9670926acdb6b78be37a56c8be171c21975d34ebf0196c ctrlc-3.4.4.tar.gz +15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a dashmap-5.5.3.tar.gz +a685c7bbd251a5738b27ac3ac8121a0db049221510c99e0ada6f245ed7499d04ec29d725ad01c688ad283e3d2d5aae0751685c804f6d95cae84e63a160d04c9c data-encoding-2.6.0.tar.gz +d8b149626dfc6506a776780012240db75e07ea8c2cf671995cc0278f1f5961d6c70145a94adf200d847bbf91e9c35165bbc7fdb64e73e049d3e95534846fa8e3 data-url-0.1.1.tar.gz +48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 deranged-0.3.11.tar.gz +39e5de0d1ed93bf3fcd37e87a04ac3b23d3a50d28b37b0962b30f9461753b3c1e3639c9760101bbaf1d4269c7eaa8568764b481d3cac6faa6b9580f51d11144c deunicode-1.6.0.tar.gz +0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c digest-0.10.7.tar.gz 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055 digest-0.8.1.tar.gz -d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044 dtoa-0.4.4.tar.gz -5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2 either-1.5.3.tar.gz -63349de11a3b485ca9cf4961a951f286dc22842aa98229510eecb3e9e2fc5fe8deb03199eeabebb28e3adb24625ca78f4deead72af0696053c3a463228487731 elasticlunr-rs-2.3.6.tar.gz -601e0a8ac8eb39def2336463b38de3052123f62653e22f5a48b8015912f946ab7e78610eca65e7663b2158c908e7f7f4f9f6b48f188c18319ef5594fb7e86e9d encoding_rs-0.8.20.tar.gz -37c8034c74e74e590d785af955f34989454bf8051608aed2968ec6e5609f492fa3fa4ca829404a13c1e2f987eb72403b8c9c3463e69b5bde0b5307fc4b8d7f8d enum-as-inner-0.2.1.tar.gz -1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc error-chain-0.12.1.tar.gz -8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc failure-0.1.5.tar.gz -c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a failure_derive-0.1.5.tar.gz +a1de2c200584bfac640f8b84b5103d8687919cd29f59a14898e98d480f476a8e4dc06e3b929af479d536cd02186e2a9be72e6414338bc117b97bc0d160029592 displaydoc-0.2.4.tar.gz +e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba doc-comment-0.3.3.tar.gz +996814e68f67c77d68a0e3195241f7034575453401370a1842c94232a35aa41c832f788720ee68947662ae0e8c7595df736810a2b392871f57e6ccb47f55a4b9 dtoa-1.0.9.tar.gz +da4d7c318b7146775260de71be363fa257ce9b1f7fcee8f5213cf905211379c5f58496d2070a001fd74fd4570a7de2a1ddf4d02e617dae6977e7a1e29b8817f2 dtoa-short-0.3.5.tar.gz +88e1ac4053c39740cf643a8fd445f2d939a8398e952b4b66ab38bb48bd54bc7a976967c4bebab36fed66c4f5fb76082e9c6d40e146914283fca28f31af0e0138 either-1.12.0.tar.gz +2f65cc09ac0a9a806fe36a617fe1fd8b6eddc2fa427012ed3fa2eee2f05743089820a801063d0fcd38bf5269b70b6b5f5ad0e6d706cfd461fcf4a62a9f956361 elasticlunr-rs-3.0.2.tar.gz +64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 encode_unicode-0.3.6.tar.gz +10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e encoding-0.2.33.tar.gz +879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2 encoding-index-japanese-1.20141219.5.tar.gz +0e79eb9b01fe0354532dc7a8ca55e6332add19827905340560ef9b0e4725becda68ffedd5d18b9ac9d0c4a1b64fb337a9a31de5891b9e6469478fc974e5f9884 encoding-index-korean-1.20141219.5.tar.gz +caffc2a9b77545c2cc22bfcb38c886fba21e765ef49a3cfcfff88ebd76064432638bb432cd57a7ecd23bf2ea074c400c1f043a0589e5aa28024ed3ae0f59be75 encoding-index-simpchinese-1.20141219.5.tar.gz +648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a encoding-index-singlebyte-1.20141219.5.tar.gz +3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d encoding-index-tradchinese-1.20141219.5.tar.gz +0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6 encoding_index_tests-0.1.4.tar.gz +e23b87003814dd6e7e17924bd1f53989a5008dd1da07baa23c40d2a18dc1ab2d786d61e2c304b3f60e73be5f180ae2deea3b4499c0157b6afe3c9273d2f739f6 encoding_rs-0.8.34.tar.gz +a3ee86e77d980c2eefe4be32d75422aa0f9a60a43fd11bafaa3c9e556584cf65c36976a6aa650f87426edfd82de0cbb919e0906cdba6db8b486b4dd4b2583bbe env_logger-0.9.3.tar.gz +b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 equivalent-1.0.1.tar.gz +777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a errno-0.3.9.tar.gz +eeab15189ca6801d3b3748c88395de9d2a3fd970f182f70bd39ff7dbc960bd27d06191a42d1a5cb895a334787f18dd3ff31af74d223419e1845396a5f696dd1c exr-1.72.0.tar.gz d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 fake-simd-0.1.2.tar.gz -410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a filetime-0.2.7.tar.gz -d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a flate2-1.0.11.tar.gz -f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 fnv-1.0.6.tar.gz +ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104 fastrand-2.1.0.tar.gz +a38b493eba656beb97275faf5a2f32c8a2c2cb12c5d5c280d37bbcf1406fe404151fd6312ec496aafdce802ef08745a6927e571890f9b290010ca5ac45ac9bdf fdeflate-0.3.4.tar.gz +f6d77d9cbee1d95415ce64caebc4c6e662a8ef05a72b59e4daf941f9f0746706156372dd2d9702ca0bf6de800bec05f9b35d81b573965583df5aa35f86d768c6 file-id-0.2.1.tar.gz +8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3 filetime-0.2.23.tar.gz +21528f80c1709cfa764723dce012903581dbc2b63ecad194ec601fc75103307e1b2ef17479186ad895ad957c9a33c6fd666b2981382a8a68ca78dfac7cb5d578 flate2-1.0.30.tar.gz +29e499f3de970d2d400c3826e912a49a01408dae8d933068dc94576cb0c2ca0e42ec4a9ebeffd17a20f56869f09eec04a2b90a335bfaa6462b8df474b2a49fcd flume-0.11.0.tar.gz +2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 fnv-1.0.7.tar.gz bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 foreign-types-0.3.2.tar.gz bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a foreign-types-shared-0.1.1.tar.gz -c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a fs_extra-1.1.0.tar.gz -98d5e6998e3ae0cf3e0f383aa1e8f7fadd9b75154753168da4f6b87cc9a37b8830e7bed4b2169993ddf49646c9d47aa022d6af8a8a66370e7fc533932e70855f fsevent-0.4.0.tar.gz -4c7f96586c4564f804390c3ad22388456a138bef1902a5985463515ca9b56976fc14c993f08ac188897c449b2d2843890c2357398eb3ef5eb064326881e7167d fsevent-sys-2.0.1.tar.gz -ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 form_urlencoded-1.2.1.tar.gz +e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7 fsevent-sys-4.1.0.tar.gz a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 fuchsia-zircon-0.3.3.tar.gz 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 fuchsia-zircon-sys-0.3.3.tar.gz -4cd5ecbb8c180c9b390a6884edf65bfc3aff53ffe7b930cf2b432ff9c46a8c5a06001f3f412f99c41a60def52207e709ffa07a4b432ada488e77067fb5e1b3bf futf-0.1.4.tar.gz -16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200 futures-0.1.29.tar.gz -49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6 futures-cpupool-0.1.8.tar.gz -75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 generic-array-0.12.3.tar.gz -5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f getopts-0.2.21.tar.gz -0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518 getrandom-0.1.12.tar.gz -e189b2c745a0abd3ae1803724fab6dc36422d7c0fab760de40856f82d752096df875d15ba8f1c3dba6bdbba811a484babc4fc8bc2422c7998918dfda70387c1c gif-0.10.3.tar.gz -87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 glob-0.3.0.tar.gz -b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985 globset-0.4.4.tar.gz -889445498d83d9fcd4cd91bcc6bb72a476f4bee4f2cb74260abff2a8a18206583d883afb7b9e8dff83b878d9acede81ce12c9f81bab3b93ca0f401e2681d724f globwalk-0.7.1.tar.gz -37686cbb102eeb15de3f76d0607cf64210b11f5272ed83dbbb145650fbf11916027be3acb487cbb3e02654469b9f78167a7f18551f39af142e659cb149363d49 h2-0.1.26.tar.gz -96c878d0f9dd70eddb14be2c42df955956a334e768a021f6e14369244c9b0f199182566181d4cbdf137adf040f5a397a57d9ab3d503470fb3412f9edb44b2e01 hashbrown-0.5.0.tar.gz -134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz -1b822bc6261cda2a52518c625790878eb4592fbccbea72b503da42322659b8e6c95ccac442753a6cf1d5d612413679221650e0c584bb06162c3b1c89d8bafb02 hostname-0.1.5.tar.gz -1d11d085ee333b28fab8a5693d4eccce29d81bad08528b19f558a16b0ce19b0cb34ba6cf3960436a4c6057554e658af0732b5cb1e06b00559ff30075f0df2ad9 html5ever-0.24.1.tar.gz -850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726 http-0.1.18.tar.gz -b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80 http-body-0.1.0.tar.gz -97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457 httparse-1.3.4.tar.gz -dfca883bddb8562e7538522a560624bc98a53fc8ee712fc3e023e502ffe85ac7bbcd9a68a2718331bb206014dfdb74445bdab7d4aefedd047994219ad1b216a8 humansize-1.1.0.tar.gz -2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da humantime-1.3.0.tar.gz -40f3285b4de23ac8404b191a44a78399ed3186d9e6abf77d759615cc4678292411df798cbe4c2d5405677cd5c108468c015d6b42fd8d833484f8ca9c1128f68c hyper-0.12.35.tar.gz -9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c hyper-tls-0.3.2.tar.gz -217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a idna-0.1.5.tar.gz -375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d idna-0.2.0.tar.gz -ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb ignore-0.4.10.tar.gz -3a4b3545e133616ccb9100aa0a11501e708da41b909b0407840cb26d834d13463a9021cc7662eb1a9a5c3361db7f4771b8397bddbd4223bcf9196ed46f892435 image-0.22.2.tar.gz -de0fa70403f5874133c0b9c97892ffa65b3adf4a1e307fff7039e3a37be0a07de5133d33edeb4d1ac9791b6ead7bffc53f2cf5876a732fadd58977d6d36bed38 indexmap-1.2.0.tar.gz -1392402f72a8463dc5cdaf815d8933e8dfcc914fb3a91e69c38e54deb7d55b5211e157b640b7cfa999400fb4d2e233a4a1a678147594dfa0be300894126d17f2 inflate-0.4.5.tar.gz -f818c3a74f2525ae9e57e5a0f1625ac0b86a567f8e8ac92f93836371ae818a05b3ad92893f3e080d2f0e0f7d22d3f25ecb3de5cc744daebd8977301c9280b64c inotify-0.6.1.tar.gz -82ce82277ef2ef05888aae3a997461515d340c7286daefa4f54f7942fcdcbd1e29fbc60907ecdbcb00139db36462fb3c21ce64b9add2b785826adfaa54216a66 inotify-sys-0.1.3.tar.gz -3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223 iovec-0.1.2.tar.gz -b9c2e23476cebe74ba1f3ac15404a5c336f1d85c1320ef802cd4e3b23b8274855ee42545429c110fab88bb925799375753be3a2e78638c50be5f32666327691b ipconfig-0.2.1.tar.gz -f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz -9ae7d8add326e3b84f28763980499fc6570193fc7d819adaea0f396957505fc74837409e8dde023bdecb859139ba735b0dcc212e7f22928735c1862ff790120e jpeg-decoder-0.1.16.tar.gz +691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155 funty-2.0.0.tar.gz +4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3 futf-0.1.5.tar.gz +689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c futures-channel-0.3.30.tar.gz +3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 futures-core-0.3.30.tar.gz +077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2 futures-io-0.3.30.tar.gz +1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 futures-sink-0.3.30.tar.gz +c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d futures-task-0.3.30.tar.gz +7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 futures-util-0.3.30.tar.gz +638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38 fxhash-0.2.1.tar.gz +f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8 generic-array-0.12.4.tar.gz +363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d generic-array-0.14.7.tar.gz +c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53 getrandom-0.1.16.tar.gz +04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb getrandom-0.2.15.tar.gz +48840cb01c4887e832ef30e9f3162dfdffa42a184ba585206ae4c48ff3bf94548f006ac6b120377546156933c222d7cc8326aa63e439477c26e9a2616b083825 gh-emoji-1.0.8.tar.gz +7e76ee111c6a94763c4dfe01faf4cb0b5272d5041e2b2b8f4db666debf647e192b963c6fb3228cdde28e1d112830c2aa31eaf0551d712ea9963e41e47e26fb26 gif-0.13.1.tar.gz +a6b591d48dbe93a1fa6b814759a5cb61fba0838288840667aaecf01346a3ab862fbfe1cab51b057a425ba9a0ce35c8421b28cd5195464be881f38905062f1446 gimli-0.29.0.tar.gz +29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b glob-0.3.1.tar.gz +e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc globset-0.4.14.tar.gz +9c95d6832950b35cf6ac87bd986116a75c847f11dd2e96ec0cbeb6c223ff901c949429669698cd75c4244a60c3de7df9adec648bc531303cdfba889e09f29448 globwalk-0.9.1.tar.gz +c0c87bbebaaec67ff6ded1ce72b99009a58b254bd4ed8da284372a06d5d7332e0603e2ede2746d7e4f446bb69c892a219cd40202ac9e9fd833588dd6a6ade78d grass-0.13.3.tar.gz +7ced90e2d9a01c0a02f6fc5099c4a1e9ec5bf2d05e16080a22e989a29716f7ef3f206040fa2d3a3064c13978c3393cb698052be513977c84a290057e38231469 grass_compiler-0.13.3.tar.gz +3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163 h2-0.3.26.tar.gz +0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193 half-2.4.1.tar.gz +b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 hashbrown-0.12.3.tar.gz +21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70 hashbrown-0.13.2.tar.gz +215ea860bd3de80e2dd2d4647c9dd31c0ac895ea7c08b87256dc11d36407e412ffefaebc6cdbec024057dd4f24b3762b4fe427be307e15d1e68ccfde89a99742 hashbrown-0.14.5.tar.gz +8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 heck-0.4.1.tar.gz +f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76 heck-0.5.0.tar.gz +1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a hermit-abi-0.1.19.tar.gz +8d736fc122da78e9ba8b546868d0770837ea0b4951ff027f1b5593dedeb9831c082dad1868659422fab5527711ffed18d4428d519a830a3434d4594a1af6c868 html5ever-0.27.0.tar.gz +e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58 http-0.2.12.tar.gz +fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462 http-body-0.4.6.tar.gz +16f9baeb1b00920b4a29c93556482a2da38b58aa661b87c6b543b551c731a037c9ee6a4c535f03c62fbd30f2e5433ddc9ef1a5e9373a2debd930fd1cb9ba304e httparse-1.9.3.tar.gz +0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a httpdate-1.0.3.tar.gz +0adb6825650fa074a0ff33a4090563987ef311de5ab23e12f715286d8198310d17cca9028f41b8ef0e17d15b939e50d165419853ffde6a7ccf977d33acd920fe humansize-2.1.3.tar.gz +3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c humantime-2.1.0.tar.gz +998c0ae60a6fd2b80717da1aa9596553489a8af890f34d9d9e6b0afe1e7e8960645fd5cbcf1379bd14d91f006fd4eb1c45e0d1ac5d3bd68731395c1b51b1dd07 hyper-0.14.29.tar.gz +f30e83408376b985ee9df26728f8183a7048d4586c5fa3d797cc837931e13300018929583a087767bd19d4bd60d85ea1c2696601c236fb65be9a6805ef6fc193 hyper-rustls-0.24.2.tar.gz +45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e hyper-tls-0.5.0.tar.gz +5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722 iana-time-zone-0.1.60.tar.gz +448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 iana-time-zone-haiku-0.1.2.tar.gz +127f1c91101ba69405b10a2590579606df766166fcf1fe6aa9a74c4900296425cba5c47a391a53a01b02026af5581f068fce4a7a400179809f7ed9922b94c0db icu_collections-1.5.0.tar.gz +4b85f0e7cc73166a542b2e502b3ffae1f30d2a9609ab83acf98e90b0edb37fa8ae4592f61ecf48a0ae0779fdd376abeff59e1d5cb97475012eda99ce2a97da57 icu_locid-1.5.0.tar.gz +1779078e2ef9859bee2bfd5414ad7e4b0f0a40e6813f4ccf8de2bbe8c764fac7f99ef001cce22332a8b3840af22e9c7fb7cc0341cf8ba61303794ebe87071e63 icu_locid_transform-1.5.0.tar.gz +1c00fb962eb4b8c759b1120313bb890f4388d579890d7450b798d6266a7d6adcbbebc8a8dad2f267668ca6f1c059d0bd2209eafbe2a72f4558c85258eba57405 icu_locid_transform_data-1.5.0.tar.gz +22612b86a24e3ea222469392763ae9d40dcbb37191dd8b9fa1c64332463a4299a53275a1cd3deb7e0f057d137f4312d990762f9925d0ceafbc8839d67c425a13 icu_normalizer-1.5.0.tar.gz +222fbb819791fb4ec7889e45ed3032ac8d4753e2e9cdce9d0b3f79128baca5ce64157a8a58ecdf39cfddb6c2395001e3cc8828ed51803e85cae133c247cb338f icu_normalizer_data-1.5.0.tar.gz +a5ec9036b5c8ae35cd9afaa143ad29d0656078e1b5f2c589d7ad6a9e4755c4a383e45c2a3b9335455f414e4d068f7e8f7b41e9cc79309c84ac769c40634f03cc icu_properties-1.5.0.tar.gz +c651d0a50c229acafa648ce234a73bc1d0a85a8bf2369fdadaa62badc741c35e8a7d5392fb1bdb7b720fe2e0f883d1309c78de4ba913691969e5367a4e8bafac icu_properties_data-1.5.0.tar.gz +6c11d89c7d2b788a44757f02b0e298b558ebe174fe917664401d91109cdc7bd1aba5526b3cdcee1f066018de1b775bc9dfc294bdfb40476c53d552bd6f29d6a1 icu_provider-1.5.0.tar.gz +a0dd58d731556a010428fe4aebbc9dbcd626b46d380cf28ba5236ec8824045a20f6f2ec986e0c1e791bc8bc2b692a10306f448279f079b4c37237e4a3c3cef63 icu_provider_macros-1.5.0.tar.gz +9230b6e7410532190e77c9783da477c3f09b34cdda8376ac813bf905b116e6490470afd93fe2bcb383a0234074605de5e93780873685020732cbdea422eaad29 idna-1.0.0.tar.gz +9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9 ignore-0.4.22.tar.gz +4252672cb5b5fde61e9c7fce1712997ea082e3e7d5350970d597c0a1421b21078e1b4c3088474c4b500f396bce604d0749085fe4cdfe1c3b5f3d1ffcd39c1b04 image-0.25.1.tar.gz +c983df0b31990c0d5c1176d94a659f4f1d45bfe41eef77e4734916fb04c2a1870de3b40fb252668142c1abfc1b33682f624e301e17815609bb5b3011b94e6d04 image-webp-0.1.2.tar.gz +cb58823cd0357c4cfc6daf3052b59e7de105acd85a1f8bdc49bee65f4d8b88ecd8a59ebaa7d157d91f643449f6c071a113d998f50a2ae9bc04dcb7b635c805b8 imgref-1.10.1.tar.gz +2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 indexmap-1.9.3.tar.gz +53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea indexmap-2.2.6.tar.gz +39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2 inotify-0.9.6.tar.gz +dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da inotify-sys-0.1.5.tar.gz +6d50e49af1b76ac53962565d37e05a3fa5b9dae47655529cb675b498a0308ce6008d9c2821e4cc323c2e05560f76539572a7d8881d151e015b32444b02175e5d insta-1.39.0.tar.gz +87d2b732a9104d1a094a15ba6fa642641690aec10bec065d02aff5830f54a0fed02ff5de4bd5c237a91d34cd81da0ef11cc37ded3d4ac640de9dcb96fb73fe11 interpolate_name-0.2.4.tar.gz +e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158 iovec-0.1.4.tar.gz +8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54 ipnet-2.9.0.tar.gz +759e00292710b685954df031ef96bb650993cc3384cf03760ebaec377524cadc929c6561dde5fd3e14d71f9f122c86495dcf9893d1216d99055048542123ff06 is-docker-0.2.0.tar.gz +69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049 is-wsl-0.4.0.tar.gz +c07d5076978e4c5d8d6a191d8880fb62643161979c473564881feb17726cd9ac8da25c40094ff12727dbdb064fe88fbda1867120a2c3fda1051bcc39380645d6 is_terminal_polyfill-1.70.0.tar.gz +d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 itertools-0.10.5.tar.gz +0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 itertools-0.12.1.tar.gz +7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 itoa-1.0.11.tar.gz +d83bbf82706cd113115840d098db9135e9ae848c87d1f0037402f112d759ac259e2808b138378bfeb1717881c60b9f5385053f53bef644cb8e444a2f57203fa3 jieba-rs-0.6.8.tar.gz +0488e5eafc5a99583d4626ae8900d49082aa09228b35a8992d8e715b5a39aade47f51562dc4db8ac41305e069988c4c63e1c78e92d65561e3e8a09d4dfa5fe25 jobserver-0.1.31.tar.gz +103b7602876069603620cc2b5530e84fdab88ec96855a821606560a67cfa26f628b401eace62ee793e6c16ef282f958ed789f5db725ff901124fe6c9b123de00 jpeg-decoder-0.3.1.tar.gz +506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9 js-sys-0.3.69.tar.gz +22e0be2cf0a95c61259c0785e680a369ebc5f40219a13f1070175372203fc831844b451cb7f1374b58042ba6a73c9bdbcafecab6371b6ea18d6d18c9f08c419c kamadak-exif-0.5.5.tar.gz 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b kernel32-sys-0.2.2.tar.gz -54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6 language-tags-0.2.2.tar.gz +c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3 kqueue-1.0.8.tar.gz +6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5 kqueue-sys-1.0.4.tar.gz +c3a14f9b65c3add25398eb69f6162e349866cf13bea0eb3fd85abe1d4f159d5ffe26b7890964dae696a9f7e1872b09085e8f7a57db2fef87418bade94188bd03 lasso-0.7.2.tar.gz e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 lazy_static-1.4.0.tar.gz -de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2 lazycell-1.2.1.tar.gz -93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e libc-0.2.62.tar.gz -31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb line-wrap-0.1.1.tar.gz -74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94 linked-hash-map-0.5.2.tar.gz -e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde lock_api-0.1.5.tar.gz -2180d07e06be22c02e4133b5436c4805ec791865a775a5deb7bcfd54130cb759b02a31e081d082bed418b066b9bcdafd36edcf44b5ac58120d1a6d2956fd9bdd lock_api-0.3.1.tar.gz -0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz -ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1 lru-cache-0.1.2.tar.gz -4f62b824a4ede1be1618e75734d109202ad85dcd219409412868433e92513f4f1953a3d85b570d5195cb9b6fcd7af08e0a56a9f1f4daea42d604b37f1218c2f2 lzw-0.10.0.tar.gz +f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d lazycell-1.3.0.tar.gz +ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae lebe-0.5.2.tar.gz +ca7885bc22b4b67053aa7c83299459d5b1f5e627eddbde4827b6a5bf09827ef81d506a445a5a742bc6736cb9e02d7f9b458f16b87ad1af038ea4559ca0184c69 lexical-sort-0.3.1.tar.gz +05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807 libc-0.2.155.tar.gz +8c1e4d8897edce34020ee3e507fde3da357324c15e5288c6e4fd553ce876d2f9b7b5cc3de39d03aea89faa5fa75bbab52f671ff1777054739a888aefa3651c57 libfuzzer-sys-0.4.7.tar.gz +753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5 libm-0.2.8.tar.gz +07d57a78696e09ae7566c2948ca78624c6c50df5c4da63b83d6234142a4739c07da7abfba7f6c4613681fc699470dcb4b8e9a6ff024debc10f4e84b782f0fa61 libwebp-sys-0.9.5.tar.gz +502a6aa0959de7459987f894b1dad0c095e0d1aa20e0daeaaf18157e2d8e4b154e35cff02983378677bd4618397dc73d7b7b82c5ab0a43a974a9ba4dd6970446 lightningcss-1.0.0-alpha.57.tar.gz +9077b27619b6f6d1ca800702bc9cbfae1f2060902d6ece6b2713a47c47202f6df37ed22fdbd534e0a1e76dd13d2e3921a026698f0a924d391baa6cd3a79f4acb lindera-0.14.0.tar.gz +d06340f34bd758412ee5a83a69e021d0277b469ce2d04becdcf529351471bb5252e12ad386d4b360e0812d26318375fb99b6f17421c23f10f70832feb1c8dae6 lindera-cc-cedict-builder-0.13.5.tar.gz +544c2ae6115fe21244749d78d87cd27cfce05d77e9752aa02313ac5b3c9f6bef7ed14f936276eea19dbcc2c2e4e76797ae0b6b6298ff3c0e7bf8fadf2a7862c8 lindera-core-0.13.5.tar.gz +65410cb8476f0ff54f4da06a13e68919c4434fc295d275c871a1793f76bd4661f2a93a81be592673b4a7d0e6f4c55f06dd4f2111f52a45da59fb26672ce39d19 lindera-decompress-0.13.5.tar.gz +f7ab561c06b8133c58b6b48b0265beb497e6a5d45a68fb0e350dbfb828bbcea21f3ae7d1be9cb3eb63455a4c0c264697c9057b773eaedfd3cc12fa1d70e6efe4 lindera-dictionary-0.13.5.tar.gz +a6fd14b45e1dd1d010a46836f755b448de1599f8f5810e7056dee4aa20d84950709dc0a30c439d9e1e7048f35285603fa5578a2b9000ea6d816f09865a00ff00 lindera-ipadic-0.13.5.tar.gz +f0830820fb83456921aea78e6d0a4d0df357242bf7764acce988e4f488a3905ad9bb3239485834151eb965d62cf006e4aa4125dbd7ff87eded17f91b961bd46b lindera-ipadic-builder-0.13.5.tar.gz +c28408d5b00a00116d89d46b729a9d0cf11b2f28711d70104c32b23258fa59c1e985e6a8e4c8f6f765fce37a231fdf669aa1658dc27c67447d0ba35aca310d74 lindera-ko-dic-builder-0.13.5.tar.gz +ea49a1ca66cd7f03d52a9a70c5dcc07a1ef10ec9e70b3f89d01b467845ca2ce1722fb518b43558b2f6f7d97b83ea8b3d8815fc1a1afe1feab510634cab0a8833 lindera-unidic-builder-0.13.5.tar.gz +0fdb591ffaee918e32249a83cc28b72bcabb1259b0531cc4cc2a2241f1dc4fef27af41d5e8da150b9629de025ed60d25240bbffd02f4121f355433e7dd13297c line-wrap-0.2.0.tar.gz +031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707 linked-hash-map-0.5.6.tar.gz +28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7 linux-raw-sys-0.4.14.tar.gz +2c3bc6c4cbf6609f3cc2d986e701d23b73f5bac55995887c90aed01bf4392a42c718a69c0050296fa635a46f7cc9ef3dd6c6a2a505d3cccc690899aa345455a8 litemap-0.7.3.tar.gz +525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7 lock_api-0.4.12.tar.gz +0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b log-0.4.21.tar.gz +0a04d4e2561963671f5aa1c9af09470d0a8d30bb02299ab08c7dcec70b1dd3f9380244a59a4da1b8b269967313d6645a154a3dbe92fbae0e43cba6e009e6b7b9 loop9-0.1.5.tar.gz +74a00d76da2322d7e72a3a9cf9900a5fe861292f9afa4a363b2a9c6820801d504f1ab0a0e618a95e0b5b9d4933c8b060c125e061307601c6f62cada561edf8f5 lzma-rs-0.2.0.tar.gz dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a mac-0.1.1.tar.gz 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f maplit-1.0.2.tar.gz -ac321105b4631c7e9a2f987d0bee867effb8f86962e8d5a056b6009ea596389ea87f7f21bfc47f0fbfae24e8ae4e6e5e7a510f3694f677dd91d56ebb728cdf4b markup5ever-0.9.0.tar.gz -98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590 matches-0.1.8.tar.gz -0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d memchr-2.2.1.tar.gz -8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e memoffset-0.5.1.tar.gz -7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471 mime-0.3.14.tar.gz -c4d83d8c05b1173c531eea48073762dcc5e80efc2609e06dfc1413ae2f3a3f7d89e533453aeaa75182a8b663c51c7ad0d4eb0b5b4450afc8e11fd74b84a9799f mime_guess-2.0.1.tar.gz -e00ab08d024806ffe68f8d9d0404bf83e62c58d04398bd8b0f8993a6c60a38fcc3a50189cef7a699ad7a93682d9f2353a31f5596d62a72c5f6560d12cf0c0a02 miniz-sys-0.1.12.tar.gz -ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95 miniz_oxide-0.3.2.tar.gz -a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097 mio-0.6.19.tar.gz -743fc56546d8bcb09efecda0d60007a175a2db2a75dc882b21fedeb8fc4fcfe98ac0a6d55b0e843b088aac4e24e57145d96b372cdfa39933efee2514ba2ebba9 mio-extras-2.0.5.tar.gz -fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04 mio-uds-0.6.7.tar.gz -b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72 miow-0.2.1.tar.gz -9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09 native-tls-0.2.3.tar.gz -e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9 net2-0.2.33.tar.gz -d12686d789b0c37ae0b05881223b61737fd04092f10217caf4e6c9b8604e0a7734c9ff81b01ac204966c687481758b4dfaebf3b4947736ff90291a0dbfed3caa new_debug_unreachable-1.0.3.tar.gz -c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3 nix-0.14.1.tar.gz -2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e nodrop-0.1.13.tar.gz -663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54 nom-4.2.3.tar.gz -2b4be105d216ece418cb52239f150cbf23b21b58acab6298fc2b57eee4b37516bb4e5fb8624501da61a540bfad5a97ac1e2ce74c4812cc8dc7c73815f1150d35 notify-4.0.13.tar.gz -63ec8a69a964fc7c4d6286c04503fb77acb6e3609237b3b4619418c06b11e96bff88e7cb10898718ae690a187cec75c8b96b9c3d524e171ec1678eb457d354d9 num-derive-0.2.5.tar.gz -f979ace06e3c109e9b5217a85341117ad12bb6e8da1b7ad799d91a967e3da1eb785fb114294f049ed8a2022cd5269c1ff771bc319af3da0899df97a1e412297f num-integer-0.1.41.tar.gz -4f6e94c4f5e7ea1a95d76a61a4be4c5ac3b3e8ca0a2271b721c265881e47b0454525918aa207bcad738de8e19ca7c5e5c915a1c4c158d5c9c2e68d05649bdaf8 num-iter-0.1.39.tar.gz -cbe0dadf88b0704543005c96e2bac7bf981a90dabfd6595b06ee21973acb304591929dfaf51b3e860456dbbb812e60c5700a4793b46214595092f4defdf8159b num-rational-0.2.2.tar.gz -a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534 num-traits-0.2.8.tar.gz -f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd num_cpus-1.10.1.tar.gz -6c8e06a9c2f0aa130df2e3ace50d3b24b8da6906ed6dd153d34cc2036e886e8c7848dd3861218a8981aeda30813c9c86d7d0b5b98eca20bda4632b56ae6d67c5 onig-4.3.3.tar.gz -676884bf338fe2d9726956eec5d26297f3eba03642766ee3e64d7e2f5a945d6da93521c19c2c11881b5bb2785f24e5e91febfc08f12729fe58d74e4494f08ae6 onig_sys-69.1.0.tar.gz +5063b6591c63897017d79f64d11cc13edce2e8e21462df8a00166d582e83af3132ea7f4e50af4f248b56b75cbd12c6f89b7433da14147c76004fb2ffeda02b92 markup5ever-0.12.1.tar.gz +2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d matches-0.1.10.tar.gz +6f4e0e2a342fc86b5d0626a08779075c68911ffd3f837ac6ab2c15c821ba96e50617cfc9df9d16bf96ae57fa1802c5549e21d67f79e4e1c3f10bce04b88115e9 maybe-rayon-0.1.1.tar.gz +8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 memchr-2.7.4.tar.gz +e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 mime-0.3.17.tar.gz +acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908 mime_guess-2.0.4.tar.gz +616fed1dcd105b3b34eda59e11a091ae1c62c1bea9313301c683782fdf13e5355266396e96e782d25609bed71dbe5952ca7604504196df36870281831709f407 minidom-0.12.0.tar.gz +92d8ff03891dc9f0b8bcef8e61bebb14eb100767cfc565a873c6f88cef3719f8aa96392207f011210ded0e4bd4a5ba8ddb35d65b33fd8e7a319aa5fba6131c48 minify-html-0.15.0.tar.gz +b726a960f5e756e41ea0291d09c25d8bab62ce08e4cfcc0e3d0aecde6b9edb01790d0ed7f073f475ce0ea8772ccf1b4d15e697c6dbbcd1df9234303a76367c46 minify-html-common-0.0.2.tar.gz +d20d8b089731452c877baf2d0f536877438be584e952424cdddb0b8a1f359655f09de54a8bfd1de12ac8934afc987056b537f9cdda338f4a8049fc1f00a3ddb0 minify-js-0.5.6.tar.gz +385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c minimal-lexical-0.2.1.tar.gz +b9e2cc214d6213fb343cacc5f87228487592883fc8f7cf46c9a26b7148691783b2729ef80c0d0e11fbedf6edb1332dd87d88b253f7c2e645fe86ff2ffd47121f miniz_oxide-0.7.3.tar.gz +ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c mio-0.6.23.tar.gz +9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 mio-0.8.11.tar.gz +2d92e5afb34ef4c7d00c78d6ed15d4e786aaa9b57ea6e2743b996b8377389c9ae058a6aa227c5c66c39a2f86a7bb0b22a13c73a3e35c4b7c65b7b01fcf7fa232 mio-extras-2.0.6.tar.gz +e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba miow-0.2.2.tar.gz +5ef5aa972a45c8b6ff74b88cadf6bdc3e6465b742b08f1b1f12e72f5276adb2f1f7320c051896af3903acbf8849d0fdd034ab6d36ac75773bd1399c79f006fd4 mockito-0.31.1.tar.gz +395a11830264269602b4dd0a7bd296298cea606d21f3ac122a815954da2e370b21e820c6df9916325ffcc9789d57fa8ffc9b65f4d1562b760bb3cdb286d7b709 mutate_once-0.1.1.tar.gz +15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723 native-tls-0.2.12.tar.gz +3e36acae8205a9cdbe4337fa487a61989e17de0e584b586f3826c10d0df96c886cce374ddb918dae6b00544780e28d8e0e9d40da07a7d97f05cb5dd3ba622187 net2-0.2.39.tar.gz +73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48 new_debug_unreachable-1.0.6.tar.gz +73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a nix-0.28.0.tar.gz +1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad nom-7.1.3.tar.gz +57a890fbc9e5529f7b3fb1fa2ef02dbe55cd619d1c2b50ce286ad9436bf4d4730e58139892c90e9a6387a00065305925e3deef71bf45a0308110f229a21d8c31 nom-bibtex-0.5.0.tar.gz +cdddf8b6ba8215d2dbb9849cd1696d46f7ff355541341ff85b6b33974b8d25f9294534b76f5b366451a678fbc6e4d2e1b373602d39a69d389c0bea77c4b07163 nom-tracable-0.9.1.tar.gz +9d3826d6197816b627abd0bd4dc214fc4116399fae1280ec13511e1fa065e3ec257e3f10f76ee33046ed4cc52c993f3ffd25356bf5801628109bae7881e3ad86 nom-tracable-macros-0.9.1.tar.gz +9c697a577662c3b11f790e4964e0c2bd423ced2442c1dd8d663470f1391353938886664f2de5b337681d82ce49ddf9bbc7aeff5eb7e90a24ffea6dd9bac73815 nom_locate-4.2.0.tar.gz +a5ad22e815b8c574b42f7b70486a3fac319c24334ade74726ec07b976a838954d1de2d3632fc55ce6c8de2673e62b987fb4607a49c576f60959b1609e47b3771 noop_proc_macro-0.3.0.tar.gz +58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69 notify-6.1.1.tar.gz +2dfa90add844b25f2c111f086748b29388a58904d1dd46773d6c4c3cf9613b181def28b24ea974739234ff60d2423c965f98e4be8b330bc075153a870d2b0f1d notify-debouncer-full-0.3.1.tar.gz +0d3b1da7f37a441cae0bc276b5b9b8aaad2f5a7ddc3a1c9b6c6e09be70147f7430604c74c57a79dce12d32c242393c8031ec7bbe9b1cc6fb6e496d6fd151474e num-bigint-0.4.5.tar.gz +7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100 num-conv-0.1.0.tar.gz +55b951470a07dbce489ee43e1540056123d3eb7b5240903cd348951b81ef5aa5b2b1db311d1219bec8ad191373d0079bf40861e3f45380f8d8132f39d33b4f4c num-derive-0.4.2.tar.gz +4bfffce4b0b24a49cf3b8617bba0213769c9bbbdf111801915c2c6b524a8c54ae728b2e8f0901d367ec1d5a4129e9d76597f5df1c3bfd65459a02b0dcc84eedc num-format-0.4.4.tar.gz +e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae num-integer-0.1.46.tar.gz +0999130db45e5d877d1e2232c8900cc633bd39e749186b2ef4ac4343b958dcc80edcc2247df5f229546dcb3537fd45984a7a459a9bd8f62aee69a0239fce0b62 num-rational-0.4.2.tar.gz +180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 num-traits-0.2.19.tar.gz +60eecfe49c1afca8efa320c5f4d0cd794f6adf8924193682c903307f484ca0a1ddb56102a772232aca040f29651bbe26ddc1c4939e1f030e229d179837e06bda num_threads-0.1.7.tar.gz +5a75b296bde7a01a9a5cb59da98b7599b51c3ccdea2c135c5291ed10af8b1fab46dfe936e43de617328c216fd113913545fdedde00adf22fca251149b22bd6bc object-0.36.0.tar.gz +4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c once_cell-1.19.0.tar.gz +5d388d35eaeb4ba4876b5a683010e4e38c7c54abaf15c900681a7c9ed199b6b7ff414aa1d6246153546680eab28505cfda359c3d5df5b9fd3a5cdbfba35953bf onig-6.4.0.tar.gz +26a7dec69abe1535d575e7db63448abd898d363ef42352605e7b7d046b5abac5733e3cc05b7d442ce67db9366dc96d4a7a82a7f486d3b9af6d298b49b0baa864 onig_sys-69.8.1.tar.gz 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40 opaque-debug-0.2.3.tar.gz -2dd2f5e018fa4089a79a24d8535b4a9d87c80792170083c2469f8335eb89a8a2986979296694509288f878ae27f8d3f690c4133bf0e19d12179cc896dbb9e3e0 open-1.3.2.tar.gz -2127ff5f9b8feb3b567362ea9988a125f39e524432c629481e5ab27f08e2bec20147fb14bfa2d10cecf357fef5f6d6447e8d045f157bac7c1a4e0175903e19ec openssl-0.10.24.tar.gz -4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a openssl-probe-0.1.2.tar.gz -814febad99cc74eb5fee60d58d685b2c956893db8f3f4994a6f5226261c8dc8ab569067959aec2aaf3fc684eaef6654f102a1f82a215e42b4a087c357693b6a4 openssl-sys-0.9.49.tar.gz -51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba owning_ref-0.4.0.tar.gz -d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed parking_lot-0.7.1.tar.gz -148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331 parking_lot-0.9.0.tar.gz -25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08 parking_lot_core-0.4.0.tar.gz -5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689 parking_lot_core-0.6.2.tar.gz -2344f2a14ea0245a4bcd1face932fd2b993349e9b81556821cf6edf1d85944455ea5bcdf521e0916a46175b5cde9a7d0f57ee48f5cf9204f98f635f7f3aaab22 parse-zoneinfo-0.2.0.tar.gz -6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 percent-encoding-1.0.1.tar.gz -98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a percent-encoding-2.1.0.tar.gz -c23624c33c986823d22b685e7297afb506254e2fc1b05e5a87e9b7f8c3e9c898312116fbc93517be5994eb1e3b9bbb20a479f8c72010873b790ea6cce2129a87 pest-2.1.2.tar.gz -4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba pest_derive-2.1.0.tar.gz -bf9f3912e99c5fe341d423afadde830abb0125dd0c8485c591e465b88dd047de273b1f185d417368879a3dc80965f13d6262557e8c158f357babd0587bbd5b62 pest_generator-2.1.1.tar.gz -b84b1faae2e56502e399c0d1befdf7a8aa458590ee7354ced0c785be64ebc59aad4c5b89f6715335605897ef0f03ce8675eca268c7f983ad831b8b109bd62c36 pest_meta-2.1.2.tar.gz -0140e9acb7dbf6ac2d17110e8efc9ef515e2f54b1b3b213d98507da6b9e9e3eb0995173c69b31c34f536ca9b06eab108015ac26d2207af79bec4e20d19d62e44 phf-0.7.24.tar.gz -2f01538937b89c0bb3e4f779b4347ae0d0515e6a99a6692a57898b8c97e33a02dbf918757b95800333cbbb60748593471e40260b767f8b87cb48e2a23a90d664 phf_codegen-0.7.24.tar.gz -793d8d46fd2848f165099324ba36d6ee074a54e1c20236afa5c5429894bafd23740d1cb41f00b87e4d21fea1f78be7151ace7590e2e7cbc906d565e5eb7225f7 phf_generator-0.7.24.tar.gz -5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca phf_shared-0.7.24.tar.gz -13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572 pkg-config-0.3.16.tar.gz -667de29732a76dd6d7b9768c3e58edd8c21e62fe5dbbfe9a64a37de5488640aa42c04a8683596eee9a58b02dde1cb0f10e3edb9fc48b3d93e61dda0122357162 plist-0.4.2.tar.gz -dd7d4ab9013196575f468a1b2598524973d031a3854c5e7954943ce21bfde4a6a9f7d373237063afc6a4a942ae36e3453f4d12dd1852aaa01e43487e87d332f8 png-0.15.0.tar.gz -281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243 ppv-lite86-0.2.5.tar.gz +a74b68b459a221992771a4bffdd7c928a8949a0e59f0a53c7448598e5b23a0646d1e4072062ececb744f4ac7bfe5cc213dc1cd807afea74cfafe52c61100be8f open-5.1.4.tar.gz +a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6 openssl-0.10.64.tar.gz +57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c openssl-macros-0.1.1.tar.gz +7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c openssl-probe-0.1.5.tar.gz +7ecfaa0b49cea5c60f6f063fe5217252a65b27c5e6d1185e0aa1bb4b59c4cf9bf326840e8795a870a537c18ee5a987feedaaf2dd767cd6f1380f25468a1622bd openssl-sys-0.9.102.tar.gz +977c0fe9891c021914153d6a081c3789018fcd1830224f5c6768d0c75ac8ac4919638bb0a41949710fd5e699b162d9290a5379cc6251535a127e212f5b86932d os_str_bytes-6.6.1.tar.gz +2195750f3e84212e0155b880d34e6ac8cddedef6b445e7e059ea62699d4b9d0e571a3515a42c679ef58242857d48b4c3e7a9b5be359df6481bf864016d8f6b65 outref-0.1.0.tar.gz +820a2824635d9d9c5645aa9b34bd2600631050f064660525e88f7272fe2f167a5350c4bdce4937a4052f603f52347a6b6324aa1c80cdbe97c9ba3599e0d94500 parcel_selectors-0.26.5.tar.gz +aafa4bd6f6babf5b8b75bae0ca18a495bf1193f0f7c6856438331472e53d6994d4b6cb9ad99db5230c7a6b0eb37a137465e9bc643d5bb5a9bd699ebc8cb34fd6 parcel_sourcemap-2.1.1.tar.gz +368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703 parking_lot-0.12.3.tar.gz +4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389 parking_lot_core-0.9.10.tar.gz +fe68e3c696c17732cf7c8dea1090fa1eca092bd1ea817855e6621170b28d97b33e5aae87c5b7a3c76df45f7244b4dd80e6b95d9c1bd51660cf22a9c07b913a50 parse-js-0.17.0.tar.gz +88f581dadc306585addac8a16fd3bf56f13f6b933689dc6bea36a07d9b283f9c77ed68f4175d676574062b911e3b1220bc82a79fe59ea551a7dcfee91ac74ecf parse-zoneinfo-0.3.1.tar.gz +5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4 paste-1.0.15.tar.gz +c046707586f25f13d2f9fa452ea340198f6d2e6333ca3af806b9d2d1a61d46b033fffad60d1632ec16062fa79a3710d695b923b831a7db52602b728ed31fc3ab path-slash-0.2.1.tar.gz +a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7 pathdiff-0.2.1.tar.gz +5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 percent-encoding-2.3.1.tar.gz +3facdb4a8bcf0356b702cbff4d314db32a80b33fb3512e52c31114a3f666414a49445a1f502c911cccfb28b7390fa058207570bf9127677815842b4988d1f34a pest-2.7.10.tar.gz +c63ec4c6849b27946f68afeb0eed6d3f3bf6160bf73ef4228c3303b5b9271e30db8e93d01842ab3cf1ea6a987f33b1e4f55ef4bb62fdf7d9ec32220193ba2b89 pest_derive-2.7.10.tar.gz +8fd4678f445780cccdac73c51d75a823a9b71c9b9c52c9fd4dca32b2bc4e8a8b33e68d8d90bbe039e4fb2fd9eb8247bcb7911019325c1137ff4d9d835adb0f59 pest_generator-2.7.10.tar.gz +8c931690d025be0af8ef3ef997eb95d3ebcef47ce0672544a632c77281651f2d0c9c34f1b477426164b169bab638171853bfdad2696d32a90ac22a8bb143cf6e pest_meta-2.7.10.tar.gz +84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073 phf-0.10.1.tar.gz +97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4 phf-0.11.2.tar.gz +dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1 phf_codegen-0.10.0.tar.gz +0a11be13927f6d4303a2f10bc3a0c986dfcc4bc91c9e885e8912d077e434098f75ff4ed9633085ccfbeb052d573721750fb80c7a19ee1e75fc09660aac2a6c5d phf_codegen-0.11.2.tar.gz +b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7 phf_generator-0.10.0.tar.gz +122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3 phf_generator-0.11.2.tar.gz +ea6acfc43491af1330d32860103ad60f29566f6c32d43bbef254f23da0f17cc3723b1d04153fa41f82c01d3865e0e16156b9d2dcbe6a52532b8f268f3a55df7c phf_macros-0.11.2.tar.gz +f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5 phf_shared-0.10.0.tar.gz +f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe phf_shared-0.11.2.tar.gz +f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293 pin-project-lite-0.2.14.tar.gz +828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 pin-utils-0.1.0.tar.gz +e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d pkg-config-0.3.30.tar.gz +fdec4ff7d080668df45e6a26a92520f72a3fcd58638238f42603723ad0cac48ea5df41c066a19f6f6e1207263cea02c775495b1ecf6e09ef101ffdc157cccea6 plist-1.6.1.tar.gz +064a932f4c48c2243286a9b4cdec0487cc976291bc8ecf4753691afdfe43acda4b17ea8d48ec933f309d158df28f40ee93b5b32b3ab5252e2e7aa1ee1c0e4e84 png-0.17.13.tar.gz +0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 powerfmt-0.2.0.tar.gz +539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a ppv-lite86-0.2.17.tar.gz a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 precomputed-hash-0.1.1.tar.gz -73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz -e81800f46b8f0805d10a614848603dbee19ad24339c67986496597fcfd501c528ec4eec081e166b38283b3e7d64a0c2bd972280407ad30e388610b2b81594f80 proc-macro2-1.0.4.tar.gz -6ce7c1e37190892d454f9b858041640eac6749a392264cecf6a64696dddcdb038a9b81b580991aa0727b1b015e05e0b7582baea17b82ed327eea30ca01cd555c publicsuffix-1.5.3.tar.gz -468cf46d0426fa9f2c5b9fdca60ca1c009d823fd1942e9983c9d5ab8b4dc47d455ef8342e41f19664c40c7379a0a9dad265381a6a5f7ad03b298cf37d06e71f6 pulldown-cmark-0.6.0.tar.gz -f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b quick-error-1.2.2.tar.gz -bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e quote-0.6.13.tar.gz -67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4 quote-1.0.2.tar.gz -2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz -d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c rand-0.7.2.tar.gz -200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz -30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6 rand_chacha-0.2.1.tar.gz -5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz -f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 rand_core-0.4.2.tar.gz +8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db proc-macro-error-1.0.4.tar.gz +2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495 proc-macro-error-attr-1.0.4.tar.gz +54c61dd0581bb5802e077a58fa41f113aa1fab59026478268ece293f2643921b7649844c1675a21a3a21674cdb3ccf94928e5bd069a02bf6813ccc1114d37262 proc-macro2-1.0.85.tar.gz +3f944c6e219e2410be4b555c4421fa26cb4b6ebdde3058c8c191c12290ba1009ad28f2e021d1d86feb71d29bbd717050a6567a2ef8b40a5d431fb8ca1b03925d profiling-1.0.15.tar.gz +3cbe321aac42213ff4edae0847d0a5b18cd6c4ff1fac651f0e750ff189f615121cbfba8a0fe5ed58984933b9a671fd0a55120dada664b77efdf4c9d945ad5cfd profiling-procmacros-1.0.15.tar.gz +9936264dd52ae40e6afc8cef8914dbdc5767f397b91ea965d65275fe547a2d9cde7ccdcf908f787e25f84fbc23a2e30df895793fca308e09f48f2adf2e30d2bf ptr_meta-0.1.4.tar.gz +15a72b2c36e9d1761c4dd42cee1623c2d85c52eadc3c3102c8334c14c9c5db9a43d74dbbab1d14a2600d789917fcb5bc2652877b172aaa02c37a6868462ff20e ptr_meta_derive-0.1.4.tar.gz +80e485e69fbf7330737bb35befb41b587bf0e5fa6e04c628e0da77d8383a5a2da3f765a696a877d605b5580f85297e723c76e0c0f6bca0235e83a683f67cba14 pulldown-cmark-0.11.0.tar.gz +b8244d6c93a983bcade5e1ff699f334aa72eb638b7e4d22cc746b713b1d0144e6c1eac243476362a77bfed37a3a13a6315ac8d57920dadee7d2734f4d96023e0 pulldown-cmark-escape-0.11.0.tar.gz +cddd35f6d288c863a0790a1e0213004d93b0c2dfdc5cccb22fbdb726b0853f776d3c6b03e2082d76f827c41f9831fed762a6804d186447e18e61f903f827c51c pure-rust-locales-0.8.1.tar.gz +884cde33bfb2d02716daa5f309890093bdb7b3f53eb06aca0b6eff0b7a66fd67cb8b9acd510d19e3ae7718930add971e871532a1605e4989639bf72f59329377 qoi-0.4.1.tar.gz +e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32 quick-error-2.0.1.tar.gz +5fb06d85f520d628d6fd38e06b8540385d47c9c56d489e2900f25e36b51aa071255e800a9549e147bd80b8e6d4f927841a4b0558b2f40e23213cb292d207d859 quick-xml-0.17.2.tar.gz +9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de quick-xml-0.31.0.tar.gz +ab1d8b2dcdcc1ca7b26116556ca8c7b832fb718b4abd7f2b0029ad2066a008864faae845075a627382777c5f1a71b06d1ee94a2cf23e0f1aed014af981501aa5 quickxml_to_serde-0.6.0.tar.gz +f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685 quote-1.0.36.tar.gz +51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0 radium-0.7.0.tar.gz +f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e rand-0.7.3.tar.gz +8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 rand-0.8.5.tar.gz +1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84 rand_chacha-0.2.2.tar.gz +8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 rand_chacha-0.3.1.tar.gz 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf rand_core-0.5.1.tar.gz -808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 rand_core-0.6.4.tar.gz bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 rand_hc-0.2.0.tar.gz -9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz -fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz -01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz -6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz -3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz -351f7ddd2600001ef9655f290b743034402a56dcb04a25ac25afeaa549da5e399a8be72cd318d3d4a558d1a190bca7ce03386f3320e9909db48d9d1152154a52 rayon-1.2.0.tar.gz -78f231633fb2382fd38a89b967f5a2f38e611293a19db342039e63fd0c7cffd33a78d18b8f0788089b157373ebf20eae0c88365be9668f48abc3a390130be36c rayon-core-1.6.0.tar.gz -6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz -17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 redox_syscall-0.1.56.tar.gz -6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7 regex-1.3.1.tar.gz -41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a regex-automata-0.1.8.tar.gz -671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec regex-syntax-0.6.12.tar.gz -d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd remove_dir_all-0.5.2.tar.gz -c6683099c79ab48acd2b7abb903686f64e985bd239f3e348a7c6f80d248e3f2860d7f8eeca768244c8925794e96f6253d786e91d94b926bad2581f22f5a824e0 reqwest-0.9.20.tar.gz -5065fffb8fcc6afb2c42ee82cb09ebe879605e6ef2a6f02decf4892967730271bf4e798de02fdf37b4b55b0610f76689ef749ca85870b6656669af4cfd859473 resolv-conf-0.6.2.tar.gz -8f6ad0906f32259af6a5877b10432d6bc001a60dd094c93fa89aca544dd1e061f55c484a4ac524510f634b4a3491e170dae0619dd7fb5da11891d20fcd3ef0c7 rust-stemmers-1.1.0.tar.gz -36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063 rustc-demangle-0.1.16.tar.gz -01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 rustc_version-0.2.3.tar.gz -b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0 ryu-1.0.0.tar.gz -6d886d8b96ada623436586ebbbb84d9eea34329bab3164d915a47e3e4de00b724928c6dc224c88541aeb0715de633d129949e7bcedcc2393b348a2692451ddda safemem-0.3.2.tar.gz -33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc same-file-1.0.5.tar.gz -6932f30eaba7eec56783e0b976fd0321666a182529b604a2f0c8b7ef00018bbba5d93ea487d674d1043681a73a8b98b808255de6bcb7474313dba671c1afadbc sass-rs-0.2.2.tar.gz -dbee75ec407fa2065786cd572ceabafdf1b10ecfce5d21067c2834e72c45c6dfdd1f5d29f2dc1c01d14d9d2da6f433aaee1c18d088682c308cd678254cbf302e sass-sys-0.4.13.tar.gz -11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b schannel-0.1.16.tar.gz -df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33 scoped_threadpool-0.1.9.tar.gz -57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719 scopeguard-0.3.3.tar.gz -4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37 scopeguard-1.0.0.tar.gz -69b1e32cc4cdd3a069e9f1de08d6b5563a90e094e0fce07b4949386072632cdfa5ee7711ae16904148936dafebd77321160b28acce239f0cbd5547ba1d77edc5 security-framework-0.3.1.tar.gz -28c731aba35ff80dedf73978ba18f47a80ed308ad6f123467ab435f825680386f665d06f93a5703b8dd0b6893f805f5ae6875a0a7c8669a478c71c69448b2a54 security-framework-sys-0.3.1.tar.gz -03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc semver-0.9.0.tar.gz -17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f semver-parser-0.7.0.tar.gz -3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678 serde-1.0.101.tar.gz -08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417 serde_derive-1.0.101.tar.gz -d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842 serde_json-1.0.40.tar.gz -9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145 serde_urlencoded-0.5.5.tar.gz -e48b87717549d1b99f5759aa12b5c76507b26a6176a69f0a3c7297145b50b539344b43a827345096783256ac8053bf700505091c6d9d0e430bf01a990803d444 serde_urlencoded-0.6.1.tar.gz -7446e7564b5903e588911008f9367f9d9b0d96ae883d299ee4f10ec3d7a30abf1af1bc9c4f2172226f09071413116c12a8a67419246f7a7de95e9fdeec3aacb1 sha-1-0.8.1.tar.gz -32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c sha1-0.6.0.tar.gz -a92898bd08d9870b3a59c92342d811b7911891862f5e4ff68b1c75ab7ad34535eac9d2b4e84e8a654421c4fc602cb2143f78d30b20a56c581d07b3dfe15efcae signal-hook-0.1.10.tar.gz -3947e3249861ef50d2261080dd47fb400fded19d5c8555c4bc65f10ededc7102c6eb26a299de961308310a9856d2a757d7a981a24e3bafa0cec72b55b515fba7 signal-hook-registry-1.1.1.tar.gz -7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0 siphasher-0.2.3.tar.gz -f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661 slab-0.4.2.tar.gz -039fa1edff498b8db274febbeae23e7f1f7d83794572b8009f3da494cbafbff1716deee4fcc7be71d59bc6d94e70ab9aabe262bcd1fb278773012bb1a087cca1 slotmap-0.4.0.tar.gz -2c85dabcca9400c5e2a3b409997403a6acb17357449df4ef9a7b27511c5a979bfcb1a4d80b7e7c36122233ee6d47e59507631dd6ac9e93d1610f54b9b160ee96 slug-0.1.4.tar.gz -802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4 smallvec-0.6.10.tar.gz -6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c socket2-0.3.11.tar.gz -ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4 stable_deref_trait-1.1.1.tar.gz -4d7ab65f12d63065e895947285d5aa1b9003324002b0f657e7ded975c90eebd63c1033ae9a01969c42d446b0ea878571af62776bcb4a8834cace173f908c76cd string-0.2.1.tar.gz -4ee532350e951ff1423aba00c34054653e2a2e6fdda8fe86d4052407cbbcf51bf3765288e581e6dbd7031969cafc9727267b2ebaf23750eb3e866b855b567fc2 string_cache-0.7.3.tar.gz -59a92121f4e0967da13c6a2f40cfefb0451c734af6555f014dfd885ef8b478a803253f0c36c7ec95cd78032f2f50d3614daa3828cdc85e28acb6f588472aca44 string_cache_codegen-0.4.4.tar.gz -1ccae53f80c250bcb715c3276133295f3543d0a8708fe4a990c1ac81a5c783c23d9e7e080fa7bd159397d0908f90cf1eb3453975750c121c1c36c80d3fd3cca3 string_cache_shared-0.3.0.tar.gz -1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz -85eb70f7a514dbc7a69a4b002fe82c0787b907d37d3ce83e78b3f35317b0dccdf9f247f4b3cc7265e3f572d2bf9685e1f06254258f95c135e2fa26ae98715d64 strum-0.15.0.tar.gz -fd0e363693bd34f0f8cd20d17a4fa12745e82b75de48d700ed5062312d202abba21d21bad434f22d4c467e9d6d3f8e4b1c5a7975aafed8418cc0c12d5f218f30 strum_macros-0.15.0.tar.gz -c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7 syn-0.15.44.tar.gz -4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc syn-1.0.5.tar.gz -48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458 synstructure-0.10.2.tar.gz -5b684a8f50f56b3f2a69fbde0623835a6a0ff44169ec6a558d6d0f702eb0921894061d9baf8edf9ec6802d7623f9073df365e68b4f33107bbb93807f32e4fadc syntect-3.2.0.tar.gz -a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz -d94ef7c124d65317438de67e064616511df5e89081e3735982b315df0a8aab319ba16dc3b6513b1f92e0434da3d7aabdd9caf9b7ef28af9d84cf558ce662e693 tendril-0.4.1.tar.gz -f31003a25ba0f51550bba2f1ce88720098a455c81907c4a86b519bff33e09869e03558a9746e9ed683d4b33b2a7703417bed470c0a1902cc12ed54cd2ee4bfd8 tera-1.0.0-beta.16.tar.gz -d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca termcolor-1.0.5.tar.gz -f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz -cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz -e46733ea55a27a32868596562bbaf1e50508dea58359006cabd160b06cec4854c97b5d253cdcb8bfd60c7b3a33e496bec4159d0621efaa3cdcbc77255be4f275 threadpool-1.7.1.tar.gz -1b6cc0da94d8b052448674ce3a9e72cd41de87245b1f6ac8aa900d61f3b99bcf0d455c513f7e87da14db4519368c7d725596e151a9e81134eb8366dce7254c3a tiff-0.3.1.tar.gz -4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83 time-0.1.42.tar.gz -d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1 tokio-0.1.22.tar.gz -42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81 tokio-buf-0.1.1.tar.gz -9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044 tokio-codec-0.1.1.tar.gz -321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6 tokio-current-thread-0.1.6.tar.gz -b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334 tokio-executor-0.1.8.tar.gz -57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149 tokio-io-0.1.12.tar.gz -134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1 tokio-reactor-0.1.9.tar.gz -60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f tokio-signal-0.2.7.tar.gz -bebfe2173d544595cbc162fce2afe1574f267a08b77c8e056358cc4e959a94f1e899e47e76927e374ab1f51751079b283e0d13479a4a40c7f754cacad2578a1f tokio-sync-0.1.6.tar.gz -ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336 tokio-tcp-0.1.3.tar.gz -aa36de397b8a0dc9376073bcb2e661ff5fddf2754b391b854d8683398cf56a69e79a6dbd3f6e76d9d851752757a75b79673cff36b9e1987ed4c30dd38f9d483f tokio-threadpool-0.1.15.tar.gz -2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57 tokio-timer-0.2.11.tar.gz -24b5eba25117ba3344d90329134f15be8631d1d9bae06a94f4df7f05b1bf6e1b309b776a0f2685fff2b7567a80331450a2027cb4bd264dbd5fd202913db6055f tokio-udp-0.1.5.tar.gz -f3798afe9cbededee2c5d0cc2cd45a9a5b09004bc4d6f0e2863aa56a3aa377e9eb8fc2e4c557fe448afbec77bea5bb6953fe6ff59cb83389351ea207bd912458 toml-0.5.3.tar.gz -45822fcd375f01e8e93b91c1806be6c653d202ca93a719af45661b8b5e016a802535774a2adf7ac503d889d4f9589d945c02ec651aa4cb81f443b60e7f082611 trust-dns-proto-0.7.4.tar.gz -e44e36c9f51c80b858a976071f911081eca5c30fd82ed34ad5eccbf397b9782773f36340ecc3f0f8b4a19dbc7fe73cb50e9df36730deaf2e228b8728e3e00e6b trust-dns-resolver-0.11.1.tar.gz -aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330 try-lock-0.2.2.tar.gz -a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739 try_from-0.3.2.tar.gz -c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a typenum-1.11.2.tar.gz -788d01f6b42bda3e18d18b5be53fcb3ca50c9c5f816b19d0fb37147f7dcdd08f5d535ef950c17ae92eca1b86ae6c3ae899a33d1bb767068dcef3820ef2c14607 ucd-trie-0.1.2.tar.gz +23b0f5827945bae8b3d2109e46d67fbdc85e961a5d3c6a0e0322ee8c568d7b807f62b0b2abe199bc4eca00dd5eb5bca0bd9d509b2b9ff1975b38092224850ee0 rav1e-0.7.1.tar.gz +01f099fdab28820cc569a08bca19d1b044e357165ee977fe6be4490b20cf7cccc93655cf646d9e90dea2758967fae1c263970d919cf1feffe6b7c5265dc47e10 ravif-0.11.7.tar.gz +3f628c58f3af3cbd1f245ca1be9c8393eff41112891fc4e676a2b9e26b6cba7cb80d7b6ce46e75bbb65e42fc00c5c0bb6b6a4b59092882f03febeb31f9cca5d3 rayon-1.10.0.tar.gz +33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e rayon-core-1.12.1.tar.gz +073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d redox_syscall-0.4.1.tar.gz +b7e39a08e220153370449cec7b058c2dbc4916ff7be01b34658e1793035323ecc28f40712194cb9bfc9b863e4bb316e58662721eb0e54f68f09438bd880ea032 redox_syscall-0.5.2.tar.gz +177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb regex-1.10.5.tar.gz +b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3 regex-automata-0.4.7.tar.gz +10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed regex-syntax-0.8.4.tar.gz +fd5c88d370865870570859a110245e009eba557225e4297783a606227b13b42abf0c7e69a4beb5093a5a9dabac1545afd988f4c831abe912c21ccd8013c30382 relative-path-1.9.3.tar.gz +2df17191ce710e09927f6d17fa5e3432a154d605cf3b58bdd6a3037d69cc0b017007e23c16526a8879a89cc49e3a47d38ae5f6aca8b42cd05624fd15c9dc3529 rend-0.4.2.tar.gz +95e5c2e375e345a3ac9d4f4b4fa9aec28f45a457c1615d303d4b4dddb639749995ef2834a6f8659f5f0cbb49e0876e89c9925bb2b2ba62207e393c9b12e58ad3 reqwest-0.11.27.tar.gz +72491fb2c315ee347c7474e6f9b3d6eaaf1db66ddf163214df8466a4a8ccb0aaaed76fc4c72808b70bfbcdf9dc2a109511ccf8e405e4a006b349030e8ad199a8 rgb-0.8.37.tar.gz +e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358 ring-0.17.8.tar.gz +8401efd3bd442862b6c4c62f22289191ca9cddab8d67dd6361c9f5722e4265c1a3941be20108822480fae8d567e7b2b0ce1d66200fbc5931d775225e9d6735b6 rkyv-0.7.44.tar.gz +f4b56d92b529a4b5915799a5de6b4e3ef8d006237b43ac78323fe2ea774a9c14581c09d504dbf31c58494ab2a56039b01ce646e9f6a9798cddfe5b23a400e663 rkyv_derive-0.7.44.tar.gz +f8a934d3809e417c43bca53478cef0a7a18d908620175c84cfa2cdb8c85775b52cc641fb7eb12c80c483e0c17eb500dd3358ace858aceaa810d3ddbdef902d91 roxmltree-0.20.0.tar.gz +b9453a0984d41e5a692e5ea1a8a7bc6142de30f7b345a269489b8d4ebe3b3d442e7fe5f338c72a790521dea7a2ad9605c0ca8218a6b76d8bc5e19ae02cf711d7 rust-stemmers-1.2.0.tar.gz +eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8 rustc-demangle-0.1.24.tar.gz +84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 rustc-hash-1.1.0.tar.gz +717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f rustix-0.38.34.tar.gz +7e48a990ee69fc298df45d9a0de9b5a33a56261ec3f79ff16065cbae7368705c1f3432b77e3262a6141df68b19cbedcccf16eb271a54202049435c63454186e5 rustls-0.21.12.tar.gz +bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37 rustls-pemfile-1.0.4.tar.gz +680e3d52f699c9d6200e2e738a4245a5114fc7122546c07d3f15f1e6741a52275061b3e016c2240f1dc3eb9f701f7346193bd82e827274fb73b8e9e0d5af4e68 rustls-webpki-0.101.7.tar.gz +a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 ryu-1.0.18.tar.gz +3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c same-file-1.0.6.tar.gz +dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84 schannel-0.1.23.tar.gz +6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb scopeguard-1.2.0.tar.gz +6030295b3b11411f5a7e518db1066282bf11a279c27414c5e959cd430e9fcbb7358e5d69bcc68c8bf696d4c1d9579ed7218b7f9dfbb61de2271c4c3d3316fb7e sct-0.7.1.tar.gz +4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b seahash-4.1.0.tar.gz +7a1a1d1b807cfcc0c87b27a13aa0007d5c29560a45f20963cc84fc705385554b969b4062c7f8b15fe793291ab624fb2a5257c05d140c53200c2eb344547652be security-framework-2.11.0.tar.gz +e3848a45391ebd98026ecafb0777852aa826b465613ef184cc33cdbaa75fb91053d46d417dfda6398339abd3b67788a567562e99b3c509b676b7ee5a4372acd8 security-framework-sys-2.11.0.tar.gz +a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec serde-1.0.203.tar.gz +b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392 serde_derive-1.0.203.tar.gz +363443af23e8e03dd17c0efc94b376f0d89b596c74d70d0437471e78bc20c6beb61da59404ff150af52000162f6df728ce73475feb828c453e58ea43e66ca056 serde_json-1.0.117.tar.gz +e07254723645c80d10c1ab9a7282251fcafa0b5144991568b1b1f85e7c8c8bbd82b5992f2ed73fc7a988f6a0175fd79fc927c6b28b7420e83269c3364d7ead4f serde_spanned-0.6.6.tar.gz +b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 serde_urlencoded-0.7.1.tar.gz +64329436d18bc3b1a0737afff7c8727f7e04c71b2bf6022f597a45f0860fa3a678eac688f61f0bf7a7846f98809f427c9907625e1d00c8691c383043c1cffaca serde_yaml-0.9.34+deprecated.tar.gz +65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd sha-1-0.8.2.tar.gz +3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785 sha2-0.10.8.tar.gz +f8c856e100fe8761e13268a9c8df5a18abb127dd1e46c22044e19b3816c617d8e39280b2a0bb444fd14b3cdf13d3e44c8201fa2a23a5941698137977391f8db8 simd-abstraction-0.7.1.tar.gz +2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac simd-adler32-0.3.7.tar.gz +20577ab7615f955ee3a88c617630fc6c88703d455629d5b3838a551baebbeae8c64a2587871ec5a4fb6bc203945cace50593a238e4765b5fa2313bac30237ca7 simd_helpers-0.1.0.tar.gz +9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c simdutf8-0.1.4.tar.gz +7206380b6e4eb496b1dddc4501ac03d716bd6b5228971a35ca71f507940e799410dffad7e50e52c6f8fcd43c570ecef23220962fb057100665343498a5ce118f similar-2.5.0.tar.gz +601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b siphasher-0.3.11.tar.gz +b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 slab-0.4.9.tar.gz +7ba0f946e60d2f5923cb21ae044dbd2c0e128bd77bc5eaf7171eb0a53584f61ac472bc937d8b600441d92aa6f916baa9797439c992e3a7cd6530243e8cdfc9c4 slug-0.1.5.tar.gz +a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 smallvec-1.13.2.tar.gz +ca37157bfa970cf3cee8b45c7fe64930becf2ffbbc309ea4613be968400279b70edd084d159f65b76fe1130917312d81455023c0d7c1bab7a59c79542aef9dcd socket2-0.5.7.tar.gz +b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee spin-0.9.8.tar.gz +a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03 stable_deref_trait-1.2.0.tar.gz +03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479 string_cache-0.8.7.tar.gz +01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864 string_cache_codegen-0.5.2.tar.gz +78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 strsim-0.10.0.tar.gz +0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c strsim-0.11.1.tar.gz +49212066047848e5289969614bf9a763f55f6a1cc746a1c0814d0b5246fd0c41a69294e05860e1aa27d732a3085df45c16791e6d956249f5f3f7201d1d18f6ce svg_metadata-0.5.1.tar.gz +12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d syn-1.0.109.tar.gz +60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0 syn-2.0.66.tar.gz +ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8 sync_wrapper-0.1.2.tar.gz +09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa synstructure-0.13.1.tar.gz +52780b693e484da02d773e9cca460e6b20d8aee436ba96c2e965a078e24b88dea35a03e692c5f7e3d02c82477093a592078e8686a6c9ccc7a2df9a6e20577c2b syntect-5.2.0.tar.gz +af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f system-configuration-0.5.1.tar.gz +764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34 system-configuration-sys-0.5.0.tar.gz +a81020d5cbccab3c618f17d691d76a058c634ff9e3615cafdc95ec002d8f1533586ce9ea1ad5da8ae3945be7dfd3d962cd7dbdcc95f0614ed5156bfb3c6c9c42 system-deps-6.2.2.tar.gz +d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995 tap-1.0.1.tar.gz +547d4a10cca5b593a04e3775bfc175a3a4de27f3c4dede305c6d50b63b4eb38152c6f06280098f14c4fadcca4cc9aa98626ea50aebe9bab2cb7b7f4e0c4d2b92 tar-0.4.41.tar.gz +3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a target-lexicon-0.12.14.tar.gz +bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39 tempfile-3.10.1.tar.gz +53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f tendril-0.4.3.tar.gz +1bea8153253c1c301077bda258bc88ff2f4092efb67066f07b46754df00a01908e5aacaa41df089a73d5d8ffc49e518b6d0312a7d6846d5b548c85298bde6150 tera-1.20.0.tar.gz +b66aad157c4fa2985f764321d157dfb1f0325fd633811870db7919b5579bf7bc19fefe99e1c706cdfa67504c37dc2ca3d283e11d1bb516edcfaf1eb7747a778a termcolor-1.4.1.tar.gz +9d6836759dcd71a61ab4e395db7c1a75a14ac3102a36c39b09868ba96d28a2265d8ded385942e55cf95dafc7f4b53fc498b30b6473cedc9b558977878e831b3c test-case-3.3.1.tar.gz +2c58aa3c9051b99c269168d5d321c73314188501fd33170a8a5d44e860354f5a399545abbdf50478a43d13e15ee9ed53d4a9c800b263a5e42b97416f96e2c0e3 test-case-core-3.3.1.tar.gz +3383ad7fa23f09b3289e2beefb2a2ea6bb7f7f48d71339b4c1e613c4807e83e4ab816b1c36369524d65aec7929064d2951c758d9c88164e7792a0a46fbf2d933 test-case-macros-3.3.1.tar.gz +3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b textwrap-0.16.1.tar.gz +9c08b868eaa47178ee60733aaeeda60dc46d58d2b9c15985ba3dcae4923e8edf02b97556df52f508753b0ff52782f6ca3227e9ef6343066e5d5d3a89e03f3f15 thiserror-1.0.61.tar.gz +b43bd2ba6b751b777e2fc78aac92a3e662a1876f704625c4e894019fc68a6b7628b9c3b7ddfbd2cb15fe6fdc0ff679ff94b0c47e2660a40919000ad2fe1cfeec thiserror-impl-1.0.61.tar.gz +82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93 tiff-0.9.1.tar.gz +83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133 time-0.3.36.tar.gz +3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 time-core-0.1.2.tar.gz +557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4 time-macros-0.2.18.tar.gz +a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25 tinystr-0.7.6.tar.gz +e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c tinyvec-1.6.0.tar.gz +10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e tinyvec_macros-0.1.1.tar.gz +4bc16fe979f2261cb17f007ce8ebb05b915be79c1000c5c429744cab01755b933908aadba0005c84faba6bf5d486ae6e3aae6c8f9bf0d6a5dc0ab6d0390ebae9 tokio-1.38.0.tar.gz +bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914 tokio-native-tls-0.3.1.tar.gz +93098f34d117107214e2e80e0e6c030423850ba160d1858b5149c165643700d308dacef7723e45b79fc911ba13bc1bf363c89ccac047cc6636e48a9a5a9502fa tokio-rustls-0.24.1.tar.gz +09956fc3eac8587f48cc739370883b96d19eb3de19293d240396b64b187178adc081248a5ed3d15accf97c27f9aabd0e6a1e3e2a194f330a0efcbebcd5055360 tokio-util-0.7.11.tar.gz +eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 toml-0.5.11.tar.gz +31af40bb5d8a172f45b5f0ea7f089862cfec57bc9bcea6559932b045efefe9e8be349df24f55d6ebe536f414fc35950f6545a4703e13a202212eec9fed6ecf62 toml-0.8.14.tar.gz +710182bcca90f0d830423df41ff0f8e7bd10b866fd7ea1f6d37a315c7b4732a3b6fd61cf411b28051959034534010f24e250e10282c4e5a2539c2858f447aca0 toml_datetime-0.6.6.tar.gz +fef6ca35315482f635bfe35c2c6753d09f9bd33681d8f032f448fb9c6f494d30fc5789d96f99657879be9fdd7b35a640d52fce7722fc6ca05d8b9d5ed91903c4 toml_edit-0.22.14.tar.gz +f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 tower-service-0.3.2.tar.gz +5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 tracing-0.1.40.tar.gz +164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 tracing-core-0.1.32.tar.gz +433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 try-lock-0.2.5.tar.gz +99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 typenum-1.17.0.tar.gz +00d9732797029c16d84fe518b2d90de841b87b5ed6c3628b9f097f5340f1e50778749db18f22e4ecc513f53624806ddc3484e5cc9ebffdbb6c0c800bef817e95 ucd-trie-0.1.6.tar.gz ef969968c61eae6a7d68e6ccb0b40f6618a69bfc4714b51bf4ee8c5ec4532d10b9c6675a4cd5121c904a578ceec7c6471d1496fedbf121059f076ad1c5ccb70d unic-char-property-0.9.0.tar.gz bb0ede1695f4f016bdf9ec83bb49639527248c175c71d24993b8651ea6be0a411251ed8518893101dd5e96fd2913cf15ec27799c677ddb08b8e408da06ae0ceb unic-char-range-0.9.0.tar.gz 9212f99afd4c694a3a671963d63e5349f81adde6d5f50c92ec39d15e7ee24aa91eee63ba578a857c8b21380937860968a8e13cd16bb0ee0c0ccd96b3094ad155 unic-common-0.9.0.tar.gz +e006351fc040df380947ce60e057e130180a021dd4828c6525fe974ff2af432f9cfa024cf01e0b445fc6dab510b34d612eb27412831b1628867433a14f16587a unic-langid-0.9.5.tar.gz +a9bc573585c4fe456a42c5d097a0e74748f22ca6384317a61bb50f428e95fa3ab164ffc3f9e16634f1fd241b6c2ac892fde089469e52ca8c27766e86b9d35f33 unic-langid-impl-0.9.5.tar.gz cc2a27459dca554a78ce24fee42f0e4d0fbac37c42b4c5a1275f9e3b412cd1c813a4b4864857ddc33b549d99f10c9ce9c277b00f9fa7d93f130f5e47106d8fb3 unic-segment-0.9.0.tar.gz 04aab71f97785453dce7f561acfb2382a23d60a68735f3664577015a256191463dd6b1f90694e4440c4889eb9b6380c16c7a0ec2dfc2d49fc44a284eeca43c09 unic-ucd-segment-0.9.0.tar.gz 153219ff18be02e23ff3dc90bba11fa8c7cda11b972e0d84500d9a0742fb7d84466f2cc63ee278a24098c39634e50742af3317cd942f4ea882ef5a2a8e003d7b unic-ucd-version-0.9.0.tar.gz -fe77fe7dacc1a340a760f3f474b2bcaf3cc0ad1b71ae6b5811dab77faaaf8bdf4bc8158682254971702bd648769ec776689560f4c2ed5c8c544cc04ace4608fd unicase-2.5.1.tar.gz -170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e unicode-bidi-0.3.4.tar.gz -4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547 unicode-normalization-0.1.8.tar.gz -6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c unicode-segmentation-1.3.0.tar.gz -d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05 unicode-width-0.1.6.tar.gz -cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz -590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz -c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04 url-1.7.2.tar.gz -1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3 url-2.1.0.tar.gz -610dba6991597b117f3ec602c2c1df42da3a554bd452283f56867d53f1bdc7c0bac6e593b63ec3186016d886951397314ff7e0cf0bfae8015281a6afe77f19ec utf-8-0.7.5.tar.gz -5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265 uuid-0.7.4.tar.gz -db2e64654b25ad839877649d6aaa36fa69e2ecb9dcd5510404dd9899244c00f6103135fb5c749b38c9479eba88ad868d408ee2e82343f81453efe1c29857cfc2 v_escape-0.7.4.tar.gz -0dee1a10798062093912edd9a1250f46bcea1e6fa0472895aaf637231cc616b0d9fd0822ac96f1bfa585b0283b4ab810f4eac0813f1275e66854791933843c3b v_escape_derive-0.5.5.tar.gz -a9bd1638df5b9f5e4a96ef453f9943af935f035308c3bc9cb613400054538ccc1e76c78b6bb9a135ce1128593be4fcf8630d8b6d8e185087322251750b676b80 v_htmlescape-0.4.5.tar.gz -d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b vcpkg-0.2.7.tar.gz -026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz -cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362 version_check-0.1.5.tar.gz -1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 void-1.0.2.tar.gz -43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b walkdir-2.2.9.tar.gz -1264e8095ba41b6cde85517538449d99f05a40207437bad9b618af3668ad675a3517b3d190e8b962820e2c302146d8d0571b665a1176c090ed75a4e83e8c5b59 want-0.2.0.tar.gz -1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0 wasi-0.7.0.tar.gz -88d82fdddb268e35497cab9a17f9cd3845b25084bc9932a3ec1fa256a4ff59307ff46e112fc26144eba6c57b4a094eb9d9687a51cda1839e03f7f06744a19b32 widestring-0.4.0.tar.gz +c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828 unicase-2.7.0.tar.gz +bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 unicode-ident-1.0.12.tar.gz +4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef unicode-segmentation-1.11.0.tar.gz +a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712 unsafe-libyaml-0.2.11.tar.gz +5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416 untrusted-0.9.0.tar.gz +1ba5cd14166517a5114feee1f7d2ae7c1d2763a34c0e331171f9cc07fc35bcadbb0c87318533fd07b4c01e052abd88ac417fad7f898abe62126919e3f02c0528 url-2.5.1.tar.gz +6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b utf-8-0.7.6.tar.gz +44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa utf16_iter-1.0.5.tar.gz +a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090 utf8_iter-1.0.4.tar.gz +f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 utf8parse-0.2.2.tar.gz +fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5 uuid-1.8.0.tar.gz +4b42945193b5fda130bb54fe36abc6ced6b408a15d80352af21b01cb0881408d4f5127f68ad1b1dbb513358743ca8655545b55f45a2299de01f51071569f13cb v_frame-0.3.8.tar.gz +7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 vcpkg-0.2.15.tar.gz +b799c1713d4bf7af00f9c6d562d39c5e916f37350c2f3f57119277725b81c93246d0b1410d4ee981694bbbb731460b6512a813fdde1cf25949cd45fb3e70bd6f version-compare-0.2.0.tar.gz +b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 version_check-0.9.4.tar.gz +b2c071a4ac3669cd469b1fb52963aa25ef268bcd02d45470e9533eae5d93478172798ffc5c25079bc5579be6fcc43700899323808006c6bdb6f9c665bffb8160 vlq-0.5.1.tar.gz +da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad walkdir-2.5.0.tar.gz +f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 want-0.3.1.tar.gz +043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f wasi-0.11.0+wasi-snapshot-preview1.tar.gz +dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47 wasi-0.9.0+wasi-snapshot-preview1.tar.gz +6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5 wasm-bindgen-0.2.92.tar.gz +22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa wasm-bindgen-backend-0.2.92.tar.gz +0a77203499381b6bc4e9258480d7ef499d9c26b195baf38d0b7b228872f844d24c827cd57c8e2b0176927fd5957428084f53fe80cf60b35b7ba02d02b27a4682 wasm-bindgen-futures-0.4.42.tar.gz +78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462 wasm-bindgen-macro-0.2.92.tar.gz +92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7 wasm-bindgen-macro-support-0.2.92.tar.gz +70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07 wasm-bindgen-shared-0.2.92.tar.gz +78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b web-sys-0.3.69.tar.gz +78ba3534a46887d899a44a287c6d0d3b799c7fbb8efc3505e159563daa182237610419ff115952bb790164395faa349ae817b05c93061a70c5931582c5d64657 webp-0.3.0.tar.gz +4891aa5c6a5bb8a4d6bd730fca5ab5bbddb5a39b9267c81951ca8d3ff0dbcd305b498328f99b2da79ac65cdc9dfa42c40631a4f8d6975ac6f4ed9c85a8d2178e webpki-roots-0.25.4.tar.gz +6012de47d6bb5177820be9794e70ce6354577247750b8a125dad1d3e093d96cacba62471d8f67f056a72447bb6bf7fffabc6254ae96d93014a5200c71d571c97 weezl-0.1.8.tar.gz 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe winapi-0.2.8.tar.gz -5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 winapi-0.3.8.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 winapi-build-0.1.1.tar.gz a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz -54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a winapi-util-0.1.2.tar.gz +e186111398f9f0f0686e791ad0d72c39205e5f246b6e020df413e477ee07f32e91d09405c61dc92752f061f54fd7533435545c1a151477b40e2d68acc94a57fd winapi-util-0.1.8.tar.gz 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz -b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10 wincolor-1.0.2.tar.gz -a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102 winreg-0.6.2.tar.gz -68afe1dce3d5daaaa6a15d023dcbf91d26b06f4319ddd76d0993d97c10fd8d9f6c2a76c87290347d50281640609aefbb9fc8f691ebd18104f566a005d84c43bc winutil-0.1.1.tar.gz -c4763a8b5218c307622c9d017250098b7a1e69ed01e0b540464193811e34cf0138e2cecb2a709d59ba77dd041489f8dac85167ba981e462e21e93c34d051ef0a ws-0.9.0.tar.gz +0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 windows-core-0.52.0.tar.gz +bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed windows-sys-0.48.0.tar.gz +24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 windows-sys-0.52.0.tar.gz +e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 windows-targets-0.48.5.tar.gz +d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee windows-targets-0.52.5.tar.gz +20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 windows_aarch64_gnullvm-0.48.5.tar.gz +b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d windows_aarch64_gnullvm-0.52.5.tar.gz +223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff windows_aarch64_msvc-0.48.5.tar.gz +c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d windows_aarch64_msvc-0.52.5.tar.gz +931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a windows_i686_gnu-0.48.5.tar.gz +cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2 windows_i686_gnu-0.52.5.tar.gz +da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b windows_i686_gnullvm-0.52.5.tar.gz +70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e windows_i686_msvc-0.48.5.tar.gz +08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634 windows_i686_msvc-0.52.5.tar.gz +1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 windows_x86_64_gnu-0.48.5.tar.gz +d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8 windows_x86_64_gnu-0.52.5.tar.gz +c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa windows_x86_64_gnullvm-0.48.5.tar.gz +22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08 windows_x86_64_gnullvm-0.52.5.tar.gz +fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 windows_x86_64_msvc-0.48.5.tar.gz +81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6 windows_x86_64_msvc-0.52.5.tar.gz +a8a94c26afc4cc4db6ec2e65e7bff325fbe6816d4a80fb97e2014e202af0f549a77518f0435157985822aa9fd8642b95258b6cf87a9e695f4b9a11b5fe514d86 winnow-0.6.13.tar.gz +2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787 winreg-0.50.0.tar.gz +9f61edafb4a262b56d130e48ac6bba94f5a432bf0a8c20243e6c8fa98c3f9e0d2ab00a77b35a2e49dd63585a272af597e236e089641b5f488760ac42d22f5a67 winres-0.1.12.tar.gz +655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1 write16-1.0.0.tar.gz +818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1 writeable-0.5.5.tar.gz +256c9b6bb69fcb5d421fd38474ac5c1be8061e38c6909c3de0ddff85237815b02eafd7c13be4a75517ff754db8f102fd1a963e63edccf5236d2ee489071ede5b ws-0.9.2.tar.gz 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f ws2_32-sys-0.2.1.tar.gz -94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd xml-rs-0.8.0.tar.gz -31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3 yaml-rust-0.4.3.tar.gz" +15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9 wyz-0.5.1.tar.gz +4047abda42b949cf58f820e15ee99850de483857bbaaef737eeee48e1a2132972470f15bb2ddda56438f6a934918be96607a8de518a5a3dcec7c8ee6c00ad280 xattr-1.3.1.tar.gz +fe3ed58997146ea715764e2318f01df4a7f38159302cd3705520036fa1e275bff67b97a1fe98e612820a7085b19fc176020b0c7eaa529c39602b9f6c32be62d7 yada-0.5.1.tar.gz +7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0 yaml-rust-0.4.5.tar.gz +b3d1456e28d53723470644ae15a4298fa96a79593d90729221ca4e45a6f09de4d7c554703425c61595c4e78959652122db95865c0337cc0cd6a4ec57d7bea84d yoke-0.7.4.tar.gz +5be38b8ae8dcb640a3fcb097e5b118354b45a41a0367afeff3c2ba5d13458524e88f9433848f09c670533d36a49a0e2b393e23368921553b5bb008e66e8e4a40 yoke-derive-0.7.4.tar.gz +4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148 zerocopy-0.7.34.tar.gz +1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63 zerocopy-derive-0.7.34.tar.gz +11f37a67108185a8090cda71338b02492fabd15e6cfe018833a165cd869ed65338e12d7c5680ffb0b763fc3acbdff6fe4df30457653dfe4d79ecc864b69d780f zerofrom-0.1.4.tar.gz +f2ea4650fcb4e7c3583f0f7c6146c7734cf6e80e07d92c330c6bc6a0a4e0fe14ae3393845713331240c70685e92eec114565c5be21189e687fe6232aef75a9c0 zerofrom-derive-0.1.4.tar.gz +159cb90d2ee2a2662429141e0948cfb44e7784ba35e92c32b2ac7183d6b69a9318b0617ff4de7b87831f9727f9d5c9d7d4fd3a9b1f54e67ca29a4ed6afc8d046 zerovec-0.10.2.tar.gz +da4a056e9147142e51a58c3b16a12179433fc889b4efacbadd1294bb5a750860201a472bf7d72a10e7e82e95d97761a67ec93a727620c1c1844a15362f6736ea zerovec-derive-0.10.2.tar.gz +1106ec19018c7db15ef5c1db97883f8125e647336aab1579f02123b83452e97c9f2b53ebea72f4845e5b79f048e5802917a2d9fa215c9cac3892c3a1b14074eb zune-core-0.4.12.tar.gz +0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd zune-inflate-0.2.54.tar.gz +15bbe43bd963138a6750939b94225039b778fceb4af369438425096a2700b25083555c371a5cb80f5f3456664f072bdf5fee9ffb886480bebcd0939dc775eac6 zune-jpeg-0.4.11.tar.gz" diff --git a/user/zola/ring-use-generic-implementation-on-non-sse2-x86.patch b/user/zola/ring-use-generic-implementation-on-non-sse2-x86.patch new file mode 100644 index 000000000..e0b17d163 --- /dev/null +++ b/user/zola/ring-use-generic-implementation-on-non-sse2-x86.patch @@ -0,0 +1,430 @@ +Patch source: + +* https://github.com/briansmith/ring/issues/1999 +* https://salsa.debian.org/rust-team/debcargo-conf/-/commit/ace5e3fc96a8b0d85150c399d5f79c314abd4a60 + +This patch was modified from upstream in the following ways: + +* sed -e 's@rust-ring-0.17.8/@b/ring-0.17.8/@g' \ + -e 's@rust-ring-0.17.8.orig/@a/ring-0.17.8/@g' +* remove `use std`; replace `env` with `std::env` + +Description: Avoid using the x86-specific implementations on non-sse2 x86 + Upstream has said that the x86-specific implementation requires sse2, and + now enforces this via a static assert. + + This patch replaces all checks in "src" for x86 with checks for x86 with + sse2 and also inhibits the build of assembler on x86 without sse2. This should + cause the generic implementations to be used. + + The changes to "src" were created with the command + for file in `find src -name '*.rs'` ; do sed -i 's/target_arch = "x86"/all(target_arch = "x86", target_feature = "sse2")/g' $file ; done +Author: Peter Michael Green <plugwash@debian.org> + +Index: b/ring-0.17.8/src/aead/aes.rs +=================================================================== +--- a/ring-0.17.8/src/aead/aes.rs ++++ b/ring-0.17.8/src/aead/aes.rs +@@ -149,7 +149,7 @@ impl Key { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::HWAES => { + set_encrypt_key!(aes_hw_set_encrypt_key, bytes, key_bits, &mut key)? +@@ -159,7 +159,7 @@ impl Key { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::VPAES_BSAES => { + set_encrypt_key!(vpaes_set_encrypt_key, bytes, key_bits, &mut key)? +@@ -180,7 +180,7 @@ impl Key { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::HWAES => encrypt_block!(aes_hw_encrypt, a, self), + +@@ -188,7 +188,7 @@ impl Key { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::VPAES_BSAES => encrypt_block!(vpaes_encrypt, a, self), + +@@ -219,7 +219,7 @@ impl Key { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::HWAES => { + ctr32_encrypt_blocks!(aes_hw_ctr32_encrypt_blocks, in_out, src, &self.inner, ctr) +@@ -263,7 +263,7 @@ impl Key { + ctr32_encrypt_blocks!(vpaes_ctr32_encrypt_blocks, in_out, src, &self.inner, ctr) + } + +- #[cfg(target_arch = "x86")] ++ #[cfg(all(target_arch = "x86", target_feature = "sse2"))] + Implementation::VPAES_BSAES => { + super::shift::shift_full_blocks(in_out, src, |input| { + self.encrypt_iv_xor_block(ctr.increment(), Block::from(input), cpu_features) +@@ -365,7 +365,7 @@ pub enum Implementation { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + HWAES = 1, + +@@ -374,7 +374,7 @@ pub enum Implementation { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + VPAES_BSAES = 2, + +@@ -387,7 +387,7 @@ fn detect_implementation(cpu_features: c + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + )))] + let _cpu_features = cpu_features; + +@@ -398,14 +398,14 @@ fn detect_implementation(cpu_features: c + } + } + +- #[cfg(any(target_arch = "x86_64", target_arch = "x86"))] ++ #[cfg(any(target_arch = "x86_64", all(target_arch = "x86", target_feature = "sse2")))] + { + if cpu::intel::AES.available(cpu_features) { + return Implementation::HWAES; + } + } + +- #[cfg(any(target_arch = "x86_64", target_arch = "x86"))] ++ #[cfg(any(target_arch = "x86_64", all(target_arch = "x86", target_feature = "sse2")))] + { + if cpu::intel::SSSE3.available(cpu_features) { + return Implementation::VPAES_BSAES; +Index: b/ring-0.17.8/src/aead/chacha.rs +=================================================================== +--- a/ring-0.17.8/src/aead/chacha.rs ++++ b/ring-0.17.8/src/aead/chacha.rs +@@ -20,7 +20,7 @@ use super::{quic::Sample, Nonce}; + not(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )) + ))] +@@ -75,7 +75,7 @@ impl Key { + // has this limitation and come up with a better solution. + // + // https://rt.openssl.org/Ticket/Display.html?id=4362 +- if cfg!(any(target_arch = "arm", target_arch = "x86")) && src.start != 0 { ++ if cfg!(any(target_arch = "arm", all(target_arch = "x86", target_feature = "sse2"))) && src.start != 0 { + let len = in_out.len() - src.start; + in_out.copy_within(src, 0); + self.encrypt_in_place(counter, &mut in_out[..len]); +@@ -91,7 +91,7 @@ impl Key { + #[cfg(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + ))] + #[inline(always)] +@@ -128,7 +128,7 @@ impl Key { + #[cfg(not(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )))] + use fallback::ChaCha20_ctr32; +@@ -169,7 +169,7 @@ impl Counter { + not(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )) + ))] +@@ -219,7 +219,7 @@ mod tests { + let max_offset = if cfg!(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )) { + MAX_ALIGNMENT_AND_OFFSET +Index: b/ring-0.17.8/src/aead/gcm.rs +=================================================================== +--- a/ring-0.17.8/src/aead/gcm.rs ++++ b/ring-0.17.8/src/aead/gcm.rs +@@ -57,7 +57,7 @@ impl Key { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::CLMUL => { + prefixed_extern! { +@@ -185,7 +185,7 @@ impl Context { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::CLMUL => { + prefixed_extern! { +@@ -236,7 +236,7 @@ impl Context { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + Implementation::CLMUL => { + prefixed_extern! { +@@ -339,7 +339,7 @@ enum Implementation { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + CLMUL, + +@@ -356,7 +356,7 @@ fn detect_implementation(cpu_features: c + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + )))] + let _cpu_features = cpu_features; + +@@ -367,7 +367,7 @@ fn detect_implementation(cpu_features: c + } + } + +- #[cfg(any(target_arch = "x86_64", target_arch = "x86"))] ++ #[cfg(any(target_arch = "x86_64", all(target_arch = "x86", target_feature = "sse2")))] + { + if cpu::intel::FXSR.available(cpu_features) && cpu::intel::PCLMULQDQ.available(cpu_features) + { +Index: b/ring-0.17.8/src/aead/shift.rs +=================================================================== +--- a/ring-0.17.8/src/aead/shift.rs ++++ b/ring-0.17.8/src/aead/shift.rs +@@ -14,7 +14,7 @@ + + use super::block::{Block, BLOCK_LEN}; + +-#[cfg(target_arch = "x86")] ++#[cfg(all(target_arch = "x86", target_feature = "sse2"))] + pub fn shift_full_blocks<F>(in_out: &mut [u8], src: core::ops::RangeFrom<usize>, mut transform: F) + where + F: FnMut(&[u8; BLOCK_LEN]) -> Block, +Index: b/ring-0.17.8/src/arithmetic/montgomery.rs +=================================================================== +--- a/ring-0.17.8/src/arithmetic/montgomery.rs ++++ b/ring-0.17.8/src/arithmetic/montgomery.rs +@@ -128,7 +128,7 @@ unsafe fn mul_mont( + #[cfg(not(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )))] + // TODO: Stop calling this from C and un-export it. +@@ -168,7 +168,7 @@ prefixed_export! { + not(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )) + ))] +@@ -201,7 +201,7 @@ pub(super) fn limbs_from_mont_in_place(r + #[cfg(not(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )))] + fn limbs_mul(r: &mut [Limb], a: &[Limb], b: &[Limb]) { +@@ -223,7 +223,7 @@ fn limbs_mul(r: &mut [Limb], a: &[Limb], + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + )) + ))] + prefixed_extern! { +@@ -236,7 +236,7 @@ prefixed_extern! { + target_arch = "aarch64", + target_arch = "arm", + target_arch = "x86_64", +- target_arch = "x86" ++ all(target_arch = "x86", target_feature = "sse2") + ))] + prefixed_extern! { + // `r` and/or 'a' and/or 'b' may alias. +Index: b/ring-0.17.8/src/cpu.rs +=================================================================== +--- a/ring-0.17.8/src/cpu.rs ++++ b/ring-0.17.8/src/cpu.rs +@@ -27,13 +27,13 @@ pub(crate) fn features() -> Features { + #[cfg(any(target_arch = "aarch64", target_arch = "arm"))] + use arm::init_global_shared_with_assembly; + +- #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] ++ #[cfg(any(all(target_arch = "x86", target_feature = "sse2"), target_arch = "x86_64"))] + use intel::init_global_shared_with_assembly; + + #[cfg(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64", + ))] + { +@@ -47,5 +47,5 @@ pub(crate) fn features() -> Features { + #[cfg(any(target_arch = "aarch64", target_arch = "arm"))] + pub mod arm; + +-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] ++#[cfg(any(all(target_arch = "x86", target_feature = "sse2"), target_arch = "x86_64"))] + pub mod intel; +Index: b/ring-0.17.8/src/cpu/intel.rs +=================================================================== +--- a/ring-0.17.8/src/cpu/intel.rs ++++ b/ring-0.17.8/src/cpu/intel.rs +@@ -13,11 +13,11 @@ + // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + #![cfg_attr( +- not(any(target_arch = "x86", target_arch = "x86_64")), ++ not(any(all(target_arch = "x86", target_feature = "sse2"), target_arch = "x86_64")), + allow(dead_code) + )] + +-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] ++#[cfg(any(all(target_arch = "x86", target_feature = "sse2"), target_arch = "x86_64"))] + mod abi_assumptions { + // TOOD: Support targets that do not have SSE and SSE2 enabled, such as + // x86_64-unknown-linux-none. See +@@ -29,7 +29,7 @@ mod abi_assumptions { + + #[cfg(target_arch = "x86_64")] + const _ASSUMED_POINTER_SIZE: usize = 8; +- #[cfg(target_arch = "x86")] ++ #[cfg(all(target_arch = "x86", target_feature = "sse2"))] + const _ASSUMED_POINTER_SIZE: usize = 4; + const _ASSUMED_USIZE_SIZE: () = assert!(core::mem::size_of::<usize>() == _ASSUMED_POINTER_SIZE); + const _ASSUMED_REF_SIZE: () = +@@ -43,7 +43,7 @@ pub(crate) struct Feature { + mask: u32, + } + +-#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] ++#[cfg(any(all(target_arch = "x86", target_feature = "sse2"), target_arch = "x86_64"))] + pub(super) unsafe fn init_global_shared_with_assembly() { + prefixed_extern! { + fn OPENSSL_cpuid_setup(); +@@ -57,7 +57,7 @@ impl Feature { + #[allow(clippy::needless_return)] + #[inline(always)] + pub fn available(&self, _: super::Features) -> bool { +- #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] ++ #[cfg(any(all(target_arch = "x86", target_feature = "sse2"), target_arch = "x86_64"))] + { + prefixed_extern! { + static mut OPENSSL_ia32cap_P: [u32; 4]; +@@ -65,7 +65,7 @@ impl Feature { + return self.mask == self.mask & unsafe { OPENSSL_ia32cap_P[self.word] }; + } + +- #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))] ++ #[cfg(not(any(all(target_arch = "x86", target_feature = "sse2"), target_arch = "x86_64")))] + { + return false; + } +Index: b/ring-0.17.8/src/prefixed.rs +=================================================================== +--- a/ring-0.17.8/src/prefixed.rs ++++ b/ring-0.17.8/src/prefixed.rs +@@ -44,7 +44,7 @@ macro_rules! prefixed_extern { + #[cfg(not(any( + target_arch = "aarch64", + target_arch = "arm", +- target_arch = "x86", ++ all(target_arch = "x86", target_feature = "sse2"), + target_arch = "x86_64" + )))] + macro_rules! prefixed_export { +Index: b/ring-0.17.8/build.rs +=================================================================== +--- a/ring-0.17.8/build.rs ++++ b/ring-0.17.8/build.rs +@@ -430,7 +430,7 @@ fn build_c_code( + + generate_prefix_symbols_asm_headers(out_dir, ring_core_prefix).unwrap(); + +- let (asm_srcs, obj_srcs) = if let Some(asm_target) = asm_target { ++ let (mut asm_srcs, mut obj_srcs) = if let Some(asm_target) = asm_target { + let perlasm_src_dsts = perlasm_src_dsts(asm_dir, asm_target); + + if !use_pregenerated { +@@ -454,6 +454,19 @@ fn build_c_code( + (vec![], vec![]) + }; + ++ if target.arch == "x86" { ++ let mut havesse2 = false; ++ for target_feature in std::env::var("CARGO_CFG_TARGET_FEATURE").unwrap_or("".to_string()).split(",") { ++ if target_feature == "sse2" { ++ havesse2 = true; ++ } ++ } ++ if !havesse2 { ++ asm_srcs = vec![]; ++ obj_srcs = vec![]; ++ } ++ } ++ + let core_srcs = sources_for_arch(&target.arch) + .into_iter() + .filter(|p| !is_perlasm(p)) |
