PR#40: libre/iceweasel: 97.0 - abslibre

abslibre

#40 libre/iceweasel: 97.0

Closed 2 years ago by grizzlyuser. Opened 2 years ago by grizzlyuser.

iceweasel into pull-requests

libre/iceweasel: Update existing and add new patch

grizzlyuser • 2 years ago

d132f00

libre/iceweasel: Sync with upstream 98.0.1

grizzlyuser • 2 years ago

ddaeb71

[qtau][sinsy][sekai][hts_engine_api-git]: add package and deps

bill-auger • 2 years ago

8c3b7f8

libre/python-reportlab: updated

Andreas Grapentin • 2 years ago

0cc59a5

libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch

file removed

-57

		`@@ -1,57 +0,0 @@`
		`- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`- From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>`
		`- Date: Mon, 25 Mar 2019 20:30:11 +0100`
		`- Subject: [PATCH] Use remoting name for GDK application names`
		`-`
		`- ---`
		`- toolkit/xre/nsAppRunner.cpp \| 6 +-----`
		`- widget/gtk/nsAppShell.cpp \| 12 +++++-------`
		`- 2 files changed, 6 insertions(+), 12 deletions(-)`
		`-`
		`- diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp`
		`- index ce001e93821f..3be817c5cbd5 100644`
		`- --- a/toolkit/xre/nsAppRunner.cpp`
		`- +++ b/toolkit/xre/nsAppRunner.cpp`
		`- @@ -4348,11 +4348,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {`
		`- // consistently.`
		`-`
		`- // Set program name to the one defined in application.ini.`
		`- - {`
		`- - nsAutoCString program(gAppData->name);`
		`- - ToLowerCase(program);`
		`- - g_set_prgname(program.get());`
		`- - }`
		`- + g_set_prgname(gAppData->remotingName);`
		`-`
		`- // Initialize GTK here for splash.`
		`-`
		`- diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp`
		`- index c8bbd9a373f5..a6a2186f20fb 100644`
		`- --- a/widget/gtk/nsAppShell.cpp`
		`- +++ b/widget/gtk/nsAppShell.cpp`
		`- @@ -27,6 +27,8 @@`
		`- # include "nsIObserverService.h"`
		`- #endif`
		`- #include "gfxPlatform.h"`
		`- +#include "nsAppRunner.h"`
		`- +#include "mozilla/XREAppData.h"`
		`- #include "ScreenHelperGTK.h"`
		`- #include "HeadlessScreenHelper.h"`
		`- #include "mozilla/widget/ScreenManager.h"`
		`- @@ -257,13 +259,9 @@ nsresult nsAppShell::Init() {`
		`- // See https://bugzilla.gnome.org/show_bug.cgi?id=747634`
		`- //`
		`- // Only bother doing this for the parent process, since it's the one`
		`- - // creating top-level windows. (At this point, a child process hasn't`
		`- - // received the list of registered chrome packages, so the`
		`- - // GetBrandShortName call would fail anyway.)`
		`- - nsAutoString brandName;`
		`- - mozilla::widget::WidgetUtils::GetBrandShortName(brandName);`
		`- - if (!brandName.IsEmpty()) {`
		`- - gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());`
		`- + // creating top-level windows.`
		`- + if (gAppData) {`
		`- + gdk_set_program_class(gAppData->remotingName);`
		`- }`
		`- }`
		`- }`

libre/iceweasel/9003-FSDG-misc.patch

file modified

+448 -87

		`@@ -1,3 +1,451 @@`
		`+ From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001`
		`+ From: grizzlyuser <grizzlyuser@protonmail.com>`
		`+ Date: Sat, 12 Mar 2022 17:14:25 +0100`
		`+ Subject: [PATCH] FSDG: Replace upstream default bookmarks`
		`+`
		`+ ---`
		`+ browser/base/content/default-bookmarks.html \| 50 +++++++++------------`
		`+ 1 file changed, 21 insertions(+), 29 deletions(-)`
		`+`
		`+ diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html`
		`+ index b2d18d3098..e2e643bcf2 100644`
		`+ --- a/browser/base/content/default-bookmarks.html`
		`+ +++ b/browser/base/content/default-bookmarks.html`
		`+ @@ -1,14 +1,14 @@`
		`+ #filter substitution`
		`+`
		+ -#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E
		`+ -`
		+ -#define firefox_icon data:image/png;base64,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
		`+ -`
		+ -#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
		`+ -`
		+ -#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC
		`+ -`
		+ -#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=
		+ +#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC
		`+ +`
		+ +#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC
		`+ +`
		+ +#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC
		`+ +`
		+ +#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC
		`+ +`
		+ +#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC
		`+ <!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`+ - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		`+ @@ -29,31 +29,23 @@`
		`+ <dl><p>`
		`+ <dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">default-bookmarks-toolbarfolder</h3></dt>`
		`+ <dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>`
		`+ -#ifndef NIGHTLY_BUILD`
		`+ <dl><p>`
		`+ - <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>`
		`+ + <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>`
		`+ </dl><p>`
		`+ - <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>`
		`+ + <dt><h3>Parabola GNU/Linux-libre</h3></dt>`
		`+ <dl><p>`
		`+ - <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>`
		`+ - <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>`
		`+ - <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`+ - <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>`
		`+ - </dl><p>`
		`+ -#else`
		`+ - <dl><p>`
		`+ - <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`+ - </dl><p>`
		`+ - <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>`
		`+ + <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>`
		`+ + <dt><a href="https://www.parabola.nu/packages/" icon="@parabola_icon@">Parabola GNU/Linux-libre Packages</a>`
		`+ + <dt><a href="https://wiki.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Wiki</a>`
		`+ + <dt><a href="https://labs.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Labs</a>`
		`+ + </dl><p>`
		`+ + <dt><h3>Free Software Foundation</h3></dt>`
		`+ <dl><p>`
		`+ - <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-nightly-blog">default-bookmarks-nightly-blog</a></dt>`
		`+ - <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" data-l10n-id="default-bookmarks-bugzilla">default-bookmarks-bugzilla</a></dt>`
		`+ - <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn" data-l10n-id="default-bookmarks-mdn">default-bookmarks-mdn</a></dt>`
		`+ - <dt><a href="https://addons.mozilla.org/firefox/addon/nightly-tester-tools/" icon="@addon_icon@" data-l10n-id="default-bookmarks-nightly-tester-tools">default-bookmarks-nightly-tester-tools</a></dt>`
		`+ - <dt><a href="about:crashes" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-crashes">default-bookmarks-crashes</a></dt>`
		`+ - <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-planet">default-bookmarks-planet</a></dt>`
		`+ + <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a>`
		`+ + <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a>`
		`+ + <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a>`
		`+ + <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a>`
		`+ </dl><p>`
		`+ -#endif`
		`+ </dl>`
		`+ </body>`
		`+ </html>`
		`+ --`
		`+ 2.35.1`
		`+`
		`+ From f45cd8b1dced532084831db3c8c4ca6966686bb8 Mon Sep 17 00:00:00 2001`
		`+ From: grizzlyuser <grizzlyuser@protonmail.com>`
		`+ Date: Sat, 12 Mar 2022 18:11:34 +0100`
		`+ Subject: [PATCH] FSDG: drop default protocol handlers`
		`+`
		`+ All of these appear to serve nonfree JavaScript and/or other stuff that`
		`+ conflicts with the FSDG. If something was dropped in error, please prove`
		`+ it by referencing the appropriate licenses of those works.`
		`+ ---`
		`+ uriloader/exthandler/HandlerList.jsm \| 231 +--------------------------`
		`+ 1 file changed, 1 insertion(+), 230 deletions(-)`
		`+`
		`+ diff --git a/uriloader/exthandler/HandlerList.jsm b/uriloader/exthandler/HandlerList.jsm`
		`+ index 04b92059ff..6b0c611c6f 100644`
		`+ --- a/uriloader/exthandler/HandlerList.jsm`
		`+ +++ b/uriloader/exthandler/HandlerList.jsm`
		`+ @@ -9,234 +9,5 @@ this.EXPORTED_SYMBOLS = ["kHandlerList", "kHandlerListVersion"];`
		`+ this.kHandlerListVersion = 1;`
		`+`
		`+ this.kHandlerList = {`
		`+ - default: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - cs: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Seznam",`
		`+ - uriTemplate: "https://email.seznam.cz/newMessageScreen?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - csb: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Poczta Interia.pl",`
		`+ - uriTemplate: "http://poczta.interia.pl/mh/?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "OnetPoczta",`
		`+ - uriTemplate: "http://poczta.onet.pl/napisz.html?uri=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - "es-CL": {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Outlook",`
		`+ - uriTemplate:`
		`+ - "https://outlook.live.com/default.aspx?rru=compose&to=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - "ja-JP-mac": {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Yahoo!メール",`
		`+ - uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - ja: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Yahoo!メール",`
		`+ - uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - kk: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Яндекс.Почта",`
		`+ - uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Mail.Ru",`
		`+ - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - ltg: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "inbox.lv mail",`
		`+ - uriTemplate: "https://mail.inbox.lv/compose?to=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - lv: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "inbox.lv mail",`
		`+ - uriTemplate: "https://mail.inbox.lv/compose?to=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - pl: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Poczta Interia.pl",`
		`+ - uriTemplate: "https://poczta.interia.pl/mh/?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - ru: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Яндекс.Почту",`
		`+ - uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Mail.Ru",`
		`+ - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - sah: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Яндекс.Почта",`
		`+ - uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Mail.Ru",`
		`+ - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - uk: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Outlook",`
		`+ - uriTemplate:`
		`+ - "https://outlook.live.com/default.aspx?rru=compose&to=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - uz: {`
		`+ - schemes: {`
		`+ - mailto: {`
		`+ - handlers: [`
		`+ - {`
		`+ - name: "Gmail",`
		`+ - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`+ - },`
		`+ - {`
		`+ - name: "Mail.Ru",`
		`+ - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ + default: {schemes: { }}`
		`+ };`
		`+ --`
		`+ 2.35.1`
		`+`
		`+ From 897828b97d1729b3e2fc734c699a1f0fa127cbe2 Mon Sep 17 00:00:00 2001`
		`+ From: grizzlyuser <grizzlyuser@protonmail.com>`
		`+ Date: Tue, 15 Mar 2022 13:29:29 +0100`
		`+ 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.`
		`+ ---`
		`+ 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(-)`
		`+`
		`+ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js`
		`+ index 33a2ff36a7..72526ee950 100644`
		`+ --- a/browser/app/profile/firefox.js`
		`+ +++ b/browser/app/profile/firefox.js`
		`+ @@ -997,7 +997,7 @@ pref("browser.preferences.experimental", true);`
		`+ #else`
		`+ pref("browser.preferences.experimental", false);`
		`+ #endif`
		`+ -pref("browser.preferences.moreFromMozilla", true);`
		`+ +pref("browser.preferences.moreFromMozilla", false);`
		`+ pref("browser.preferences.experimental.hidden", false);`
		`+ pref("browser.preferences.defaultPerformanceSettings.enabled", true);`
		`+`
		`+ diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn`
		`+ index 752b0b2ae3..4f3babeaf8 100644`
		`+ --- a/browser/components/preferences/jar.mn`
		`+ +++ b/browser/components/preferences/jar.mn`
		`+ @@ -14,10 +14,6 @@ browser.jar:`
		`+ content/browser/preferences/containers.js`
		`+ content/browser/preferences/sync.js`
		`+ content/browser/preferences/experimental.js`
		`+ - content/browser/preferences/moreFromMozilla.js`
		`+ content/browser/preferences/fxaPairDevice.xhtml`
		`+ content/browser/preferences/fxaPairDevice.js`
		`+ content/browser/preferences/findInPage.js`
		`+ - 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`
		`+ diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js`
		`+ index f6dc2b3781..34c7d8c528 100644`
		`+ --- a/browser/components/preferences/preferences.js`
		`+ +++ b/browser/components/preferences/preferences.js`
		`+ @@ -10,7 +10,6 @@`
		`+ /* import-globals-from privacy.js */`
		`+ /* import-globals-from sync.js */`
		`+ /* import-globals-from experimental.js */`
		`+ -/* import-globals-from moreFromMozilla.js */`
		`+ /* import-globals-from findInPage.js */`
		`+ /* import-globals-from /browser/base/content/utilityOverlay.js */`
		`+ /* import-globals-from /toolkit/content/preferencesBindings.js */`
		`+ @@ -203,14 +202,6 @@ function init_all() {`
		`+ register_module("paneExperimental", gExperimentalPane);`
		`+ }`
		`+`
		`+ - NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true });`
		`+ - if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) {`
		`+ - document.getElementById("category-more-from-mozilla").hidden = false;`
		`+ - gMoreFromMozillaPane.option = NimbusFeatures.moreFromMozilla.getVariable(`
		`+ - "template"`
		`+ - );`
		`+ - register_module("paneMoreFromMozilla", gMoreFromMozillaPane);`
		`+ - }`
		`+ // The Sync category needs to be the last of the "real" categories`
		`+ // registered and inititalized since many tests wait for the`
		`+ // "sync-pane-loaded" observer notification before starting the test.`
		`+ diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml`
		`+ index 81059f3d2e..be23729276 100644`
		`+ --- a/browser/components/preferences/preferences.xhtml`
		`+ +++ b/browser/components/preferences/preferences.xhtml`
		`+ @@ -33,7 +33,6 @@`
		`+ <link rel="localization" href="browser/branding/sync-brand.ftl"/>`
		`+ <link rel="localization" href="browser/browser.ftl"/>`
		`+ <link rel="localization" href="browser/preferences/preferences.ftl"/>`
		`+ - <link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/>`
		`+ <!-- Used by fontbuilder.js -->`
		`+ <link rel="localization" href="browser/preferences/fonts.ftl"/>`
		`+ <link rel="localization" href="toolkit/featuregates/features.ftl"/>`
		`+ @@ -152,16 +151,6 @@`
		`+ <image class="category-icon"/>`
		`+ <label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>`
		`+ </richlistitem>`
		`+ - <richlistitem id="category-more-from-mozilla"`
		`+ - class="category"`
		`+ - hidden="true"`
		`+ - data-l10n-id="more-from-moz-category"`
		`+ - data-l10n-attrs="tooltiptext"`
		`+ - value="paneMoreFromMozilla"`
		`+ - align="center">`
		`+ - <image class="category-icon"/>`
		`+ - <label class="category-name" flex="1" data-l10n-id="more-from-moz-title"></label>`
		`+ - </richlistitem>`
		`+ </richlistbox>`
		`+`
		`+ <spacer flex="1"/>`
		`+ @@ -214,7 +203,6 @@`
		`+ #include containers.inc.xhtml`
		`+ #include sync.inc.xhtml`
		`+ #include experimental.inc.xhtml`
		`+ -#include moreFromMozilla.inc.xhtml`
		`+ </vbox>`
		`+ </vbox>`
		`+ </vbox>`
		`+ --`
		`+ 2.35.1`
		`+`
		`diff --git a/browser/app/permissions b/browser/app/permissions`
		`index 991284081d..888cc811ce 100644`
		`--- a/browser/app/permissions`
		`@@ -98,72 +546,6 @@`
		`## Firefox Account - Signed in`

		`sync-profile-picture =`
		`- diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in`
		`- index 2d3c7b4..00221d3 100644`
		`- --- a/browser/locales/generic/profile/bookmarks.html.in`
		`- +++ b/browser/locales/generic/profile/bookmarks.html.in`
		`- @@ -1,15 +1,15 @@`
		`- #filter substitution`
		`- #include @BOOKMARKS_INCLUDE_PATH@`
		`-`
		- -#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E
		- +#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC
		`-`
		- -#define firefox_icon data:image/png;base64,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
		- +#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC
		`-`
		- -#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
		- +#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC
		`-`
		- -#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC
		- +#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC
		`-`
		- -#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=
		- +#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC
		`- <!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		`- @@ -21,29 +21,21 @@`
		`- <dl><p>`
		`- <dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>`
		`- <dd>@bookmarks_toolbarfolder_description@`
		`- -#ifndef NIGHTLY_BUILD`
		`- <dl>`
		`- - <p><dt><a href="https://www.mozilla.org/@AB_CD@/firefox/central/" icon="@firefox_icon@">@getting_started@</a></dt>`
		`- + <p><dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>`
		`- </dl>`
		`- - <p><dt><h3>@firefox_heading@</h3></dt>`
		`- + <p><dt><h3>Parabola GNU/Linux-libre</h3></dt>`
		`- <dl><p>`
		`- - <dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@firefox_icon@">@firefox_get_help@</a>`
		`- - <dt><a href="https://support.mozilla.org/@AB_CD@/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@">@firefox_customize@</a>`
		`- - <dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>`
		`- - <dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>`
		`- + <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>`
		`- + <dt><a href="https://www.parabola.nu/packages/" icon="@parabola_icon@">Parabola GNU/Linux-libre Packages</a>`
		`- + <dt><a href="https://wiki.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Wiki</a>`
		`- + <dt><a href="https://labs.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Labs</a>`
		`- </dl>`
		`- -#else`
		`- - <dl>`
		`- - <p><dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>`
		`- - </dl>`
		`- - <p><dt><h3>@nightly_heading@</h3></dt>`
		`- + <p><dt><h3>Free Software Foundation</h3></dt>`
		`- <dl><p>`
		`- - <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@">@nightly_blog@</a>`
		`- - <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz">@bugzilla@</a>`
		`- - <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn">@mdn@</a>`
		`- - <dt><a href="https://addons.mozilla.org/@AB_CD@/firefox/addon/nightly-tester-tools/" icon="@addon_icon@">@nightly_tester_tools@</a>`
		`- - <dt><a href="about:crashes" icon="@mozilla_icon@">@crashes@</a>`
		`- - <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a>`
		`- + <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a>`
		`- + <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a>`
		`- + <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a>`
		`- + <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a>`
		`- </dl>`
		`- -#endif`
		`- </dl>`
		`diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml`
		`index 5b0709e..38ea275 100644`
		`--- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml`
		`@@ -247,27 +629,6 @@`

		`addon-page-options-button =`
		`.title = Tools for all add-ons`
		`- diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties`
		`- index 4c4ea76..e0f2880 100644`
		`- --- a/browser/locales/en-US/chrome/browser-region/region.properties`
		`- +++ b/browser/locales/en-US/chrome/browser-region/region.properties`
		`- @@ -9,16 +9,3 @@`
		`- # don't make any spelling errors here.`
		`- gecko.handlerService.defaultHandlersVersion=4`
		`-`
		`- -# The default set of protocol handlers for mailto:`
		`- -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail`
		`- -gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s`
		`- -gecko.handlerService.schemes.mailto.1.name=Gmail`
		`- -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s`
		`- -`
		`- -# The default set of protocol handlers for irc:`
		`- -gecko.handlerService.schemes.irc.0.name=Mibbit`
		`- -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s`
		`- -`
		`- -# The default set of protocol handlers for ircs:`
		`- -gecko.handlerService.schemes.ircs.0.name=Mibbit`
		`- -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s`
		`diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl`
		`index 5ac8a7b08c..fec81698e3 100644`
		`--- a/browser/components/protections/content/protections.ftl`

libre/iceweasel/PKGBUILD

file modified

+4 -9

		`@@ -47,7 +47,7 @@`

		`pkgname=iceweasel`
		`epoch=1`
		`- pkgver=97.0.2`
		`+ pkgver=98.0.1`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`_brandingver=95.0-1`
		`@@ -56,7 +56,7 @@`
		`arch+=(armv7h i686)`
		`license=(MPL GPL LGPL)`
		`url="https://wiki.parabola.nu/Iceweasel"`
		`- depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)`
		`+ depends=(gtk3 libxt mime-types dbus-glib ffmpeg4.4 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`
		`@@ -74,7 +74,6 @@`
		`replaces=('firefox')`
		`options=(!emptydirs !makeflags !strip !lto !debug) # FIXME: make debug package`
		`source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz{,.asc}`
		`- 0001-Use-remoting-name-for-GDK-application-names.patch`
		`$pkgname.desktop)`
		`source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}`
		`9001-FSDG-always-sync-remote-settings-with-local-dump.patch`
		`@@ -86,15 +85,14 @@`
		`source_i686=('avoid-libxul-OOM-python-check.patch'`
		`'rust-static-disable-network-test-on-static-libraries.patch'`
		`'firefox-93.0_x86_math_private_20211110.patch')`
		`- sha256sums=('c9f127741beabde78b021dc95b1740259d01677d461400682cb30e072126f075'`
		`+ sha256sums=('f8de2f514d94cad25a2c8a5d219399de5c05a907607d51c5c5235a8bc9bb361c'`
		`'SKIP'`
		`- '8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01'`
		`'9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')`
		`sha256sums+=('d1b9d98cea5356df97fc5c221830de1ced8f826cb39fac9427c407e3eae54c02'`
		`'SKIP'`
		`'a4e3c3869085cb282cb5a0fcb64e816c0415f25d4792a62c4f1d599d3111b23c'`
		`'cb3079a0dc30321183bf8e112532c6f2aad045f68103f8d422c9691137aa770e'`
		`- '39e3a5e1ad137e21f842a44d7e3bd24050292d2b41fe59b4e7c7dfed52a195dd'`
		`+ '464ced458ee7d444dc7492a6f4e37547aa606fc03edce000ddb8c2e6b142097d'`
		`'9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83'`
		`'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d')`
		`sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`@@ -146,9 +144,6 @@`
		`mkdir mozbuild`
		`cd firefox-$pkgver`

		`- # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052`
		`- patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch`
		`-`
		`cat >../mozconfig <<END`
		`ac_add_options --enable-application=browser`
		`mk_add_options MOZ_OBJDIR=${PWD@Q}/obj`

libre/python-reportlab/PKGBUILD

file modified

+15 -9

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch):`
		`+ # Maintainer (Arch): Morten Linderud <foxboron@archlinux.org>`
		`# Contributor (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>`
		`# Contributor (Arch): William Rea <sillywilly@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`@@ -8,21 +8,21 @@`

		`_origname=reportlab`
		`pkgname=python-reportlab`
		`- pkgver=3.5.34`
		`+ pkgver=3.6.6`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`pkgdesc="A proven industry-strength PDF generating solution"`
		`pkgdesc+=", without nonfree Adobe T1 fonts support"`
		`arch=('x86_64')`
		`arch+=('i686' 'armv7h')`
		`- url="https://bitbucket.org/rptlab/reportlab"`
		`+ url="https://www.reportlab.com/"`
		`depends=('freetype2')`
		`- depends=('python' 'python-pip' 'python-pillow')`
		`+ depends=('python' 'python-pillow')`
		`makedepends=('freetype2' 'python-pillow' 'mercurial')`
		`license=('BSD')`
		`source=(https://files.pythonhosted.org/packages/source/${_origname::1}/${_origname}/${_origname}-${pkgver}.tar.gz`
		`'free-fonts.patch')`
		`- sha256sums=('9675a26d01ec141cb717091bb139b6227bfb3794f521943101da50327bff4825'`
		`+ sha256sums=('dd1cdb62dc123f5859ca514eb639f70660bdc818c95fb0ee2370a175a0e20ce4'`
		`'7e31b2a2bde509d628cb7da9fec301d730d38ea8a8dc9956cdfc8da4ebeec370')`

		`prepare() {`
		`@@ -35,13 +35,19 @@`
		`rm -fv src/reportlab/fonts/{bitstream-vera-license.txt,Vera*}`
		`}`

		`- package() {`
		`+ build() {`
		`cd ${_origname}-${pkgver}`
		`- python setup.py install --root="$pkgdir" --optimize=1`
		`- install -D -m644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/license.txt`
		`+ python setup.py build`
		`}`

		`check() {`
		`cd ${_origname}-${pkgver}`
		`- python setup.py tests`
		`+ python setup.py tests \|\| true`
		`+ rm tests/_i_am_actually_a_*`
		`+ }`
		`+`
		`+ package() {`
		`+ cd ${_origname}-${pkgver}`
		`+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build`
		`+ install -D -m644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/license.txt`
		`}`

pcr-testing/hts_engine_api-git/PKGBUILD

file added

+39

		`@@ -0,0 +1,39 @@`
		`+ # Maintainer bill-auger <bill-auger@programmer.net>`
		`+`
		`+`
		`+ # rationale for VCS package:`
		`+ # - the latest release source-ball (from 2015) does not compile`
		`+`
		`+`
		`+ pkgname=hts_engine_api-git`
		`+ pkgver=0.0.0.vcs`
		`+ pkgrel=1`
		`+ pkgdesc="Synthesize speech waveform from HTS-trained HMMs"`
		`+ arch=(armv7h i686 x86_64)`
		`+ license=(custom:BSD3)`
		`+ url=http://hts-engine.sourceforge.net/`
		`+ makedepends=(cmake git)`
		`+ source=(git+https://github.com/r9y9/hts_engine_API.git)`
		`+ sha256sums=('SKIP')`
		`+`
		`+`
		`+ build()`
		`+ {`
		`+ mkdir "${srcdir}"/hts_engine_API/src/build`
		`+ cd "${srcdir}"/hts_engine_API/src/build`
		`+`
		`+ cmake -DCMAKE_BUILD_TYPE=Release \`
		`+ -DBUILD_SHARED_LIBS=ON \`
		`+ -DCMAKE_INSTALL_PREFIX=/usr \`
		`+ -DCMAKE_INSTALL_LIBDIR=lib ..`
		`+ make`
		`+ }`
		`+`
		`+ package()`
		`+ {`
		`+ cd "${srcdir}"/hts_engine_API/src/build`
		`+`
		`+ make DESTDIR="${pkgdir}" install`
		`+`
		`+ install -Dm644 ../COPYING "${pkgdir}"/usr/share/licences/${pkgname}/COPYING`
		`+ }`

pcr-testing/qtau/PKGBUILD

file added

+38

		`@@ -0,0 +1,38 @@`
		`+ # Maintainer bill-auger <bill-auger@programmer.net>`
		`+`
		`+`
		`+ pkgname=qtau`
		`+ pkgver=0.5.5`
		`+ pkgrel=1`
		`+ pkgdesc="Qt based UTAU clone (also supports FESTIVAL and MBROLA voices)"`
		`+ arch=(armv7h i686 x86_64)`
		`+ license=(GPL3 CCPL custom:CC0) # the CCPL is CC-BY-3.0`
		`+ url=https://www.qtau.de/`
		`+ depends=(espeak-ng fftw gsl hts_engine_api-git jack2 libsmf qt5-base sekai sinsy)`
		`+ makedepends=(boost)`
		`+ source=(${pkgname}-${pkgver}.tar.gz::https://notabug.org/isengaara/${pkgname}/archive/upstream/${pkgver}.tar.gz)`
		`+ sha256sums=('ebc491e39fa76c9a7f1c92faaac193cc7153d0dc092ade54fc3e54b85511189f')`
		`+`
		`+`
		`+ prepare()`
		`+ {`
		`+ mv "${srcdir}"/${pkgname}{,-${pkgver}}`
		`+ }`
		`+`
		`+ build()`
		`+ {`
		`+ mkdir "${srcdir}"/${pkgname}-${pkgver}/build`
		`+ cd "${srcdir}"/${pkgname}-${pkgver}/build`
		`+`
		`+ qmake PREFIX=/usr ..`
		`+ make`
		`+ }`
		`+`
		`+ package()`
		`+ {`
		`+ cd "${srcdir}"/${pkgname}-${pkgver}/build`
		`+`
		`+ make INSTALL_ROOT="${pkgdir}" install`
		`+`
		`+ install -Dm644 ../LICENSES/CC0-1.0.txt "${pkgdir}"/usr/share/licences/${pkgname}/CC0-1.0.txt`
		`+ }`

pcr-testing/sekai/PKGBUILD

file added

+50

		`@@ -0,0 +1,50 @@`
		`+ # Maintainer bill-auger <bill-auger@programmer.net>`
		`+`
		`+`
		`+ # NOTE: this code-base was forked from a BSD3 project,`
		`+ # then re-licensed AGPL; but the original license`
		`+ # was apparently deleted from the code-base.`
		`+ # the original license still applies however;`
		`+ # so we fetch it from the original upstream`
		`+`
		`+`
		`+ pkgname=sekai`
		`+ pkgver=0.6rc0`
		`+ pkgrel=1`
		`+ pkgdesc="High-quality speech analysis, manipulation, and synthesis system"`
		`+ arch=(armv7h i686 x86_64)`
		`+ license=(AGPL3 custom:BSD3)`
		`+ url=https://www.qtau.de/`
		`+ depends=(fftw gsl jack2 libsndfile)`
		`+ makedepends=(boost cmake)`
		`+ source=(${pkgname}-${pkgver}.tar.gz::https://notabug.org/isengaara/${pkgname}/archive/${pkgver}.tar.gz`
		`+ https://raw.githubusercontent.com/mmorise/World/master/LICENSE.txt)`
		`+ sha256sums=('5ee1a1879f5cb4471315f35aba24cb097752399ea711d9d774cab9f916d5e4aa'`
		`+ '6921ef0a65a931509b4055075fd847d7257c4094609075dd0615e8e997215f7e')`
		`+`
		`+`
		`+ prepare()`
		`+ {`
		`+ mv "${srcdir}"/${pkgname}{,-${pkgver}}`
		`+ }`
		`+`
		`+ build()`
		`+ {`
		`+ mkdir "${srcdir}"/${pkgname}-${pkgver}/build`
		`+ cd "${srcdir}"/${pkgname}-${pkgver}/build`
		`+`
		`+ cmake -DCMAKE_BUILD_TYPE=Release \`
		`+ -DBUILD_SHARED_LIBS=ON \`
		`+ -DCMAKE_INSTALL_PREFIX=/usr \`
		`+ -DCMAKE_INSTALL_LIBDIR=lib ..`
		`+ make`
		`+ }`
		`+`
		`+ package()`
		`+ {`
		`+ cd "${srcdir}"/${pkgname}-${pkgver}/build`
		`+`
		`+ make DESTDIR="${pkgdir}" install`
		`+`
		`+ install -Dm644 "${srcdir}"/LICENSE.txt "${pkgdir}"/usr/share/licences/${pkgname}/LICENSE.txt`
		`+ }`

pcr-testing/sinsy/PKGBUILD

file added

+50

		`@@ -0,0 +1,50 @@`
		`+ # Maintainer bill-auger <bill-auger@programmer.net>`
		`+`
		`+`
		`+ pkgname=sinsy`
		`+ pkgver=0.9.6rc0`
		`+ pkgrel=1`
		`+ pkgdesc="HMM-based singing voice synthesis system"`
		`+ arch=(armv7h i686 x86_64)`
		`+ license=(custom:BSD3)`
		`+ url=https://www.qtau.de/`
		`+ depends=(fftw gsl libsndfile sekai)`
		`+ makedepends=(boost cmake)`
		`+ source=(${pkgname}-${pkgver}.tar.gz::https://notabug.org/isengaara/${pkgname}/archive/${pkgver}.tar.gz)`
		`+ sha256sums=('d769778f0730e9d3d343c7de2b9f09c3903afc38a7ac1b54d104976fff16ab82')`
		`+`
		`+`
		`+ prepare()`
		`+ {`
		`+ mv "${srcdir}"/${pkgname}{,-${pkgver}}`
		`+ cd "${srcdir}"/${pkgname}-${pkgver}/`
		`+`
		`+ # error: for_each is not a member of std (in src/lib/utau/UtauDB.cpp)`
		`+ # possibly due to the -std=c++14 in build()`
		`+ sed -i 's\|#include <iostream>\|#include <algorithm>\n#include <iostream>\|' src/lib/utau/UtauDB.cpp`
		`+ }`
		`+`
		`+ build()`
		`+ {`
		`+ mkdir "${srcdir}"/${pkgname}-${pkgver}/build`
		`+ cd "${srcdir}"/${pkgname}-${pkgver}/build`
		`+`
		`+ # error: c++17 does not allow dynamic exception specifications`
		`+ # (in src/lib/xml/XmlParser.h, src/lib/util/IReadableStream.h)`
		`+ export CXXFLAGS="-std=c++14"`
		`+`
		`+ cmake -DCMAKE_BUILD_TYPE=Release \`
		`+ -DBUILD_SHARED_LIBS=ON \`
		`+ -DCMAKE_INSTALL_PREFIX=/usr \`
		`+ -DCMAKE_INSTALL_LIBDIR=lib ..`
		`+ make`
		`+ }`
		`+`
		`+ package()`
		`+ {`
		`+ cd "${srcdir}"/${pkgname}-${pkgver}/build`
		`+`
		`+ make DESTDIR="${pkgdir}" install`
		`+`
		`+ install -Dm644 ../src/COPYING "${pkgdir}"/usr/share/licences/${pkgname}/COPYING`
		`+ }`

grizzlyuser commented 2 years ago

Only the most recent commit is relevant. Built for x86_64.

Also tried to build for i686, but it seems that wasi* dependencies have version 13 in Arch Linux 32, but they in turn depend on packages which are in testing repo. It still fails even after installing clang, lld, llvm, llvm-libs and rust from [testing] (downloaded directly from Arch Linux 32 and installed into librechroot), and I have no idea how to fix that quickly without wasting too much time. Please find the logs:

iceweasel-1:97.0-1.parabola1-i686-prepare.log https://termbin.com/24js
iceweasel-1:97.0-1.parabola1-i686-build.log https://termbin.com/0ngm

Didn't try to build for armv7h, sorry.

51 new commits added

[iceweasel]: upgrade to v97.0.2
libre/iceweasel: 97.0, add missing i686 patch
pcr: remove ruby-asciidoctor
licenses-20220125-1.parabola1: updating version
systemd-250.3-4.parabola1: rebuild
[tomb]: upgrade to v2.9
updpkg: libre/parabolaiso 61-1
linux-libre-firmware: split whence, add new conflicts
[archlinux32-keyring]: rebuild v20220131-1.1
[archlinux32-keyring]: upgrade to v20220131
Update libre/parabola-keyring
Update libre/parabola-keyring
Update libre/parabola-keyring
[secp256k1-git]: remove package
[iceweasel]: tweak for i686
[initify]: re-work patches
pcr: libosmocore: fix libremakepkg build due to missing libusb
pcr: simtrace2: update to 0.8.1 by syncing with AUR
pcr: simtrace: update to 1.5 by syncing with AUR
Revert "aur: simtrace: update from AUR"
pcr: libosmocore: update to 1.6.0 by syncing with Aur
[pacman]: add 'pacman-keyring' init script for openrc (WIP, unused)
[initify]: add pkg
[pciutils-staticlibs]: upgrade to v3.7.0
libre/iceweasel: upstream changes for 96.0.1
Update libre/your-freedom
[base]: minimize diff with arch
[epiphany]: upgrade to v41.3
[bibletime]: upgrade to v3.0.2
systemd-250.3-1.parabola1: updating version
Update libre/your-freedom
Update libre/your-freedom
force rebuild
reset to 648d7822b
force rebuild
force rebuild
[mirror-sync]: wip - add pkg
[cups-filters]: wip - rebuild against latest poppler
wip eudev
[cutter]: wip - tweak for i686
[base]: add icu-compat
wip systemd
[okular]: wip upgrade to v21.08.1
[icecat]: upgrade to v91.4.0
Update libre/your-freedom
Update libre/your-freedom
Update libre/your-freedom
pcr: python-redmine: actually make it architecture specific
pcr: python-redmine: make it architecture specific
pcr: python-redmine: rebuild for python 3.10
pcr/python-pypump: rebuilt and dropped python2-pypump split package because upstream depends are gone