summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-04-20 13:57:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 10:44:32 +0100
commit1eff536f67037af491a7621251e14e8734ccb946 (patch)
treef1b30ec9a821feaebccd5b1b065638816d348718
parent38fd4ce95957a8f4737e979d685b87027d32d291 (diff)
downloadpoky-1eff536f67037af491a7621251e14e8734ccb946.tar.gz
polkit: upgrade to version 0.101.
Derive introspection.patch from gobject to fix autoconf issue. (From OE-Core rev: 8e530947da27304ad499a8cd1110907d5c172ff8) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/polkit/polkit-0.101/introspection.patch104
-rw-r--r--meta/recipes-extended/polkit/polkit_0.101.bb (renamed from meta/recipes-extended/polkit/polkit_0.99.bb)11
2 files changed, 110 insertions, 5 deletions
diff --git a/meta/recipes-extended/polkit/polkit-0.101/introspection.patch b/meta/recipes-extended/polkit/polkit-0.101/introspection.patch
new file mode 100644
index 0000000000..58c27abbb3
--- /dev/null
+++ b/meta/recipes-extended/polkit/polkit-0.101/introspection.patch
@@ -0,0 +1,104 @@
1Copied from gobject-introspection/m4/introspection.m4
2
3Upstream-Status: Inappropriate [configuration]
4
5Signed-off-By: Dongxiao Xu <dongxiao.xu@intel.com>
6
7diff -ruN polkit-0.101-orig/m4/introspection.m4 polkit-0.101/m4/introspection.m4
8--- polkit-0.101-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800
9+++ polkit-0.101/m4/introspection.m4 2010-12-06 11:08:16.000000000 +0800
10@@ -0,0 +1,94 @@
11+dnl -*- mode: autoconf -*-
12+dnl Copyright 2009 Johan Dahlin
13+dnl
14+dnl This file is free software; the author(s) gives unlimited
15+dnl permission to copy and/or distribute it, with or without
16+dnl modifications, as long as this notice is preserved.
17+dnl
18+
19+# serial 1
20+
21+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
22+[
23+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
24+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
25+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
26+
27+ dnl enable/disable introspection
28+ m4_if([$2], [require],
29+ [dnl
30+ enable_introspection=yes
31+ ],[dnl
32+ AC_ARG_ENABLE(introspection,
33+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
34+ [Enable introspection for this build]),,
35+ [enable_introspection=auto])
36+ ])dnl
37+
38+ AC_MSG_CHECKING([for gobject-introspection])
39+
40+ dnl presence/version checking
41+ AS_CASE([$enable_introspection],
42+ [no], [dnl
43+ found_introspection="no (disabled, use --enable-introspection to enable)"
44+ ],dnl
45+ [yes],[dnl
46+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
47+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
48+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
49+ found_introspection=yes,
50+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
51+ ],dnl
52+ [auto],[dnl
53+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
54+ ],dnl
55+ [dnl
56+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
57+ ])dnl
58+
59+ AC_MSG_RESULT([$found_introspection])
60+
61+ INTROSPECTION_SCANNER=
62+ INTROSPECTION_COMPILER=
63+ INTROSPECTION_GENERATE=
64+ INTROSPECTION_GIRDIR=
65+ INTROSPECTION_TYPELIBDIR=
66+ if test "x$found_introspection" = "xyes"; then
67+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
68+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
69+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
70+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
71+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
72+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
73+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
74+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
75+ fi
76+ AC_SUBST(INTROSPECTION_SCANNER)
77+ AC_SUBST(INTROSPECTION_COMPILER)
78+ AC_SUBST(INTROSPECTION_GENERATE)
79+ AC_SUBST(INTROSPECTION_GIRDIR)
80+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
81+ AC_SUBST(INTROSPECTION_CFLAGS)
82+ AC_SUBST(INTROSPECTION_LIBS)
83+ AC_SUBST(INTROSPECTION_MAKEFILE)
84+
85+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
86+])
87+
88+
89+dnl Usage:
90+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
91+
92+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
93+[
94+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
95+])
96+
97+dnl Usage:
98+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
99+
100+
101+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
102+[
103+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
104+])
diff --git a/meta/recipes-extended/polkit/polkit_0.99.bb b/meta/recipes-extended/polkit/polkit_0.101.bb
index 7f969792ea..6769914881 100644
--- a/meta/recipes-extended/polkit/polkit_0.99.bb
+++ b/meta/recipes-extended/polkit/polkit_0.101.bb
@@ -4,10 +4,11 @@ HOMEPAGE = "http://code.google.com/p/polkit/"
4LICENSE = "LGPLv2+" 4LICENSE = "LGPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
6 file://src/polkit/polkit.h;beginline=1;endilne=20;md5=9f797b8912dac8a806be820c14e783f8 \ 6 file://src/polkit/polkit.h;beginline=1;endilne=20;md5=9f797b8912dac8a806be820c14e783f8 \
7 file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99" 7 file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
8 8
9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz" 9SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
10PR = "r1" 10 file://introspection.patch"
11PR = "r0"
11DEPENDS = "libpam expat dbus-glib eggdbus intltool" 12DEPENDS = "libpam expat dbus-glib eggdbus intltool"
12RDEPENDS_${PN} = "libpam" 13RDEPENDS_${PN} = "libpam"
13EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection" 14EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
@@ -19,5 +20,5 @@ FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \
19 ${datadir}/dbus-1/system-services/*" 20 ${datadir}/dbus-1/system-services/*"
20FILES_${PN}-dbg += "${libdir}/${PN}-1/extensions/.debug/*.so" 21FILES_${PN}-dbg += "${libdir}/${PN}-1/extensions/.debug/*.so"
21 22
22SRC_URI[md5sum] = "fcc4d7b19c08ad54d3ce0eae0ab12398" 23SRC_URI[md5sum] = "f925ac93aba3c072977370c1e27feb7f"
23SRC_URI[sha256sum] = "f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f" 24SRC_URI[sha256sum] = "927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b"