[Dev] [PATCH] Orphan Libre package [iceweasel] marked out-of-date

Andreas Grapentin andreas at grapentin.org
Sun Mar 29 13:07:35 GMT 2020


Hi,

thank you for the patches. a new updated iceweasel-74 is now available
on parabola, thanks to your efforts!

I have taken the liberty of not applying commit no. 5, and instead to
keep using the branding tarballs. This doesn't mean that I'm opposed to
the proposed change, I just feel like this is something that we should
properly discuss and identify the advantages and disadvantages of both
approaches, before making a change.

Best,
Andreas

On Thu, Mar 26, 2020 at 09:58:39AM +0000, grizzlyuser wrote:
> I'm sorry for the late reply, had completely abandoned the
> mailbox for some time.
> 
> Please find the patch for Iceweasel 74.0-2 attached. As usual,
> it contains descriptions of all the changes in commit messages.
> 
> Successfully built on x86_64, i686 and armv7h.
> 
> 
> On Thursday, March 12, 2020 3:02 PM, Andreas Grapentin <andreas at grapentin.org> wrote:
> 
> > Thanks for the patches. I applied them and the packages are currently
> > rebuilding. Keep them coming. Especially patches to update the ice*
> > family of packages are always appreciated, mainly because they take so
> > much time to get right.
> >
> > So thanks again!
> 
> Great! Thank you too!
> 
> 
> On Friday, March 13, 2020 2:58 AM, bill-auger <bill-auger at peers.community> wrote:
> 
> > that is a bit confusing - there are several 'iceweasel' git repos; even one named 'iceweasel-branding.git'; which is actually not used anymore - we should probably delete that one and rename the current one to 'iceweasel-branding.git' - OTOH, i dont see why we could not fore-go making a special tarball each time, and simply add the git repo to the sources=() array
> >
> > anyways, the current one is at https://git.parabola.nu/packages/iceweasel.git/
> 
> Thanks you for all the suggestions!
> 
> This one is done in the commit 5. The only issue I see is that
> sources tarball generated after libremakepkg appears to have
> some git related files instead of the actual branding sources.
> It looks like a bug in libremakepkg or whatever makes that
> tarball. If something is not OK, please just disregard the
> last commit.
> 
> > On Fri, 14 Feb 2020 21:52:25 +0000 grizzlyuser wrote:
> >
> > > --- a/libre/iceweasel/PKGBUILD
> > > +++ b/libre/iceweasel/PKGBUILD
> > > @@ -5,6 +5,7 @@
> > >
> > > Maintainer (alarm): Kevin Mihelich kevin at archlinuxarm.org
> > >
> > > ==========================================================
> > >
> > > Maintainer (arch32): Andreas Baumann mail at andreasbaumann.cc
> > >
> > > ============================================================
> > >
> > > Contributor (arch32): Erich Eckner git at eckner.net
> > >
> > > ==================================================
> > >
> > > +# Contributor (Arch Linux ARM): Kevin Mihelich kevin at archlinuxarm.org
> >
> > "Kevin Mihelich" is a duplicate there
> 
> Indeed, my bad, corrected.
> 
> > On Fri, 14 Feb 2020 21:52:25 +0000 grizzlyuser wrote:
> >
> > > -   .placeholder = Search addons.mozilla.org
> > >
> > > -   .placeholder = Search www.parabola.nu/packages
> > >
> > > +- .placeholder = Search addons.mozilla.org
> > > ++ .placeholder = Search www.parabola.nu/packages
> > > +
> >
> > nice little extra - we should go over BR #2488 to see how many nit-pickings still remain
> > https://labs.parabola.nu/issues/2488
> >
> > im a bit confused about this though, now that im looking at it - in v72, the search queries are actually directed to the gnuzilla addons page
> > https://directory.fsf.org/wiki/Gnuzilla
> >
> > (redirected apparently) - the query is dropped on the floor when it arrives; but i think the new null message will still be incorrect, until we sort out what is the purpose of each these keys - or maybe just delete that search box - or maybe convince gnuzilla to make it work as expected
> >
> > this is what i have in my v72 abslibre; and i dont see any changes in this latest patch-set:
> >
> > $ grep fsf vendor.js.in
> > pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat");
> > pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat");
> > pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat");
> >
> > $ grep 'www.parabola.nu/packages' vendor.js.in
> > pref("extensions.getAddons.search.browseURL", "https://www.parabola.nu/packages/?q=%TERMS%");
> >
> > i think 'extensions.getAddons.search.url' is the one that controls that search box
> 
> It looks like latest upstream versions introduced changes that
> remove older preferences. Please see [PATCH 3/5].
> 
> > On Fri, 14 Feb 2020 21:52:25 +0000 grizzlyuser wrote:
> >
> > > Let's stick as close to upstream as possible.
> >
> > that is the goal - this PKGBUILD has accumulated a lot of cruft over the years though - sometimes a switch or two need to be flipped just to get one arch to build - then they may be forgotten to be flipped back next time whenwhatever quirk has passed
> 
> Right. I think every flag and and preference may be removed or
> change meaning in future, so it makes sense to review and update
> them from time to time. But that's hard to go over each one of
> them.
> 
> > On Fri, 14 Feb 2020 21:52:25 +0000 grizzlyuser wrote:
> >
> > > +# vim:set sw=2 et:
> >
> > yea maybe not that close though :)
> > personally, i delete every one of those "litter-bug droppings" that i see and i am not ashamed to admit it
> 
> Sorry, I don't understand. Should it be deleted, or not?
> 
> 

> From 22b4cd62b5cbfa0807339855df2d89d7126859ad Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Wed, 25 Mar 2020 11:11:52 +0200
> Subject: [PATCH 1/5] Sync with changes from Arch Linux firefox 74.0-2
> 
> ---
>  libre/iceweasel/PKGBUILD | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
> index 1ee90ada9..3b538b1f1 100644
> --- a/libre/iceweasel/PKGBUILD
> +++ b/libre/iceweasel/PKGBUILD
> @@ -48,8 +48,8 @@
>  pkgname=iceweasel
>  replaces=('firefox')
>  epoch=1
> -pkgver=73.0
> -pkgrel=1
> +pkgver=74.0
> +pkgrel=2
>  pkgrel+=.parabola1
>  _brandingver=73.0
>  _brandingrel=1
> @@ -62,8 +62,8 @@ depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg nss
>           ttf-font libpulse)
>  depends+=(sqlite icu)
>  makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
> -             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2
> -             python nodejs python2-psutil cbindgen nasm)
> +             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python
> +             nodejs python2-psutil cbindgen nasm)
>  # FIXME: 'mozilla-serarchplugins' package needs re-working (see note in prepare())
>  makedepends+=(quilt libxslt imagemagick)
>  optdepends=('networkmanager: Location detection via available WiFi networks'
> @@ -83,7 +83,7 @@ source_armv7h=(arm.patch
>                 build-arm-libopus.patch)
>  source_i686=('rust-static-disable-network-test-on-static-libraries.patch'
>               'avoid-libxul-OOM-python-check.patch')
> -sha256sums=('b57af802aae32d7f4624ce8b373701236b76904abcb893ded9e0cb5805ba6e17'
> +sha256sums=('74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a'
>              'SKIP'
>              '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
>              'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
> @@ -127,6 +127,7 @@ ac_add_options --with-branding=browser/branding/iceweasel
>  ac_add_options --enable-update-channel=release
>  ac_add_options --with-distribution-id=nu.parabola
>  ac_add_options --with-unsigned-addon-scopes=app,system
> +ac_add_options --allow-addon-sideload
>  export MOZ_APP_REMOTINGNAME=${pkgname//-/}
>  export MOZ_TELEMETRY_REPORTING=
>  export MOZ_REQUIRE_SIGNING=
> @@ -342,7 +343,7 @@ END
>        ./mach package
>        LLVM_PROFDATA=llvm-profdata \
>          JARLOG_FILE="$PWD/jarlog" \
> -        xvfb-run -a -n 92 -s "-screen 0 1600x1200x24" \
> +        xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \
>          ./mach python build/pgo/profileserver.py
>  
>        if [[ ! -s merged.profdata ]]; then
> @@ -399,9 +400,8 @@ pref("spellchecker.dictionary_path", "/usr/share/hunspell");
>  // Disable default browser checking.
>  pref("browser.shell.checkDefaultBrowser", false);
>  
> -// Don't disable our bundled extensions in the application directory
> +// Don't disable extensions in the application directory
>  pref("extensions.autoDisableScopes", 11);
> -pref("extensions.shownSelectionUI", true);
>  END
>  
>    # Parabola additions to vendor.js
> -- 
> 2.26.0
> 
> 
> From e6e122a205261fe1d834c54771139279d9f022cf Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Wed, 25 Mar 2020 11:12:53 +0200
> Subject: [PATCH 2/5] Update patches for changes from Firefox 74.0
> 
> ---
>  libre/iceweasel/libre-searchengines.patch | 31 -----------------
>  libre/iceweasel/libre.patch               | 41 +++++++++--------------
>  2 files changed, 16 insertions(+), 56 deletions(-)
> 
> diff --git a/libre/iceweasel/libre-searchengines.patch b/libre/iceweasel/libre-searchengines.patch
> index e42ca78e8..220b07a95 100644
> --- a/libre/iceweasel/libre-searchengines.patch
> +++ b/libre/iceweasel/libre-searchengines.patch
> @@ -190,37 +190,6 @@ index d023e0a..15ee5f5 100644
>  -        ]
>         }
>       },
> -     "en-ZA": {
> -@@ -338,30 +214,6 @@
> -         "visibleDefaultEngines": [
> -           "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
> -         ]
> --      },
> --      "KZ": {
> --        "visibleDefaultEngines": [
> --          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
> --        ],
> --        "searchDefault": "Yandex"
> --      },
> --      "BY": {
> --        "visibleDefaultEngines": [
> --          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
> --        ],
> --        "searchDefault": "Yandex"
> --      },
> --      "RU": {
> --        "visibleDefaultEngines": [
> --          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
> --        ],
> --        "searchDefault": "Yandex"
> --      },
> --      "TR": {
> --        "visibleDefaultEngines": [
> --          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
> --        ],
> --        "searchDefault": "Yandex"
> -       }
> -     },
>       "eo": {
>  @@ -397,11 +249,6 @@
>           "visibleDefaultEngines": [
> diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
> index 96852f0ae..0870d45cb 100644
> --- a/libre/iceweasel/libre.patch
> +++ b/libre/iceweasel/libre.patch
> @@ -166,28 +166,19 @@ index 2d3c7b4..00221d3 100644
>  -#endif
>   </dl>
>  diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js
> -index 0a31843..c01e488 100644
> +index 1573c23a39..eed066db72 100644
>  --- a/devtools/client/whats-new/src/main.js
>  +++ b/devtools/client/whats-new/src/main.js
>  @@ -29,7 +29,7 @@ const aside = {
>   };
>   
>   const release = {
> --  title: "What???s New in DevTools (Firefox 72 & 71)",
> -+  title: "What???s New in DevTools (Iceweasel 72 & 71)",
> +-  title: "What???s New in DevTools (Firefox 74 & 73)",
> ++  title: "What???s New in DevTools (Iceweasel 74 & 73)",
>     linkText: "Read more",
> -   linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/72?${utmParams}`,
> +   linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/74?${utmParams}`,
>     features: [
> -@@ -39,7 +39,7 @@ const release = {
> -       href: `https://wiki.developer.mozilla.org/docs/Tools/Debugger/How_to/Set_a_watchpoint_on_a_property?${utmParams}`,
> -     },
> -     {
> --      header: `Improvements to VS Code???s Debugger for Firefox`,
> -+      header: `Improvements to VS Code???s Debugger for Iceweasel`,
> -       description: `A new source map integration makes debugging faster and also integrates with VSCode???s new column breakpoints UI for fine-grained control. The new Watchpoints can be used via VSCode???s Data Points.`,
> -       href: `https://marketplace.visualstudio.com/items?itemName=firefox-devtools.vscode-firefox-debug`,
> -     },
> -@@ -66,29 +66,6 @@ const release = {
> +@@ -71,29 +71,6 @@ const release = {
>     ],
>   };
>   
> @@ -197,19 +188,19 @@ index 0a31843..c01e488 100644
>  -  linkText: "Get DevEdition",
>  -  features: [
>  -    {
> --      header: `Asynchronous Stacks in Debugger`,
> --      description: `Asynchronous call stacks in the Debugger let you examine the event-driven function calls at previous points in time.`,
> +-      header: `Full Asynchronous Stacks in Debugger`,
> +-      description: `Step through event, timeout and promise-based function calls over time with the full-featured async stacks in Debugger.`,
>  -      href: `https://developer.mozilla.org/en-US/docs/Tools/Debugger/UI_Tour?${utmParams}`,
>  -    },
>  -    {
> --      header: `Correct Meta Viewport in Responsive Design Mode`,
> --      description: `RDM with touch simulation enabled will now correctly simulate the meta viewport rendering of a mobile device.`,
> --      href: `https://developer.mozilla.org/docs/Tools/Responsive_Design_Mode?${utmParams}`,
> +-      header: `Inspect & Debug Service Workers`,
> +-      description: `Start, pause and debug your Service Workers and inspect your Web App Manifests within the long-awaited Application panel.`,
> +-      href: `https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers?${utmParams}`,
>  -    },
>  -    {
> --      header: `CSP Style Directives No Longer Prevent CSS Edits`,
> --      description: `Editing an element???s inline style from Inspector???s rule-view now works even if style-src is blocked by CSP.`,
> --      href: `https://developer.mozilla.org/en-US/docs/Tools/Page_Inspector/How_to/Examine_and_edit_CSS?${utmParams}`,
> +-      header: `Instantly evaluated Console previews`,
> +-      description: `Peek into the results of your current Console expression and autocomplete values as you type.`,
> +-      href: `https://developer.mozilla.org/en-US/docs/Tools/Web_Console/The_command_line_interpreter?${utmParams}`,
>  -    },
>  -  ],
>  -};
> @@ -217,7 +208,7 @@ index 0a31843..c01e488 100644
>   function openLink(href, e) {
>     return openDocLink(href, {
>       relatedToCurrent: true,
> -@@ -182,11 +159,6 @@ class App extends Component {
> +@@ -187,11 +164,6 @@ class App extends Component {
>             ...release.features
>               .filter(feature => !feature.hidden)
>               .map(feature => createFactory(Feature)(feature))
> @@ -230,7 +221,7 @@ index 0a31843..c01e488 100644
>         )
>       );
>  diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
> -index f69ffa3..5a5b4d2 100644
> +index 5b0709e..38ea275 100644
>  --- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml
>  +++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
>  @@ -89,19 +89,6 @@
> @@ -241,7 +232,7 @@ index f69ffa3..5a5b4d2 100644
>  -    <footer>
>  -      <img class="dev-edition-logo"
>  -           src="chrome://devtools-startup/content/aboutdevtools/images/dev-edition-logo.svg"
> --           alt="Firefox Developer Edition logo"/>
> +-           alt="" />
>  -      <div class="footer-message">
>  -        <h1 class="footer-message-title" data-l10n-id="footer-title"></h1>
>  -        <p data-l10n-id="footer-message"></p>
> -- 
> 2.26.0
> 
> 
> From 32be52497ae8e3bfe21d6a13e179392fb607a836 Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Wed, 25 Mar 2020 11:34:12 +0200
> Subject: [PATCH 3/5] Adjust vendor.js preferences for search engines and
>  addons
> 
> This is mostly related to a recent switch of about:addons from XUL to
> HTML [1].
> 
> extensions.webservice.discoverURL has been removed upstream, see [2].
> 
> extensions.getAddons.search.url seems to be removed as well, but could
> not find any proofs except that source code search doesn't find it
> anymore. Couldn't see any effect from it either (see [4]).
> 
> That's why removed those two. Also changed the search engines URL to a
> more appropriate one, and also disabled 'Recommendations' section the
> same way Tor Browser Bundle does this [3].
> 
> [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1558982
> [2] https://bugzilla.mozilla.org/show_bug.cgi?id=1544011
> [3] https://trac.torproject.org/projects/tor/ticket/22073
> [4] http://kb.mozillazine.org/Extensions.getAddons.search.url
> ---
>  libre/iceweasel/vendor.js.in | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in
> index 562f270d7..c4b4a13da 100644
> --- a/libre/iceweasel/vendor.js.in
> +++ b/libre/iceweasel/vendor.js.in
> @@ -212,10 +212,8 @@ pref("media.peerconnection.ice.default_address_only", true);
>  
>  pref("font.default.x-western", "sans-serif");
>  
> -// Preferences for the Get Add-ons panel and search engines
> -pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat");
> -pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat");
> -pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat");
> +// URL for the 'Find more search engines' link in about:preferences#search
> +pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/Collection:Search_engines");
>  
>  // Mobile
>  pref("privacy.announcements.enabled", false);
> @@ -320,3 +318,7 @@ pref("privacy.resistFingerprinting.block_mozAddonManager", true);
>  // Disable 'What's New' gift icon in toolbar and main menu.
>  // It shows downloaded news that sometimes contain links to non-free software like mobile Firefox.
>  pref("browser.messaging-system.whatsNewPanel.enabled", false);
> +
> +// Disable 'Recommendations' section in about:addons
> +// Related to: https://labs.parabola.nu/issues/2409
> +pref("extensions.getAddons.showPane", false);
> -- 
> 2.26.0
> 
> 
> From a4ce1ebbe3f9baf4200c351291a99f2e7ca8de4c Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Wed, 25 Mar 2020 11:35:13 +0200
> Subject: [PATCH 4/5] updpkgsums and remove duplicate maintainer/contributor
> 
> ---
>  libre/iceweasel/PKGBUILD | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
> index 3b538b1f1..84010fc74 100644
> --- a/libre/iceweasel/PKGBUILD
> +++ b/libre/iceweasel/PKGBUILD
> @@ -5,7 +5,6 @@
>  # Maintainer (alarm): Kevin Mihelich <kevin at archlinuxarm.org>
>  # Maintainer (arch32): Andreas Baumann <mail at andreasbaumann.cc>
>  # Contributor (arch32): Erich Eckner <git at eckner.net>
> -# Contributor (Arch Linux ARM): Kevin Mihelich <kevin at archlinuxarm.org>
>  # Contributor: Andreas Grapentin <andreas at grapentin.org>
>  # Contributor: Luke Shumaker <lukeshu at parabola.nu>
>  # Contributor: Andr?? Silva <emulatorman at hyperbola.info>
> @@ -89,9 +88,9 @@ sha256sums=('74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a'
>              'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
>              '091b32290e1cbb8597bd31c770f3b850d2cecc0e8ca591bb50956fde67c0a449'
>              'SKIP'
> -            'dbcd5e241ea559c611bb651b41d5f763375f5c5517390c47a0faa60544867772'
> -            'dfed11d97f1d4198a3dc608be159b6b53a11054f376cdb73bb0fe9a487ae9418'
> -            '940772282aa7b9e6fcb59ac27994fda548b8ab9fb73cc778d422d359fdd9bb93')
> +            'dcc25e04627842bbd160059f1c576397d688418198a225210fae8a5ea6c32a7a'
> +            'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e'
> +            'f42b329e96cdf15d09844ca2541d096f56a5ca946f3d94d72dd10e3411fd5e85')
>  sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b'
>                   '1882cd2a1689d41c3111abe45dab7215a5b292d5fff24fdde9af25af7b891a59')
>  sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
> -- 
> 2.26.0
> 
> 
> From 92f94e59fcd4c83840e02e087177850587c5d4d1 Mon Sep 17 00:00:00 2001
> From: grizzlyuser <grizzlyuser at protonmail.com>
> Date: Thu, 26 Mar 2020 11:20:42 +0200
> Subject: [PATCH 5/5] Fetch branding sources directly from git
> 
> ---
>  libre/iceweasel/PKGBUILD | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
> index 84010fc74..62401a43c 100644
> --- a/libre/iceweasel/PKGBUILD
> +++ b/libre/iceweasel/PKGBUILD
> @@ -64,7 +64,7 @@ makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
>               xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python
>               nodejs python2-psutil cbindgen nasm)
>  # FIXME: 'mozilla-serarchplugins' package needs re-working (see note in prepare())
> -makedepends+=(quilt libxslt imagemagick)
> +makedepends+=(quilt libxslt imagemagick git)
>  optdepends=('networkmanager: Location detection via available WiFi networks'
>              'libnotify: Notification integration'
>              'pulseaudio: Audio support'
> @@ -74,7 +74,7 @@ options=(!emptydirs !makeflags !strip)
>  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}-${_brandingrel}.branding.tar.xz{,.sig}
> +source+=("git+https://git.parabola.nu/packages/iceweasel.git#tag=${_brandingver}-${_brandingrel}"
>           libre.patch
>           libre-searchengines.patch
>           vendor.js.in)
> @@ -86,7 +86,6 @@ sha256sums=('74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a'
>              'SKIP'
>              '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
>              'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
> -            '091b32290e1cbb8597bd31c770f3b850d2cecc0e8ca591bb50956fde67c0a449'
>              'SKIP'
>              'dcc25e04627842bbd160059f1c576397d688418198a225210fae8a5ea6c32a7a'
>              'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e'
> @@ -208,7 +207,7 @@ END
>    ## branding ##
>  
>    echo "applying parabola branding"
> -  local brandingsrcdir="${srcdir}/${pkgname}-${_brandingver}"
> +  local brandingsrcdir="${srcdir}/${pkgname}/src"
>    local brandingdestdir=browser/branding/${pkgname}
>    rm -rf -- ${brandingdestdir}
>    cp -aT -- ${brandingsrcdir}/branding ${brandingdestdir}
> -- 
> 2.26.0
> 


-- 

------------------------------------------------------------------------------
my GPG Public Key:                 https://files.grapentin.org/.gpg/public.key
------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <https://lists.parabola.nu/pipermail/dev/attachments/20200329/2b299371/attachment.sig>


More information about the Dev mailing list