Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> --- ...dd-missing-conditional-HAVE_INTROSPECTION.patch | 130 +++++++++++++++++++++ patches/polkit-0.105/series | 3 +- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch
diff --git a/patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch b/patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch new file mode 100644 index 000000000000..88afa7a0023b --- /dev/null +++ b/patches/polkit-0.105/0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch @@ -0,0 +1,130 @@ +From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelm...@pengutronix.de> +Date: Wed, 4 Oct 2017 10:57:38 +0200 +Subject: [PATCH] automake: add missing conditional HAVE_INTROSPECTION +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Copy the corresponding m4 file from gobject-introspection-1.52.1. + +Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> +--- + Makefile.am | 2 ++ + m4/introspection.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 98 insertions(+) + create mode 100644 m4/introspection.m4 + +diff --git a/Makefile.am b/Makefile.am +index 01f0a4bae8f3..d7ad566dc5f7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++ACLOCAL_AMFLAGS = -I m4 ++ + SUBDIRS = actions data src docs po test + + NULL = +diff --git a/m4/introspection.m4 b/m4/introspection.m4 +new file mode 100644 +index 000000000000..d89c3d907d9c +--- /dev/null ++++ b/m4/introspection.m4 +@@ -0,0 +1,96 @@ ++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 Canonicalize enable_introspection ++ enable_introspection=$found_introspection ++ ],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/patches/polkit-0.105/series b/patches/polkit-0.105/series index 3808027460dc..28afbfe9d5c1 100644 --- a/patches/polkit-0.105/series +++ b/patches/polkit-0.105/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-check-for-libsystemd-instead-of-libsystemd-login.patch -# 83e2d8f0392c42858cb3b8f452d4bb83 - git-ptx-patches magic +0002-automake-add-missing-conditional-HAVE_INTROSPECTION.patch +# 4b827c19ffc3dd77b57d89f9c2c9ab8d - git-ptx-patches magic -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
