1 From c7b74aa53e9d64da5175f9b86ec7f68e53d1398e Mon Sep 17 00:00:00 2001
2 From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
3 Date: Tue, 28 Jul 2020 12:17:30 +0200
4 Subject: Fix two build failures due to new gcc-10 warnings, such as
5 uninitialized variables and duplicated definitions:
8 /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
9 /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
10 /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
11 /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
12 collect2: error: ld returned 1 exit status
14 debian/changelog | 14 ++++++++++++++
15 gtk/window-decorator/gtk-window-decorator.h | 2 +-
16 plugins/expo/src/expo.cpp | 2 +-
17 3 files changed, 16 insertions(+), 2 deletions(-)
19 #diff --git a/debian/changelog b/debian/changelog
20 #index 97b93dd..b21831d 100644
21 #--- a/debian/changelog
22 #+++ b/debian/changelog
24 #+compiz (1:0.9.14.1+20.10.20200526-0ubuntu3) groovy; urgency=medium
26 #+ * Initialize 3 arrays to zero to silence a new gcc-10 warning
27 #+ * Move window_type_frames to extern in the header file, fixing a build
28 #+ failure with gcc-10
30 #+ -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 28 Jul 2020 11:39:45 +0200
32 #+compiz (1:0.9.14.1+20.10.20200526-0ubuntu2) groovy; urgency=medium
34 #+ * Rebuild against new libprotobuf23.
36 #+ -- Gianfranco Costamagna <locutusofborg@debian.org> Sun, 26 Jul 2020 10:13:56 +0200
38 # compiz (1:0.9.14.1+20.10.20200526-0ubuntu1) groovy; urgency=medium
41 diff --git a/gtk/window-decorator/gtk-window-decorator.h b/gtk/window-decorator/gtk-window-decorator.h
42 index 6bf5d31..da7f905 100644
43 --- a/gtk/window-decorator/gtk-window-decorator.h
44 +++ b/gtk/window-decorator/gtk-window-decorator.h
45 @@ -266,7 +266,7 @@ typedef struct _default_frame_references
46 } default_frame_references_t;
48 extern default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM * 2];
49 -const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
50 +extern const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
52 extern char *program_name;
54 diff --git a/plugins/expo/src/expo.cpp b/plugins/expo/src/expo.cpp
55 index 86c1618..802071b 100644
56 --- a/plugins/expo/src/expo.cpp
57 +++ b/plugins/expo/src/expo.cpp
58 @@ -708,7 +708,7 @@ ExpoScreen::invertTransformedVertex (const GLScreenPaintAttrib &attrib,
61 GLMatrix sTransform (transform);
62 - float p1[3], p2[3], v[3];
63 + float p1[3] = { 0 } , p2[3] = { 0 }, v[3] = { 0 };
66 gScreen->glApplyTransform (attrib, output, &sTransform);