[brisk-menu] 04/05: debian/patches: Add 1001_build-brisk-glue-early.patch. Fix occasional but regular failures when this package is built parallely. (Closes: #887686). Add 1002_fix-build-against-old-GLib.patch. Fix FTBFS against GLib << 2.51.3.
Mike Gabriel
sunweaver at debian.org
Fri Jan 19 22:37:29 UTC 2018
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository brisk-menu.
commit 7722b7a473488c3d1fc843f079c9b1f26ff213a3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jan 19 17:36:01 2018 +0100
debian/patches: Add 1001_build-brisk-glue-early.patch. Fix occasional but regular failures when this package is built parallely. (Closes: #887686). Add 1002_fix-build-against-old-GLib.patch. Fix FTBFS against GLib << 2.51.3.
---
debian/patches/1001_build-brisk-glue-early.patch | 145 +++++++++++++++++++++
.../patches/1002_fix-build-against-old-GLib.patch | 17 +++
debian/patches/series | 2 +
3 files changed, 164 insertions(+)
diff --git a/debian/patches/1001_build-brisk-glue-early.patch b/debian/patches/1001_build-brisk-glue-early.patch
new file mode 100644
index 0000000..1a688c1
--- /dev/null
+++ b/debian/patches/1001_build-brisk-glue-early.patch
@@ -0,0 +1,145 @@
+Description: Move brisk-glue .xml files to data/ and process them in an earlier stage of the build.
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/src/frontend/meson.build
++++ b/src/frontend/meson.build
+@@ -24,6 +24,7 @@
+
+ libfrontend_includes = [
+ include_directories('.'),
++ include_directories('../../data'),
+ ]
+
+ # Contains the main Brisk UI (Windowed)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -18,15 +18,37 @@
+ ],
+ )
+
++# Build the Cs into a simple static library and control compiler noise
++libsession_stub = static_library(
++ 'brisk-glue',
++ sources: [
++ libsaver_glue,
++ libsession_glue,
++ ],
++ c_args: [
++ '-Wno-unused-parameter',
++ ],
++ dependencies: dep_gio_unix,
++ install: false,
++)
++
++# Allow linking to the stub
++link_libsession_stub = declare_dependency(
++ link_with: libsession_stub,
++ dependencies: [
++ dep_gio_unix,
++ ],
++ include_directories: [
++ include_directories('.'),
++ ],
++)
++
+ # Build common library (currently just keybinder really.)
+ subdir('lib')
+
+ # Build the backend component
+ subdir('backend')
+
+-# Build session glue to help the frontend out
+-subdir('session')
+-
+ # Now build our main UI
+ subdir('frontend')
+
+--- /dev/null
++++ b/data/org.gnome.SessionManager.xml
+@@ -0,0 +1,15 @@
++<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
++ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
++<!-- GDBus 2.48.1 -->
++<node>
++ <interface name="org.gnome.SessionManager">
++ <method name="Shutdown"/>
++ <method name="Reboot"/>
++ <method name="CanShutdown">
++ <arg type="b" name="is_available" direction="out"/>
++ </method>
++ <method name="Logout">
++ <arg type="u" name="mode" direction="in"/>
++ </method>
++ </interface>
++</node>
+--- /dev/null
++++ b/data/org.mate.ScreenSaver.xml
+@@ -0,0 +1,11 @@
++<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
++"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
++<node>
++ <interface name="org.mate.ScreenSaver">
++ <method name="Lock">
++ </method>
++ <method name="GetActive">
++ <arg name="value" direction="out" type="b"/>
++ </method>
++ </interface>
++</node>
+--- a/src/session/org.gnome.SessionManager.xml
++++ /dev/null
+@@ -1,15 +0,0 @@
+-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+- "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+-<!-- GDBus 2.48.1 -->
+-<node>
+- <interface name="org.gnome.SessionManager">
+- <method name="Shutdown"/>
+- <method name="Reboot"/>
+- <method name="CanShutdown">
+- <arg type="b" name="is_available" direction="out"/>
+- </method>
+- <method name="Logout">
+- <arg type="u" name="mode" direction="in"/>
+- </method>
+- </interface>
+-</node>
+--- a/src/session/org.mate.ScreenSaver.xml
++++ /dev/null
+@@ -1,11 +0,0 @@
+-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+-<node>
+- <interface name="org.mate.ScreenSaver">
+- <method name="Lock">
+- </method>
+- <method name="GetActive">
+- <arg name="value" direction="out" type="b"/>
+- </method>
+- </interface>
+-</node>
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -12,6 +12,22 @@
+ ],
+ )
+
++# libsaver_glue provides dbus code for the MATE screensaver
++libsaver_glue = gnome.gdbus_codegen(
++ 'libsaver-glue',
++ 'org.mate.ScreenSaver.xml',
++ interface_prefix : 'org.mate.',
++ namespace : 'Mate',
++)
++
++# libsession_glue provides dbus code for the MATE/GNOME session
++libsession_glue = gnome.gdbus_codegen(
++ 'libsession-glue',
++ 'org.gnome.SessionManager.xml',
++ interface_prefix : 'org.gnome.',
++ namespace : 'Gnome',
++)
++
+ icons = [
+ 'brisk_system-log-out-symbolic.svg',
+ ]
diff --git a/debian/patches/1002_fix-build-against-old-GLib.patch b/debian/patches/1002_fix-build-against-old-GLib.patch
new file mode 100644
index 0000000..5176811
--- /dev/null
+++ b/debian/patches/1002_fix-build-against-old-GLib.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBFS against GLib < 2.51.3.
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Abstract:
+ For details, see https://github.com/mesonbuild/meson/issues/1387
+
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -30,6 +30,9 @@
+ ],
+ dependencies: dep_gio_unix,
+ install: false,
++ include_directories: [
++ include_directories('..'),
++ ],
+ )
+
+ # Allow linking to the stub
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e5d5404
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+1001_build-brisk-glue-early.patch
+1002_fix-build-against-old-GLib.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/brisk-menu.git
More information about the pkg-mate-commits
mailing list