Merge lp:~khurshid-alam/indicator-keyboard/vala-44-fix into lp:indicator-keyboard

[Khurshid Alam]

Fix build agaonst vala >= 0.44

[Sebastien Bacher (seb128)]

Thanks, the change makes sense according to Rico so let's merge it ;)

review: Approve

[Sebastien Bacher (seb128)]

The build still fails though, it hits this error

'GnomeDesktop-3.0.h: No such file or directory
   27 | #include <GnomeDesktop-3.0.h>
      | ^~~~~~~~~~~~~~~~~~~~'

review: Needs Fixing

[Khurshid Alam (khurshid-alam)]

The c file is generated internally. And it's compiling locally for me. Not sure what's wrong..may be ask Rico ?

[Rico Tzschichholz (ricotz)]

=== modified file 'data/Makefile.am'
--- data/Makefile.am 2017-02-03 21:08:35 +0000
+++ data/Makefile.am 2019-07-16 07:27:45 +0000
@@ -19,8 +19,7 @@ indicator_keyboard_icon_generator_VALAFL
                                               --pkg freetype2-2.0 \
                                               --pkg PangoFT2-1.0 \
                                               --pkg gtk+-3.0 \
- --pkg GDesktopEnums-3.0 \
- --pkg GnomeDesktop-3.0 \
+ --pkg gnome-desktop-3.0 \
                                               --pkg Xkl-1.0
 indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS) \
                                            $(GEE_CFLAGS) \

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am 2017-09-04 16:36:52 +0000
+++ lib/Makefile.am 2019-07-16 07:27:43 +0000
@@ -21,8 +21,7 @@ indicator_keyboard_service_VALAFLAGS = $
                                        --pkg posix \
                                        --pkg pangocairo \
                                        --pkg gtk+-3.0 \
- --pkg GDesktopEnums-3.0 \
- --pkg GnomeDesktop-3.0 \
+ --pkg gnome-desktop-3.0 \
                                        --pkg Xkl-1.0 \
                                        --pkg Gkbd-3.0 \
                                        --pkg ibus-1.0 \

[Sebastien Bacher (seb128)]

Kurshid, can you include those changes to the merge request?

[lp:~khurshid-alam/indicator-keyboard/vala-44-fix]

1501. By Rico Tzschichholz on 2019-07-16

Fix build: Use gnome-desktop-3.0 instead of GnomeDesktop-3.0 in VALAFLAGS

[Khurshid Alam (khurshid-alam)]

Yes, I now made the required changes. Now it compiles.

[Sebastien Bacher (seb128)]

Thanks!

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2017-02-03 21:08:35 +0000
+++ data/Makefile.am	2019-07-16 14:42:13 +0000
@@ -19,8 +19,7 @@
                                               --pkg freetype2-2.0     \
                                               --pkg PangoFT2-1.0      \
                                               --pkg gtk+-3.0          \
-                                              --pkg GDesktopEnums-3.0 \
-                                              --pkg GnomeDesktop-3.0  \
+                                              --pkg gnome-desktop-3.0 \
                                               --pkg Xkl-1.0
 indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS)            \
                                            $(GEE_CFLAGS)           \
 
=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2017-09-04 16:36:52 +0000
+++ lib/Makefile.am	2019-07-16 14:42:13 +0000
@@ -21,8 +21,7 @@
                                        --pkg posix                \
                                        --pkg pangocairo           \
                                        --pkg gtk+-3.0             \
-                                       --pkg GDesktopEnums-3.0    \
-                                       --pkg GnomeDesktop-3.0     \
+                                       --pkg gnome-desktop-3.0    \
                                        --pkg Xkl-1.0              \
                                        --pkg Gkbd-3.0             \
                                        --pkg ibus-1.0             \
 
=== modified file 'lib/main.vala'
--- lib/main.vala	2017-12-12 21:34:03 +0000
+++ lib/main.vala	2019-07-16 14:42:13 +0000
@@ -31,7 +31,7 @@
 	private Settings source_settings;
 	private Settings per_window_settings;
 	private Settings? unity8_settings;
-	private SList<Act.User> users;
+	private SList<weak Act.User> users;
 
 	private WindowStack? window_stack;
 	private Gee.HashMap<uint, Source>? window_sources;