libglade: fix build and cleanup

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
2017-02-12 22:02:09 +01:00
committed by Martin Jansa
parent f35f4fbb7d
commit 928849af3a
2 changed files with 38 additions and 3 deletions

View File

@@ -0,0 +1,30 @@
From ceefcb19cebf8bc3d45ee502f8eabd3bc5bd0aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 11 Feb 2017 16:42:12 +0100
Subject: [PATCH] configure.in: remove deprecated GNOME_COMMON_INIT
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>
---
configure.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.in b/configure.in
index 8905f1c..3901398 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,6 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
-GNOME_COMMON_INIT
if test "$enable_debug" != "no"; then
AC_DEFINE([DEBUG],[1],[enable use of LIBGLADE_DEBUG environment variable])
--
2.9.3

View File

@@ -15,17 +15,22 @@ inherit autotools pkgconfig gnomebase gtk-doc distro_features_check
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
GNOME_COMPRESS_TYPE="bz2"
SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch"
SRC_URI += " \
file://glade-cruft.patch \
file://no-xml2.patch \
file://python_environment.patch \
file://0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch \
"
SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139"
SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec"
EXTRA_OECONF += "--without-libxml2 --disable-gtk-doc"
CFLAGS += "-lz"
CFLAGS += "-lz -lgmodule-2.0"
PACKAGES += " ${PN}-data"
FILES_${PN} = "${libdir}/lib*.so.*"
FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
FILES_${PN}-dev += "${bindir}/libglade-convert"
#RDEPENDS_${PN} = "${PN}-data"