From: Jeremy Bicha <jbi...@ubuntu.com> Date: Mon, 30 Apr 2018 17:49:16 -0400 Subject: [PATCH 1/2] Add patch to fix build without gconf
--- debian/patches/gconf.patch | 58 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 59 insertions(+) create mode 100644 debian/patches/gconf.patch diff --git a/debian/patches/gconf.patch b/debian/patches/gconf.patch new file mode 100644 index 0000000..a45d62d --- /dev/null +++ b/debian/patches/gconf.patch @@ -0,0 +1,58 @@ +From: Jeremy Bicha <jbi...@ubuntu.com> +Date: Mon, 30 Apr 2018 17:48:12 -0400 +Subject: build: fix configure without gconf + +Forwarded: no +--- + matchbox-window-manager/configure.ac | 8 +++++--- + matchbox-window-manager/data/Makefile.am | 2 +- + matchbox-window-manager/data/schemas/Makefile.am | 4 ---- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/matchbox-window-manager/configure.ac b/matchbox-window-manager/configure.ac +index 1e074ee..5fd2b3b 100644 +--- a/matchbox-window-manager/configure.ac ++++ b/matchbox-window-manager/configure.ac +@@ -394,11 +394,13 @@ if test x$enable_gconf != xno; then + + AC_DEFINE(USE_GCONF, [1], [Has GConf Support]) + +-fi ++ m4_ifdef([AM_GCONF_SOURCE_2], [AM_GCONF_SOURCE_2]) ++ ++else + +-AM_GCONF_SOURCE_2 ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) + +-AM_CONDITIONAL(ENABLE_SCHEMAS, test x$enable_gconf != xno) ++fi + + dnl ----- Session Manager --------------------------------------------------- + +diff --git a/matchbox-window-manager/data/Makefile.am b/matchbox-window-manager/data/Makefile.am +index 7448424..14e296c 100644 +--- a/matchbox-window-manager/data/Makefile.am ++++ b/matchbox-window-manager/data/Makefile.am +@@ -1,4 +1,4 @@ +-if ENABLE_SCHEMAS ++if GCONF_SCHEMAS_INSTALL + SUBDIRS = themes schemas + else + SUBDIRS = themes +diff --git a/matchbox-window-manager/data/schemas/Makefile.am b/matchbox-window-manager/data/schemas/Makefile.am +index bf38631..5016892 100644 +--- a/matchbox-window-manager/data/schemas/Makefile.am ++++ b/matchbox-window-manager/data/schemas/Makefile.am +@@ -1,11 +1,7 @@ + EXTRA_DIST = matchbox.schemas + +-if GCONF_SCHEMAS_INSTALL +- + schemadir = @GCONF_SCHEMA_FILE_DIR@ + schema_DATA = matchbox.schemas + + install-data-local: + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) +- +-endif diff --git a/debian/patches/series b/debian/patches/series index 267793e..1064914 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ install-themes.patch default-theme.patch build-themes.patch tidy-help-text.patch +gconf.patch
From: Jeremy Bicha <jbi...@ubuntu.com> Date: Mon, 30 Apr 2018 17:31:22 -0400 Subject: [PATCH 2/2] Drop obsolete Build-Depends on libgconf2-dev --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5e32c1c..2b12316 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: embedded Priority: optional Maintainer: Moray Allan <mo...@debian.org> Uploaders: Thibaut GIRKA <t...@sitedethib.com> -Build-Depends: debhelper (>= 9), dh-autoreconf (>= 5), pkg-config, libstartup-notification0-dev, libmatchbox-dev (>= 1.9-4), libx11-dev, libxext-dev, libxt-dev, libxft-dev, libxsettings-dev, libxsettings-client-dev, autotools-dev, libgconf2-dev +Build-Depends: debhelper (>= 9), dh-autoreconf (>= 5), pkg-config, libstartup-notification0-dev, libmatchbox-dev (>= 1.9-4), libx11-dev, libxext-dev, libxt-dev, libxft-dev, libxsettings-dev, libxsettings-client-dev, autotools-dev Standards-Version: 3.9.7 Homepage: http://matchbox-project.org/
