Nouvelle version de l'ancienne version d'icecat qui marche avec bitwarden
This commit is contained in:
parent
a9bcb6e8f4
commit
48bfeb44f0
|
|
@ -0,0 +1,49 @@
|
||||||
|
Fixes needed when avoiding bundled libraries.
|
||||||
|
|
||||||
|
--- icecat-60.5.0/xpcom/build/moz.build.orig 2018-09-13 17:46:49.000000000 -0400
|
||||||
|
+++ icecat-60.5.0/xpcom/build/moz.build 2018-09-22 04:26:50.659564554 -0400
|
||||||
|
@@ -99,10 +99,5 @@
|
||||||
|
'/docshell/base',
|
||||||
|
]
|
||||||
|
|
||||||
|
-if CONFIG['MOZ_VPX']:
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- '/media/libvpx',
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||||
|
CXXFLAGS += CONFIG['TK_CFLAGS']
|
||||||
|
--- icecat-60.5.0/storage/moz.build.orig 2018-09-13 17:51:11.000000000 -0400
|
||||||
|
+++ icecat-60.5.0/storage/moz.build 2018-09-22 04:26:50.659564554 -0400
|
||||||
|
@@ -117,7 +117,6 @@
|
||||||
|
DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True
|
||||||
|
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
- '/db/sqlite3/src',
|
||||||
|
'/dom/base',
|
||||||
|
]
|
||||||
|
|
||||||
|
--- icecat-60.5.0/dom/indexedDB/moz.build.orig 2018-09-13 17:49:42.000000000 -0400
|
||||||
|
+++ icecat-60.5.0/dom/indexedDB/moz.build 2018-09-22 04:26:50.663564574 -0400
|
||||||
|
@@ -102,7 +102,6 @@
|
||||||
|
CXXFLAGS += ['-Wno-error=shadow']
|
||||||
|
|
||||||
|
LOCAL_INCLUDES += [
|
||||||
|
- '/db/sqlite3/src',
|
||||||
|
'/dom/base',
|
||||||
|
'/dom/storage',
|
||||||
|
'/ipc/glue',
|
||||||
|
--- icecat-60.5.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build.orig 2018-09-13 17:40:54.000000000 -0400
|
||||||
|
+++ icecat-60.5.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build 2018-09-23 21:33:12.319975105 -0400
|
||||||
|
@@ -130,11 +130,6 @@
|
||||||
|
DEFINES["WEBRTC_POSIX"] = True
|
||||||
|
DEFINES["_FILE_OFFSET_BITS"] = "64"
|
||||||
|
|
||||||
|
- LOCAL_INCLUDES += [
|
||||||
|
- "/ipc/chromium/src/third_party/libevent/include/",
|
||||||
|
- "/ipc/chromium/src/third_party/libevent/linux/"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
UNIFIED_SOURCES += [
|
||||||
|
"/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc",
|
||||||
|
"/media/webrtc/trunk/webrtc/base/task_queue_posix.cc"
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
Make some of the changes needed to the 'makeicecat' script, to allow it to run
|
||||||
|
in a snippet without network access. After this patch is applied, some
|
||||||
|
additional changes will be made using 'substitute*'.
|
||||||
|
|
||||||
|
diff --git a/makeicecat b/makeicecat
|
||||||
|
index bf2b7a6..bc3b19b 100755
|
||||||
|
--- a/makeicecat
|
||||||
|
+++ b/makeicecat
|
||||||
|
@@ -58,7 +58,7 @@ readonly SOURCEDIR=icecat-${FFVERSION}
|
||||||
|
# debug/shell options
|
||||||
|
readonly DEVEL=0
|
||||||
|
set -euo pipefail
|
||||||
|
-(( DEVEL )) && set -x
|
||||||
|
+set -x
|
||||||
|
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
@@ -459,7 +459,7 @@ configure_search()
|
||||||
|
sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json
|
||||||
|
|
||||||
|
# Process various JSON pre-configuration dumps.
|
||||||
|
- python3 ../../tools/process-json-files.py . browser/components/extensions/schemas/
|
||||||
|
+ python3 "${DATADIR}"/../tools/process-json-files.py . browser/components/extensions/schemas/
|
||||||
|
}
|
||||||
|
|
||||||
|
configure_mobile()
|
||||||
|
@@ -855,12 +855,12 @@ finalize_sourceball()
|
||||||
|
# entry point
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
-validate_env || exit 1
|
||||||
|
-prepare_env
|
||||||
|
-fetch_source
|
||||||
|
-verify_sources
|
||||||
|
-extract_sources
|
||||||
|
-fetch_l10n
|
||||||
|
+# validate_env || exit 1
|
||||||
|
+# prepare_env
|
||||||
|
+# fetch_source
|
||||||
|
+# verify_sources
|
||||||
|
+# extract_sources
|
||||||
|
+# fetch_l10n
|
||||||
|
apply_patches
|
||||||
|
configure
|
||||||
|
configure_search
|
||||||
|
@@ -872,4 +872,4 @@ prepare_macos_packaging
|
||||||
|
configure_extensions
|
||||||
|
configure_onboarding
|
||||||
|
apply_bugfixes
|
||||||
|
-finalize_sourceball
|
||||||
|
+# finalize_sourceball
|
||||||
|
|
@ -0,0 +1,226 @@
|
||||||
|
Allow building against system-wide graphite2/harfbuzz.
|
||||||
|
See <https://bugzilla.mozilla.org/show_bug.cgi?id=847568>
|
||||||
|
Based on:
|
||||||
|
https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug847568?revision=472833&view=co
|
||||||
|
Modified for use with patch -p1, and to apply cleanly to GNU IceCat.
|
||||||
|
|
||||||
|
--- icecat-60.5.0/config/system-headers.mozbuild
|
||||||
|
+++ icecat-60.5.0/config/system-headers.mozbuild
|
||||||
|
@@ -1311,6 +1311,19 @@
|
||||||
|
'pixman.h',
|
||||||
|
]
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
|
||||||
|
+ system_headers += [
|
||||||
|
+ 'graphite2/Font.h',
|
||||||
|
+ 'graphite2/Segment.h',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ system_headers += [
|
||||||
|
+ 'harfbuzz/hb-glib.h',
|
||||||
|
+ 'harfbuzz/hb-ot.h',
|
||||||
|
+ 'harfbuzz/hb.h',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_SYSTEM_LIBVPX']:
|
||||||
|
system_headers += [
|
||||||
|
'vpx_mem/vpx_mem.h',
|
||||||
|
--- icecat-60.5.0/dom/base/moz.build
|
||||||
|
+++ icecat-60.5.0/dom/base/moz.build
|
||||||
|
@@ -474,6 +474,9 @@
|
||||||
|
if CONFIG['MOZ_X11']:
|
||||||
|
CXXFLAGS += CONFIG['TK_CFLAGS']
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||||
|
+
|
||||||
|
GENERATED_FILES += [
|
||||||
|
'PropertyUseCounterMap.inc',
|
||||||
|
'UseCounterList.h',
|
||||||
|
--- icecat-60.5.0/gfx/graphite2/moz-gr-update.sh
|
||||||
|
+++ icecat-60.5.0/gfx/graphite2/moz-gr-update.sh
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Script used to update the Graphite2 library in the mozilla source tree
|
||||||
|
+# and bump version for --with-system-graphite2
|
||||||
|
|
||||||
|
# This script lives in gfx/graphite2, along with the library source,
|
||||||
|
# but must be run from the top level of the mozilla-central tree.
|
||||||
|
@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
|
||||||
|
#find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
|
||||||
|
#find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
|
||||||
|
|
||||||
|
+# chase version for --with-system-graphite2
|
||||||
|
+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
|
||||||
|
+ if /GR2_VERSION_REQUIRE/" old-configure.in
|
||||||
|
+
|
||||||
|
# summarize what's been touched
|
||||||
|
echo Updated to $RELEASE.
|
||||||
|
echo Here is what changed in the gfx/graphite2 directory:
|
||||||
|
echo
|
||||||
|
|
||||||
|
-hg stat gfx/graphite2
|
||||||
|
+hg stat old-configure.in gfx/graphite2
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo If gfx/graphite2/src/files.mk has changed, please make corresponding
|
||||||
|
--- icecat-60.5.0/gfx/moz.build
|
||||||
|
+++ icecat-60.5.0/gfx/moz.build
|
||||||
|
@@ -10,6 +10,12 @@ with Files('**'):
|
||||||
|
if CONFIG['MOZ_TREE_CAIRO']:
|
||||||
|
DIRS += ['cairo']
|
||||||
|
|
||||||
|
+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
|
||||||
|
+ DIRS += ['graphite2/src' ]
|
||||||
|
+
|
||||||
|
+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ DIRS += ['harfbuzz/src']
|
||||||
|
+
|
||||||
|
DIRS += [
|
||||||
|
'2d',
|
||||||
|
'ycbcr',
|
||||||
|
@@ -18,8 +24,6 @@ DIRS += [
|
||||||
|
'qcms',
|
||||||
|
'gl',
|
||||||
|
'layers',
|
||||||
|
- 'graphite2/src',
|
||||||
|
- 'harfbuzz/src',
|
||||||
|
'ots/src',
|
||||||
|
'thebes',
|
||||||
|
'ipc',
|
||||||
|
--- icecat-60.5.0/gfx/skia/generate_mozbuild.py
|
||||||
|
+++ icecat-60.5.0/gfx/skia/generate_mozbuild.py
|
||||||
|
@@ -148,6 +148,9 @@
|
||||||
|
'-Wno-unused-private-field',
|
||||||
|
]
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
|
||||||
|
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
|
||||||
|
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
|
||||||
|
--- icecat-60.5.0/gfx/skia/moz.build
|
||||||
|
+++ icecat-60.5.0/gfx/skia/moz.build
|
||||||
|
@@ -822,6 +822,9 @@
|
||||||
|
'-Wno-unused-private-field',
|
||||||
|
]
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
|
||||||
|
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
|
||||||
|
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
|
||||||
|
--- icecat-60.5.0/gfx/thebes/moz.build
|
||||||
|
+++ icecat-60.5.0/gfx/thebes/moz.build
|
||||||
|
@@ -272,7 +272,13 @@
|
||||||
|
|
||||||
|
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
|
||||||
|
|
||||||
|
-DEFINES['GRAPHITE2_STATIC'] = True
|
||||||
|
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
|
||||||
|
+else:
|
||||||
|
+ DEFINES['GRAPHITE2_STATIC'] = True
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||||
|
|
||||||
|
if CONFIG['CC_TYPE'] == 'clang':
|
||||||
|
# Suppress warnings from Skia header files.
|
||||||
|
--- icecat-60.5.0/intl/unicharutil/util/moz.build
|
||||||
|
+++ icecat-60.5.0/intl/unicharutil/util/moz.build
|
||||||
|
@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
|
||||||
|
'nsUnicodeProperties.cpp',
|
||||||
|
]
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||||
|
+
|
||||||
|
FINAL_LIBRARY = 'xul'
|
||||||
|
--- icecat-60.5.0/netwerk/dns/moz.build
|
||||||
|
+++ icecat-60.5.0/netwerk/dns/moz.build
|
||||||
|
@@ -76,3 +76,6 @@
|
||||||
|
|
||||||
|
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
|
||||||
|
CXXFLAGS += ['-Wno-error=shadow']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
|
||||||
|
--- icecat-60.5.0/old-configure.in
|
||||||
|
+++ icecat-60.5.0/old-configure.in
|
||||||
|
@@ -3971,6 +3971,27 @@
|
||||||
|
AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
|
||||||
|
|
||||||
|
dnl ========================================================
|
||||||
|
+dnl Check for graphite2
|
||||||
|
+dnl ========================================================
|
||||||
|
+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
|
||||||
|
+ dnl graphite2.pc has bogus version, check manually
|
||||||
|
+ _SAVE_CFLAGS=$CFLAGS
|
||||||
|
+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS"
|
||||||
|
+ AC_TRY_COMPILE([ #include <graphite2/Font.h>
|
||||||
|
+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \
|
||||||
|
+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
|
||||||
|
+ * 100 + GR2_VERSION_BUGFIX >= \
|
||||||
|
+ (major) * 10000 + (minor) * 100 + (bugfix) )
|
||||||
|
+ ], [
|
||||||
|
+ #if !GR2_VERSION_REQUIRE(1,3,10)
|
||||||
|
+ #error "Insufficient graphite2 version."
|
||||||
|
+ #endif
|
||||||
|
+ ], [],
|
||||||
|
+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
|
||||||
|
+ CFLAGS=$_SAVE_CFLAGS
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+dnl ========================================================
|
||||||
|
dnl Check for pixman and cairo
|
||||||
|
dnl ========================================================
|
||||||
|
|
||||||
|
--- icecat-60.5.0/toolkit/library/moz.build
|
||||||
|
+++ icecat-60.5.0/toolkit/library/moz.build
|
||||||
|
@@ -235,6 +235,12 @@
|
||||||
|
if CONFIG['MOZ_SYSTEM_PNG']:
|
||||||
|
OS_LIBS += CONFIG['MOZ_PNG_LIBS']
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
|
||||||
|
+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
|
||||||
|
+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_SYSTEM_HUNSPELL']:
|
||||||
|
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
|
||||||
|
|
||||||
|
--- icecat-60.5.0/toolkit/moz.configure
|
||||||
|
+++ icecat-60.5.0/toolkit/moz.configure
|
||||||
|
@@ -1051,6 +1051,26 @@
|
||||||
|
add_old_configure_assignment('FT2_CFLAGS',
|
||||||
|
ft2_info.cflags)
|
||||||
|
|
||||||
|
+# Graphite2
|
||||||
|
+# ==============================================================
|
||||||
|
+option('--with-system-graphite2',
|
||||||
|
+ help="Use system graphite2 (located with pkgconfig)")
|
||||||
|
+
|
||||||
|
+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
|
||||||
|
+ when='--with-system-graphite2')
|
||||||
|
+
|
||||||
|
+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True))
|
||||||
|
+
|
||||||
|
+# HarfBuzz
|
||||||
|
+# ==============================================================
|
||||||
|
+option('--with-system-harfbuzz',
|
||||||
|
+ help="Use system harfbuzz (located with pkgconfig)")
|
||||||
|
+
|
||||||
|
+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4',
|
||||||
|
+ when='--with-system-harfbuzz')
|
||||||
|
+
|
||||||
|
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
|
||||||
|
+
|
||||||
|
# Mortar
|
||||||
|
# ==============================================================
|
||||||
|
option('--enable-mortar', help='Enable mortar extension')
|
||||||
|
|
@ -0,0 +1,380 @@
|
||||||
|
Support building with system media libraries.
|
||||||
|
See <https://bugzilla.mozilla.org/show_bug.cgi?id=517422>
|
||||||
|
|
||||||
|
Based on:
|
||||||
|
https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-z-bug517422?revision=472833&view=markup
|
||||||
|
|
||||||
|
Changes to files within the bundled libraries are omitted, since those files
|
||||||
|
are removed from Guix sources. Modified for use with patch -p1, and to apply
|
||||||
|
cleanly to GNU IceCat.
|
||||||
|
|
||||||
|
--- icecat-60.5.0/build/moz.configure/old.configure
|
||||||
|
+++ icecat-60.5.0/build/moz.configure/old.configure
|
||||||
|
@@ -273,7 +273,12 @@
|
||||||
|
'--with-system-libvpx',
|
||||||
|
'--with-system-nspr',
|
||||||
|
'--with-system-nss',
|
||||||
|
+ '--with-system-ogg',
|
||||||
|
'--with-system-png',
|
||||||
|
+ '--with-system-soundtouch',
|
||||||
|
+ '--with-system-theora',
|
||||||
|
+ '--with-system-tremor',
|
||||||
|
+ '--with-system-vorbis',
|
||||||
|
'--with-system-zlib',
|
||||||
|
'--with-thumb',
|
||||||
|
'--with-thumb-interwork',
|
||||||
|
--- icecat-60.5.0/config/external/moz.build
|
||||||
|
+++ icecat-60.5.0/config/external/moz.build
|
||||||
|
@@ -23,12 +23,21 @@
|
||||||
|
|
||||||
|
external_dirs += ['modules/xz-embedded']
|
||||||
|
|
||||||
|
-if CONFIG['MOZ_VORBIS']:
|
||||||
|
+if not CONFIG['MOZ_SYSTEM_OGG']:
|
||||||
|
+ external_dirs += ['media/libogg']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']:
|
||||||
|
external_dirs += ['media/libvorbis']
|
||||||
|
|
||||||
|
-if CONFIG['MOZ_TREMOR']:
|
||||||
|
+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']:
|
||||||
|
external_dirs += ['media/libtremor']
|
||||||
|
|
||||||
|
+if not CONFIG['MOZ_SYSTEM_THEORA']:
|
||||||
|
+ external_dirs += ['media/libtheora']
|
||||||
|
+
|
||||||
|
+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
|
||||||
|
+ external_dirs += ['media/libsoundtouch']
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_WEBM_ENCODER']:
|
||||||
|
external_dirs += ['media/libmkv']
|
||||||
|
|
||||||
|
@@ -51,11 +60,8 @@
|
||||||
|
'media/kiss_fft',
|
||||||
|
'media/libcubeb',
|
||||||
|
'media/libnestegg',
|
||||||
|
- 'media/libogg',
|
||||||
|
'media/libopus',
|
||||||
|
- 'media/libtheora',
|
||||||
|
'media/libspeex_resampler',
|
||||||
|
- 'media/libsoundtouch',
|
||||||
|
'media/mp4parse-rust',
|
||||||
|
'media/psshparser'
|
||||||
|
]
|
||||||
|
--- icecat-60.5.0/config/system-headers.mozbuild
|
||||||
|
+++ icecat-60.5.0/config/system-headers.mozbuild
|
||||||
|
@@ -1324,6 +1324,28 @@
|
||||||
|
'harfbuzz/hb.h',
|
||||||
|
]
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_OGG']:
|
||||||
|
+ system_headers += [
|
||||||
|
+ 'ogg/ogg.h',
|
||||||
|
+ 'ogg/os_types.h',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_THEORA']:
|
||||||
|
+ system_headers += [
|
||||||
|
+ 'theora/theoradec.h',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_VORBIS']:
|
||||||
|
+ system_headers += [
|
||||||
|
+ 'vorbis/codec.h',
|
||||||
|
+ 'vorbis/vorbisenc.h',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_TREMOR']:
|
||||||
|
+ system_headers += [
|
||||||
|
+ 'tremor/ivorbiscodec.h',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_SYSTEM_LIBVPX']:
|
||||||
|
system_headers += [
|
||||||
|
'vpx_mem/vpx_mem.h',
|
||||||
|
--- icecat-60.5.0/dom/media/AudioStream.cpp
|
||||||
|
+++ icecat-60.5.0/dom/media/AudioStream.cpp
|
||||||
|
@@ -128,7 +128,9 @@
|
||||||
|
: mMonitor("AudioStream"),
|
||||||
|
mChannels(0),
|
||||||
|
mOutChannels(0),
|
||||||
|
+#ifndef MOZ_SYSTEM_SOUNDTOUCH
|
||||||
|
mTimeStretcher(nullptr),
|
||||||
|
+#endif
|
||||||
|
mDumpFile(nullptr),
|
||||||
|
mState(INITIALIZED),
|
||||||
|
mDataSource(aSource),
|
||||||
|
@@ -147,9 +149,11 @@
|
||||||
|
if (mDumpFile) {
|
||||||
|
fclose(mDumpFile);
|
||||||
|
}
|
||||||
|
+#ifndef MOZ_SYSTEM_SOUNDTOUCH
|
||||||
|
if (mTimeStretcher) {
|
||||||
|
soundtouch::destroySoundTouchObj(mTimeStretcher);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
#if defined(XP_WIN)
|
||||||
|
if (XRE_IsContentProcess()) {
|
||||||
|
audio::AudioNotificationReceiver::Unregister(this);
|
||||||
|
@@ -170,7 +174,11 @@
|
||||||
|
nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() {
|
||||||
|
mMonitor.AssertCurrentThreadOwns();
|
||||||
|
if (!mTimeStretcher) {
|
||||||
|
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
|
||||||
|
+ mTimeStretcher = new soundtouch::SoundTouch();
|
||||||
|
+#else
|
||||||
|
mTimeStretcher = soundtouch::createSoundTouchObj();
|
||||||
|
+#endif
|
||||||
|
mTimeStretcher->setSampleRate(mAudioClock.GetInputRate());
|
||||||
|
mTimeStretcher->setChannels(mOutChannels);
|
||||||
|
mTimeStretcher->setPitch(1.0);
|
||||||
|
--- icecat-60.5.0/dom/media/AudioStream.h
|
||||||
|
+++ icecat-60.5.0/dom/media/AudioStream.h
|
||||||
|
@@ -15,7 +15,11 @@
|
||||||
|
#include "mozilla/TimeStamp.h"
|
||||||
|
#include "mozilla/UniquePtr.h"
|
||||||
|
#include "CubebUtils.h"
|
||||||
|
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
|
||||||
|
+#include "soundtouch/SoundTouch.h"
|
||||||
|
+#else
|
||||||
|
#include "soundtouch/SoundTouchFactory.h"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if defined(XP_WIN)
|
||||||
|
#include "mozilla/audio/AudioNotificationReceiver.h"
|
||||||
|
@@ -293,7 +297,11 @@
|
||||||
|
uint32_t mChannels;
|
||||||
|
uint32_t mOutChannels;
|
||||||
|
AudioClock mAudioClock;
|
||||||
|
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
|
||||||
|
+ nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
|
||||||
|
+#else
|
||||||
|
soundtouch::SoundTouch* mTimeStretcher;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
// Output file for dumping audio
|
||||||
|
FILE* mDumpFile;
|
||||||
|
--- icecat-60.5.0/dom/media/moz.build
|
||||||
|
+++ icecat-60.5.0/dom/media/moz.build
|
||||||
|
@@ -327,6 +327,21 @@
|
||||||
|
|
||||||
|
DEFINES['MOZILLA_INTERNAL_API'] = True
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_OGG']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_THEORA']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_VORBIS']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_TREMOR']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
|
||||||
|
+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
|
||||||
|
DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
|
||||||
|
|
||||||
|
--- icecat-60.5.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
|
||||||
|
+++ icecat-60.5.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
|
||||||
|
@@ -15,9 +15,13 @@
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
|
||||||
|
+#include "nsXPCOMPrivate.h" // for XUL_DLL
|
||||||
|
+#else
|
||||||
|
// We use a known symbol located in lgpllibs to determine its location.
|
||||||
|
// soundtouch happens to be always included in lgpllibs
|
||||||
|
#include "soundtouch/SoundTouch.h"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
namespace mozilla {
|
||||||
|
|
||||||
|
@@ -60,6 +64,12 @@
|
||||||
|
|
||||||
|
sLinkStatus = LinkStatus_FAILED;
|
||||||
|
|
||||||
|
+#ifdef MOZ_SYSTEM_SOUNDTOUCH
|
||||||
|
+ // We retrieve the path of the XUL library as this is where mozavcodec and
|
||||||
|
+ // mozavutil libs are located.
|
||||||
|
+ char* path =
|
||||||
|
+ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init);
|
||||||
|
+#else
|
||||||
|
// We retrieve the path of the lgpllibs library as this is where mozavcodec
|
||||||
|
// and mozavutil libs are located.
|
||||||
|
PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs");
|
||||||
|
@@ -68,6 +78,7 @@
|
||||||
|
}
|
||||||
|
PathString path = GetLibraryFilePathname(
|
||||||
|
lgpllibsname.get(), (PRFuncPtr)&soundtouch::SoundTouch::getVersionId);
|
||||||
|
+#endif
|
||||||
|
if (path.IsEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
--- icecat-60.5.0/old-configure.in
|
||||||
|
+++ icecat-60.5.0/old-configure.in
|
||||||
|
@@ -2417,6 +2417,111 @@
|
||||||
|
fi
|
||||||
|
fi # COMPILE_ENVIRONMENT
|
||||||
|
|
||||||
|
+dnl ========================================================
|
||||||
|
+dnl Check for libogg
|
||||||
|
+dnl ========================================================
|
||||||
|
+
|
||||||
|
+MOZ_ARG_WITH_BOOL(system-ogg,
|
||||||
|
+[ --with-system-ogg Use system libogg (located with pkgconfig)],
|
||||||
|
+MOZ_SYSTEM_OGG=1,
|
||||||
|
+MOZ_SYSTEM_OGG=)
|
||||||
|
+
|
||||||
|
+if test -n "$MOZ_SYSTEM_OGG"; then
|
||||||
|
+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3)
|
||||||
|
+
|
||||||
|
+ _SAVE_LIBS=$LIBS
|
||||||
|
+ LIBS="$LIBS $MOZ_OGG_LIBS"
|
||||||
|
+ AC_CHECK_FUNC(ogg_set_mem_functions, [],
|
||||||
|
+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)])
|
||||||
|
+ LIBS=$_SAVE_LIBS
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST(MOZ_SYSTEM_OGG)
|
||||||
|
+
|
||||||
|
+dnl ========================================================
|
||||||
|
+dnl Check for libvorbis
|
||||||
|
+dnl ========================================================
|
||||||
|
+
|
||||||
|
+MOZ_ARG_WITH_BOOL(system-vorbis,
|
||||||
|
+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)],
|
||||||
|
+MOZ_SYSTEM_VORBIS=1,
|
||||||
|
+MOZ_SYSTEM_VORBIS=)
|
||||||
|
+
|
||||||
|
+if test -n "$MOZ_SYSTEM_VORBIS"; then
|
||||||
|
+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6)
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST(MOZ_SYSTEM_VORBIS)
|
||||||
|
+
|
||||||
|
+dnl ========================================================
|
||||||
|
+dnl Check for integer-only libvorbis aka tremor
|
||||||
|
+dnl ========================================================
|
||||||
|
+
|
||||||
|
+MOZ_ARG_WITH_BOOL(system-tremor,
|
||||||
|
+[ --with-system-tremor Use system libtremor (located with pkgconfig)],
|
||||||
|
+MOZ_SYSTEM_TREMOR=1,
|
||||||
|
+MOZ_SYSTEM_TREMOR=)
|
||||||
|
+
|
||||||
|
+if test -n "$MOZ_SYSTEM_TREMOR"; then
|
||||||
|
+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST(MOZ_SYSTEM_TREMOR)
|
||||||
|
+
|
||||||
|
+dnl ========================================================
|
||||||
|
+dnl Check for libtheora
|
||||||
|
+dnl ========================================================
|
||||||
|
+
|
||||||
|
+MOZ_ARG_WITH_BOOL(system-theora,
|
||||||
|
+[ --with-system-theora Use system libtheora (located with pkgconfig)],
|
||||||
|
+MOZ_SYSTEM_THEORA=1,
|
||||||
|
+MOZ_SYSTEM_THEORA=)
|
||||||
|
+
|
||||||
|
+if test -n "$MOZ_SYSTEM_THEORA"; then
|
||||||
|
+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST(MOZ_SYSTEM_THEORA)
|
||||||
|
+
|
||||||
|
+dnl ========================================================
|
||||||
|
+dnl Check for libSoundTouch
|
||||||
|
+dnl ========================================================
|
||||||
|
+
|
||||||
|
+MOZ_ARG_WITH_BOOL(system-soundtouch,
|
||||||
|
+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)],
|
||||||
|
+MOZ_SYSTEM_SOUNDTOUCH=1,
|
||||||
|
+MOZ_SYSTEM_SOUNDTOUCH=)
|
||||||
|
+
|
||||||
|
+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
|
||||||
|
+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)
|
||||||
|
+
|
||||||
|
+ AC_LANG_SAVE
|
||||||
|
+ AC_LANG_CPLUSPLUS
|
||||||
|
+ _SAVE_CXXFLAGS=$CXXFLAGS
|
||||||
|
+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
|
||||||
|
+ AC_CACHE_CHECK(for soundtouch sample type,
|
||||||
|
+ ac_cv_soundtouch_sample_type,
|
||||||
|
+ [AC_TRY_COMPILE([#include <SoundTouch.h>
|
||||||
|
+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES
|
||||||
|
+ #error soundtouch expects float samples
|
||||||
|
+ #endif],
|
||||||
|
+ [],
|
||||||
|
+ [ac_cv_soundtouch_sample_type=short],
|
||||||
|
+ [ac_cv_soundtouch_sample_type=float])])
|
||||||
|
+ CXXFLAGS=$_SAVE_CXXFLAGS
|
||||||
|
+ AC_LANG_RESTORE
|
||||||
|
+
|
||||||
|
+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
|
||||||
|
+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
|
||||||
|
+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
|
||||||
|
+ fi
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
|
||||||
|
+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH)
|
||||||
|
+fi
|
||||||
|
+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
|
||||||
|
+
|
||||||
|
dnl system libvpx Support
|
||||||
|
dnl ========================================================
|
||||||
|
MOZ_ARG_WITH_BOOL(system-libvpx,
|
||||||
|
--- icecat-60.5.0/toolkit/library/moz.build
|
||||||
|
+++ icecat-60.5.0/toolkit/library/moz.build
|
||||||
|
@@ -244,6 +244,21 @@
|
||||||
|
if CONFIG['MOZ_SYSTEM_HUNSPELL']:
|
||||||
|
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
|
||||||
|
|
||||||
|
+if CONFIG['MOZ_SYSTEM_OGG']:
|
||||||
|
+ OS_LIBS += CONFIG['MOZ_OGG_LIBS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_THEORA']:
|
||||||
|
+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_VORBIS']:
|
||||||
|
+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_TREMOR']:
|
||||||
|
+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
|
||||||
|
+
|
||||||
|
+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
|
||||||
|
+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
|
||||||
|
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
|
||||||
|
|
||||||
|
--- icecat-60.5.0/xpcom/build/XPCOMInit.cpp
|
||||||
|
+++ icecat-60.5.0/xpcom/build/XPCOMInit.cpp
|
||||||
|
@@ -139,7 +139,9 @@
|
||||||
|
|
||||||
|
#include "mozilla/ipc/GeckoChildProcessHost.h"
|
||||||
|
|
||||||
|
+#ifndef MOZ_OGG_NO_MEM_REPORTING
|
||||||
|
#include "ogg/ogg.h"
|
||||||
|
+#endif
|
||||||
|
#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
|
||||||
|
#if defined(HAVE_STDINT_H)
|
||||||
|
// mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in
|
||||||
|
@@ -635,10 +637,12 @@
|
||||||
|
// this oddness.
|
||||||
|
mozilla::SetICUMemoryFunctions();
|
||||||
|
|
||||||
|
+#ifndef MOZ_OGG_NO_MEM_REPORTING
|
||||||
|
// Do the same for libogg.
|
||||||
|
ogg_set_mem_functions(
|
||||||
|
OggReporter::CountingMalloc, OggReporter::CountingCalloc,
|
||||||
|
OggReporter::CountingRealloc, OggReporter::CountingFree);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING)
|
||||||
|
// And for VPX.
|
||||||
|
|
@ -1,24 +1,361 @@
|
||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
||||||
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Mark H Weaver <mhw@netris.org>
|
||||||
|
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||||
|
;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||||
|
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||||
|
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||||
|
;;; Copyright © 2017, 2018 Nikita <nikita@n0.is>
|
||||||
|
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
|
;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||||
|
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
||||||
|
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
|
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||||
|
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
|
||||||
|
;;; Copyright © 2020, 2021, 2022 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||||
|
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
|
||||||
|
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
||||||
|
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
||||||
|
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
|
;;; Copyright © 2021 Baptiste Strazzul <bstrazzull@hotmail.fr>
|
||||||
|
;;;
|
||||||
|
;;; This file is part of GNU Guix.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||||
|
;;; under the terms of the GNU General Public License as published by
|
||||||
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
;;; your option) any later version.
|
||||||
|
;;;
|
||||||
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||||
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
;;; GNU General Public License for more details.
|
||||||
|
;;;
|
||||||
|
;;; You should have received a copy of the GNU General Public License
|
||||||
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (icecustom)
|
(define-module (icecustom)
|
||||||
#:use-module (gnu packages gnuzilla)
|
#:use-module ((srfi srfi-1) #:hide (zip))
|
||||||
#:use-module (gnu packages base)
|
#:use-module (ice-9 match)
|
||||||
#:use-module (gnu packages python-xyz)
|
|
||||||
#:use-module (gnu packages commencement)
|
|
||||||
#:use-module (gnu packages python)
|
|
||||||
#:use-module (gnu packages compression)
|
|
||||||
#:use-module (gnu packages bash)
|
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix hg-download)
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix hg-download))
|
#:use-module (guix store)
|
||||||
|
#:use-module (guix monads)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system cargo)
|
||||||
|
#:use-module (guix build-system trivial)
|
||||||
|
#:use-module (gnu packages admin)
|
||||||
|
#:use-module (gnu packages audio)
|
||||||
|
#:use-module (gnu packages autotools)
|
||||||
|
#:use-module (gnu packages m4)
|
||||||
|
#:use-module (gnu packages base)
|
||||||
|
#:use-module (gnu packages bash)
|
||||||
|
#:use-module (gnu packages databases)
|
||||||
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gtk)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
|
#:use-module (gnu packages libcanberra)
|
||||||
|
#:use-module (gnu packages cups)
|
||||||
|
#:use-module (gnu packages kerberos)
|
||||||
|
#:use-module (gnu packages linux)
|
||||||
|
#:use-module (gnu packages perl)
|
||||||
|
#:use-module (gnu packages pkg-config)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages fontutils)
|
||||||
|
#:use-module (gnu packages fonts)
|
||||||
|
#:use-module (gnu packages hunspell)
|
||||||
|
#:use-module (gnu packages libevent)
|
||||||
|
#:use-module (gnu packages image)
|
||||||
|
#:use-module (gnu packages libffi)
|
||||||
|
#:use-module (gnu packages pulseaudio)
|
||||||
|
#:use-module (gnu packages python)
|
||||||
|
#:use-module (gnu packages python-xyz)
|
||||||
|
#:use-module (gnu packages node)
|
||||||
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
|
#:use-module (gnu packages pciutils)
|
||||||
|
#:use-module (gnu packages assembly)
|
||||||
|
#:use-module (gnu packages rust)
|
||||||
|
#:use-module (gnu packages rust-apps)
|
||||||
|
#:use-module (gnu packages llvm)
|
||||||
|
#:use-module (gnu packages nss)
|
||||||
|
#:use-module (gnu packages icu4c)
|
||||||
|
#:use-module (gnu packages video)
|
||||||
|
#:use-module (gnu packages xiph)
|
||||||
|
#:use-module (gnu packages xdisorg)
|
||||||
|
#:use-module (gnu packages readline)
|
||||||
|
#:use-module (gnu packages sqlite))
|
||||||
|
|
||||||
(define %icecat-base-version "102.7.0")
|
(define mozjs
|
||||||
(define computed-origin-method (@@ (guix packages) computed-origin-method))
|
(package
|
||||||
(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
|
(name "mozjs")
|
||||||
(define %icecat-build-id "20230606000000") ;must be of the form YYYYMMDDhhmmss
|
(version "102.2.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
;; TODO: Switch to IceCat source once available on ftp.gnu.org.
|
||||||
|
(uri (string-append "https://ftp.mozilla.org/pub/firefox"
|
||||||
|
"/releases/" version "esr/source/firefox-"
|
||||||
|
version "esr.source.tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
|
||||||
|
#:modules `((guix build cargo-utils)
|
||||||
|
,@%gnu-build-system-modules)
|
||||||
|
#:test-target "check-jstests"
|
||||||
|
#:configure-flags
|
||||||
|
#~(list
|
||||||
|
;; Disable debugging symbols to save space.
|
||||||
|
"--disable-debug"
|
||||||
|
"--disable-debug-symbols"
|
||||||
|
;; This is important because without it gjs will segfault during the
|
||||||
|
;; configure phase. With jemalloc only the standalone mozjs console
|
||||||
|
;; will work.
|
||||||
|
"--disable-jemalloc"
|
||||||
|
"--enable-tests"
|
||||||
|
"--enable-hardening"
|
||||||
|
"--enable-optimize"
|
||||||
|
"--enable-release"
|
||||||
|
"--enable-readline"
|
||||||
|
"--enable-shared-js"
|
||||||
|
"--with-system-icu"
|
||||||
|
"--with-system-nspr"
|
||||||
|
"--with-system-zlib"
|
||||||
|
"--with-intl-api")
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
||||||
|
(lambda _
|
||||||
|
(let ((null-hash
|
||||||
|
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
|
||||||
|
(for-each (lambda (file)
|
||||||
|
(format #t "patching checksums in ~a~%" file)
|
||||||
|
(substitute* file
|
||||||
|
(("^checksum = \".*\"")
|
||||||
|
(string-append "checksum = \"" null-hash "\""))))
|
||||||
|
(find-files "." "Cargo\\.lock$"))
|
||||||
|
(for-each generate-all-checksums
|
||||||
|
'("js" "third_party/rust")))))
|
||||||
|
(replace 'configure
|
||||||
|
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||||
|
;; The configure script does not accept environment variables as
|
||||||
|
;; arguments. It also must be run from a different directory,
|
||||||
|
;; but not the root directory either.
|
||||||
|
(mkdir "run-configure-from-here")
|
||||||
|
(chdir "run-configure-from-here")
|
||||||
|
(setenv "SHELL" (which "sh"))
|
||||||
|
(setenv "CONFIG_SHELL" (which "sh"))
|
||||||
|
(setenv "AUTOCONF" (which "autoconf"))
|
||||||
|
(apply invoke "python" "../configure.py"
|
||||||
|
"--enable-project=js"
|
||||||
|
(string-append "--prefix=" #$output)
|
||||||
|
configure-flags)))
|
||||||
|
(add-before 'check 'adjust-tests
|
||||||
|
(lambda _
|
||||||
|
(with-directory-excursion "../js/src/tests"
|
||||||
|
(substitute* "shell/os.js"
|
||||||
|
;; FIXME: Why does the killed process have an exit status?
|
||||||
|
((".*killed process should not have exitStatus.*")
|
||||||
|
""))
|
||||||
|
|
||||||
|
;; The test suite expects a lightly patched ICU. Disable tests
|
||||||
|
;; that do not work with the system version. See
|
||||||
|
;; "intl/icu-patches" for clues.
|
||||||
|
|
||||||
|
;; See <https://unicode-org.atlassian.net/browse/ICU-20992> and
|
||||||
|
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=1636984> and
|
||||||
|
;; related patch for why this is failing.
|
||||||
|
(delete-file "non262/Intl/DateTimeFormat/\
|
||||||
|
fractional-second-digits-append-item.js")
|
||||||
|
;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)"
|
||||||
|
(delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js")
|
||||||
|
;; FIXME: got "en-US-posix", expected "en-US-POSIX".
|
||||||
|
(delete-file "non262/Intl/available-locales-supported.js")
|
||||||
|
;; FIXME: got "en-US", expected "en-US-POSIX"
|
||||||
|
(delete-file "non262/Intl/available-locales-resolved.js"))))
|
||||||
|
(add-before 'check 'pre-check
|
||||||
|
(lambda _
|
||||||
|
(setenv "JSTESTS_EXTRA_ARGS"
|
||||||
|
(string-join
|
||||||
|
(list
|
||||||
|
;; Do not run tests marked as "random".
|
||||||
|
"--exclude-random"
|
||||||
|
;; Exclude web platform tests.
|
||||||
|
"--wpt=disabled"
|
||||||
|
;; Respect the daemons configured number of jobs.
|
||||||
|
(string-append "--worker-count="
|
||||||
|
(number->string (parallel-job-count)))))))))))
|
||||||
|
(native-inputs
|
||||||
|
(list autoconf
|
||||||
|
llvm ;for llvm-objdump
|
||||||
|
m4
|
||||||
|
perl
|
||||||
|
pkg-config
|
||||||
|
python-wrapper
|
||||||
|
rust
|
||||||
|
`(,rust "cargo")))
|
||||||
|
(inputs
|
||||||
|
(list icu4c readline zlib))
|
||||||
|
(propagated-inputs
|
||||||
|
(list nspr)) ; in the Requires.private field of mozjs-*.pc
|
||||||
|
(home-page
|
||||||
|
"https://spidermonkey.dev/")
|
||||||
|
(synopsis "Mozilla JavaScript engine")
|
||||||
|
(description "SpiderMonkey is Mozilla's JavaScript engine written
|
||||||
|
in C/C++.")
|
||||||
|
(license license:mpl2.0))) ; and others for some files
|
||||||
|
|
||||||
|
(define mozjs-91
|
||||||
|
(package
|
||||||
|
(inherit mozjs)
|
||||||
|
(version "91.13.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://ftp.mozilla.org/pub/firefox"
|
||||||
|
"/releases/" version "esr/source/firefox-"
|
||||||
|
version "esr.source.tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk"))))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments mozjs)
|
||||||
|
((#:phases phases)
|
||||||
|
#~(modify-phases #$phases
|
||||||
|
(add-before 'check 'disable-timezone-tests
|
||||||
|
(lambda _
|
||||||
|
(with-directory-excursion "../js/src/tests"
|
||||||
|
;; FIXME: Assertion failed: got "2021a", expected "2021a3"?
|
||||||
|
(delete-file "non262/Intl/DateTimeFormat/timeZone_version.js")
|
||||||
|
;; XXX: Delete all tests that test time zone functionality,
|
||||||
|
;; because the test suite uses /etc/localtime to figure out
|
||||||
|
;; the offset from the hardware clock, which does not work
|
||||||
|
;; in the build container. See <tests/non262/Date/shell.js>.
|
||||||
|
(delete-file-recursively "non262/Date")
|
||||||
|
(delete-file
|
||||||
|
"non262/Intl/DateTimeFormat/tz-environment-variable.js"))))))))
|
||||||
|
(inputs (modify-inputs (package-inputs mozjs)
|
||||||
|
(replace "icu4c" icu4c-69)))))
|
||||||
|
|
||||||
|
(define mozjs-78
|
||||||
|
(package
|
||||||
|
(inherit mozjs)
|
||||||
|
(name "mozjs")
|
||||||
|
(version "78.15.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://archive.mozilla.org/pub/firefox"
|
||||||
|
"/releases/" version "esr/source/firefox-"
|
||||||
|
version "esr.source.tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments mozjs)
|
||||||
|
((#:phases phases)
|
||||||
|
#~(modify-phases #$phases
|
||||||
|
(replace 'configure
|
||||||
|
(lambda* (#:key configure-flags #:allow-other-keys)
|
||||||
|
;; The configure script does not accept environment variables as
|
||||||
|
;; arguments. It also must be run from a different directory,
|
||||||
|
;; but not the root directory either.
|
||||||
|
(mkdir "run-configure-from-here")
|
||||||
|
(chdir "run-configure-from-here")
|
||||||
|
(setenv "SHELL" (which "sh"))
|
||||||
|
(setenv "CONFIG_SHELL" (which "sh"))
|
||||||
|
(setenv "AUTOCONF" (which "autoconf"))
|
||||||
|
(apply invoke "../js/src/configure"
|
||||||
|
(cons (string-append "--prefix=" #$output)
|
||||||
|
configure-flags))))
|
||||||
|
(replace 'adjust-tests
|
||||||
|
(lambda _
|
||||||
|
(with-directory-excursion "../js/src/tests"
|
||||||
|
;; The test suite expects a lightly patched ICU 67. Since
|
||||||
|
;; Guix is about to switch to ICU 68, massage the tests to
|
||||||
|
;; work with that instead of patching ICU. Try removing this
|
||||||
|
;; phase for newer versions of mozjs.
|
||||||
|
|
||||||
|
;; These tests look up locale names and expects to get
|
||||||
|
;; "GB" instead of "UK".
|
||||||
|
(substitute* "non262/Intl/DisplayNames/language.js"
|
||||||
|
(("Traditionell, GB")
|
||||||
|
"Traditionell, UK"))
|
||||||
|
(substitute* "non262/Intl/DisplayNames/region.js"
|
||||||
|
(("\"GB\": \"GB\"")
|
||||||
|
"\"GB\": \"UK\""))
|
||||||
|
|
||||||
|
;; XXX: Some localized time formats have changed, and
|
||||||
|
;; substitution fails for accented characters, even though
|
||||||
|
;; it works in the REPL(?). Just delete these for now.
|
||||||
|
(delete-file "non262/Intl/Date/toLocaleString_timeZone.js")
|
||||||
|
(delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js")
|
||||||
|
|
||||||
|
;; Similarly, these get an unexpected "A" suffix when looking
|
||||||
|
;; up a time in the "ar-MA-u-ca-islamicc" locale, which is
|
||||||
|
;; tricky to substitute.
|
||||||
|
(delete-file "non262/Intl/DateTimeFormat/format_timeZone.js")
|
||||||
|
(delete-file "non262/Intl/DateTimeFormat/format.js")
|
||||||
|
|
||||||
|
;; This file compares a generated list of ICU locale names
|
||||||
|
;; with actual lookups. Some have changed slightly, i.e.
|
||||||
|
;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity.
|
||||||
|
(delete-file "non262/Intl/Locale/likely-subtags-generated.js"))))
|
||||||
|
(replace 'pre-check
|
||||||
|
(lambda _
|
||||||
|
(with-directory-excursion "../js/src/tests"
|
||||||
|
(substitute* "shell/os.js"
|
||||||
|
;; FIXME: Why does the killed process have an exit status?
|
||||||
|
((".*killed process should not have exitStatus.*")
|
||||||
|
""))
|
||||||
|
|
||||||
|
;; XXX: Delete all tests that test time zone functionality,
|
||||||
|
;; because the test suite uses /etc/localtime to figure out
|
||||||
|
;; the offset from the hardware clock, which does not work
|
||||||
|
;; in the build container. See <tests/non262/Date/shell.js>.
|
||||||
|
(delete-file-recursively "non262/Date")
|
||||||
|
(delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")
|
||||||
|
|
||||||
|
(setenv "JSTESTS_EXTRA_ARGS"
|
||||||
|
(string-join
|
||||||
|
(list
|
||||||
|
;; Do not run tests marked as "random".
|
||||||
|
"--exclude-random"
|
||||||
|
;; Exclude web platform tests.
|
||||||
|
"--wpt=disabled"
|
||||||
|
;; Respect the daemons configured number of jobs.
|
||||||
|
(string-append "--worker-count="
|
||||||
|
(number->string
|
||||||
|
(parallel-job-count)))))))))))))
|
||||||
|
(native-inputs
|
||||||
|
(list autoconf-2.13
|
||||||
|
automake
|
||||||
|
llvm ;for llvm-objdump
|
||||||
|
perl
|
||||||
|
pkg-config
|
||||||
|
python-3
|
||||||
|
rust
|
||||||
|
`(,rust "cargo")))
|
||||||
|
(inputs
|
||||||
|
(list icu4c-69 readline zlib))))
|
||||||
|
|
||||||
|
(define mozilla-compare-locales
|
||||||
|
(origin
|
||||||
|
(method hg-fetch)
|
||||||
|
(uri (hg-reference
|
||||||
|
(url "https://hg.mozilla.org/l10n/compare-locales/")
|
||||||
|
(changeset "RELEASE_8_1_0")))
|
||||||
|
(file-name "mozilla-compare-locales")
|
||||||
|
(sha256 (base32 "00bpkaqf2ng1nn9ajyb5mli0jq58q5fm2n3yy90jy0hp4q2gbs50"))))
|
||||||
|
|
||||||
(define (mozilla-locale locale changeset hash-string)
|
(define (mozilla-locale locale changeset hash-string)
|
||||||
(origin
|
(origin
|
||||||
|
|
@ -38,7 +375,7 @@
|
||||||
(mozilla-locales
|
(mozilla-locales
|
||||||
;; sha256 changeset locale
|
;; sha256 changeset locale
|
||||||
;;---------------------------------------------------------------------------
|
;;---------------------------------------------------------------------------
|
||||||
("1s59ihmj8x6z0ssq4xav689jb5azrpdnay8csgjm1b9pw7wmvcli" "a6940ae1a02f" "ach")
|
("1y562h0dg33vhhhwfk6jl7xbr67gng21vcf3rpm96zzcgbnf8rjj" "503a7baec899" "ach")
|
||||||
("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af")
|
("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af")
|
||||||
("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an")
|
("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an")
|
||||||
("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar")
|
("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar")
|
||||||
|
|
@ -137,24 +474,23 @@
|
||||||
("0jg676vd37wqgzjnm0yynj7xrvm6fsgdwg296h78wnyc33zc4ads" "edd4e468bc31" "zh-CN")
|
("0jg676vd37wqgzjnm0yynj7xrvm6fsgdwg296h78wnyc33zc4ads" "edd4e468bc31" "zh-CN")
|
||||||
("1y4wldm3z95mfjlficp994jyqg0lj07wi35b79dy1s8ljy3jilil" "0bad1f7d2b2d" "zh-TW")))
|
("1y4wldm3z95mfjlficp994jyqg0lj07wi35b79dy1s8ljy3jilil" "0bad1f7d2b2d" "zh-TW")))
|
||||||
|
|
||||||
(define mozilla-compare-locales
|
;; XXXX: Workaround 'snippet' limitations.
|
||||||
(origin
|
(define computed-origin-method (@@ (guix packages) computed-origin-method))
|
||||||
(method hg-fetch)
|
|
||||||
(uri (hg-reference
|
(define %icecat-version "102.7.0-guix0-preview1")
|
||||||
(url "https://hg.mozilla.org/l10n/compare-locales/")
|
(define %icecat-build-id "20230117000000") ;must be of the form YYYYMMDDhhmmss
|
||||||
(changeset "RELEASE_8_1_0")))
|
|
||||||
(file-name "mozilla-compare-locales")
|
|
||||||
(sha256 (base32 "00bpkaqf2ng1nn9ajyb5mli0jq58q5fm2n3yy90jy0hp4q2gbs50"))))
|
|
||||||
|
|
||||||
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
|
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
|
||||||
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
|
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
|
||||||
;; script from the upstream IceCat project.
|
;; script from the upstream IceCat project.
|
||||||
(define icecat-source-102.7
|
(define-public icecat-custom-source
|
||||||
(let* ((major-version (first (string-split %icecat-base-version #\.)))
|
(let* ((base-version (first (string-split %icecat-version #\-)))
|
||||||
(minor-version (second (string-split %icecat-base-version #\.)))
|
|
||||||
(sub-version (third (string-split %icecat-base-version #\.)))
|
|
||||||
|
|
||||||
(upstream-firefox-version (string-append %icecat-base-version "esr"))
|
(major-version (first (string-split base-version #\.)))
|
||||||
|
(minor-version (second (string-split base-version #\.)))
|
||||||
|
(sub-version (third (string-split base-version #\.)))
|
||||||
|
|
||||||
|
(upstream-firefox-version (string-append base-version "esr"))
|
||||||
(upstream-firefox-source
|
(upstream-firefox-source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
@ -166,10 +502,9 @@
|
||||||
(base32
|
(base32
|
||||||
"1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957"))))
|
"1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957"))))
|
||||||
|
|
||||||
;; The upstream-icecat-base-version may be older than the
|
(upstream-icecat-base-version "102.7.0") ; maybe older than base-version
|
||||||
;; %icecat-base-version.
|
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
|
||||||
(upstream-icecat-base-version "102.7.0")
|
(gnuzilla-commit "7f76da3cfd5d04fa38d894f6ea6ac5f2fd0ea837")
|
||||||
(gnuzilla-commit "b2d463b0e331795eebe3ee62f2c58c1bd05b9899")
|
|
||||||
(gnuzilla-source
|
(gnuzilla-source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
|
@ -181,7 +516,7 @@
|
||||||
(string-take gnuzilla-commit 8)))
|
(string-take gnuzilla-commit 8)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0db03i3xmapdr0xyb9yg6cl66kyxavnl22hhhnf85ffnlfrcdx2r"))))
|
"19i66qvwzgllgnlw270bxphymybjj1qb5hdznqi4i2dcgpcrq77l"))))
|
||||||
|
|
||||||
;; 'search-patch' returns either a valid file name or #f, so wrap it
|
;; 'search-patch' returns either a valid file name or #f, so wrap it
|
||||||
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
|
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
|
||||||
|
|
@ -199,13 +534,14 @@
|
||||||
#~(begin
|
#~(begin
|
||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
(let ((firefox-dir
|
(let ((firefox-dir
|
||||||
(string-append "firefox-" #$%icecat-base-version))
|
(string-append "firefox-" #$base-version))
|
||||||
(icecat-dir
|
(icecat-dir
|
||||||
(string-append "icecat-" #$%icecat-version)))
|
(string-append "icecat-" #$%icecat-version)))
|
||||||
|
|
||||||
(set-path-environment-variable
|
(set-path-environment-variable
|
||||||
"PATH" '("bin")
|
"PATH" '("bin")
|
||||||
(list #+python
|
(list #+rename
|
||||||
|
#+python
|
||||||
#+(canonical-package bash)
|
#+(canonical-package bash)
|
||||||
#+(canonical-package coreutils)
|
#+(canonical-package coreutils)
|
||||||
#+(canonical-package findutils)
|
#+(canonical-package findutils)
|
||||||
|
|
@ -227,6 +563,9 @@
|
||||||
(package-transitive-propagated-inputs
|
(package-transitive-propagated-inputs
|
||||||
python-jsonschema))))
|
python-jsonschema))))
|
||||||
|
|
||||||
|
;; Needed by the 'makeicecat' script.
|
||||||
|
(setenv "RENAME_CMD" "rename")
|
||||||
|
|
||||||
;; We copy the gnuzilla source directory because it is
|
;; We copy the gnuzilla source directory because it is
|
||||||
;; read-only in 'gnuzilla-source', and the makeicecat script
|
;; read-only in 'gnuzilla-source', and the makeicecat script
|
||||||
;; uses "cp -a" to copy parts of it and assumes that the
|
;; uses "cp -a" to copy parts of it and assumes that the
|
||||||
|
|
@ -314,9 +653,446 @@
|
||||||
"--sort=name"
|
"--sort=name"
|
||||||
icecat-dir)))))))))
|
icecat-dir)))))))))
|
||||||
|
|
||||||
(define-public icecat-102.7
|
(define-public icecat-custom
|
||||||
(package
|
(package
|
||||||
(inherit icecat-minimal)
|
(name "icecat-custom")
|
||||||
(name "icecat-102.7")
|
(version %icecat-version)
|
||||||
(version "102.7.0-guix0-preview1")
|
(source icecat-custom-source)
|
||||||
(source icecat-source-102.7)))
|
(build-system gnu-build-system)
|
||||||
|
(inputs
|
||||||
|
(list alsa-lib
|
||||||
|
bzip2
|
||||||
|
cups
|
||||||
|
dbus-glib
|
||||||
|
gdk-pixbuf
|
||||||
|
glib
|
||||||
|
gtk+
|
||||||
|
gtk+-2
|
||||||
|
;; UNBUNDLE-ME! graphite2
|
||||||
|
cairo
|
||||||
|
pango
|
||||||
|
freetype
|
||||||
|
font-dejavu
|
||||||
|
;; UNBUNDLE-ME! harfbuzz
|
||||||
|
libcanberra
|
||||||
|
libgnome
|
||||||
|
libjpeg-turbo
|
||||||
|
libpng-apng
|
||||||
|
;; UNBUNDLE-ME! libogg
|
||||||
|
;; UNBUNDLE-ME! libtheora ; wants theora-1.2, not yet released
|
||||||
|
;; UNBUNDLE-ME! libvorbis
|
||||||
|
libxft
|
||||||
|
libevent
|
||||||
|
libxinerama
|
||||||
|
libxscrnsaver
|
||||||
|
libxcomposite
|
||||||
|
libxt
|
||||||
|
libffi
|
||||||
|
ffmpeg
|
||||||
|
libvpx
|
||||||
|
icu4c ; TODO: Change to 'icu4c' when its version is >= 71.
|
||||||
|
pixman
|
||||||
|
pulseaudio
|
||||||
|
mesa
|
||||||
|
pciutils
|
||||||
|
mit-krb5
|
||||||
|
hunspell
|
||||||
|
libnotify
|
||||||
|
;; See <https://bugs.gnu.org/32833>
|
||||||
|
;; and related comments in the 'remove-bundled-libraries' phase.
|
||||||
|
;; UNBUNDLE-ME! nspr
|
||||||
|
;; UNBUNDLE-ME! nss
|
||||||
|
shared-mime-info
|
||||||
|
sqlite
|
||||||
|
eudev
|
||||||
|
unzip
|
||||||
|
zip
|
||||||
|
zlib))
|
||||||
|
(native-inputs
|
||||||
|
;; The following patches are specific to the Guix packaging of IceCat,
|
||||||
|
;; and therefore we prefer to leave them out of 'source', which should be
|
||||||
|
;; a tarball suitable for compilation on any system that IceCat supports.
|
||||||
|
;; (Bug fixes and security fixes, however, should go in 'source').
|
||||||
|
(list
|
||||||
|
;; XXX TODO: Adapt these patches to IceCat 102.
|
||||||
|
;; ("icecat-avoid-bundled-libraries.patch"
|
||||||
|
;; ,(search-patch "icecat-avoid-bundled-libraries.patch"))
|
||||||
|
;; ("icecat-use-system-graphite2+harfbuzz.patch"
|
||||||
|
;; ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch"))
|
||||||
|
;; ("icecat-use-system-media-libs.patch"
|
||||||
|
;; ,(search-patch "icecat-use-system-media-libs.patch"))
|
||||||
|
rust
|
||||||
|
`(,rust "cargo")
|
||||||
|
rust-cbindgen-0.23
|
||||||
|
llvm
|
||||||
|
clang
|
||||||
|
perl
|
||||||
|
node
|
||||||
|
python-wrapper
|
||||||
|
yasm
|
||||||
|
nasm ; XXX FIXME: only needed on x86_64 and i686
|
||||||
|
pkg-config
|
||||||
|
m4
|
||||||
|
which))
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ;not worth the cost
|
||||||
|
|
||||||
|
;; Some dynamic lib was determined at runtime, so rpath check may fail.
|
||||||
|
#:validate-runpath? #f
|
||||||
|
|
||||||
|
#:configure-flags
|
||||||
|
#~(list
|
||||||
|
"--enable-application=browser"
|
||||||
|
"--with-distribution-id=org.gnu"
|
||||||
|
"--enable-geckodriver"
|
||||||
|
;; Do not require addons in the global app or system directories to
|
||||||
|
;; be signed by Mozilla.
|
||||||
|
"--with-unsigned-addon-scopes=app,system"
|
||||||
|
"--allow-addon-sideload"
|
||||||
|
|
||||||
|
"--enable-pulseaudio"
|
||||||
|
|
||||||
|
"--disable-tests"
|
||||||
|
"--disable-updater"
|
||||||
|
"--disable-crashreporter"
|
||||||
|
"--disable-eme"
|
||||||
|
|
||||||
|
;; Building with debugging symbols takes ~5GiB, so disable it.
|
||||||
|
"--disable-debug"
|
||||||
|
"--disable-debug-symbols"
|
||||||
|
|
||||||
|
"--enable-rust-simd"
|
||||||
|
"--enable-release"
|
||||||
|
"--enable-optimize"
|
||||||
|
"--enable-strip"
|
||||||
|
"--disable-elf-hack"
|
||||||
|
|
||||||
|
;; Clang is needed to build Stylo, Mozilla's new CSS engine. We must
|
||||||
|
;; specify the clang paths manually, because otherwise the Mozilla
|
||||||
|
;; build system looks in the directories returned by llvm-config
|
||||||
|
;; --bindir and llvm-config --libdir, which return paths in the llvm
|
||||||
|
;; package where clang is not found.
|
||||||
|
(string-append "--with-clang-path="
|
||||||
|
(search-input-file %build-inputs "bin/clang"))
|
||||||
|
(string-append "--with-libclang-path="
|
||||||
|
(dirname (search-input-file %build-inputs
|
||||||
|
"lib/libclang.so")))
|
||||||
|
|
||||||
|
;; Hack to work around missing "unofficial" branding in icecat.
|
||||||
|
"--enable-official-branding"
|
||||||
|
|
||||||
|
;; TODO: Add support for wasm sandboxed libraries.
|
||||||
|
"--without-wasm-sandboxed-libraries"
|
||||||
|
|
||||||
|
;; Avoid bundled libraries.
|
||||||
|
"--with-system-jpeg" ;must be libjpeg-turbo
|
||||||
|
"--with-system-png" ;must be libpng-apng
|
||||||
|
"--with-system-zlib"
|
||||||
|
;; UNBUNDLE-ME! "--with-system-bz2"
|
||||||
|
;; UNBUNDLE-ME! "--with-system-libevent"
|
||||||
|
;; UNBUNDLE-ME! "--with-system-ogg"
|
||||||
|
;; UNBUNDLE-ME! "--with-system-vorbis"
|
||||||
|
;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released
|
||||||
|
;; UNBUNDLE-ME! "--with-system-libvpx"
|
||||||
|
"--with-system-icu"
|
||||||
|
|
||||||
|
;; See <https://bugs.gnu.org/32833>
|
||||||
|
;; and related comments in the
|
||||||
|
;; 'remove-bundled-libraries' phase below.
|
||||||
|
;; UNBUNDLE-ME! "--with-system-nspr"
|
||||||
|
;; UNBUNDLE-ME! "--with-system-nss"
|
||||||
|
|
||||||
|
;; UNBUNDLE-ME! "--with-system-harfbuzz"
|
||||||
|
;; UNBUNDLE-ME! "--with-system-graphite2"
|
||||||
|
"--enable-system-pixman"
|
||||||
|
"--enable-system-ffi"
|
||||||
|
;; UNBUNDLE-ME! "--enable-system-sqlite"
|
||||||
|
)
|
||||||
|
|
||||||
|
#:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
|
||||||
|
|
||||||
|
#:modules `((ice-9 ftw)
|
||||||
|
(ice-9 match)
|
||||||
|
(srfi srfi-1)
|
||||||
|
(srfi srfi-26)
|
||||||
|
(rnrs bytevectors)
|
||||||
|
(rnrs io ports)
|
||||||
|
(guix elf)
|
||||||
|
(guix build gremlin)
|
||||||
|
,@%gnu-build-system-modules)
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'apply-guix-specific-patches
|
||||||
|
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||||
|
(let ((patch (search-input-file inputs "bin/patch")))
|
||||||
|
(for-each (match-lambda
|
||||||
|
((label . file)
|
||||||
|
(when (and (string-prefix? "icecat-" label)
|
||||||
|
(string-suffix? ".patch" label))
|
||||||
|
(format #t "applying '~a'...~%" file)
|
||||||
|
(invoke patch "--force" "--no-backup-if-mismatch"
|
||||||
|
"-p1" "--input" file))))
|
||||||
|
(or native-inputs inputs)))))
|
||||||
|
(add-after 'apply-guix-specific-patches 'remove-bundled-libraries
|
||||||
|
(lambda _
|
||||||
|
;; Remove bundled libraries that we don't use, since they may
|
||||||
|
;; contain unpatched security flaws, they waste disk space and
|
||||||
|
;; memory, and may cause confusion.
|
||||||
|
(for-each (lambda (file)
|
||||||
|
(format #t "deleting '~a'...~%" file)
|
||||||
|
(delete-file-recursively file))
|
||||||
|
'( ;; FIXME: Removing the bundled icu breaks configure.
|
||||||
|
;; * The bundled icu headers are used in some places.
|
||||||
|
;; * The version number is taken from the bundled copy.
|
||||||
|
;;"intl/icu"
|
||||||
|
;;
|
||||||
|
;; FIXME: A script from the bundled nspr is used.
|
||||||
|
;;"nsprpub"
|
||||||
|
;;
|
||||||
|
;; FIXME: With the update to IceCat 60, using system NSS
|
||||||
|
;; broke certificate validation. See
|
||||||
|
;; <https://bugs.gnu.org/32833>. For now, we use
|
||||||
|
;; the bundled NSPR and NSS. TODO: Investigate,
|
||||||
|
;; and try to unbundle these libraries again.
|
||||||
|
;; UNBUNDLE-ME! "security/nss"
|
||||||
|
;;
|
||||||
|
;; TODO: Use more system media libraries. See:
|
||||||
|
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=517422>
|
||||||
|
;; * libtheora: esr60 wants v1.2, not yet released.
|
||||||
|
;; * soundtouch: avoiding the bundled library would
|
||||||
|
;; result in some loss of functionality. There's
|
||||||
|
;; also an issue with exception handling
|
||||||
|
;; configuration. It seems that this is needed in
|
||||||
|
;; some moz.build:
|
||||||
|
;; DEFINES['ST_NO_EXCEPTION_HANDLING'] = 1
|
||||||
|
;; * libopus
|
||||||
|
;; * speex
|
||||||
|
;;
|
||||||
|
"modules/freetype2"
|
||||||
|
;; "media/libjpeg" ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build
|
||||||
|
;; UNBUNDLE-ME! "modules/zlib"
|
||||||
|
;; UNBUNDLE-ME! "ipc/chromium/src/third_party/libevent"
|
||||||
|
;; UNBUNDLE-ME! "media/libvpx"
|
||||||
|
;; UNBUNDLE-ME! "media/libogg"
|
||||||
|
;; UNBUNDLE-ME! "media/libvorbis"
|
||||||
|
;; UNBUNDLE-ME! "media/libtheora" ; wants theora-1.2, not yet released
|
||||||
|
;; UNBUNDLE-ME! "media/libtremor"
|
||||||
|
;; UNBUNDLE-ME! "gfx/harfbuzz"
|
||||||
|
;; UNBUNDLE-ME! "gfx/graphite2"
|
||||||
|
"js/src/ctypes/libffi"
|
||||||
|
;; UNBUNDLE-ME! "db/sqlite3"
|
||||||
|
))))
|
||||||
|
(add-after 'remove-bundled-libraries 'fix-ffmpeg-runtime-linker
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
;; Arrange to load libavcodec.so by its absolute file name.
|
||||||
|
(substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp"
|
||||||
|
(("libavcodec\\.so")
|
||||||
|
(search-input-file inputs "lib/libavcodec.so")))))
|
||||||
|
(add-after 'fix-ffmpeg-runtime-linker 'build-sandbox-whitelist
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(define (runpath-of lib)
|
||||||
|
(call-with-input-file lib
|
||||||
|
(compose elf-dynamic-info-runpath
|
||||||
|
elf-dynamic-info
|
||||||
|
parse-elf
|
||||||
|
get-bytevector-all)))
|
||||||
|
(define (runpaths-of-input label)
|
||||||
|
(let* ((dir (string-append (assoc-ref inputs label) "/lib"))
|
||||||
|
(libs (find-files dir "\\.so$")))
|
||||||
|
(append-map runpath-of libs)))
|
||||||
|
;; Populate the sandbox read-path whitelist as needed by ffmpeg.
|
||||||
|
(let* ((whitelist
|
||||||
|
(map (cut string-append <> "/")
|
||||||
|
(delete-duplicates
|
||||||
|
`(,(string-append (assoc-ref inputs "shared-mime-info")
|
||||||
|
"/share/mime")
|
||||||
|
,(string-append (assoc-ref inputs "font-dejavu")
|
||||||
|
"/share/fonts")
|
||||||
|
"/run/current-system/profile/share/fonts"
|
||||||
|
,@(append-map runpaths-of-input
|
||||||
|
'("mesa" "ffmpeg"))))))
|
||||||
|
(whitelist-string (string-join whitelist ","))
|
||||||
|
(port (open-file "browser/app/profile/icecat.js" "a")))
|
||||||
|
(format #t "setting 'security.sandbox.content.read_path_whitelist' to '~a'~%"
|
||||||
|
whitelist-string)
|
||||||
|
(format port "~%pref(\"security.sandbox.content.read_path_whitelist\", ~S);~%"
|
||||||
|
whitelist-string)
|
||||||
|
(close-output-port port))))
|
||||||
|
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
||||||
|
(lambda _
|
||||||
|
(use-modules (guix build cargo-utils))
|
||||||
|
(let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
|
||||||
|
(for-each (lambda (file)
|
||||||
|
(format #t "patching checksums in ~a~%" file)
|
||||||
|
(substitute* file
|
||||||
|
(("^checksum = \".*\"")
|
||||||
|
(string-append "checksum = \"" null-hash "\""))))
|
||||||
|
(find-files "." "Cargo.lock$"))
|
||||||
|
(for-each generate-all-checksums
|
||||||
|
'("services"
|
||||||
|
"js"
|
||||||
|
"third_party/rust"
|
||||||
|
"dom/media"
|
||||||
|
"dom/webauthn"
|
||||||
|
"toolkit"
|
||||||
|
"gfx"
|
||||||
|
"storage"
|
||||||
|
"modules"
|
||||||
|
"xpcom/rust"
|
||||||
|
"media"
|
||||||
|
"mozglue/static/rust"
|
||||||
|
"netwerk"
|
||||||
|
"remote"
|
||||||
|
"intl"
|
||||||
|
"servo"
|
||||||
|
"security/manager/ssl"
|
||||||
|
"build")))))
|
||||||
|
(add-after 'patch-cargo-checksums 'remove-cargo-frozen-flag
|
||||||
|
(lambda _
|
||||||
|
;; Remove --frozen flag from cargo invokation, otherwise it'll
|
||||||
|
;; complain that it's not able to change Cargo.lock.
|
||||||
|
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
|
||||||
|
(substitute* "build/RunCbindgen.py"
|
||||||
|
(("\"--frozen\",") ""))))
|
||||||
|
(delete 'bootstrap)
|
||||||
|
(replace 'configure
|
||||||
|
;; configure does not work followed by both "SHELL=..." and
|
||||||
|
;; "CONFIG_SHELL=..."; set environment variables instead
|
||||||
|
(lambda* (#:key outputs configure-flags #:allow-other-keys)
|
||||||
|
(let* ((bash (which "bash"))
|
||||||
|
(abs-srcdir (getcwd))
|
||||||
|
(flags `(,(string-append "--prefix=" #$output)
|
||||||
|
,(string-append "--with-l10n-base="
|
||||||
|
abs-srcdir "/l10n")
|
||||||
|
,@configure-flags)))
|
||||||
|
(setenv "SHELL" bash)
|
||||||
|
(setenv "CONFIG_SHELL" bash)
|
||||||
|
|
||||||
|
(setenv "AR" "llvm-ar")
|
||||||
|
(setenv "NM" "llvm-nm")
|
||||||
|
(setenv "CC" "clang")
|
||||||
|
(setenv "CXX" "clang++")
|
||||||
|
(setenv "LDFLAGS" (string-append "-Wl,-rpath="
|
||||||
|
#$output "/lib/icecat"))
|
||||||
|
|
||||||
|
(setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system")
|
||||||
|
(setenv "MOZ_BUILD_DATE" #$%icecat-build-id) ; avoid timestamp
|
||||||
|
|
||||||
|
;; XXX TODO: Fix this to work on systems other than x86_64-linux.
|
||||||
|
(setenv "GUIX_PYTHONPATH"
|
||||||
|
(string-append (getcwd)
|
||||||
|
"/obj-x86_64-pc-linux-gnu/_virtualenvs/build"))
|
||||||
|
|
||||||
|
(mkdir ".mozbuild")
|
||||||
|
(setenv "MOZBUILD_STATE_PATH"
|
||||||
|
(string-append (getcwd) "/.mozbuild"))
|
||||||
|
|
||||||
|
(format #t "build directory: ~s~%" (getcwd))
|
||||||
|
(format #t "configure flags: ~s~%" flags)
|
||||||
|
|
||||||
|
(call-with-output-file "mozconfig"
|
||||||
|
(lambda (port)
|
||||||
|
(for-each (lambda (flag)
|
||||||
|
(format port "ac_add_options ~a\n" flag))
|
||||||
|
flags)))
|
||||||
|
|
||||||
|
(invoke "./mach" "configure"))))
|
||||||
|
(replace 'build
|
||||||
|
(lambda* (#:key (make-flags '()) (parallel-build? #t)
|
||||||
|
#:allow-other-keys)
|
||||||
|
(apply invoke "./mach" "build"
|
||||||
|
;; mach will use parallel build if possible by default
|
||||||
|
`(,@(if parallel-build?
|
||||||
|
'()
|
||||||
|
'("-j1"))
|
||||||
|
,@make-flags))))
|
||||||
|
(add-after 'build 'neutralise-store-references
|
||||||
|
(lambda _
|
||||||
|
;; Mangle the store references to compilers & other build tools in
|
||||||
|
;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64.
|
||||||
|
(let* ((obj-dir (match (scandir "." (cut string-prefix? "obj-" <>))
|
||||||
|
((dir) dir)))
|
||||||
|
(file (string-append
|
||||||
|
obj-dir
|
||||||
|
"/dist/bin/chrome/toolkit/content/global/buildconfig.html")))
|
||||||
|
(substitute* file
|
||||||
|
(("[0-9a-df-np-sv-z]{32}" hash)
|
||||||
|
(string-append (string-take hash 8)
|
||||||
|
"<!-- Guix: not a runtime dependency -->"
|
||||||
|
(string-drop hash 8)))))))
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(invoke "./mach" "install")
|
||||||
|
;; The geckodriver binary is not installed by the above, for some
|
||||||
|
;; reason. Use 'find-files' to avoid having to deal with the
|
||||||
|
;; system/architecture-specific file name.
|
||||||
|
(install-file (first (find-files "." "geckodriver"))
|
||||||
|
(string-append #$output "/bin"))))
|
||||||
|
(add-after 'install 'wrap-program
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(let* ((lib (string-append #$output "/lib"))
|
||||||
|
(gtk #$(this-package-input "gtk+"))
|
||||||
|
(gtk-share (string-append gtk "/share"))
|
||||||
|
(ld-libs '#$(map (lambda (label)
|
||||||
|
(file-append (this-package-input label) "/lib"))
|
||||||
|
'("libpng-apng"
|
||||||
|
"libxscrnsaver"
|
||||||
|
"mesa"
|
||||||
|
"pciutils"
|
||||||
|
"mit-krb5"
|
||||||
|
"eudev"
|
||||||
|
"pulseaudio"
|
||||||
|
;; For the integration of native notifications
|
||||||
|
"libnotify"))))
|
||||||
|
(wrap-program (car (find-files lib "^icecat$"))
|
||||||
|
`("XDG_DATA_DIRS" prefix (,gtk-share))
|
||||||
|
;; The following line is commented out because the icecat
|
||||||
|
;; package on guix has been observed to be unstable when
|
||||||
|
;; using wayland, and the bundled extensions stop working.
|
||||||
|
;; `("MOZ_ENABLE_WAYLAND" = ("1"))
|
||||||
|
`("LD_LIBRARY_PATH" prefix ,ld-libs)))))
|
||||||
|
(add-after 'wrap-program 'install-desktop-entry
|
||||||
|
(lambda _
|
||||||
|
;; Install the '.desktop' file.
|
||||||
|
(let* ((desktop-file "taskcluster/docker/icecat-snap/icecat.desktop")
|
||||||
|
(applications (string-append #$output "/share/applications")))
|
||||||
|
(substitute* desktop-file
|
||||||
|
(("^Exec=icecat") (string-append "Exec=" #$output "/bin/icecat"))
|
||||||
|
(("IceCat") "GNU IceCat")
|
||||||
|
(("Icon=.*") "Icon=icecat\n")
|
||||||
|
(("NewWindow") "new-window")
|
||||||
|
(("NewPrivateWindow") "new-private-window")
|
||||||
|
(("StartupNotify=true")
|
||||||
|
"StartupNotify=true\nStartupWMClass=Navigator"))
|
||||||
|
(install-file desktop-file applications))))
|
||||||
|
(add-after 'install-desktop-entry 'install-icons
|
||||||
|
(lambda _
|
||||||
|
(with-directory-excursion "browser/branding/official"
|
||||||
|
(for-each
|
||||||
|
(lambda (file)
|
||||||
|
(let* ((size (string-filter char-numeric? file))
|
||||||
|
(icons (string-append #$output "/share/icons/hicolor/"
|
||||||
|
size "x" size "/apps")))
|
||||||
|
(mkdir-p icons)
|
||||||
|
(copy-file file (string-append icons "/icecat.png"))))
|
||||||
|
'("default16.png" "default22.png" "default24.png"
|
||||||
|
"default32.png" "default48.png" "content/icon64.png"
|
||||||
|
"mozicon128.png" "default256.png"))))))))
|
||||||
|
(home-page "https://www.gnu.org/software/gnuzilla/")
|
||||||
|
(synopsis "Entirely free browser derived from Mozilla Firefox")
|
||||||
|
(description
|
||||||
|
"IceCat is the GNU version of the Firefox browser. It is entirely free
|
||||||
|
software, which does not recommend non-free plugins and addons. It also
|
||||||
|
features built-in privacy-protecting features. This package also includes the
|
||||||
|
@command{geckodriver} command, which can be useful for automated web
|
||||||
|
testing.
|
||||||
|
|
||||||
|
WARNING: IceCat 102 has not yet been released by the upstream IceCat project.
|
||||||
|
This is a preview release, and does not currently meet the privacy-respecting
|
||||||
|
standards of the IceCat project.")
|
||||||
|
(license license:mpl2.0) ;and others, see toolkit/content/license.html
|
||||||
|
(properties
|
||||||
|
`((ftp-directory . "/gnu/gnuzilla")
|
||||||
|
(cpe-name . "firefox_esr")
|
||||||
|
(cpe-version . ,(first (string-split version #\-)))))))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue