Update gcc10_common_fix.patch to the official patch from upstream

3 files changed, 66 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d9ba2b6bdcb..e30bf924ec61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = compiz
 	pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM
 	pkgver = 0.9.14.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://launchpad.net/compiz
 	arch = i686
 	arch = x86_64
@@ -53,7 +53,7 @@ pkgbase = compiz
 	sha256sums = 6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b
 	sha256sums = 89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61
 	sha256sums = 4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a
-	sha256sums = 580f237fc4800669d5c50d9af392dd5f5cf2750131a9fa1d5edfd17df02d0a3c
+	sha256sums = eca2918214e81f742b7617ede20b81b8690ac723d756f690286e73ab3cbb6068
 
 pkgname = compiz
 
diff --git a/PKGBUILD b/PKGBUILD
index 61acbf1a89ec..00a43e7309d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=compiz
 pkgver=0.9.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/compiz"
@@ -31,7 +31,7 @@ sha256sums=('2505602b6c93d6565e681473df4157634268533c6874c3cdc9493b73b301ac52'
             '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
             '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
             '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
-            '580f237fc4800669d5c50d9af392dd5f5cf2750131a9fa1d5edfd17df02d0a3c')
+            '6268dfaaf72957388b6324f8cfac1daaa32a453e8f3b377dd522a38e6bf55469')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
diff --git a/gcc10_common_fix.patch b/gcc10_common_fix.patch
index a5867b495160..be3a0b4c39d4 100644
--- a/gcc10_common_fix.patch
+++ b/gcc10_common_fix.patch
@@ -1,24 +1,69 @@
-diff -Nur original/gtk/window-decorator/gtk-window-decorator.c modified/gtk/window-decorator/gtk-window-decorator.c
---- original/gtk/window-decorator/gtk-window-decorator.c	2019-11-27 13:24:31.000000000 +0000
-+++ modified/gtk/window-decorator/gtk-window-decorator.c	2020-05-17 00:28:11.586617947 +0100
-@@ -122,7 +122,7 @@
- 
- XRenderPictFormat *xformat_rgba;
- 
--const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM] = {
-+const gchar * __attribute__((__common__))window_type_frames[WINDOW_TYPE_FRAMES_NUM] = {
-     "normal", "modal_dialog", "dialog", "menu", "utility"
- };
- 
-diff -Nur original/gtk/window-decorator/gtk-window-decorator.h modified/gtk/window-decorator/gtk-window-decorator.h
---- original/gtk/window-decorator/gtk-window-decorator.h	2019-11-27 13:24:31.000000000 +0000
-+++ modified/gtk/window-decorator/gtk-window-decorator.h	2020-05-17 00:27:21.383286282 +0100
-@@ -272,7 +272,7 @@
+From c7b74aa53e9d64da5175f9b86ec7f68e53d1398e Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Tue, 28 Jul 2020 12:17:30 +0200
+Subject: Fix two build failures due to new gcc-10 warnings, such as
+ uninitialized variables and duplicated definitions:
+
+e.g. of failure:
+/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-settings-xproperty-storage.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
+/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
+/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme-cairo.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
+/usr/bin/ld: CMakeFiles/gtk-window-decorator.dir/gwd-theme-metacity.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: multiple definition of `window_type_frames'; CMakeFiles/gtk-window-decorator.dir/gtk-window-decorator.c.o:./obj-x86_64-linux-gnu/gtk/window-decorator/./gtk/window-decorator/gtk-window-decorator.h:269: first defined here
+collect2: error: ld returned 1 exit status
+---
+ debian/changelog                            | 14 ++++++++++++++
+ gtk/window-decorator/gtk-window-decorator.h |  2 +-
+ plugins/expo/src/expo.cpp                   |  2 +-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+#diff --git a/debian/changelog b/debian/changelog
+#index 97b93dd..b21831d 100644
+#--- a/debian/changelog
+#+++ b/debian/changelog
+#@@ -1,3 +1,17 @@
+#+compiz (1:0.9.14.1+20.10.20200526-0ubuntu3) groovy; urgency=medium
+#+
+#+  * Initialize 3 arrays to zero to silence a new gcc-10 warning
+#+  * Move window_type_frames to extern in the header file, fixing a build
+#+    failure with gcc-10
+#+
+#+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 28 Jul 2020 11:39:45 +0200
+#+
+#+compiz (1:0.9.14.1+20.10.20200526-0ubuntu2) groovy; urgency=medium
+#+
+#+  * Rebuild against new libprotobuf23.
+#+
+#+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 26 Jul 2020 10:13:56 +0200
+#+
+# compiz (1:0.9.14.1+20.10.20200526-0ubuntu1) groovy; urgency=medium
+# 
+#   [ Daniel Kondor ]
+diff --git a/gtk/window-decorator/gtk-window-decorator.h b/gtk/window-decorator/gtk-window-decorator.h
+index 6bf5d31..da7f905 100644
+--- a/gtk/window-decorator/gtk-window-decorator.h
++++ b/gtk/window-decorator/gtk-window-decorator.h
+@@ -266,7 +266,7 @@ typedef struct _default_frame_references
  } default_frame_references_t;
  
  extern default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM * 2];
 -const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
-+const gchar * __attribute__((__common__))window_type_frames[WINDOW_TYPE_FRAMES_NUM];
++extern const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
  
  extern char *program_name;
  
+diff --git a/plugins/expo/src/expo.cpp b/plugins/expo/src/expo.cpp
+index 86c1618..802071b 100644
+--- a/plugins/expo/src/expo.cpp
++++ b/plugins/expo/src/expo.cpp
+@@ -708,7 +708,7 @@ ExpoScreen::invertTransformedVertex (const GLScreenPaintAttrib &attrib,
+ 				     int                       vertex[2])
+ {
+     GLMatrix sTransform (transform);
+-    float    p1[3], p2[3], v[3];
++    float    p1[3] = { 0 } , p2[3] = { 0 }, v[3] = { 0 };
+     GLint    viewport[4];
+ 
+     gScreen->glApplyTransform (attrib, output, &sTransform);
+-- 
+cgit v1.1
+