Skip to contentSkip to conversation

xchat: update recipe with build/configure fixes

PATCH New Steve Arnold 1 participant 1 message Sep 13, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xchat: update recipe with build/configure fixes

Update recipe with build/configure fixes (rework autotools config, add patch for separate build dir, add patch for automake foreign, add PACKAGECONFIG option for python interface, move dbus to RDEPEND, as dbus-glib header is required for build; the last one is a workaround for the QA depend warning on more than one dep in PKGCONF).

Upstream-Status: Inappropriate (no more upstream)

---
 .../xchat/xchat-2.8.8/automake-foreign.patch       | 11 +++
 .../fix-includes-for-separate-build.patch          | 78 ++++++++++++++++++++++
 meta-oe/recipes-support/xchat/xchat_2.8.8.bb       | 19 +++---
 3 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 meta-oe/recipes-support/xchat/xchat-2.8.8/automake-foreign.patch
 create mode 100644 meta-oe/recipes-support/xchat/xchat-2.8.8/fix-includes-for-separate-build.patch
meta-oe/recipes-support/xchat/xchat-2.8.8/automake-foreign.patch new file +11 -0
new file mode 100644
index 0000000..cfa2f6c
@@ -0,0 +1,11 @@
+--- a/configure.in	2014-08-18 01:25:43.911597023 -0700
++++ b/configure.in	2014-08-18 01:26:27.763786629 -0700
+@@ -8,7 +8,7 @@
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([configure.in])
+ 
+-AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define])
++AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 subdir-objects no-define])
+ 
+ AM_MAINTAINER_MODE
+ AC_PROG_CC
meta-oe/recipes-support/xchat/xchat-2.8.8/fix-includes-for-separate-build.patch new file +78 -0

78 lines not on this page · raw message

meta-oe/recipes-support/xchat/xchat_2.8.8.bb +10 -9
index fe07bc2..6da11cd 100644
@@ -2,33 +2,34 @@ SUMMARY = "Full-featured IRC chat client with scripting support"
 LICENSE = "GPLv2+"
 HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
+
 DEPENDS = "libgcrypt zlib gtk+ libsexy"
 DEPENDS += "gdk-pixbuf-native"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 
-PR = "r1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 
-PNBLACKLIST[xchat] = "BROKEN: Doesn't work with B!=S"
+PR = "r2"
 
 SRC_URI = "http://xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
     file://glib-2.32.patch \
+    file://automake-foreign.patch \
+    file://fix-includes-for-separate-build.patch \
 "
 
-inherit autotools gettext
+inherit autotools gettext pkgconfig
 
 PACKAGECONFIG ??= "dbus"
-PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus-glib"
 PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
+PACKAGECONFIG[python] = "--enable-python,--disable-python,python"
 
 EXTRA_OECONF = "\
+    --enable-maintainer-mode \
     --disable-perl \
-    --disable-python \
     --disable-tcl \
 "
-do_configure_prepend(){
-    rm -f ${S}/po/Makefile.in.in
-}
 
+RDEPENDS_${PN} += "dbus"
 FILES_${PN} += "${datadir}/dbus-1"
 FILES_${PN}-dbg += "${libdir}/xchat/plugins/.debug"
 
Signature · 1 line
2.0.4