[arch-commits] Commit in bluegriffon/repos/community-x86_64 (9 files)

Balló György bgyorgy at archlinux.org
Fri Oct 4 14:05:16 UTC 2019


    Date: Friday, October 4, 2019 @ 14:05:15
  Author: bgyorgy
Revision: 512735

archrelease: copy trunk to community-x86_64

Added:
  bluegriffon/repos/community-x86_64/PKGBUILD
    (from rev 512734, bluegriffon/trunk/PKGBUILD)
  bluegriffon/repos/community-x86_64/bluegriffon.desktop
    (from rev 512734, bluegriffon/trunk/bluegriffon.desktop)
  bluegriffon/repos/community-x86_64/mozconfig
    (from rev 512734, bluegriffon/trunk/mozconfig)
  bluegriffon/repos/community-x86_64/no-crmf.diff
    (from rev 512734, bluegriffon/trunk/no-crmf.diff)
  bluegriffon/repos/community-x86_64/rust-explitcit-dyn.patch
    (from rev 512734, bluegriffon/trunk/rust-explitcit-dyn.patch)
Deleted:
  bluegriffon/repos/community-x86_64/PKGBUILD
  bluegriffon/repos/community-x86_64/bluegriffon.desktop
  bluegriffon/repos/community-x86_64/mozconfig
  bluegriffon/repos/community-x86_64/no-crmf.diff

--------------------------+
 PKGBUILD                 |  289 ++++++++++++++++++++++-----------------------
 bluegriffon.desktop      |   32 ++--
 mozconfig                |   62 ++++-----
 no-crmf.diff             |   30 ++--
 rust-explitcit-dyn.patch |   22 +++
 5 files changed, 231 insertions(+), 204 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-04 14:05:10 UTC (rev 512734)
+++ PKGBUILD	2019-10-04 14:05:15 UTC (rev 512735)
@@ -1,142 +0,0 @@
-# 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=6
-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"
-        "no-crmf.diff")
-sha256sums=('4fb9b29f00ff4e94e78994308ffa52bce818978009e0d8229203d6ac4210b0f4'
-            '01096e58c898e1b37cba581e1cc0f325d1c402091ccc4a2491543b39add40c6c'
-            'd589572a0e36b8500ed12937727e540a13b635c7ac12621a10ff675250b61175'
-            '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff'
-            '6417fda6af8e610556f662fca28b2c25ceedb3e6970923a4eec562389b00b6d6'
-            '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
-            '806cbe936720676ea8d82c5f2bb880ca632181b07b0cf24a47c064a3485b7c7f'
-            '18fbcfda13dd7d30d3c1310da15a133f90bf9ce6b7cfa15de833928e7d9efe95'
-            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873')
-
-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
-
-  # 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-x86_64/PKGBUILD (from rev 512734, bluegriffon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-10-04 14:05:15 UTC (rev 512735)
@@ -0,0 +1,147 @@
+# 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=7
+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"
+        "no-crmf.diff"
+        "rust-explitcit-dyn.patch")
+sha256sums=('4fb9b29f00ff4e94e78994308ffa52bce818978009e0d8229203d6ac4210b0f4'
+            '01096e58c898e1b37cba581e1cc0f325d1c402091ccc4a2491543b39add40c6c'
+            'd589572a0e36b8500ed12937727e540a13b635c7ac12621a10ff675250b61175'
+            '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff'
+            '6417fda6af8e610556f662fca28b2c25ceedb3e6970923a4eec562389b00b6d6'
+            '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
+            '806cbe936720676ea8d82c5f2bb880ca632181b07b0cf24a47c064a3485b7c7f'
+            '18fbcfda13dd7d30d3c1310da15a133f90bf9ce6b7cfa15de833928e7d9efe95'
+            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
+            '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
+
+  # https://bugs.archlinux.org/task/63861
+  patch -Np1 -i ../rust-explitcit-dyn.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"
+}

Deleted: bluegriffon.desktop
===================================================================
--- bluegriffon.desktop	2019-10-04 14:05:10 UTC (rev 512734)
+++ bluegriffon.desktop	2019-10-04 14:05:15 UTC (rev 512735)
@@ -1,16 +0,0 @@
-[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-x86_64/bluegriffon.desktop (from rev 512734, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- bluegriffon.desktop	                        (rev 0)
+++ bluegriffon.desktop	2019-10-04 14:05:15 UTC (rev 512735)
@@ -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

Deleted: mozconfig
===================================================================
--- mozconfig	2019-10-04 14:05:10 UTC (rev 512734)
+++ mozconfig	2019-10-04 14:05:15 UTC (rev 512735)
@@ -1,31 +0,0 @@
-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-x86_64/mozconfig (from rev 512734, bluegriffon/trunk/mozconfig)
===================================================================
--- mozconfig	                        (rev 0)
+++ mozconfig	2019-10-04 14:05:15 UTC (rev 512735)
@@ -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

Deleted: no-crmf.diff
===================================================================
--- no-crmf.diff	2019-10-04 14:05:10 UTC (rev 512734)
+++ no-crmf.diff	2019-10-04 14:05:15 UTC (rev 512735)
@@ -1,15 +0,0 @@
-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-x86_64/no-crmf.diff (from rev 512734, bluegriffon/trunk/no-crmf.diff)
===================================================================
--- no-crmf.diff	                        (rev 0)
+++ no-crmf.diff	2019-10-04 14:05:15 UTC (rev 512735)
@@ -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-x86_64/rust-explitcit-dyn.patch (from rev 512734, bluegriffon/trunk/rust-explitcit-dyn.patch)
===================================================================
--- rust-explitcit-dyn.patch	                        (rev 0)
+++ rust-explitcit-dyn.patch	2019-10-04 14:05:15 UTC (rev 512735)
@@ -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