[arch-commits] Commit in bluegriffon/repos (8 files)

Evangelos Foutras foutrelis at archlinux.org
Thu Apr 9 04:27:39 UTC 2020


    Date: Thursday, April 9, 2020 @ 04:27:38
  Author: foutrelis
Revision: 612888

archrelease: copy trunk to community-staging-x86_64

Added:
  bluegriffon/repos/community-staging-x86_64/
  bluegriffon/repos/community-staging-x86_64/PKGBUILD
    (from rev 612887, bluegriffon/trunk/PKGBUILD)
  bluegriffon/repos/community-staging-x86_64/bluegriffon.desktop
    (from rev 612887, bluegriffon/trunk/bluegriffon.desktop)
  bluegriffon/repos/community-staging-x86_64/bug_1533969_glibc230.patch
    (from rev 612887, bluegriffon/trunk/bug_1533969_glibc230.patch)
  bluegriffon/repos/community-staging-x86_64/fix-rust-lifetime-issue.patch
    (from rev 612887, bluegriffon/trunk/fix-rust-lifetime-issue.patch)
  bluegriffon/repos/community-staging-x86_64/mozconfig
    (from rev 612887, bluegriffon/trunk/mozconfig)
  bluegriffon/repos/community-staging-x86_64/no-crmf.diff
    (from rev 612887, bluegriffon/trunk/no-crmf.diff)
  bluegriffon/repos/community-staging-x86_64/rust-explitcit-dyn.patch
    (from rev 612887, bluegriffon/trunk/rust-explitcit-dyn.patch)

-------------------------------+
 PKGBUILD                      |  157 ++++++++++++++++++++++++++++++++++++++++
 bluegriffon.desktop           |   16 ++++
 bug_1533969_glibc230.patch    |   61 +++++++++++++++
 fix-rust-lifetime-issue.patch |   61 +++++++++++++++
 mozconfig                     |   31 +++++++
 no-crmf.diff                  |   15 +++
 rust-explitcit-dyn.patch      |   22 +++++
 7 files changed, 363 insertions(+)

Copied: bluegriffon/repos/community-staging-x86_64/PKGBUILD (from rev 612887, bluegriffon/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-04-09 04:27:38 UTC (rev 612888)
@@ -0,0 +1,157 @@
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgbase=bluegriffon
+pkgname=(bluegriffon)
+pkgver=3.1
+_gecko_dev_revision=042b84a # see config/gecko_dev_revision.txt
+pkgrel=10
+pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
+arch=('x86_64')
+url="http://bluegriffon.org/"
+license=('MPL' 'GPL' 'LGPL')
+depends=('dbus-glib' 'gtk3' 'hunspell' 'mozilla-common' 'nss' 'libvpx' 'libxt' 'startup-notification')
+makedepends=('autoconf2.13' 'gtk2' 'libpulse' 'python2' 'rust' 'unzip' 'yasm' 'zip')
+options=('!emptydirs')
+source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/therealglazou/${pkgbase}/archive/${pkgver}.tar.gz"
+        "gecko-dev-${_gecko_dev_revision}.tar.gz"::"https://github.com/mozilla/gecko-dev/archive/${_gecko_dev_revision}.tar.gz"
+        "mozconfig"
+        "${pkgbase}.desktop"
+        "bug_1353650_icu59.patch"::"https://hg.mozilla.org/integration/mozilla-inbound/raw-rev/605d00e70409"
+        "bug_1384062_systemresourcemonitor.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/8d9ae8c45dd0"
+        "bug_1427455-unused-variables.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/8e28a66b548b"
+        "bug_445128_install-dir.patch"::"https://hg.mozilla.org/mozilla-central/raw-rev/8f74ddd39f61"
+        "bug_1533969_glibc230.patch"
+        "no-crmf.diff"
+        "fix-rust-lifetime-issue.patch"
+        "rust-explitcit-dyn.patch")
+sha256sums=('4fb9b29f00ff4e94e78994308ffa52bce818978009e0d8229203d6ac4210b0f4'
+            '01096e58c898e1b37cba581e1cc0f325d1c402091ccc4a2491543b39add40c6c'
+            'd589572a0e36b8500ed12937727e540a13b635c7ac12621a10ff675250b61175'
+            '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff'
+            '6417fda6af8e610556f662fca28b2c25ceedb3e6970923a4eec562389b00b6d6'
+            '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
+            '806cbe936720676ea8d82c5f2bb880ca632181b07b0cf24a47c064a3485b7c7f'
+            '18fbcfda13dd7d30d3c1310da15a133f90bf9ce6b7cfa15de833928e7d9efe95'
+            '35bd21633bfe1005ccb643d6863e5da32b1281594f92bdcbd2ed36ef3fc43dfd'
+            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
+            '6726dce0ceabbb0893f8776168f20c15777a27e108e8ca46b1e39d5945d2c008'
+            '76d54fe6f5a5a50065b1d23f6a6bc4b057d4944bfab5d8ee3bb7faef4e30c334')
+
+prepare() {
+  mkdir path
+  ln -s /usr/bin/python2 path/python
+
+  cd "${srcdir}/gecko-dev-${_gecko_dev_revision}"*/
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1427455
+  patch -Np1 -i ../bug_1427455-unused-variables.patch
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=445128
+  patch -Np1 -i ../bug_445128_install-dir.patch
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
+  patch -Np1 -i ../no-crmf.diff
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1353650
+  patch -Np1 -i ../bug_1353650_icu59.patch
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1384062
+  patch -Np1 -i ../bug_1384062_systemresourcemonitor.patch
+
+  # patch from https://github.com/OpenMandrivaAssociation/bluegriffon
+  patch -Np1 -i ../fix-rust-lifetime-issue.patch
+
+  # https://bugs.archlinux.org/task/63861
+  patch -Np1 -i ../rust-explitcit-dyn.patch
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1533969
+  patch -Np1 -i ../bug_1533969_glibc230.patch
+
+  # Move files to their correct location
+  cp -r "${srcdir}/${pkgbase}-${pkgver}" bluegriffon
+  cp "${srcdir}/mozconfig" .mozconfig
+
+  # Apply BlueGriffon's upstream customizations
+  patch -Np1 -i "bluegriffon/config/gecko_dev_content.patch"
+  patch -Np1 -i "bluegriffon/config/gecko_dev_idl.patch"
+}
+
+build() {
+  cd "${srcdir}/gecko-dev-${_gecko_dev_revision}"*/
+
+  # _FORTIFY_SOURCE causes configure failures
+  CPPFLAGS+=" -O2"
+
+  export PATH="$srcdir/path:$PATH"
+
+  # Build the package
+  ./mach build
+}
+
+package_bluegriffon() {
+  cd "${srcdir}/gecko-dev-${_gecko_dev_revision}"*/
+  DESTDIR="${pkgdir}" ./mach install
+
+  # Install icons
+  cp bluegriffon/branding/mozicon128.png bluegriffon/branding/default128.png
+  for _icon in 16 32 48 128 256; do
+      install -Dm644 bluegriffon/branding/default${_icon}.png \
+        "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgbase}.png"
+  done
+
+  # Install desktop file
+  install -Dm644 ../${pkgbase}.desktop \
+    "${pkgdir}/usr/share/applications/${pkgbase}.desktop"
+
+  # Use system-provided dictionaries
+  rm -r "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
+  ln -Ts /usr/share/hunspell "${pkgdir}/usr/lib/$pkgbase/dictionaries"
+  ln -Ts /usr/share/hyphen "${pkgdir}/usr/lib/$pkgbase/hyphenation"
+
+  # Split out language packs
+  mv "$pkgdir"/usr/lib/$pkgbase/distribution/extensions/langpack-*@bluegriffon.org.xpi "$srcdir"
+  install -Dm644 "$srcdir/langpack-en-US at bluegriffon.org.xpi" \
+    "$pkgdir/usr/lib/$pkgbase/distribution/extensions/langpack-en-US at bluegriffon.org.xpi"
+}
+
+_languages=(
+  'cs     "Czech"'
+  'de     "German"'
+  'es-ES  "Spanish (Spain)"'
+  'fi     "Finnish"'
+  'fr     "French"'
+  'gl     "Galician"'
+  'he     "Hebrew"'
+  'hu     "Hungarian"'
+  'it     "Italian"'
+  'ja     "Japanese"'
+  'ko     "Korean"'
+  'nl     "Dutch"'
+  'pl     "Polish"'
+  'ru     "Russian"'
+  'sl     "Slovenian"'
+  'sr     "Serbian"'
+  'sv-SE  "Swedish"'
+  'zh-CN  "Chinese (Simplified)"'
+  'zh-TW  "Chinese (Traditional)"'
+)
+
+for _lang in "${_languages[@]}"; do
+  _locale=${_lang%% *}
+  _pkgname=bluegriffon-i18n-${_locale,,}
+
+  pkgname+=($_pkgname)
+  eval "package_$_pkgname() {
+    _package $_lang
+  }"
+done
+
+_package() {
+  pkgdesc="$2 language pack for Bluegriffon"
+  depends=("bluegriffon>=$pkgver")
+  provides=('bluegriffon-i18n')
+
+  install -Dm644 langpack-$1 at bluegriffon.org.xpi \
+    "$pkgdir/usr/lib/$pkgbase/distribution/extensions/langpack-$1 at bluegriffon.org.xpi"
+}

Copied: bluegriffon/repos/community-staging-x86_64/bluegriffon.desktop (from rev 612887, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- community-staging-x86_64/bluegriffon.desktop	                        (rev 0)
+++ community-staging-x86_64/bluegriffon.desktop	2020-04-09 04:27:38 UTC (rev 612888)
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=BlueGriffon
+GenericName=Web Editor
+GenericName[hu]=Webszerkesztő
+X-GNOME-FullName=BlueGriffon Web Editor
+X-GNOME-FullName[hu]=BlueGriffon webszerkesztő
+Comment=Create Web Pages
+Comment[es]=Crea páginas web
+Comment[hu]=Weboldalak készítése
+Comment[it]=Creare pagine Web
+Categories=Development;WebDevelopment;
+Exec=bluegriffon
+Icon=bluegriffon
+Terminal=false
+MimeType=text/html;application/xhtml+xml;
+Type=Application

Copied: bluegriffon/repos/community-staging-x86_64/bug_1533969_glibc230.patch (from rev 612887, bluegriffon/trunk/bug_1533969_glibc230.patch)
===================================================================
--- community-staging-x86_64/bug_1533969_glibc230.patch	                        (rev 0)
+++ community-staging-x86_64/bug_1533969_glibc230.patch	2020-04-09 04:27:38 UTC (rev 612888)
@@ -0,0 +1,61 @@
+
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio at crisal.io>
+# Date 1552332517 0
+# Node ID 7b85bf9c5210e5679fa6cfad92466a6e2ba30232
+# Parent  96e78962a05388c638385c2bad0cc772b7295291
+Bug 1533969 - Fix build error with newer glibc. r=nbp
+
+New glibc versions provide a wrapper for gettid, which means that our stuff
+fails to build with:
+
+```
+/home/emilio/src/moz/gecko/js/src/util/NativeStack.cpp:28:14: error: static declaration of 'gettid' follows non-static declaration
+static pid_t gettid() { return syscall(__NR_gettid); }
+             ^
+/usr/include/bits/unistd_ext.h:34:16: note: previous declaration is here
+extern __pid_t gettid (void) __THROW;
+```
+
+Differential Revision: https://phabricator.services.mozilla.com/D22829
+
+diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h
+--- a/tools/profiler/core/platform.h
++++ b/tools/profiler/core/platform.h
+@@ -34,32 +34,26 @@
+ #include "mozilla/StaticMutex.h"
+ #include "mozilla/TimeStamp.h"
+ #include "mozilla/UniquePtr.h"
+ #include "mozilla/Unused.h"
+ #include "PlatformMacros.h"
+ #include <vector>
+ #include "StackTop.h"
+ 
+-// We need a definition of gettid(), but glibc doesn't provide a
++// We need a definition of gettid(), but old glibc versions don't provide a
+ // wrapper for it.
+ #if defined(__GLIBC__)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+-static inline pid_t gettid()
+-{
+-  return (pid_t) syscall(SYS_gettid);
+-}
++#  define gettid() static_cast<pid_t>(syscall(SYS_gettid))
+ #elif defined(GP_OS_darwin)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+-static inline pid_t gettid()
+-{
+-  return (pid_t) syscall(SYS_thread_selfid);
+-}
++#  define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid))
+ #elif defined(GP_OS_android)
+ #include <unistd.h>
+ #elif defined(GP_OS_windows)
+ #include <windows.h>
+ #include <process.h>
+ #ifndef getpid
+ #define getpid _getpid
+ #endif
+

Copied: bluegriffon/repos/community-staging-x86_64/fix-rust-lifetime-issue.patch (from rev 612887, bluegriffon/trunk/fix-rust-lifetime-issue.patch)
===================================================================
--- community-staging-x86_64/fix-rust-lifetime-issue.patch	                        (rev 0)
+++ community-staging-x86_64/fix-rust-lifetime-issue.patch	2020-04-09 04:27:38 UTC (rev 612888)
@@ -0,0 +1,61 @@
+diff --git a/third_party/rust/url/.cargo-checksum.json b/third_party/rust/url/.cargo-checksum.json
+index 9f3bd51..9887964 100644
+--- a/third_party/rust/url/.cargo-checksum.json
++++ b/third_party/rust/url/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".gitignore":"e20a03cb660e0039506f8828204fd93815ebfe051ef62194f8dcf3fc8b7d0e5a",".travis.yml":"2a3033f9edf86bc829de486fc1e74fe0bbe3166ed99b0139754ea29772c19b06","Cargo.toml":"3e4aa9825375f1849bcf059596443b23c6aba2b0fbe58db5174a7d3c3cc2c18d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","Makefile":"e79b3348d3d25603c496a805bd905c4ae5df042c52e30550286adeb7baae360f","README.md":"eb3f4694003f408cbe3c7f3e9fbbc71241defb940cc55a816981f0f0f144c8eb","UPGRADING.md":"fbcc2d39bdf17db0745793db6626fcd5c909dddd4ce13b27566cfabece22c368","appveyor.yml":"c78486dbfbe6ebbf3d808afb9a19f7ec18c4704ce451c6305f0716999b70a1a6","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","docs/index.h
 tml":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","github.png":"b432fd855efe7c430fe6a57ccf83935c1996f03a7cdc8d6e1b34154b8c43f6ec","rust-url-todo":"1192cee7b6cedf2133d97dc6074b593a1d19b0ee13fff6f28d6329855044e575","src/encoding.rs":"7fb43e1c109bf9f2a80a05525082f90e79dba8e8056547571c49fba074406d39","src/form_urlencoded.rs":"172922f2c51eb8dae0182d70e5e0c2969f1b5b7aac026720ced9f84059465999","src/host.rs":"b4ae209e83bfd77a35df3f63f3b689c510190d69008682fa42cf5473487a4e62","src/lib.rs":"e0e2d6e74ff63d897a74d7ed06f49fd0bdd940401a1af039a43d3f0a02fbb9fe","src/origin.rs":"d52010a280d363aed6832f7de5e52c1a62815302e59dcbc9cdc2574e2ac884b9","src/parser.rs":"4ab643e63e6457bf2f108be8af1d0eed79ade3e0f66fb842d024d8345a9165d7","src/path_segments.rs":"85e16d4e3a7bf4162b2ddd6a14beda0d753395da7c8efe208c52862fc2b21221","src/percent_encoding.rs":"44d3321eaa1c77715e9ea1421519289ca73612a31c3d6fce04ff489dfa7db3c5","src/quirks.rs":"3249d1a1f73dd29ec06d626ea2ea4d61e7b2a782543742a5bee422b2f3
 864b19","src/slicing.rs":"4e539886b23945a92094625f3e5
31a4bff40daa44240b5d19ee8577478c4f7fe","tests/data.rs":"9218e8853602ef4191c1e600f6123d63caf20c416dd516b504791f2e736138f1","tests/setters_tests.json":"ebcbdb52e9a4b5a565f8806d52ebc610d46a34df883e10b0be080d026468ff73","tests/unit.rs":"9ab86f8d1e54d7e1969862f830f10e8d60f399980400fb6d29e35fd93a738bb9","tests/urltestdata.json":"430c74aa3a31afaa57a92805544e00825f4dffe2def98c1e3c212c3db80268af"},"package":"f5ba8a749fb4479b043733416c244fa9d1d3af3d7c23804944651c8a448cb87e"}
+\ No newline at end of file
++{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".gitignore":"e20a03cb660e0039506f8828204fd93815ebfe051ef62194f8dcf3fc8b7d0e5a",".travis.yml":"2a3033f9edf86bc829de486fc1e74fe0bbe3166ed99b0139754ea29772c19b06","Cargo.toml":"3e4aa9825375f1849bcf059596443b23c6aba2b0fbe58db5174a7d3c3cc2c18d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"20c7855c364d57ea4c97889a5e8d98470a9952dade37bd9248b9a54431670e5e","Makefile":"e79b3348d3d25603c496a805bd905c4ae5df042c52e30550286adeb7baae360f","README.md":"eb3f4694003f408cbe3c7f3e9fbbc71241defb940cc55a816981f0f0f144c8eb","UPGRADING.md":"fbcc2d39bdf17db0745793db6626fcd5c909dddd4ce13b27566cfabece22c368","appveyor.yml":"c78486dbfbe6ebbf3d808afb9a19f7ec18c4704ce451c6305f0716999b70a1a6","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","docs/index.h
 tml":"f61e6271c1ea1aa113b64b356e994595fa548f0433f89948d747503ad22195cd","github.png":"b432fd855efe7c430fe6a57ccf83935c1996f03a7cdc8d6e1b34154b8c43f6ec","rust-url-todo":"1192cee7b6cedf2133d97dc6074b593a1d19b0ee13fff6f28d6329855044e575","src/encoding.rs":"7fb43e1c109bf9f2a80a05525082f90e79dba8e8056547571c49fba074406d39","src/form_urlencoded.rs":"b29023703c557576b28e752645614c22694dd176deb39cbd236834659001cee5","src/host.rs":"b4ae209e83bfd77a35df3f63f3b689c510190d69008682fa42cf5473487a4e62","src/lib.rs":"adc318878134cfb48a1de526adf11b797590d21b267d2199157ae04b036c12a9","src/origin.rs":"d52010a280d363aed6832f7de5e52c1a62815302e59dcbc9cdc2574e2ac884b9","src/parser.rs":"4ab643e63e6457bf2f108be8af1d0eed79ade3e0f66fb842d024d8345a9165d7","src/path_segments.rs":"85e16d4e3a7bf4162b2ddd6a14beda0d753395da7c8efe208c52862fc2b21221","src/percent_encoding.rs":"44d3321eaa1c77715e9ea1421519289ca73612a31c3d6fce04ff489dfa7db3c5","src/quirks.rs":"3249d1a1f73dd29ec06d626ea2ea4d61e7b2a782543742a5bee422b2f3
 864b19","src/slicing.rs":"4e539886b23945a92094625f3e5
31a4bff40daa44240b5d19ee8577478c4f7fe","tests/data.rs":"9218e8853602ef4191c1e600f6123d63caf20c416dd516b504791f2e736138f1","tests/setters_tests.json":"ebcbdb52e9a4b5a565f8806d52ebc610d46a34df883e10b0be080d026468ff73","tests/unit.rs":"9ab86f8d1e54d7e1969862f830f10e8d60f399980400fb6d29e35fd93a738bb9","tests/urltestdata.json":"430c74aa3a31afaa57a92805544e00825f4dffe2def98c1e3c212c3db80268af"},"package":"f5ba8a749fb4479b043733416c244fa9d1d3af3d7c23804944651c8a448cb87e"}
+diff --git a/third_party/rust/url/src/form_urlencoded.rs b/third_party/rust/url/src/form_urlencoded.rs
+index f4a6555..036abe8 100644
+--- a/third_party/rust/url/src/form_urlencoded.rs
++++ b/third_party/rust/url/src/form_urlencoded.rs
+@@ -242,8 +242,16 @@ impl<'a> Target for &'a mut String {
+ // * `Serializer` keeps its target in a private field
+ // * Unlike in other `Target` impls, `UrlQuery::finished` does not return `Self`.
+ impl<'a> Target for ::UrlQuery<'a> {
+-    fn as_mut_string(&mut self) -> &mut String { &mut self.url.serialization }
+-    fn finish(self) -> &'a mut ::Url { self.url }
++    fn as_mut_string(&mut self) -> &mut String {
++        &mut self.url.as_mut().unwrap().serialization
++    }
++
++    fn finish(mut self) -> &'a mut ::Url {
++        let url = self.url.take().unwrap();
++        url.restore_already_parsed_fragment(self.fragment.take());
++        url
++    }
++
+     type Finished = &'a mut ::Url;
+ }
+ 
+diff --git a/third_party/rust/url/src/lib.rs b/third_party/rust/url/src/lib.rs
+index 4292b2f..52068ea 100644
+--- a/third_party/rust/url/src/lib.rs
++++ b/third_party/rust/url/src/lib.rs
+@@ -1012,7 +1012,7 @@ impl Url {
+             self.serialization.push('?');
+         }
+ 
+-        let query = UrlQuery { url: self, fragment: fragment };
++        let query = UrlQuery { url: Some(self), fragment: fragment };
+         form_urlencoded::Serializer::for_suffix(query, query_start + "?".len())
+     }
+ 
+@@ -1888,12 +1888,14 @@ fn io_error<T>(reason: &str) -> io::Result<T> {
+ 
+ /// Implementation detail of `Url::query_pairs_mut`. Typically not used directly.
+ pub struct UrlQuery<'a> {
+-    url: &'a mut Url,
++    url: Option<&'a mut Url>,
+     fragment: Option<String>,
+ }
+ 
+ impl<'a> Drop for UrlQuery<'a> {
+     fn drop(&mut self) {
+-        self.url.restore_already_parsed_fragment(self.fragment.take())
++        if let Some(url) = self.url.take() {
++            url.restore_already_parsed_fragment(self.fragment.take())
++        }
+     }
+ }

Copied: bluegriffon/repos/community-staging-x86_64/mozconfig (from rev 612887, bluegriffon/trunk/mozconfig)
===================================================================
--- community-staging-x86_64/mozconfig	                        (rev 0)
+++ community-staging-x86_64/mozconfig	2020-04-09 04:27:38 UTC (rev 612888)
@@ -0,0 +1,31 @@
+ac_add_options --enable-application=bluegriffon
+ac_add_options --enable-chrome-format=jar
+
+ac_add_options --prefix=/usr
+ac_add_options --enable-release
+ac_add_options --enable-gold
+ac_add_options --enable-pie
+ac_add_options --enable-optimize="-O2"
+
+# System libraries
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+
+# Features
+ac_add_options --enable-alsa
+ac_add_options --enable-startup-notification
+ac_add_options --disable-gconf
+ac_add_options --disable-tests
+ac_add_options --disable-crashreporter
+ac_add_options --disable-webrtc
+ac_add_options --disable-dbm
+ac_add_options --disable-updater
+ac_add_options --disable-sandbox

Copied: bluegriffon/repos/community-staging-x86_64/no-crmf.diff (from rev 612887, bluegriffon/trunk/no-crmf.diff)
===================================================================
--- community-staging-x86_64/no-crmf.diff	                        (rev 0)
+++ community-staging-x86_64/no-crmf.diff	2020-04-09 04:27:38 UTC (rev 612888)
@@ -0,0 +1,15 @@
+diff --git i/old-configure.in w/old-configure.in
+index 12170a47568f..dbbaa0bc9194 100644
+--- i/old-configure.in
++++ w/old-configure.in
+@@ -1808,9 +1808,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+     AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+ 
+-if test -n "$MOZ_SYSTEM_NSS"; then
+-   NSS_LIBS="$NSS_LIBS -lcrmf"
+-else
++if test -z "$MOZ_SYSTEM_NSS"; then
+    NSS_CFLAGS="-I${DIST}/include/nss"
+    case "${OS_ARCH}" in
+         # Only few platforms have been tested with GYP

Copied: bluegriffon/repos/community-staging-x86_64/rust-explitcit-dyn.patch (from rev 612887, bluegriffon/trunk/rust-explitcit-dyn.patch)
===================================================================
--- community-staging-x86_64/rust-explitcit-dyn.patch	                        (rev 0)
+++ community-staging-x86_64/rust-explitcit-dyn.patch	2020-04-09 04:27:38 UTC (rev 612888)
@@ -0,0 +1,22 @@
+diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src/bindings.rs
+index d3c44d69a150..c88285dae715 100644
+--- a/gfx/webrender_bindings/src/bindings.rs
++++ b/gfx/webrender_bindings/src/bindings.rs
+@@ -69,7 +69,7 @@ impl Into<WrExternalImageId> for ExternalImageId {
+ const GL_FORMAT_BGRA_GL: gl::GLuint = gl::BGRA;
+ const GL_FORMAT_BGRA_GLES: gl::GLuint = gl::BGRA_EXT;
+ 
+-fn get_gl_format_bgra(gl: &gl::Gl) -> gl::GLuint {
++fn get_gl_format_bgra(gl: &dyn gl::Gl) -> gl::GLuint {
+     match gl.get_type() {
+         gl::GlType::Gl => {
+             GL_FORMAT_BGRA_GL
+@@ -787,7 +787,7 @@ pub extern "C" fn wr_window_new(window_id: WrWindowId,
+                                 -> bool {
+     assert!(unsafe { is_in_render_thread() });
+ 
+-    let recorder: Option<Box<ApiRecordingReceiver>> = if ENABLE_RECORDING {
++    let recorder: Option<Box<dyn ApiRecordingReceiver>> = if ENABLE_RECORDING {
+         let name = format!("wr-record-{}.bin", window_id.0);
+         Some(Box::new(BinaryRecorder::new(&PathBuf::from(name))))
+     } else {


More information about the arch-commits mailing list