summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--exlibs/mozilla-app.exlib38
-rw-r--r--packages/mail-client/daily/files/bundled-botan-cc-fix.patch8
3 files changed, 15 insertions, 33 deletions
diff --git a/.mailmap b/.mailmap
index f5b943a..a39e465 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,2 @@
Marc-Antoine Perennou <keruspe@exherbo.org> <Marc-Antoine@Perennou.com>
-Quentin Glidic <sardemff7@exherbo.org> <sardemff7+git@sardemff7.net>
+Morgane Glidic <sardemff7@exherbo.org> <sardemff7+git@sardemff7.net>
diff --git a/exlibs/mozilla-app.exlib b/exlibs/mozilla-app.exlib
index e9ca3a4..89f33dd 100644
--- a/exlibs/mozilla-app.exlib
+++ b/exlibs/mozilla-app.exlib
@@ -28,7 +28,7 @@ if ever is_scm; then
exparam -b comm && SCM_SECONDARY_REPOSITORIES="moz_comm ${SCM_SECONDARY_REPOSITORIES}"
#exparam -b comm && SCM_SECONDARY_REPOSITORIES="moz_comm moz_ldap_sdks ${SCM_SECONDARY_REPOSITORIES}"
- require autotools [ supported_autoconf=[ 2.1 ] supported_automake=[ none ] ]
+ require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ none ] ]
require scm-git
# It is really quicker and we do not need a full repo here
@@ -39,7 +39,7 @@ if ever is_scm; then
}
fi
-require cargo [ rust_minimum_version=1.47.0 ]
+require cargo [ rust_minimum_version=1.57.0 ]
export_exlib_phases pkg_setup src_configure src_compile src_test src_install
@@ -55,18 +55,13 @@ MYOPTIONS="
wifi
( providers: jpeg-turbo [[ description = [ Build with system jpeg ] ]] )
"
-if exparam -b comm; then
- MYOPTIONS+="
- lightning [[ description = [ Install the calendar extension 'Lightning' ] ]]
- "
-fi
DEPENDENCIES="
build:
app-arch/zip
dev-lang/python:*[>=3][sqlite]
dev-lang/yasm[>=1.1]
- dev-rust/cbindgen[>=0.16.0]
+ dev-rust/cbindgen[>=0.24.3]
virtual/pkg-config
build+run:
app-arch/unzip
@@ -74,7 +69,7 @@ DEPENDENCIES="
dev-lang/node
dev-libs/expat
dev-libs/glib:2
- dev-libs/icu:=[>=67.1]
+ dev-libs/icu:=[>=71.1]
dev-libs/libevent:=[>=1.4.7]
dev-libs/libffi
dev-libs/libIDL[>=0.8.0]
@@ -88,6 +83,7 @@ DEPENDENCIES="
x11-libs/libXmu
x11-libs/libXrender
x11-libs/libXt
+ x11-libs/libXtst
x11-libs/pango[>=1.10.1]
x11-libs/pixman
@@ -167,8 +163,6 @@ if ever is_scm; then
-e "/cmd =/s/'nm'/'$(exhost --tool-prefix)nm'/" \
config/check_vanilla_allocations.py
- eautoconf
-
edo pushd nsprpub
edo sed -i \
@@ -178,14 +172,6 @@ if ever is_scm; then
-e "/AC_PATH_PROGS(STRIP/d" \
configure.in
- WANT_AUTOCONF=2.5 eautoconf
-
- edo popd
-
- edo pushd js/src
-
- edo mkdir .deps
-
eautoconf
edo popd
@@ -247,6 +233,7 @@ EOF
# Exherbo system
--with-distribution-id=org.exherbo
--with-branding=${MOZ_BRANDING}
+ --disable-bootstrap
# Disable auto-distribution stuff
--disable-updater
@@ -263,6 +250,7 @@ EOF
--x-includes=/usr/$(exhost --target)/include
--x-libraries=/usr/$(exhost --target)/lib
--with-system-zlib
+ --without-wasm-sandboxed-libraries
# Exheres defaults and options
--enable-chrome-format=omni
@@ -278,7 +266,6 @@ EOF
# Application defaults
--enable-application=${MOZ_APPLICATION}
- --enable-extensions=default
)
# Dev tools
@@ -287,12 +274,6 @@ EOF
# -e s/MOZ_DEVTOOLS=all/MOZ_DEVTOOLS=server/ \
# ${MOZ_APPLICATION}/confvars.sh
- if exparam -b comm; then
- mozconfig_params+=(
- $(option_enable lightning calendar)
- )
- fi
-
local x
edo tee .mozconfig <<EOF
$(for x in "${mozconfig_params[@]}" "${@}"; do
@@ -310,14 +291,15 @@ EOF
unset AS
- MACH_USE_SYSTEM_PYTHON=1 \
+ MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip \
+ MOZBUILD_STATE_PATH=${TEMP}/.mozbuild \
edo ./mach configure
}
mozilla-app_src_compile() {
unset TARGETS
- MACH_USE_SYSTEM_PYTHON=1 \
+ MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip \
edo ./mach build -j${EXJOBS:-1} -v
}
diff --git a/packages/mail-client/daily/files/bundled-botan-cc-fix.patch b/packages/mail-client/daily/files/bundled-botan-cc-fix.patch
index 14bc0af..b2215b6 100644
--- a/packages/mail-client/daily/files/bundled-botan-cc-fix.patch
+++ b/packages/mail-client/daily/files/bundled-botan-cc-fix.patch
@@ -1,12 +1,12 @@
-diff --git a/comm/third_party/botan/botan.mozbuild b/comm/third_party/botan/botan.mozbuild
-index 3b35edd30e..8f530b0a0a 100644
+diff --git a/third_party/botan/botan.mozbuild b/third_party/botan/botan.mozbuild
+index 50ca96d6f7..bfc3326c00 100644
--- a/comm/third_party/botan/botan.mozbuild
+++ b/comm/third_party/botan/botan.mozbuild
-@@ -45,7 +45,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
+@@ -44,7 +44,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
botan_build = GENERATED_FILES['build/build.h']
botan_build.script = 'botan_configure.py'
botan_build.flags = [
-- '--cc-bin={}'.format(CONFIG['MZLA_RNP_CXX']),
+- '--cc-bin={}'.format(CONFIG['CXX']),
+ '--cc={}'.format(CONFIG['CC_TYPE']),
'--cpu={}'.format(CONFIG['target_cpu']),
'--os={}'.format(botan_os),