python: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch for both python-dbus and
python-pygobject that replace automake macros no longer supported
by automake-1.13 with modern constructs.

(From OE-Core rev: 9866bed92c0f3dee3f1674e9f9a28e21f5ba33fc)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marko Lindqvist 2013-01-10 11:59:55 +02:00 committed by Richard Purdie
parent f6bc657476
commit 7879893ae2
4 changed files with 45 additions and 4 deletions

View File

@ -0,0 +1,14 @@
Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59006]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd dbus-python-1.1.1/configure.ac dbus-python-1.1.1/configure.ac
--- dbus-python-1.1.1/configure.ac 2012-06-25 19:02:12.000000000 +0300
+++ dbus-python-1.1.1/configure.ac 2013-01-03 05:42:00.498912733 +0200
@@ -29,7 +29,7 @@
AC_SUBST(DBUS_PYTHON_MICRO_VERSION, dbus_python_micro_version)
AC_CONFIG_SRCDIR([_dbus_bindings/module.c])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([1.9 -Wno-portability])

View File

@ -4,9 +4,11 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=f5612614133e9a2f2dad527d97554670"
DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
PR = "r1"
PR = "r2"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
file://obsolete_automake_macros.patch \
"
SRC_URI[md5sum] = "742c7432ad0f7c3f98291d58fa2e35dc"
SRC_URI[sha256sum] = "8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88"

View File

@ -0,0 +1,23 @@
Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac
--- pygobject-2.27.91/configure.ac 2011-02-23 22:14:37.000000000 +0200
+++ pygobject-2.27.91/configure.ac 2013-01-03 05:13:44.034949954 +0200
@@ -35,7 +35,7 @@
AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version])
AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
AM_INIT_AUTOMAKE(foreign)
AM_MAINTAINER_MODE
@@ -82,7 +82,6 @@
m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
AC_ISC_POSIX
AC_PROG_CC
-AM_PROG_CC_STDC
AM_PROG_CC_C_O
# check that we have the minimum version of python necisary to build

View File

@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
DEPENDS = "python python-pygobject-native glib-2.0"
DEPENDS_class-native = "glib-2.0-native"
RDEPENDS_class-native = ""
PR = "r5"
PR = "r6"
MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2"
SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
file://obsolete_automake_macros.patch \
"
SRC_URI[md5sum] = "2b11a3050264721aac83188224b093a8"
SRC_URI[sha256sum] = "a1dffbe2a8e0d490594554ed8d06f0ee4a371acb6c210e7f35158e9ae77e0df4"