glade3: unbreak, unblacklist and other fixes

* fix build with gcc-6
* add intltool-native to DEPENDS
* add gtk-icon-cache to inherit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2016-09-05 23:32:03 +02:00
committed by Martin Jansa
parent e9b5fc160f
commit 07c1512928
3 changed files with 46 additions and 7 deletions
@@ -1,2 +1 @@
PACKAGECONFIG ??= "gnome" PACKAGECONFIG ??= "gnome"
PNBLACKLIST[glade3] ?= "Depends on broken libgnomeui"
@@ -0,0 +1,39 @@
From 5aa3d2abb905fa8594f6c6572a87809da54c9342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 5 Sep 2016 11:25:27 +0200
Subject: [PATCH] fix gcc-6 build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status; Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
gladeui/glade-editor-property.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index a0c1039..5e9ac38 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -2703,6 +2703,8 @@ glade_eprop_object_view (gboolean radio)
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
static gchar *
glade_eprop_object_dialog_title (GladeEditorProperty *eprop)
{
@@ -2731,6 +2733,7 @@ glade_eprop_object_dialog_title (GladeEditorProperty *eprop)
return g_strdup_printf (format, g_type_name
(eprop->klass->pspec->value_type));
}
+#pragma GCC diagnostic pop
gboolean
--
2.5.5
@@ -4,12 +4,15 @@ LICENSE = "GPLv2 & LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2" DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native"
inherit autotools pkgconfig pythonnative inherit autotools pkgconfig pythonnative gtk-icon-cache
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ SRC_URI = " \
file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch" http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \
file://0002-fix-gcc-6-build.patch \
"
SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f" SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f"
SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735" SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735"
@@ -19,5 +22,3 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui" PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui"
FILES_${PN} += "${datadir}/icons" FILES_${PN} += "${datadir}/icons"
FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"