From 050ee779f48c070d2ccc4fe09fa55f8c8e84b177 Mon Sep 17 00:00:00 2001 From: bill-auger Date: May 09 2022 10:17:12 +0000 Subject: [PATCH 1/7] [filesystem]: upgrade to v2021.12.07 * revised nsswitch.conf rules for systemd * arch dropped the empty motd; so i added a pretty one for parabola instead * added VARIANT_ID to the os-release file as a reliable way to determine the init-system the rest of the changes were only to minimize the diff against the arch PKGBUILD --- diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 952e555..21e947a 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,10 +1,16 @@ -# Maintainer (Arch): Sébastien Luttringer -# Contributor (Arch): Tom Gundersen +# Maintainer (arch): Sébastien Luttringer +# Contributor: Tom Gundersen # Maintainer: Omar Vega Ramos # Contributor: Nicolás Reynolds +# Contributor: bill-auger + + +# parabola changes and rationale: +# - parabola branding (os-release,motd,icon,logo) + pkgname=filesystem -pkgver=2021.01.19 +pkgver=2021.12.07 pkgrel=1 pkgrel+=.parabola1 pkgdesc='Base Parabola GNU/Linux-libre files' @@ -14,14 +20,17 @@ license=('GPL') url='https://www.parabola.nu' depends=('iana-etc') backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf' - 'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/motd' 'etc/nsswitch.conf' + 'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf' 'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty' 'etc/shadow' 'etc/shells') +backup+=('etc/motd') source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts' - 'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release' + 'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' - 'sysusers' 'tmpfiles' 'parabola.svg' 'parabola.png' - 'parabola-logo.svg' 'parabola-logo.png') + 'sysusers' 'tmpfiles' 'archlinux-logo.svg' 'archlinux-logo.png' + 'archlinux-logo-text.svg' 'archlinux-logo-text-dark.svg') +source=( ${source[*]//archlinux-logo/parabola-logo} ) +source+=('motd') sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' 'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da' 'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696' @@ -29,12 +38,11 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273' '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733' 'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9' - '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385' + '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385' # issue 'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5' '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10' - 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - '39d2f719f095028fa655c246bc8608cf3b00971cb7d8c3dbae5a6d89b93a6ca7' - '1fb18c22836c5b679d183a504e594f14d2fdbeb7ce97dd3de5a0c88299f3d597' + 'c8ee7a9faf798caab178ec51afae4146f1efd8a716b7acedf28345b6c75f9697' + 'af2eee47719566740b750f0806e897a8439656df4a7476bb6e71465fd075b45d' # os-release '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a' '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0' '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c' @@ -42,12 +50,21 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c' 'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61' '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4' - '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818' - '618ac097441c1f2daffc9967e5c3cd18ea8866f776db62d04bf401c53907b1c9' - 'cb8ece3772744ef162d0ff6018e6a7051889c2aba1bf6439ba9e74a64ac46927' - '826c61cb40bb0b31e2071b21e04ad7f8c6aabe2817e681246569ae9dff81cd9b' - 'cb8ece3772744ef162d0ff6018e6a7051889c2aba1bf6439ba9e74a64ac46927' - '826c61cb40bb0b31e2071b21e04ad7f8c6aabe2817e681246569ae9dff81cd9b') + '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818' # sysusers + 'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742' + 'd5f0a4f75761afd5ebbc6970ac9aba5be3c28bb660adf7118353a0e018911e68' # parabola-logo.svg + 'c6486f4c9456fa62a75727adfcc8f2403a1a9fac29386f942c0678c109cc72e8' # parabola-logo.png + '09838fea00c5ceff6e7ed28bb1b6d62feb1e2471df9fe5a4328071ecb9e837f3' # parabola-logo-text.svg + 'bc9be3442fab17ac6990814db4c0cc76c2ac6112c70a6c103530f607aa54c11e') # parabola-logo-text-dark.svg +sha256sums+=('0018e0387155ee65472f71f0003fcbcb863355d12442150922e7156da12cabad') # motd + + +prepare() { + # inject OS variant information into os-release + local init='SystemD' + sed -i "s|@VARIANT@|${CARCH} ${init} Edition|" "${srcdir}"/os-release + sed -i "s|@VARIANT_ID@|${CARCH}-${init,,}|" "${srcdir}"/os-release +} package() { cd "$pkgdir" @@ -66,7 +83,7 @@ package() { # setup /etc and /usr/share/factory/etc install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc - for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf \ + for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf \ passwd resolv.conf securetty shells profile; do install -m644 "$srcdir"/$f etc/ install -m644 "$srcdir"/$f usr/share/factory/etc/ @@ -76,8 +93,9 @@ package() { install -m600 "$srcdir"/$f etc/ install -m600 "$srcdir"/$f usr/share/factory/etc/ done + touch etc/arch-release touch etc/parabola-release - ln -sv parabola-release etc/arch-release + install -m644 "$srcdir"/motd etc/ install -m644 "$srcdir"/locale.sh etc/profile.d/locale.sh install -Dm644 "$srcdir"/os-release usr/lib/os-release @@ -103,14 +121,11 @@ package() { # add lib symlinks ln -s usr/lib lib + [[ $CARCH = 'ppc64le' ]] || \ [[ $CARCH = 'x86_64' ]] && { ln -s usr/lib lib64 ln -s lib usr/lib64 } - [[ $CARCH = 'powerpc64le' ]] && { - ln -s usr/lib lib64 - ln -s lib usr/lib64 - } # add bin symlinks ln -s usr/bin bin @@ -136,5 +151,5 @@ package() { install -D -m755 "$srcdir"/env-generator usr/lib/systemd/system-environment-generators/10-arch # add logo - install -D -m644 "$srcdir"/parabola{,-logo}.{svg,png} usr/share/pixmaps + install -D -m644 "$srcdir"/parabola-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps } diff --git a/libre/filesystem/motd b/libre/filesystem/motd index e69de29..70274a6 100644 --- a/libre/filesystem/motd +++ b/libre/filesystem/motd @@ -0,0 +1,8 @@ + , ,  ____ + ,,#',^ ,#; / _ \ _ _ + _,#'-^ ^ ,###' | |_) |__ _ _ __ ___ _| |_ ___ | | __ _ +' `### | __// _` | '__/ _ ` | '_ \ / _ \| |/ _` |  GNU  + ;## | | | (_| | | | (_| | |_) | (_) | | (_| | Linux + ## |_| \__,_|_| \___,_|_,__/ \___/|_|\__,_| libre + #' + / Free as in Freedom diff --git a/libre/filesystem/nsswitch.conf b/libre/filesystem/nsswitch.conf index 062aeea..1ca05d5 100644 --- a/libre/filesystem/nsswitch.conf +++ b/libre/filesystem/nsswitch.conf @@ -3,11 +3,12 @@ passwd: files systemd group: files [SUCCESS=merge] systemd -shadow: files +shadow: files systemd +gshadow: files systemd publickey: files -hosts: files mymachines myhostname resolve [!UNAVAIL=return] dns +hosts: mymachines resolve [!UNAVAIL=return] files myhostname dns networks: files protocols: files diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release index 901694f..60b0adc 100644 --- a/libre/filesystem/os-release +++ b/libre/filesystem/os-release @@ -3,6 +3,8 @@ PRETTY_NAME="Parabola GNU/Linux-libre" ID=parabola ID_LIKE=arch BUILD_ID=rolling +VARIANT="@VARIANT@" +VARIANT_ID="@VARIANT_ID@" ANSI_COLOR="1;35" HOME_URL="https://www.parabola.nu/" DOCUMENTATION_URL="https://wiki.parabola.nu/" diff --git a/libre/filesystem/parabola-logo-text-dark.svg b/libre/filesystem/parabola-logo-text-dark.svg new file mode 100644 index 0000000..a480a4e --- /dev/null +++ b/libre/filesystem/parabola-logo-text-dark.svg @@ -0,0 +1,73 @@ + + + + + + + + Parabola + + GNU + Linux-libre + + diff --git a/libre/filesystem/parabola-logo-text.svg b/libre/filesystem/parabola-logo-text.svg new file mode 100644 index 0000000..3b9a776 --- /dev/null +++ b/libre/filesystem/parabola-logo-text.svg @@ -0,0 +1,73 @@ + + + + + + + + Parabola + + GNU + Linux-libre + + diff --git a/libre/filesystem/parabola-logo.png b/libre/filesystem/parabola-logo.png index b17070d..0335f35 100644 Binary files a/libre/filesystem/parabola-logo.png and b/libre/filesystem/parabola-logo.png differ diff --git a/libre/filesystem/parabola-logo.svg b/libre/filesystem/parabola-logo.svg index da4aeed..119266d 100644 --- a/libre/filesystem/parabola-logo.svg +++ b/libre/filesystem/parabola-logo.svg @@ -1,231 +1,40 @@ - - - - Parabola GNU/Linux-libre logo - - + width="128" + height="128" + version="1.1"> + Parabola Official Icon (Default Color) + image/svg+xml - Parabola GNU/Linux-libre logo - 18-04-2013 + Parabola Official Icon (Default Color) + + 2013/04/18 Jorge Araya Navarro <elcorreo@deshackra.com> - English - Parabola GNU/Linux-libre logo. - - - - Parabola GNU/Linux-libre - - - https://repo.parabolagnulinux.org/other/artwork/parabola_gnu+linux-libre_logo.svg - - - Márcio Alexandre Silva Delgado <coadde@parabola.nu> - - + + + Parabola + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/libre/filesystem/parabola.png b/libre/filesystem/parabola.png deleted file mode 100644 index b17070d..0000000 Binary files a/libre/filesystem/parabola.png and /dev/null differ diff --git a/libre/filesystem/parabola.svg b/libre/filesystem/parabola.svg deleted file mode 100644 index da4aeed..0000000 --- a/libre/filesystem/parabola.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - Parabola GNU/Linux-libre logo - - - - - image/svg+xml - - Parabola GNU/Linux-libre logo - 18-04-2013 - - - Jorge Araya Navarro <elcorreo@deshackra.com> - - - English - Parabola GNU/Linux-libre logo. - - - - Parabola GNU/Linux-libre - - - https://repo.parabolagnulinux.org/other/artwork/parabola_gnu+linux-libre_logo.svg - - - Márcio Alexandre Silva Delgado <coadde@parabola.nu> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libre/filesystem/tmpfiles b/libre/filesystem/tmpfiles index 8fc77b5..4b5368f 100644 --- a/libre/filesystem/tmpfiles +++ b/libre/filesystem/tmpfiles @@ -8,7 +8,6 @@ C /etc/host.conf C /etc/hosts C /etc/issue C /etc/ld.so.conf -C /etc/motd C /etc/nsswitch.conf C /etc/passwd C /etc/profile diff --git a/nonsystemd/filesystem/PKGBUILD b/nonsystemd/filesystem/PKGBUILD index 9d0b8c4..de0b8f2 100644 --- a/nonsystemd/filesystem/PKGBUILD +++ b/nonsystemd/filesystem/PKGBUILD @@ -1,9 +1,18 @@ # Maintainer: David P. -# Maintainer (Arch): Sébastien Luttringer -# Contributor (Arch): Tom Gundersen +# Maintainer (arch): Sébastien Luttringer +# Contributor: Tom Gundersen +# Contributor: Omar Vega Ramos +# Contributor: Nicolás Reynolds +# Contributor: bill-auger + + +# parabola changes and rationale: +# - parabola branding (os-release,motd,icon,logo) +# - systemd-specific 'env-generator' is not used for nonsystemd + pkgname=filesystem -pkgver=2021.01.19 +pkgver=2021.12.07 pkgrel=1 pkgrel+=.parabola1 pkgrel+=.nonsystemd1 @@ -14,26 +23,30 @@ license=('GPL') url='https://www.parabola.nu' depends=('iana-etc') backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf' - 'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/motd' 'etc/nsswitch.conf' + 'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf' 'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty' 'etc/shadow' 'etc/shells') -source=('crypttab' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts' # 'env-generator - 'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release' +backup+=('etc/motd') +source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts' + 'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' - 'sysusers' 'tmpfiles' 'parabola.svg' 'parabola.png' - 'parabola-logo.svg' 'parabola-logo.png') + 'sysusers' 'tmpfiles' 'archlinux-logo.svg' 'archlinux-logo.png' + 'archlinux-logo-text.svg' 'archlinux-logo-text-dark.svg') +source=( ${source[*]/env-generator/} ) +source=( ${source[*]//archlinux-logo/parabola-logo} ) +source+=('motd') sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' + # (env-generator is not used for nonsystemd) 'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696' '244f0718ee2a9d6862ae59d6c18c1dd1568651eada91a704574fa527fbac2b3a' '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273' '4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733' 'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9' - '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385' + '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385' # issue 'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5' '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10' - 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' - 'aa4dc5b2374fb32863e3bc1ce20a2de2d34fe4eed1cd63c599bc82fab21463cc' - '8426638643316faebeee3af660bb8075e4b5dba494c84078c620384d4c6db4c3' + 'aa4dc5b2374fb32863e3bc1ce20a2de2d34fe4eed1cd63c599bc82fab21463cc' # nsswitch.conf + 'af2eee47719566740b750f0806e897a8439656df4a7476bb6e71465fd075b45d' # os-release '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a' '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0' '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c' @@ -41,12 +54,21 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82' '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c' 'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61' '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4' - '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818' - '618ac097441c1f2daffc9967e5c3cd18ea8866f776db62d04bf401c53907b1c9' - 'cb8ece3772744ef162d0ff6018e6a7051889c2aba1bf6439ba9e74a64ac46927' - '826c61cb40bb0b31e2071b21e04ad7f8c6aabe2817e681246569ae9dff81cd9b' - 'cb8ece3772744ef162d0ff6018e6a7051889c2aba1bf6439ba9e74a64ac46927' - '826c61cb40bb0b31e2071b21e04ad7f8c6aabe2817e681246569ae9dff81cd9b') + '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818' # sysusers + 'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742' + 'd5f0a4f75761afd5ebbc6970ac9aba5be3c28bb660adf7118353a0e018911e68' # parabola-logo.svg + 'c6486f4c9456fa62a75727adfcc8f2403a1a9fac29386f942c0678c109cc72e8' # parabola-logo.png + '09838fea00c5ceff6e7ed28bb1b6d62feb1e2471df9fe5a4328071ecb9e837f3' # parabola-logo-text.svg + 'bc9be3442fab17ac6990814db4c0cc76c2ac6112c70a6c103530f607aa54c11e') # parabola-logo-text-dark.svg +sha256sums+=('0018e0387155ee65472f71f0003fcbcb863355d12442150922e7156da12cabad') # motd + + +prepare() { + # inject OS variant information into os-release + local init='OpenRC' + sed -i "s|@VARIANT@|${CARCH} ${init} Edition|" "${srcdir}"/os-release + sed -i "s|@VARIANT_ID@|${CARCH}-${init,,}|" "${srcdir}"/os-release +} package() { cd "$pkgdir" @@ -65,7 +87,7 @@ package() { # setup /etc and /usr/share/factory/etc install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc - for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf \ + for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf \ passwd resolv.conf securetty shells profile; do install -m644 "$srcdir"/$f etc/ install -m644 "$srcdir"/$f usr/share/factory/etc/ @@ -75,8 +97,9 @@ package() { install -m600 "$srcdir"/$f etc/ install -m600 "$srcdir"/$f usr/share/factory/etc/ done + touch etc/arch-release touch etc/parabola-release - ln -sv parabola-release etc/arch-release + install -m644 "$srcdir"/motd etc/ install -m644 "$srcdir"/locale.sh etc/profile.d/locale.sh install -Dm644 "$srcdir"/os-release usr/lib/os-release @@ -102,14 +125,11 @@ package() { # add lib symlinks ln -s usr/lib lib + [[ $CARCH = 'ppc64le' ]] || \ [[ $CARCH = 'x86_64' ]] && { ln -s usr/lib lib64 ln -s lib usr/lib64 } - [[ $CARCH = 'powerpc64le' ]] && { - ln -s usr/lib lib64 - ln -s lib usr/lib64 - } # add bin symlinks ln -s usr/bin bin @@ -135,5 +155,5 @@ package() { # (env-generator is not used for nonsystemd) # add logo - install -D -m644 "$srcdir"/parabola{,-logo}.{svg,png} usr/share/pixmaps + install -D -m644 "$srcdir"/parabola-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps } diff --git a/nonsystemd/filesystem/motd b/nonsystemd/filesystem/motd index e69de29..70274a6 100644 --- a/nonsystemd/filesystem/motd +++ b/nonsystemd/filesystem/motd @@ -0,0 +1,8 @@ + , ,  ____ + ,,#',^ ,#; / _ \ _ _ + _,#'-^ ^ ,###' | |_) |__ _ _ __ ___ _| |_ ___ | | __ _ +' `### | __// _` | '__/ _ ` | '_ \ / _ \| |/ _` |  GNU  + ;## | | | (_| | | | (_| | |_) | (_) | | (_| | Linux + ## |_| \__,_|_| \___,_|_,__/ \___/|_|\__,_| libre + #' + / Free as in Freedom diff --git a/nonsystemd/filesystem/os-release b/nonsystemd/filesystem/os-release index 901694f..60b0adc 100644 --- a/nonsystemd/filesystem/os-release +++ b/nonsystemd/filesystem/os-release @@ -3,6 +3,8 @@ PRETTY_NAME="Parabola GNU/Linux-libre" ID=parabola ID_LIKE=arch BUILD_ID=rolling +VARIANT="@VARIANT@" +VARIANT_ID="@VARIANT_ID@" ANSI_COLOR="1;35" HOME_URL="https://www.parabola.nu/" DOCUMENTATION_URL="https://wiki.parabola.nu/" diff --git a/nonsystemd/filesystem/parabola-logo-text-dark.svg b/nonsystemd/filesystem/parabola-logo-text-dark.svg new file mode 100644 index 0000000..a480a4e --- /dev/null +++ b/nonsystemd/filesystem/parabola-logo-text-dark.svg @@ -0,0 +1,73 @@ + + + + + + + + Parabola + + GNU + Linux-libre + + diff --git a/nonsystemd/filesystem/parabola-logo-text.svg b/nonsystemd/filesystem/parabola-logo-text.svg new file mode 100644 index 0000000..3b9a776 --- /dev/null +++ b/nonsystemd/filesystem/parabola-logo-text.svg @@ -0,0 +1,73 @@ + + + + + + + + Parabola + + GNU + Linux-libre + + diff --git a/nonsystemd/filesystem/parabola-logo.png b/nonsystemd/filesystem/parabola-logo.png index b17070d..0335f35 100644 Binary files a/nonsystemd/filesystem/parabola-logo.png and b/nonsystemd/filesystem/parabola-logo.png differ diff --git a/nonsystemd/filesystem/parabola-logo.svg b/nonsystemd/filesystem/parabola-logo.svg index da4aeed..119266d 100644 --- a/nonsystemd/filesystem/parabola-logo.svg +++ b/nonsystemd/filesystem/parabola-logo.svg @@ -1,231 +1,40 @@ - - - - Parabola GNU/Linux-libre logo - - + width="128" + height="128" + version="1.1"> + Parabola Official Icon (Default Color) + image/svg+xml - Parabola GNU/Linux-libre logo - 18-04-2013 + Parabola Official Icon (Default Color) + + 2013/04/18 Jorge Araya Navarro <elcorreo@deshackra.com> - English - Parabola GNU/Linux-libre logo. - - - - Parabola GNU/Linux-libre - - - https://repo.parabolagnulinux.org/other/artwork/parabola_gnu+linux-libre_logo.svg - - - Márcio Alexandre Silva Delgado <coadde@parabola.nu> - - + + + Parabola + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/nonsystemd/filesystem/parabola.png b/nonsystemd/filesystem/parabola.png deleted file mode 100644 index b17070d..0000000 Binary files a/nonsystemd/filesystem/parabola.png and /dev/null differ diff --git a/nonsystemd/filesystem/parabola.svg b/nonsystemd/filesystem/parabola.svg deleted file mode 100644 index da4aeed..0000000 --- a/nonsystemd/filesystem/parabola.svg +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - Parabola GNU/Linux-libre logo - - - - - image/svg+xml - - Parabola GNU/Linux-libre logo - 18-04-2013 - - - Jorge Araya Navarro <elcorreo@deshackra.com> - - - English - Parabola GNU/Linux-libre logo. - - - - Parabola GNU/Linux-libre - - - https://repo.parabolagnulinux.org/other/artwork/parabola_gnu+linux-libre_logo.svg - - - Márcio Alexandre Silva Delgado <coadde@parabola.nu> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nonsystemd/filesystem/tmpfiles b/nonsystemd/filesystem/tmpfiles index 8fc77b5..4b5368f 100644 --- a/nonsystemd/filesystem/tmpfiles +++ b/nonsystemd/filesystem/tmpfiles @@ -8,7 +8,6 @@ C /etc/host.conf C /etc/hosts C /etc/issue C /etc/ld.so.conf -C /etc/motd C /etc/nsswitch.conf C /etc/passwd C /etc/profile From 3d24c969beab897905d9f553a7cc92cdc3570de6 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: May 09 2022 15:31:29 +0000 Subject: [PATCH 2/7] pcr: libreboot-utils: fix python dependencies Without that fix it still builds fine with makepkg but it fails because python-setuptool is missing: | Traceback (most recent call last): | File "/build/libreboot-utils/src/libreboot-20211122_src/coreboot/default/util/me_cleaner/setup.py", line 3, in | from setuptools import setup | ModuleNotFoundError: No module named 'setuptools' | ==> ERROR: A failure occurred in build(). | Aborting... In addition the 'python' package provides 'python3', but it's probably more clear if we use the 'python' package as dependency instead of what it provides. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD index cc343c6..f5bd3ed 100644 --- a/pcr/libreboot-utils/PKGBUILD +++ b/pcr/libreboot-utils/PKGBUILD @@ -4,14 +4,14 @@ # Maintainers: Parabola hackers pkgname=libreboot-utils -pkgrel=12 +pkgrel=13 _upstream_ver=20211122 pkgver=4.15.libreboot${_upstream_ver} pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)" url="https://libreboot.org/" arch=('x86_64' 'i686' 'armv7h') license=('GPL2') -makedepends=('pciutils' 'python3') +makedepends=('pciutils' 'python' 'python-setuptools') _mirror="https://mirrors.mit.edu/libreboot" # use a mirror per libreboot's request source=("${_mirror}/testing/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig} From d3f5bcf528c0cc9cbf78c3fac4247ffd0a33d6d0 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: May 11 2022 15:14:32 +0000 Subject: [PATCH 3/7] pcr: libreboot-utils: fix ectool installation Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD index f5bd3ed..9c9865f 100644 --- a/pcr/libreboot-utils/PKGBUILD +++ b/pcr/libreboot-utils/PKGBUILD @@ -4,7 +4,7 @@ # Maintainers: Parabola hackers pkgname=libreboot-utils -pkgrel=13 +pkgrel=14 _upstream_ver=20211122 pkgver=4.15.libreboot${_upstream_ver} pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)" @@ -115,7 +115,7 @@ package() { install -Dm755 bucts/bucts "${pkgdir}"/usr/bin/bucts # Install ECtool. - make -C superiotool install DESTDIR="${pkgdir}" PREFIX=/usr + make -C ectool install PREFIX="${pkgdir}"/usr # Install inteltool. make -C inteltool install DESTDIR="${pkgdir}" PREFIX=/usr From cf8254528920035df1d85b25287d2b10edee7e7f Mon Sep 17 00:00:00 2001 From: David P Date: May 15 2022 01:11:27 +0000 Subject: [PATCH 4/7] addpkg: nonsystemd/pipewire-media-session 1:0.4.1-2.nonsystemd1 Signed-off-by: David P --- diff --git a/nonsystemd/pipewire-media-session/PKGBUILD b/nonsystemd/pipewire-media-session/PKGBUILD new file mode 100644 index 0000000..0786f6c --- /dev/null +++ b/nonsystemd/pipewire-media-session/PKGBUILD @@ -0,0 +1,79 @@ +# Maintainer: David P. +# Maintainer (Arch): Jan Alexander Steffens (heftig) + +pkgbase=pipewire-media-session +pkgname=(pipewire-media-session pipewire-media-session-docs) +pkgver=0.4.1 +pkgrel=2 +pkgrel+=.nonsystemd1 +epoch=1 +pkgdesc="Example session manager for PipeWire" +url="https://gitlab.freedesktop.org/pipewire/media-session" +license=(MIT) +arch=(x86_64) +arch+=(i686 armv7h) +makedepends=(git meson doxygen graphviz 'pipewire>=0.3.39' dbus + alsa-lib) +options=(debug) +_commit=e5d5cf2404786af8bcc40bdb8a2962bef4ec18b6 # tags/0.4.1 +source=("$pkgbase::git+https://gitlab.freedesktop.org/pipewire/media-session.git#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' +} + +prepare() { + cd $pkgbase +} + +build() { + local meson_options=( + -D docs=enabled + -D systemd=disabled + -D with-module-sets=[] + ) + + arch-meson $pkgbase build "${meson_options[@]}" + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +package_pipewire-media-session() { + depends=('pipewire>=0.3.39' libpipewire-0.3.so libdbus-1.so + libasound.so) + optdepends=('pipewire-media-session-docs: Documentation') + provides=(pipewire-session-manager) + conflicts=(wireplumber) + + meson install -C build --destdir "$pkgdir" + + _pick docs "$pkgdir"/usr/share/doc + + install -Dt "$pkgdir/usr/share/doc/$pkgname" -m644 $pkgbase/{NEWS,README}* + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/COPYING +} + +package_pipewire-media-session-docs() { + pkgdesc+=" - documentation" + + mv docs/* "$pkgdir" + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/COPYING +} + +# vim:set sw=2 et: From c3dd2bc711badabfbdd3042e3397dfafc515da1b Mon Sep 17 00:00:00 2001 From: David P Date: May 15 2022 01:25:57 +0000 Subject: [PATCH 5/7] updpkg: nonsystemd/pipewire 1:0.3.51-1.nonsystemd1 Signed-off-by: David P --- diff --git a/nonsystemd/pipewire/PKGBUILD b/nonsystemd/pipewire/PKGBUILD index f48fff2..79d824e 100644 --- a/nonsystemd/pipewire/PKGBUILD +++ b/nonsystemd/pipewire/PKGBUILD @@ -1,41 +1,55 @@ # Maintainer: David P. -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Jan de Groot +# Maintainer (Arch): David Runge +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Jan de Groot + +# differences with the Artix package: +# - install an XDG autostart script to launch pipewire-pulse, like Gentoo pkgbase=pipewire pkgname=(pipewire alsa-card-profiles pipewire-docs pipewire-alsa pipewire-jack - pipewire-pulse gst-plugin-pipewire pipewire-zeroconf pipewire-v4l2) -pkgver=0.3.40 + pipewire-pulse gst-plugin-pipewire pipewire-zeroconf pipewire-v4l2 + pipewire-x11-bell) +_commit=ebc775674a0cf254cebd6d4694944006405807e3 # tags/0.3.51 +pkgver=0.3.51 pkgrel=1 pkgrel+=.nonsystemd1 epoch=1 pkgdesc="Low-latency audio/video router and processor" url="https://pipewire.org" -license=(MIT) arch=(x86_64) arch+=(i686 armv7h) +license=(MIT) makedepends=(git meson doxygen graphviz python-docutils valgrind libpulse - alsa-lib libusb gst-plugins-base rtkit dbus sdl2 ncurses libsndfile - bluez-libs sbc libldac libfreeaptx libfdk-aac avahi - webrtc-audio-processing) + alsa-lib libusb gst-plugins-base rtkit dbus sdl2 ncurses + libcanberra libsndfile bluez-libs sbc libldac libfreeaptx + libfdk-aac avahi lilv webrtc-audio-processing libx11 libxfixes) checkdepends=(desktop-file-utils) -_commit=7afd80052b7c49754a13c9ab49c368f95b60e0a7 # tags/0.3.40 -source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit") -sha256sums=('SKIP') +options=(debug) +source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit" + pipewire.desktop pipewire-launcher) +sha256sums=('SKIP' + 'b5b68d711ff070b6217c4da5de0c5488b36a012b7e5484bf1d89d1969a778026' + '47f4d64dd4583963ce493828c171b608949dcc9f6e20d5dc2cdcb3a2f3ba6bac') pkgver() { cd pipewire - git describe --tags | sed 's/-/+/g' + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { cd pipewire + + # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib + sed -i '/LD_LIBRARY_PATH/d' pipewire-jack/src/pw-jack.in } build() { local meson_options=( -D docs=enabled -D jack=disabled + -D jack-devel=true + -D libjack-path=/usr/lib -D libcamera=disabled -D udevrulesdir=/usr/lib/udev/rules.d -D systemd=disabled @@ -65,9 +79,9 @@ _ver=${pkgver:0:3} package_pipewire() { license+=(LGPL) # libspa-alsa - depends=(rtkit alsa-card-profiles libdbus-1.so libncursesw.so libsndfile.so + depends=(alsa-card-profiles libdbus-1.so libncursesw.so libsndfile.so libudev.so libusb-1.0.so libasound.so libbluetooth.so - libsbc.so libldacBT_enc.so libfreeaptx.so libfdk-aac.so + libsbc.so libldacBT_enc.so libfreeaptx.so libfdk-aac.so liblilv-0.so libwebrtc_audio_processing.so) optdepends=('pipewire-docs: Documentation' 'pipewire-session-manager: Session manager' @@ -76,7 +90,10 @@ package_pipewire() { 'pipewire-pulse: PulseAudio replacement' 'gst-plugin-pipewire: GStreamer plugin' 'pipewire-zeroconf: Zeroconf support' - 'pipewire-v4l2: V4L2 interceptor') + 'pipewire-v4l2: V4L2 interceptor' + 'pipewire-x11-bell: X11 bell' + 'realtime-privileges: realtime privileges with rt module' + 'rtkit: realtime privileges with rtkit module') provides=(libpipewire-$_ver.so) meson install -C build --destdir "$pkgdir" @@ -88,7 +105,10 @@ package_pipewire() { _pick docs usr/share/doc - _pick jack usr/bin/pw-jack usr/lib/pipewire-$_ver/jack + _pick jack usr/bin/pw-jack + _pick jack usr/include/jack + _pick jack usr/lib/libjack* + _pick jack usr/lib/pkgconfig/jack.pc _pick jack usr/share/man/man1/pw-jack.1 _pick jack usr/share/pipewire/jack.conf @@ -98,9 +118,10 @@ package_pipewire() { _pick gst usr/lib/gstreamer-1.0 - _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-zeroconf-discover.so + _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-{raop,zeroconf}-discover.so _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_ver/v4l2 + _pick x11-bell usr/lib/pipewire-$_ver/libpipewire-module-x11-bell.so ) mkdir -p "$pkgdir/etc/alsa/conf.d" @@ -143,13 +164,19 @@ package_pipewire-alsa() { package_pipewire-jack() { pkgdesc+=" - JACK support" license+=(GPL2) # libjackserver - depends=(pipewire-session-manager libpipewire-$_ver.so) + depends=(pipewire-session-manager libpipewire-$_ver.so sh) + optdepends=('jack-example-tools: for official JACK example-clients and tools') + conflicts=(jack jack2) + provides=(jack libjack.so libjackserver.so libjacknet.so) mv jack/* "$pkgdir" install -Dm644 /dev/null \ "$pkgdir/usr/share/pipewire/media-session.d/with-jack" + # directories for overrides + mkdir -p "$pkgdir/etc/pipewire/jack.conf.d" + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING } @@ -166,6 +193,11 @@ package_pipewire-pulse() { "$pkgdir/usr/share/pipewire/media-session.d/with-pulseaudio" install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING + + # borrowed from Gentoo's media-video/pipewire, with pipewire-media-session support + mkdir -p "$pkgdir/etc/xdg/autostart" + install -m644 pipewire.desktop "$pkgdir/etc/xdg/autostart/pipewire.desktop" + install -m755 pipewire-launcher "$pkgdir/usr/bin/pipewire-launcher" } package_gst-plugin-pipewire() { @@ -188,11 +220,20 @@ package_pipewire-zeroconf() { package_pipewire-v4l2() { pkgdesc+=" - V4L2 interceptor" - depends=(pipewire-session-manager libpipewire-$_ver.so) + depends=(pipewire-session-manager libpipewire-$_ver.so sh) mv v4l2/* "$pkgdir" install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING } + +package_pipewire-x11-bell() { + pkgdesc+=" - X11 bell" + depends=(pipewire libpipewire-$_ver.so libx11 libxfixes libcanberra.so) + + mv x11-bell/* "$pkgdir" + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING +} # vim:set sw=2 et: diff --git a/nonsystemd/pipewire/pipewire-launcher b/nonsystemd/pipewire/pipewire-launcher new file mode 100644 index 0000000..d220684 --- /dev/null +++ b/nonsystemd/pipewire/pipewire-launcher @@ -0,0 +1,32 @@ +#!/bin/sh + +# PipeWire launcher script for XDG compliant desktops on OpenRC. +# +# systemd users are very _STRONGLY_ advised to use the much +# more reliable and predictable user units instead. + +# WARNING: This script assumes being run inside XDG compliant session, +# which means D-Bus session instance is expected to be correctly set up +# prior to this script starting. If that is not true, things may break! + +# Best to reap any existing daemons and only then try to start a new set. +pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1 + +# The core daemon which by itself does probably nothing. +/usr/bin/pipewire & + +# The so called pipewire-pulse daemon used for PulseAudio compatibility. +# Commenting this out will stop the PA proxying daemon from starting, +# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using +# clients will still have access to audio and may end up clashing with +# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon). +/usr/bin/pipewire -c pipewire-pulse.conf & + +# Hack for bug #822498 (Gentoo's Bugzilla) +sleep 1 + +# Finally a session manager is required for PipeWire to do anything. +for session_manager in wireplumber pipewire-media-session; do + command -v "$session_manager" &>/dev/null && break +done +exec "$session_manager" diff --git a/nonsystemd/pipewire/pipewire.desktop b/nonsystemd/pipewire/pipewire.desktop new file mode 100644 index 0000000..f7998a6 --- /dev/null +++ b/nonsystemd/pipewire/pipewire.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Name[de]=PipeWire Mediensystem +Name=PipeWire Media System +Comment[de]=Das PipeWire Mediensystem starten +Comment=Start the PipeWire Media System +Exec=/usr/bin/pipewire-launcher +Terminal=false +Type=Application +X-GNOME-HiddenUnderSystemd=true +X-KDE-HiddenUnderSystemd=true +X-systemd-skip=true From ae663d32ddc73ed0b0f5582dd196e863bcffa5d9 Mon Sep 17 00:00:00 2001 From: David P Date: May 15 2022 06:16:10 +0000 Subject: [PATCH 6/7] addpkg: nonsystemd/wireplumber 0.4.10-3.nonsystemd1 Signed-off-by: David P --- diff --git a/nonsystemd/wireplumber/PKGBUILD b/nonsystemd/wireplumber/PKGBUILD new file mode 100644 index 0000000..d63ef57 --- /dev/null +++ b/nonsystemd/wireplumber/PKGBUILD @@ -0,0 +1,76 @@ +# Maintainer: David P. +# Maintainer (Arch): David Runge +# Maintainer (Arch): Jan Alexander Steffens (heftig) + +pkgbase=wireplumber +pkgname=(wireplumber wireplumber-docs) +_commit=3400acd0db95fefdda7595d20466c095902d8997 # tags/0.4.10 +pkgver=0.4.10 +pkgrel=3 +pkgrel+=.nonsystemd1 +pkgdesc="Session / policy manager implementation for PipeWire" +url="https://pipewire.pages.freedesktop.org/wireplumber/" +arch=(x86_64) +arch+=(i686 armv7h) +license=(MIT) +makedepends=(git meson doxygen graphviz 'pipewire>=0.3.43' glib2 lua + gobject-introspection python-sphinx python-sphinx_rtd_theme + python-breathe python-lxml elogind) +depends=(libelogind) +options=(debug) +source=("$pkgbase::git+https://gitlab.freedesktop.org/pipewire/wireplumber.git#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +build() { + local meson_options=( + -D system-lua=true + -D systemd=disabled + ) + + arch-meson $pkgbase build "${meson_options[@]}" + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +package_wireplumber() { + depends=('pipewire>=0.3.43' lua libpipewire-0.3.so + libg{lib,module,object,io}-2.0.so) + optdepends=('wireplumber-docs: Documentation') + provides=(pipewire-session-manager libwireplumber-0.4.so) + conflicts=(pipewire-media-session) + + meson install -C build --destdir "$pkgdir" + + _pick docs "$pkgdir"/usr/share/doc + + install -Dt "$pkgdir/usr/share/doc/$pkgname" -m644 $pkgbase/{NEWS,README}* + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE +} + +package_wireplumber-docs() { + pkgdesc+=" - documentation" + + mv docs/* "$pkgdir" + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE +} + +# vim:set sw=2 et: From 0947239827274ca70e91a8da93219846bdad401a Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: May 15 2022 11:09:50 +0000 Subject: [PATCH 7/7] libre/iceweasel: Update to 100.0, upstream changes Update patches for some notable changes: 1. about:devtools has been removed upstream, see [1] 2. security.pki.crlite_mode property value has been changed to 3 by default by upstream, but we still disable it. This disablement is still up for discussion, please refer to the appropriate commit message from 9001-FSDG-sync-remote-settings-with-local-dump.patch 3. Remove promos of Firefox Focus and Klar from Private Browsing page which appeared in this release (Klar for Germany, Focus for other locations) Also update existing patching of "More from Mozilla" anti-feature to actually remove SVG files with QR codes that lead to nonfree software. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1609100 --- diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index c773a8b..e1da467 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -131,7 +131,7 @@ index 1506af2913..5f43ff26f3 100644 @@ -99,4 +99,4 @@ is updated. .. _configuration schema: SearchConfigurationSchema.html - .. _remote settings: /services/common/services/RemoteSettings.html + .. _remote settings: /services/settings/index.html -.. _search-default-override-allowlist bucket: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-default-override-allowlist/records +.. _search-default-override-allowlist bucket: resource://app/defaults/settings/main/search-default-override-allowlist.json diff --git a/toolkit/components/search/docs/SearchEngineConfiguration.rst b/toolkit/components/search/docs/SearchEngineConfiguration.rst @@ -989,7 +989,7 @@ index cb72224e1b..79940b598a 100644 // 1: Consult CRLite but only collect telemetry. // 2: Consult CRLite and enforce both "Revoked" and "Not Revoked" results. // 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". --pref("security.pki.crlite_mode", 1); +-pref("security.pki.crlite_mode", 3); +pref("security.pki.crlite_mode", 0); // Issuer we use to detect MitM proxies. Set to the issuer of the cert of the diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 6324ce2..72981fb 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -82,25 +82,34 @@ index b2d18d3098..e2e643bcf2 100644 -- 2.35.1 -From 897828b97d1729b3e2fc734c699a1f0fa127cbe2 Mon Sep 17 00:00:00 2001 +From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001 From: grizzlyuser -Date: Tue, 15 Mar 2022 13:29:29 +0100 +Date: Sat, 7 May 2022 21:46:48 +0200 Subject: [PATCH] Remove 'More from Mozilla' section in Preferences Currently it contains functionality to provide links to nonfree software -like Firefox Mobile, which is not compatible with the FSDG. +like Firefox Mobile, which is not compatible with the FSDG for the same +reasons as desktop Firefox. --- - browser/app/profile/firefox.js | 2 +- - browser/components/preferences/jar.mn | 4 ---- - browser/components/preferences/preferences.js | 9 --------- - browser/components/preferences/preferences.xhtml | 12 ------------ - 4 files changed, 1 insertion(+), 26 deletions(-) + browser/app/profile/firefox.js | 2 +- + .../static/browser_all_files_referenced.js | 12 ------- + browser/components/preferences/jar.mn | 4 --- + .../more-from-mozilla-qr-code-advanced.svg | 4 --- + .../more-from-mozilla-qr-code-simple-cn.svg | 4 --- + .../more-from-mozilla-qr-code-simple.svg | 4 --- + .../components/preferences/moreFromMozilla.js | 33 +------------------ + browser/components/preferences/preferences.js | 9 ----- + .../components/preferences/preferences.xhtml | 12 ------- + 9 files changed, 2 insertions(+), 82 deletions(-) + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 33a2ff36a7..72526ee950 100644 +index 76b495ea6c..d0c2b98b11 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -997,7 +997,7 @@ pref("browser.preferences.experimental", true); +@@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true); #else pref("browser.preferences.experimental", false); #endif @@ -109,11 +118,41 @@ index 33a2ff36a7..72526ee950 100644 pref("browser.preferences.experimental.hidden", false); pref("browser.preferences.defaultPerformanceSettings.enabled", true); +diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js +index 4c59b84a7c..44d36d3b28 100644 +--- a/browser/base/content/test/static/browser_all_files_referenced.js ++++ b/browser/base/content/test/static/browser_all_files_referenced.js +@@ -33,7 +33,6 @@ var gExceptionPaths = [ + "chrome://browser/content/assets/moz-vpn.svg", + "chrome://browser/content/assets/vpn-logo.svg", + "chrome://browser/content/assets/focus-promo.png", +- "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg", + "chrome://browser/content/assets/klar-qr-code.svg", + + // These app marketplace icons are referenced based on the user's locale +@@ -136,17 +135,6 @@ var whitelist = [ + // extensions/pref/autoconfig/src/nsReadConfig.cpp + { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, + +- // browser/components/preferences/moreFromMozilla.js +- // These files URLs are constructed programatically at run time. +- { +- file: +- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg", +- }, +- { +- file: +- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg", +- }, +- + { file: "resource://gre/greprefs.js" }, + + // layout/mathml/nsMathMLChar.cpp diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn -index 752b0b2ae3..4f3babeaf8 100644 +index 912d9edf08..dd4697a368 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn -@@ -14,10 +14,6 @@ browser.jar: +@@ -14,12 +14,8 @@ browser.jar: content/browser/preferences/containers.js content/browser/preferences/sync.js content/browser/preferences/experimental.js @@ -124,6 +163,84 @@ index 752b0b2ae3..4f3babeaf8 100644 - content/browser/preferences/more-from-mozilla-qr-code-simple.svg - content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg - content/browser/preferences/more-from-mozilla-qr-code-advanced.svg + content/browser/preferences/web-appearance-dark.svg + content/browser/preferences/web-appearance-light.svg +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg +deleted file mode 100644 +index 4848d3e20c..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +- +- +\ No newline at end of file +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg +deleted file mode 100644 +index 5052db9702..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +- +- +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg +deleted file mode 100644 +index 279595db10..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +- +- +\ No newline at end of file +diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js +index 1208a5dbcd..ff91f7421e 100644 +--- a/browser/components/preferences/moreFromMozilla.js ++++ b/browser/components/preferences/moreFromMozilla.js +@@ -81,38 +81,7 @@ var gMoreFromMozillaPane = { + }, + + renderProducts() { +- let products = [ +- { +- id: "firefox-mobile", +- title_string_id: "more-from-moz-firefox-mobile-title", +- description_string_id: "more-from-moz-firefox-mobile-description", +- region: "global", +- button: { +- id: "fxMobile", +- type: "link", +- label_string_id: "more-from-moz-learn-more-link", +- actionURL: AppConstants.isChinaRepack() +- ? "https://www.firefox.com.cn/browsers/mobile/" +- : "https://www.mozilla.org/firefox/browsers/mobile/", +- }, +- qrcode: { +- title: { +- string_id: "more-from-moz-qr-code-box-firefox-mobile-title", +- }, +- image_src_prefix: +- "chrome://browser/content/preferences/more-from-mozilla-qr-code", +- button: { +- id: "qr-code-send-email", +- label: { +- string_id: "more-from-moz-qr-code-box-firefox-mobile-button", +- }, +- actionURL: AppConstants.isChinaRepack() +- ? "https://www.firefox.com.cn/mobile/get-app/" +- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm", +- }, +- }, +- }, +- ]; ++ let products = []; + + if (BrowserUtils.shouldShowVPNPromo()) { + const vpn = { diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index f6dc2b3781..34c7d8c528 100644 --- a/browser/components/preferences/preferences.js @@ -189,7 +306,617 @@ index 81059f3d2e..be23729276 100644 -- -2.35.1 +2.36.0 + + +From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001 +From: grizzlyuser +Date: Sat, 7 May 2022 21:51:06 +0200 +Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private + Browsing + +Please correct me if I'm wrong, but these are not compatible with FSDG +for the same reasons as the original Firefox. +--- + browser/app/profile/firefox.js | 2 +- + .../static/browser_all_files_referenced.js | 2 - + .../newtab/lib/OnboardingMessageProvider.jsm | 215 ------------------ + .../newtab/lib/PanelTestProvider.jsm | 84 ------- + .../content/assets/focus-qr-code.svg | 114 ---------- + .../content/assets/klar-qr-code.svg | 114 ---------- + 6 files changed, 1 insertion(+), 530 deletions(-) + delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg + delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg + +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index d0c2b98b11..54cc9de7e6 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g + pref("browser.promo.focus.disallowed_regions", "cn"); + + // Default to enabling focus promos to be shown where allowed. +-pref("browser.promo.focus.enabled", true); ++pref("browser.promo.focus.enabled", false); + + // Comma separated string of mozilla vpn supported platforms. + pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux"); +diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js +index 44d36d3b28..6823855d56 100644 +--- a/browser/base/content/test/static/browser_all_files_referenced.js ++++ b/browser/base/content/test/static/browser_all_files_referenced.js +@@ -32,8 +32,6 @@ var gExceptionPaths = [ + "chrome://activity-stream/content/data/content/assets/remote/", + "chrome://browser/content/assets/moz-vpn.svg", + "chrome://browser/content/assets/vpn-logo.svg", +- "chrome://browser/content/assets/focus-promo.png", +- "chrome://browser/content/assets/klar-qr-code.svg", + + // These app marketplace icons are referenced based on the user's locale + // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx +diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +index dab8a0ec19..81bedf523c 100644 +--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm ++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +@@ -95,221 +95,6 @@ const ONBOARDING_MESSAGES = () => [ + ], + }, + }, +- { +- id: "PB_NEWTAB_FOCUS_PROMO", +- template: "pb_newtab", +- groups: ["pbNewtab"], +- content: { +- infoBody: "fluent:about-private-browsing-info-description-simplified", +- infoEnabled: true, +- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", +- infoLinkText: "fluent:about-private-browsing-learn-more-link", +- infoTitle: "", +- infoTitleEnabled: false, +- promoEnabled: true, +- promoType: "FOCUS", +- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", +- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", +- promoLinkText: "fluent:about-private-browsing-focus-promo-cta", +- promoLinkType: "button", +- promoSectionStyle: "below-search", +- promoTitle: "fluent:about-private-browsing-focus-promo-text-c", +- promoTitleEnabled: true, +- promoButton: { +- action: { +- type: "SHOW_SPOTLIGHT", +- data: { +- content: { +- id: "FOCUS_PROMO", +- template: "multistage", +- modal: "tab", +- metrics: "block", +- backdrop: "transparent", +- screens: [ +- { +- id: "DEFAULT_MODAL_UI", +- order: 0, +- content: { +- logo: { +- imageURL: +- "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: { +- string_id: "spotlight-focus-promo-title", +- }, +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/focus-qr-code.svg", +- alt_text: { +- string_id: "spotlight-focus-promo-qr-code", +- }, +- image_overrides: { +- de: +- "chrome://browser/content/assets/klar-qr-code.svg", +- }, +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- }, +- }, +- }, +- }, +- priority: 2, +- frequency: { +- custom: [ +- { +- cap: 1, +- period: 604800000, // Max 1 per week +- }, +- ], +- lifetime: 3, +- }, +- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')", +- }, +- { +- id: "PB_NEWTAB_KLAR_PROMO", +- template: "pb_newtab", +- groups: ["pbNewtab"], +- content: { +- infoBody: "fluent:about-private-browsing-info-description-simplified", +- infoEnabled: true, +- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", +- infoLinkText: "fluent:about-private-browsing-learn-more-link", +- infoTitle: "", +- infoTitleEnabled: false, +- promoEnabled: true, +- promoType: "FOCUS", +- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", +- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", +- promoLinkText: "Download Firefox Klar", +- promoLinkType: "button", +- promoSectionStyle: "below-search", +- promoTitle: +- "Firefox Klar clears your history every time while blocking ads and trackers.", +- promoTitleEnabled: true, +- promoButton: { +- action: { +- type: "SHOW_SPOTLIGHT", +- data: { +- content: { +- id: "KLAR_PROMO", +- template: "multistage", +- modal: "tab", +- metrics: "block", +- backdrop: "transparent", +- screens: [ +- { +- id: "DEFAULT_MODAL_UI", +- order: 0, +- content: { +- logo: { +- imageURL: +- "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: "Get Firefox Klar", +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/klar-qr-code.svg", +- alt_text: { +- string_id: "spotlight-focus-promo-qr-code", +- }, +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- }, +- }, +- }, +- }, +- priority: 2, +- frequency: { +- custom: [ +- { +- cap: 1, +- period: 604800000, // Max 1 per week +- }, +- ], +- lifetime: 3, +- }, +- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", +- }, + { + id: "PB_NEWTAB_INFO_SECTION", + template: "pb_newtab", +diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm +index a991581f7b..af57c3eea8 100644 +--- a/browser/components/newtab/lib/PanelTestProvider.jsm ++++ b/browser/components/newtab/lib/PanelTestProvider.jsm +@@ -558,90 +558,6 @@ const MESSAGES = () => [ + frequency: { lifetime: 3 }, + trigger: { id: "defaultBrowserCheck" }, + }, +- { +- id: "PB_FOCUS_PROMO", +- groups: ["panel-test-provider"], +- template: "spotlight", +- content: { +- template: "multistage", +- backdrop: "transparent", +- screens: [ +- { +- id: "PBM_FIREFOX_FOCUS", +- order: 0, +- content: { +- logo: { +- imageURL: "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: { +- string_id: "spotlight-focus-promo-title", +- }, +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- email_link: { +- action: { +- data: { +- args: "https://mozilla.org", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/focus-qr-code.svg", +- alt_text: { +- string_id: "spotlight-focus-promo-qr-code", +- }, +- image_overrides: { +- de: "chrome://browser/content/assets/klar-qr-code.svg", +- }, +- }, +- email: { +- link_text: "Email yourself a link", +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- trigger: { id: "defaultBrowserCheck" }, +- }, + { + id: "PB_NEWTAB_VPN_PROMO", + template: "pb_newtab", +diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg +deleted file mode 100644 +index f182567314..0000000000 +--- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg ++++ /dev/null +@@ -1,114 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff --git a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg b/browser/components/privatebrowsing/content/assets/klar-qr-code.svg +deleted file mode 100644 +index 2217ca055c..0000000000 +--- a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg ++++ /dev/null +@@ -1,114 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-- +2.36.0 diff --git a/browser/app/permissions b/browser/app/permissions index 991284081d..888cc811ce 100644 @@ -291,67 +1018,6 @@ index 1b29e8d..6f7566c 100644 ## Firefox Account - Signed in sync-profile-picture = -diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml -index 5b0709e..38ea275 100644 ---- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml -+++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml -@@ -89,19 +89,6 @@ -
    -
- -- -- - - - -diff --git a/devtools/startup/locales/en-US/aboutDevTools.ftl b/devtools/startup/locales/en-US/aboutDevTools.ftl -index db2146d..e02ab58 100644 ---- a/devtools/startup/locales/en-US/aboutDevTools.ftl -+++ b/devtools/startup/locales/en-US/aboutDevTools.ftl -@@ -3,18 +3,18 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - head-title = About Developer Tools --enable-title = Enable Firefox Developer Tools --enable-inspect-element-title = Enable Firefox Developer Tools to use Inspect Element -+enable-title = Enable Iceweasel Developer Tools -+enable-inspect-element-title = Enable Iceweasel Developer Tools to use Inspect Element - enable-inspect-element-message = Examine and edit HTML and CSS with the Developer Tools’ Inspector. --enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools. -+enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Iceweasel Developer Tools. - enable-key-shortcut-message = You activated a Developer Tools shortcut. If that was a mistake, you can close this Tab. - enable-menu-message = Perfect your website’s HTML, CSS, and JavaScript with tools like Inspector and Debugger. --enable-common-message = Firefox Developer Tools are disabled by default to give you more control over your browser. -+enable-common-message = Iceweasel Developer Tools are disabled by default to give you more control over your browser. - enable-learn-more-link = Learn more about Developer Tools - enable-enable-button = Enable Developer Tools - enable-close-button = Close this Tab - --welcome-title = Welcome to Firefox Developer Tools! -+welcome-title = Welcome to Iceweasel Developer Tools! - newsletter-title = Mozilla Developer Newsletter - newsletter-message = Get developer news, tricks and resources sent straight to your inbox. - newsletter-email-placeholder = -@@ -24,8 +24,6 @@ newsletter-subscribe-button = Subscribe - newsletter-thanks-title = Thanks! - newsletter-thanks-message = If you haven’t previously confirmed a subscription to a Mozilla-related newsletter you may have to do so. Please check your inbox or your spam filter for an email from us. - --footer-title = Firefox Developer Edition --footer-message = Looking for more than just Developer Tools? Check out the Firefox browser that is built specifically for developers and modern workflows. - footer-learn-more-link = Learn more - - features-learn-more = Learn more diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl index edd871b..77870fe 100644 --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index a349c66..d0b4b06 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -60,7 +60,7 @@ pkgname=iceweasel epoch=1 -pkgver=99.0.1 +pkgver=100.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=98.0-1 @@ -72,7 +72,7 @@ url="https://wiki.parabola.nu/Iceweasel" depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack nodejs cbindgen nasm - python-setuptools python-psutil python-zstandard lld dump_syms + python-setuptools python-zstandard lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) makedepends_i686=(gcc10) @@ -98,15 +98,15 @@ source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('76d22279ce99588a728bb2d034064be0d5918b5900631f2148d4565b8a72e00b' +sha256sums=('664c0cc4e0fb70886aa4e652d144996045d533a18eebc7d61093103cbb2d5e7f' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('f3e89499909b172476e931d9ab18b856d0001e3042b3816d1728809536179768' 'SKIP' - 'af53bd22378cd87c27438c34dc1daf3f1909735e85c914b56440751a9dc16856' + '0bfffc020a5fba0895c40f79bd613c1e2504bf24239dfbc04474f6263fd0e834' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' - '0471c2f625ed8e76833bc7c15dfab23e613600f4ee1abe5e81047237644eea95' + '71c098c5b7d62babf2296d55d43a7bc9f2ca10da9ee77552f9afa01b78541522' '9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83' 'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') @@ -471,7 +471,7 @@ build() { export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="$srcdir/mozbuild" # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # LTO needs more open files ulimit -n 4096