From b7a528b0f5ab5ed367b4b61b8e485a7543c5b58c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Jul 2012 12:00:22 +0000 Subject: polkit/vte/gupnp/gssdp: Replace introspection hacks with gobject-introspection-stub (From OE-Core rev: dcd076a727de57677efc7130793fa0cda03bb146) Signed-off-by: Richard Purdie --- .../polkit/polkit-0.104/introspection.patch | 104 --------------------- meta/recipes-extended/polkit/polkit_0.104.bb | 3 +- 2 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 meta/recipes-extended/polkit/polkit-0.104/introspection.patch (limited to 'meta/recipes-extended/polkit') diff --git a/meta/recipes-extended/polkit/polkit-0.104/introspection.patch b/meta/recipes-extended/polkit/polkit-0.104/introspection.patch deleted file mode 100644 index 58c27abbb3..0000000000 --- a/meta/recipes-extended/polkit/polkit-0.104/introspection.patch +++ /dev/null @@ -1,104 +0,0 @@ -Copied from gobject-introspection/m4/introspection.m4 - -Upstream-Status: Inappropriate [configuration] - -Signed-off-By: Dongxiao Xu - -diff -ruN polkit-0.101-orig/m4/introspection.m4 polkit-0.101/m4/introspection.m4 ---- polkit-0.101-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800 -+++ polkit-0.101/m4/introspection.m4 2010-12-06 11:08:16.000000000 +0800 -@@ -0,0 +1,94 @@ -+dnl -*- mode: autoconf -*- -+dnl Copyright 2009 Johan Dahlin -+dnl -+dnl This file is free software; the author(s) gives unlimited -+dnl permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+ -+# serial 1 -+ -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -+ -+ dnl enable/disable introspection -+ m4_if([$2], [require], -+ [dnl -+ enable_introspection=yes -+ ],[dnl -+ AC_ARG_ENABLE(introspection, -+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -+ [Enable introspection for this build]),, -+ [enable_introspection=auto]) -+ ])dnl -+ -+ AC_MSG_CHECKING([for gobject-introspection]) -+ -+ dnl presence/version checking -+ AS_CASE([$enable_introspection], -+ [no], [dnl -+ found_introspection="no (disabled, use --enable-introspection to enable)" -+ ],dnl -+ [yes],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0],, -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -+ found_introspection=yes, -+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -+ ],dnl -+ [auto],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -+ ],dnl -+ [dnl -+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -+ ])dnl -+ -+ AC_MSG_RESULT([$found_introspection]) -+ -+ INTROSPECTION_SCANNER= -+ INTROSPECTION_COMPILER= -+ INTROSPECTION_GENERATE= -+ INTROSPECTION_GIRDIR= -+ INTROSPECTION_TYPELIBDIR= -+ if test "x$found_introspection" = "xyes"; then -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ fi -+ AC_SUBST(INTROSPECTION_SCANNER) -+ AC_SUBST(INTROSPECTION_COMPILER) -+ AC_SUBST(INTROSPECTION_GENERATE) -+ AC_SUBST(INTROSPECTION_GIRDIR) -+ AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) -+ -+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -+]) -+ -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -+]) -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -+ -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -+]) diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb index cd03898eaf..e548cbc64b 100644 --- a/meta/recipes-extended/polkit/polkit_0.104.bb +++ b/meta/recipes-extended/polkit/polkit_0.104.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \ file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38" -DEPENDS = "expat glib-2.0 intltool-native" +DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub" PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" @@ -15,7 +15,6 @@ PR = "r6" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \ - file://introspection.patch \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \ file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \ -- cgit v1.2.3-54-g00ecf