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

Proposed by Khurshid Alam on 2019-07-07
Status: Merged
Approved by: Sebastien Bacher on 2019-07-16
Approved revision: 1501
Merged at revision: 1500
Proposed branch: lp:~khurshid-alam/indicator-keyboard/vala-44-fix
Merge into: lp:indicator-keyboard
Diff against target: 40 lines (+3/-5)
3 files modified
data/Makefile.am (+1/-2)
lib/Makefile.am (+1/-2)
lib/main.vala (+1/-1)
To merge this branch: bzr merge lp:~khurshid-alam/indicator-keyboard/vala-44-fix
Reviewer Review Type Date Requested Status
Sebastien Bacher 2019-07-07 Approve on 2019-07-16
Review via email: mp+369794@code.launchpad.net

Commit message

Fix build agaonst vala >= 0.44

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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

review: Approve
Sebastien Bacher (seb128) wrote :

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) wrote :

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) wrote :

=== 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) wrote :

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

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) wrote :

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

Sebastien Bacher (seb128) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2017-02-03 21:08:35 +0000
3+++ data/Makefile.am 2019-07-16 14:42:13 +0000
4@@ -19,8 +19,7 @@
5 --pkg freetype2-2.0 \
6 --pkg PangoFT2-1.0 \
7 --pkg gtk+-3.0 \
8- --pkg GDesktopEnums-3.0 \
9- --pkg GnomeDesktop-3.0 \
10+ --pkg gnome-desktop-3.0 \
11 --pkg Xkl-1.0
12 indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS) \
13 $(GEE_CFLAGS) \
14
15=== modified file 'lib/Makefile.am'
16--- lib/Makefile.am 2017-09-04 16:36:52 +0000
17+++ lib/Makefile.am 2019-07-16 14:42:13 +0000
18@@ -21,8 +21,7 @@
19 --pkg posix \
20 --pkg pangocairo \
21 --pkg gtk+-3.0 \
22- --pkg GDesktopEnums-3.0 \
23- --pkg GnomeDesktop-3.0 \
24+ --pkg gnome-desktop-3.0 \
25 --pkg Xkl-1.0 \
26 --pkg Gkbd-3.0 \
27 --pkg ibus-1.0 \
28
29=== modified file 'lib/main.vala'
30--- lib/main.vala 2017-12-12 21:34:03 +0000
31+++ lib/main.vala 2019-07-16 14:42:13 +0000
32@@ -31,7 +31,7 @@
33 private Settings source_settings;
34 private Settings per_window_settings;
35 private Settings? unity8_settings;
36- private SList<Act.User> users;
37+ private SList<weak Act.User> users;
38
39 private WindowStack? window_stack;
40 private Gee.HashMap<uint, Source>? window_sources;

Subscribers

People subscribed via source and target branches

to all changes: