aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2018-06-10 17:08:07 +0200
committerKhem Raj <raj.khem@gmail.com>2018-06-14 08:57:14 -0700
commit409780a7482c02553156fbae064990ef874044c6 (patch)
treea09f9bca63ef4063c0997ed38d9b2071610ccecc
parent3e4c440ec2889110aac4201cc8c6ee43467b523d (diff)
downloadmeta-openembedded-contrib-409780a7482c02553156fbae064990ef874044c6.tar.gz
meta-openembedded-contrib-409780a7482c02553156fbae064990ef874044c6.tar.bz2
meta-openembedded-contrib-409780a7482c02553156fbae064990ef874044c6.zip
ristretto: fix build after update of xfconf
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-rw-r--r--meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch40
-rw-r--r--meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch
new file mode 100644
index 0000000000..5cdc8c7282
--- /dev/null
+++ b/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch
@@ -0,0 +1,40 @@
+From 2b6bdb860ef53975c7e866f393b61d253c00754d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 22 Jan 2018 15:52:09 +0100
+Subject: [PATCH] Fix build after update of xfconf
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+xfconf stopped using dbus-glib so required flags must be included here
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 36a31dc..3dd56bc 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -30,6 +30,7 @@ ristretto_CFLAGS = \
+ $(GIO_UNIX_CFLAGS) \
+ $(LIBEXIF_CFLAGS) \
+ $(XFCONF_CFLAGS) \
++ $(DBUS_GLIB_CFLAGS) \
+ $(EXO_CFLAGS) \
+ $(CAIRO_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+@@ -48,6 +49,7 @@ ristretto_LDADD = \
+ $(GIO_UNIX_LIBS) \
+ $(LIBEXIF_LIBS) \
+ $(XFCONF_LIBS) \
++ $(DBUS_GLIB_LIBS) \
+ $(EXO_LIBS) \
+ $(CAIRO_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+--
+2.14.3
+
diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb
index c4baa727e5..06dd1021d0 100644
--- a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb
+++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb
@@ -11,5 +11,6 @@ RRECOMMENDS_${PN} += "tumbler"
SRC_URI[md5sum] = "a8d8bb6b8fa7f868cfa3ae778630946e"
SRC_URI[sha256sum] = "f8f3b77ca6fc77ddf8cff1bb52e5c5802c462663f72f324393b3a0360f6901b8"
+SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch"
FILES_${PN} += "${datadir}/appdata"