diff --git a/main/firefox/.pkgfiles b/main/firefox/.pkgfiles index 6d159a5db..75443af9b 100644 --- a/main/firefox/.pkgfiles +++ b/main/firefox/.pkgfiles @@ -1,4 +1,4 @@ -firefox-107.0-1 +firefox-107.0-2 drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/revdep.d/ -rw-r--r-- root/root etc/revdep.d/firefox.conf diff --git a/main/firefox/spkgbuild b/main/firefox/spkgbuild index 2f3c97286..4b32f3491 100644 --- a/main/firefox/spkgbuild +++ b/main/firefox/spkgbuild @@ -3,7 +3,7 @@ name=firefox version=107.0 -release=1 +release=2 source="https://archive.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz $name.desktop" @@ -12,64 +12,78 @@ build() { cd $name-$version - sed -i '/ROOT_CLIP_CHAIN/d' gfx/webrender_bindings/webrender_ffi.h - cat <<- EOF > .mozconfig - mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared - unset MOZ_TELEMETRY_REPORTING - ac_add_options --prefix=/usr - ac_add_options --enable-application=browser - ac_add_options --enable-default-toolkit=cairo-gtk3 - ac_add_options --enable-application=browser - ac_add_options --enable-av1 - ac_add_options --enable-system-ffi - ac_add_options --enable-system-pixman - ac_add_options --enable-alsa - ac_add_options --enable-audio-backends=alsa - ac_add_options --disable-pulseaudio - ac_add_options --enable-ffmpeg - ac_add_options --enable-optimize - ac_add_options --enable-release - ac_add_options --enable-rust-simd - ac_add_options --enable-linker=lld - ac_add_options --enable-lto=thin - ac_add_options --enable-official-branding - ac_add_options --disable-debug-symbols - ac_add_options --disable-tests - ac_add_options --disable-debug - ac_add_options --disable-updater - ac_add_options --disable-crashreporter - ac_add_options --disable-necko-wifi - ac_add_options --disable-elf-hack - ac_add_options --with-system-jpeg - ac_add_options --with-system-zlib - ac_add_options --with-system-png - ac_add_options --with-system-nspr - ac_add_options --with-system-nss - ac_add_options --with-system-libevent - ac_add_options --with-system-libvpx - ac_add_options --with-system-webp - ac_add_options --without-wasm-sandboxed-libraries +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared +unset MOZ_TELEMETRY_REPORTING +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib +ac_add_options --disable-callgrind +ac_add_options --disable-crashreporter +ac_add_options --disable-debug +ac_add_options --disable-debug-symbols +ac_add_options --disable-elf-hack +ac_add_options --disable-eme +ac_add_options --disable-jemalloc +ac_add_options --disable-necko-wifi +ac_add_options --disable-parental-controls +ac_add_options --disable-profiling +ac_add_options --disable-system-extension-dirs +ac_add_options --disable-tests +ac_add_options --disable-updater +ac_add_options --disable-vtune +ac_add_options --enable-application=browser +ac_add_options --enable-audio-backends=alsa +ac_add_options --enable-default-toolkit=cairo-gtk3 +ac_add_options --enable-install-strip +ac_add_options --enable-linker=lld +ac_add_options --enable-lto=thin +ac_add_options --enable-official-branding +ac_add_options --enable-optimize +ac_add_options --enable-release +ac_add_options --enable-rust-simd +ac_add_options --enable-strip +ac_add_options --with-system-ffi +ac_add_options --with-system-jpeg +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-pixman +ac_add_options --with-system-png +ac_add_options --with-system-webp +ac_add_options --with-system-zlib +ac_add_options --without-wasm-sandboxed-libraries EOF + # A change in cbindgen-0.24.2 causes a symbol to now be output by cbindgen, but it has already been defined in a header. + sed -i '/ROOT_CLIP_CHAIN/d' gfx/webrender_bindings/webrender_ffi.h + + # Remove an obsolete flag in python code, that has been removed in python-3.11. + grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/' + + # Fix an issue with regular expressions in python-3.11. + sed -e 's/?s)\./?s:.)/' \ + -e '/?m)/{s/?m)/?m:/;s/\$"/$)"/}' \ + -e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \ + -i xpcom/idl-parser/xpidl/xpidl.py + export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib + export CFLAGS="${CFLAGS} -w" CXXFLAGS="${CXXFLAGS} -w" # disable warnings export MOZBUILD_STATE_PATH=${PWD}/.mozbuild export CARGO_HOME=$INITDIR export MOZ_NOSPAM=1 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system - # Show flags set at the beginning + # Show flags set at the beginning. echo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}" echo "Current CFLAGS:\t\t${CFLAGS:-no value set}" echo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}" echo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}" echo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}" - # python/mach/mach/mixin/process.py fails to detect SHELL - export SHELL='/bin/bash' + ./mach build + DESTDIR=$PKG ./mach install - SHELL=/bin/sh ./mach build - SHELL=/bin/sh DESTDIR=$PKG ./mach install + unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE MOZBUILD_STATE_PATH mkdir -pv $PKG/usr/lib/mozilla/plugins ln -sfv ../../mozilla/plugins $PKG/usr/lib/$name/browser @@ -101,7 +115,7 @@ END install -Dm644 $SRC/$name.desktop \ $PKG/usr/share/applications/$name.desktop - # exclude library for revdep + # Exclude library for revdep. install -d $PKG/etc/revdep.d echo "/usr/lib/firefox/" > $PKG/etc/revdep.d/$name.conf } diff --git a/main/gpgme/.checksums b/main/gpgme/.checksums index d77138288..073bd391e 100644 --- a/main/gpgme/.checksums +++ b/main/gpgme/.checksums @@ -1,2 +1,2 @@ 98f25a7e494d294c4b2c1a769113510e gpgme-1.18.0.tar.bz2 -c3539963f225d60a035cce8b85d9eb33 python310.patch +573ca12d51f01f974e921973538d65f8 python311.patch diff --git a/main/gpgme/python311.patch b/main/gpgme/python311.patch new file mode 100644 index 000000000..293eb557e --- /dev/null +++ b/main/gpgme/python311.patch @@ -0,0 +1,335 @@ +Taken from the Arch Repo +GPGME fails to detect python 3.11 currently, this patch fixes that +Patch has not been upstreamed as of right now +diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure +--- gpgme-1.16.0.orig/configure 2021-06-24 20:10:50.000000000 +0300 ++++ gpgme-1.16.0/configure 2021-12-01 00:12:24.383952330 +0200 +@@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -19666,7 +19666,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -19933,7 +19933,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + +@@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -20296,7 +20296,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -20563,7 +20563,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + +@@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -20926,7 +20926,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -21193,7 +21193,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + +@@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -21556,7 +21556,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -21823,7 +21823,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + +@@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -22186,7 +22186,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -22453,7 +22453,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + +@@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -22816,7 +22816,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -23083,7 +23083,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + +@@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING: + + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5 +-$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.11" >&5 ++$as_echo_n "checking whether $PYTHON version is >= 3.11... " >&6; } + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros + # because we need at least 4 digits for the hex conversion. + # map returns an iterator in Python 3.0 and a list in 2.x +-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] ++minver = list(map(int, '3.11'.split('.'))) + [0, 0, 0] + minverhex = 0 + # xrange is not present in Python 3.0 and range returns an iterator + for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +@@ -23318,19 +23318,19 @@ fi + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5 +-$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.11" >&5 ++$as_echo_n "checking for a Python interpreter with version >= 3.11... " >&6; } + if ${am_cv_pathless_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 + else + +- for am_cv_pathless_PYTHON in python3.9 none; do ++ for am_cv_pathless_PYTHON in python3.11 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros + # because we need at least 4 digits for the hex conversion. + # map returns an iterator in Python 3.0 and a list in 2.x +-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0] ++minver = list(map(int, '3.11'.split('.'))) + [0, 0, 0] + minverhex = 0 + # xrange is not present in Python 3.0 and range returns an iterator + for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +@@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -23446,7 +23446,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -23713,7 +23713,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + +@@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } +@@ -24076,7 +24076,7 @@ else: + # + try: + from platform import python_implementation +- if python_implementation() == 'CPython' and sys.version[:3] == '2.7': ++ if python_implementation() == 'CPython' and sys.version[:4] == '2.7': + can_use_sysconfig = 0 + except ImportError: + pass" +@@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 + $as_echo_n "checking for the distutils Python package... " >&6; } + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +@@ -24343,7 +24343,7 @@ EOD` + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[:3])"` ++ print (sys.version[:4])"` + fi + fi + diff --git a/main/gpgme/spkgbuild b/main/gpgme/spkgbuild index 3a5a0cae8..30b2ecfe5 100755 --- a/main/gpgme/spkgbuild +++ b/main/gpgme/spkgbuild @@ -5,12 +5,12 @@ name=gpgme version=1.18.0 release=1 source="ftp://ftp.gnupg.org/gcrypt/gpgme/$name-$version.tar.bz2 - python310.patch" + python311.patch" build() { cd $name-$version - patch -Np1 -i ../python310.patch + patch -Np1 -i $SRC/python311.patch export PYTHON='/usr/bin/python3' ./configure \ diff --git a/main/sratom/.pkgfiles b/main/sratom/.pkgfiles index 254cc57af..a58cfc039 100644 --- a/main/sratom/.pkgfiles +++ b/main/sratom/.pkgfiles @@ -1,4 +1,4 @@ -sratom-0.6.14-1 +sratom-0.6.14-2 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/sratom-0/ diff --git a/main/sratom/spkgbuild b/main/sratom/spkgbuild index 8248bb6c8..cadd5b1f8 100755 --- a/main/sratom/spkgbuild +++ b/main/sratom/spkgbuild @@ -1,16 +1,15 @@ -# description : sratom library for serializing lv2 atoms -# depends : sord lv2 +# description : sratom library for serializing lv2 atoms +# depends : sord lv2 python3-sphinx-lv2 name=sratom version=0.6.14 -release=1 +release=2 source="https://download.drobilla.net/$name-$version.tar.xz" build() { - cd $name-$version - mkdir build && cd build - venom-meson \ - .. - ninja - DESTDIR=$PKG ninja install + venom-meson $name-$version build \ + -Ddocs=disabled \ + -Dtests=disabled + meson compile -C build + DESTDIR=$PKG meson install -C build } diff --git a/main/thunderbird/.pkgfiles b/main/thunderbird/.pkgfiles index 6ecfb3519..50203ee45 100644 --- a/main/thunderbird/.pkgfiles +++ b/main/thunderbird/.pkgfiles @@ -1,4 +1,4 @@ -thunderbird-102.5.0-1 +thunderbird-102.5.0-2 drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/revdep.d/ -rw-r--r-- root/root etc/revdep.d/thunderbird.conf diff --git a/main/thunderbird/spkgbuild b/main/thunderbird/spkgbuild index 3ffc03654..705bf2f74 100755 --- a/main/thunderbird/spkgbuild +++ b/main/thunderbird/spkgbuild @@ -3,7 +3,7 @@ name=thunderbird version=102.5.0 -release=1 +release=2 source="https://archive.mozilla.org/pub/thunderbird/releases/$version/source/thunderbird-$version.source.tar.xz" build() { @@ -15,43 +15,52 @@ build() { cat > mozconfig << "EOF" #ac_add_options --disable-dbus -ac_add_options --enable-bootstrap -ac_add_options --without-wasm-sandboxed-libraries -ac_add_options --disable-necko-wifi -#ac_add_options --enable-system-hunspell -#ac_add_options --enable-startup-notification -ac_add_options --disable-audio-backends -#ac_add_options --disable-pulseaudio -ac_add_options --enable-alsa #ac_add_options --disable-gconf +#ac_add_options --disable-pulseaudio #ac_add_options --enable-calendar +#ac_add_options --enable-startup-notification +#ac_add_options --enable-system-hunspell #ac_add_options --enable-system-sqlite -ac_add_options --with-system-libevent #ac_add_options --with-system-libvpx -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-icu -ac_add_options --prefix=/usr -ac_add_options --enable-application=comm/mail +ac_add_options --disable-audio-backends ac_add_options --disable-crashreporter -ac_add_options --disable-updater ac_add_options --disable-debug +ac_add_options --disable-necko-wifi ac_add_options --disable-tests -ac_add_options --enable-optimize=-O2 -ac_add_options --enable-strip +ac_add_options --disable-updater +ac_add_options --enable-alsa +ac_add_options --enable-application=comm/mail +ac_add_options --enable-bootstrap ac_add_options --enable-install-strip ac_add_options --enable-official-branding +ac_add_options --enable-optimize=-O2 +ac_add_options --enable-strip ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman +ac_add_options --prefix=/usr ac_add_options --with-system-bz2 +ac_add_options --with-system-icu ac_add_options --with-system-jpeg +ac_add_options --with-system-libevent +ac_add_options --with-system-nspr +ac_add_options --with-system-nss ac_add_options --with-system-png ac_add_options --with-system-zlib +ac_add_options --without-wasm-sandboxed-libraries EOF export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib export MOZBUILD_STATE_PATH=${PWD}/mozbuild - export CARGO_HOME=$INITDIR + export CARGO_HOME=$INITDIR + + # Remove an obsolete flag in python-3.11 + grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/' + + # Fix an issue with regular expressions in python-3.11 + sed -e 's/?s)\./?s:.)/' \ + -e '/?m)/{s/?m)/?m:/;s/\$"/$)"/}' \ + -e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \ + -i xpcom/idl-parser/xpidl/xpidl.py SHELL=/bin/sh MACH_USE_SYSTEM_PYTHON=1 ./mach build SHELL=/bin/sh MACH_USE_SYSTEM_PYTHON=1 DESTDIR=$PKG ./mach install