Skip to content

Commit 3090749

Browse files
authored
Add OpenSUSE Leap CI and fix build (#629)
1 parent 95e6a47 commit 3090749

File tree

5 files changed

+38
-1
lines changed

5 files changed

+38
-1
lines changed

.github/workflows/main.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,26 @@ jobs:
5050
meson build -Dexample=true
5151
ninja -C build
5252
ninja -C build install
53+
54+
open-suse-leap:
55+
runs-on: ubuntu-latest
56+
57+
container:
58+
image: opensuse/leap:latest
59+
60+
steps:
61+
- name: Install dependencies
62+
run: |
63+
zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo
64+
zypper --gpg-auto-import-keys refresh
65+
zypper --non-interactive install tar git gala-devel libgee-devel gobject-introspection-devel glib2-devel granite6-devel granite-devel gtk3-devel meson vala gcc
66+
- uses: actions/checkout@v4
67+
- name: Build
68+
env:
69+
DESTDIR: out
70+
run: |
71+
meson build
72+
ninja -C build install
5373
5474
lint:
5575
runs-on: ubuntu-latest

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ x11_dep = dependency('x11')
3636
gtk_dep = dependency('gtk+-3.0', version: '>=3.10')
3737
gee_dep = dependency('gee-0.8')
3838
granite_dep = dependency('granite', version: '>=5.4.0')
39-
posix_dep = meson.get_compiler('vala').find_library('posix')
39+
posix_dep = vala.find_library('posix')
4040
wl_client_dep = dependency('wayland-client')
4141

4242
subdir('protocol')

vapi/libmutter.vapi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,11 @@ namespace Meta {
968968
public Meta.MaximizeFlags get_maximized ();
969969
public int get_monitor ();
970970
public unowned string? get_mutter_hints ();
971+
#if VALA_0_56_17
971972
public pid_t get_pid ();
973+
#else
974+
public int get_pid ();
975+
#endif
972976
public unowned string get_role ();
973977
public unowned string? get_sandboxed_app_id ();
974978
public uint get_stable_sequence ();

wingpanel-interface/FocusManager.vala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,22 @@ public class WingpanelInterface.FocusManager : Object {
128128
}
129129

130130
if (event.get_type () == MOTION || event.get_type () == TOUCH_UPDATE) {
131+
#if HAS_MUTTER46
131132
window.begin_grab_op (
132133
Meta.GrabOp.MOVING,
133134
event.get_device (),
134135
event.get_event_sequence (),
135136
event.get_time (),
136137
{ x, y }
137138
);
139+
#else
140+
window.begin_grab_op (
141+
Meta.GrabOp.MOVING,
142+
event.get_device (),
143+
event.get_event_sequence (),
144+
event.get_time ()
145+
);
146+
#endif
138147
}
139148

140149
wm.pop_modal (proxy);

wingpanel-interface/meson.build

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ if mutter_dep.length() == 0
5353
error ('No supported mutter library found!')
5454
endif
5555

56+
if vala.version().version_compare('>= 0.56.17')
57+
vala_flags += ['--define', 'VALA_0_56_17']
58+
endif
59+
5660
mutter_typelib_dir = libmutter_dep.get_variable('typelibdir')
5761

5862
gala_dep = dependency('gala')

0 commit comments

Comments
 (0)