[arch-commits] Commit in bluegriffon/trunk (PKGBUILD rust-explitcit-dyn.patch)

[Balló György]

    Date: Friday, October 4, 2019 @ 14:05:10
  Author: bgyorgy
Revision: 512734

upgpkg: bluegriffon 3.1-7

Fix build (FS#63861)

Added:
  bluegriffon/trunk/rust-explitcit-dyn.patch
Modified:
  bluegriffon/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   11 ++++++++---
 rust-explitcit-dyn.patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-04 13:50:56 UTC (rev 512733)
+++ PKGBUILD	2019-10-04 14:05:10 UTC (rev 512734)
@@ -5,7 +5,7 @@
 pkgname=(bluegriffon)
 pkgver=3.1
 _gecko_dev_revision=042b84a # see config/gecko_dev_revision.txt
-pkgrel=6
+pkgrel=7
 pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
 arch=('x86_64')
 url="http://bluegriffon.org/"
@@ -21,7 +21,8 @@
         "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")
+        "no-crmf.diff"
+        "rust-explitcit-dyn.patch")
 sha256sums=('4fb9b29f00ff4e94e78994308ffa52bce818978009e0d8229203d6ac4210b0f4'
             '01096e58c898e1b37cba581e1cc0f325d1c402091ccc4a2491543b39add40c6c'
             'd589572a0e36b8500ed12937727e540a13b635c7ac12621a10ff675250b61175'
@@ -30,7 +31,8 @@
             '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
             '806cbe936720676ea8d82c5f2bb880ca632181b07b0cf24a47c064a3485b7c7f'
             '18fbcfda13dd7d30d3c1310da15a133f90bf9ce6b7cfa15de833928e7d9efe95'
-            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873')
+            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
+            '76d54fe6f5a5a50065b1d23f6a6bc4b057d4944bfab5d8ee3bb7faef4e30c334')
 
 prepare() {
   mkdir path
@@ -53,6 +55,9 @@
   # 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

Added: rust-explitcit-dyn.patch
===================================================================
--- rust-explitcit-dyn.patch	                        (rev 0)
+++ rust-explitcit-dyn.patch	2019-10-04 14:05:10 UTC (rev 512734)
@@ -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 {