summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-27 12:00:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-28 09:20:54 +0100
commitb7a528b0f5ab5ed367b4b61b8e485a7543c5b58c (patch)
treec1109800d8515888721b698f42c1e9d881764b4b /meta
parent880994911e2dde0cf24f330c0fb5fdc1e5ea9e55 (diff)
downloadpoky-b7a528b0f5ab5ed367b4b61b8e485a7543c5b58c.tar.gz
polkit/vte/gupnp/gssdp: Replace introspection hacks with gobject-introspection-stub
(From OE-Core rev: dcd076a727de57677efc7130793fa0cda03bb146) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/gupnp/gssdp-0.10.0/introspection.patch104
-rw-r--r--meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb5
-rw-r--r--meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch104
-rw-r--r--meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb5
-rw-r--r--meta/recipes-extended/polkit/polkit-0.104/introspection.patch104
-rw-r--r--meta/recipes-extended/polkit/polkit_0.104.bb3
-rw-r--r--meta/recipes-support/vte/vte.inc4
-rw-r--r--meta/recipes-support/vte/vte/introspection.patch107
8 files changed, 6 insertions, 430 deletions
diff --git a/meta/recipes-connectivity/gupnp/gssdp-0.10.0/introspection.patch b/meta/recipes-connectivity/gupnp/gssdp-0.10.0/introspection.patch
deleted file mode 100644
index 39c1502af6..0000000000
--- a/meta/recipes-connectivity/gupnp/gssdp-0.10.0/introspection.patch
+++ /dev/null
@@ -1,104 +0,0 @@
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 gssdp-0.9.0-orig/m4/introspection.m4 gssdp-0.9.0/m4/introspection.m4
8--- gssdp-0.9.0-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800
9+++ gssdp-0.9.0/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-connectivity/gupnp/gssdp_0.10.0.bb b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
index dcc40b8b9a..f3494e77fe 100644
--- a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
+++ b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb
@@ -2,10 +2,9 @@ SUMMARY = "Resource discovery and announcement over SSDP"
2DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." 2DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)."
3LICENSE = "LGPLv2" 3LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
5DEPENDS = "glib-2.0 libsoup-2.4 libglade" 5DEPENDS = "glib-2.0 libsoup-2.4 libglade gobject-introspection-stub"
6 6
7SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz \ 7SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz"
8 file://introspection.patch"
9 8
10SRC_URI[md5sum] = "725c32e8f92a072cc34f0e091937df2a" 9SRC_URI[md5sum] = "725c32e8f92a072cc34f0e091937df2a"
11SRC_URI[sha256sum] = "8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7" 10SRC_URI[sha256sum] = "8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7"
diff --git a/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch b/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch
deleted file mode 100644
index 86d57a7424..0000000000
--- a/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch
+++ /dev/null
@@ -1,104 +0,0 @@
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 gupnp-0.16.1-orig/m4/introspection.m4 gupnp-0.16.1/m4/introspection.m4
8--- gupnp-0.16.1-orig/m4/introspection.m4 1970-01-01 08:00:00.000000000 +0800
9+++ gupnp-0.16.1/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-connectivity/gupnp/gupnp_0.16.1.bb b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
index 8460c16c15..84e0679563 100644
--- a/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
@@ -3,10 +3,9 @@ DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for cr
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
5 file://libgupnp/gupnp.h;beginline=1;endline=20;md5=28c49b17d623afc3335efc2e511879e1" 5 file://libgupnp/gupnp.h;beginline=1;endline=20;md5=28c49b17d623afc3335efc2e511879e1"
6DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gnome-icon-theme" 6DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gnome-icon-theme gobject-introspection-stub"
7 7
8SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz \ 8SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz"
9 file://introspection.patch"
10 9
11SRC_URI[md5sum] = "021bb237741532af4bca50157ff326e4" 10SRC_URI[md5sum] = "021bb237741532af4bca50157ff326e4"
12SRC_URI[sha256sum] = "f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe" 11SRC_URI[sha256sum] = "f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe"
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 @@
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.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 \
6 file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \ 6 file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4 \
7 file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38" 7 file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38"
8 8
9DEPENDS = "expat glib-2.0 intltool-native" 9DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub"
10 10
11PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 11PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
12PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" 12PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
@@ -15,7 +15,6 @@ PR = "r6"
15 15
16PAM_SRC_URI = "file://polkit-1_pam.patch" 16PAM_SRC_URI = "file://polkit-1_pam.patch"
17SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \ 17SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
18 file://introspection.patch \
19 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 18 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
20 file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \ 19 file://0001-PolkitUnixSession-Set-error-if-we-cannot-find-a-sess.patch \
21 file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \ 20 file://0002-PolkitUnixSession-Actually-return-TRUE-if-a-session-.patch \
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 9fe79564d4..0766da7429 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -1,13 +1,11 @@
1DESCRIPTION = "vte is a virtual terminal emulator" 1DESCRIPTION = "vte is a virtual terminal emulator"
2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" 2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4DEPENDS = " glib-2.0 gtk+ intltool-native ncurses" 4DEPENDS = " glib-2.0 gtk+ intltool-native ncurses gobject-introspection-stub"
5RDEPENDS_libvte = "vte-termcap" 5RDEPENDS_libvte = "vte-termcap"
6 6
7inherit gnome gtk-doc 7inherit gnome gtk-doc
8 8
9SRC_URI += "file://introspection.patch"
10
11EXTRA_OECONF = "--disable-python --disable-introspection" 9EXTRA_OECONF = "--disable-python --disable-introspection"
12 10
13PACKAGES =+ "libvte vte-termcap" 11PACKAGES =+ "libvte vte-termcap"
diff --git a/meta/recipes-support/vte/vte/introspection.patch b/meta/recipes-support/vte/vte/introspection.patch
deleted file mode 100644
index 890ba310ed..0000000000
--- a/meta/recipes-support/vte/vte/introspection.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Get this m4 file from introspection, so that we can configure without
4depending on the introspection package.
5
6Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
72011/01/03
8
9Index: vte-0.28.2/m4/introspection.m4
10===================================================================
11--- /dev/null
12+++ vte-0.28.2/m4/introspection.m4
13@@ -0,0 +1,94 @@
14+dnl -*- mode: autoconf -*-
15+dnl Copyright 2009 Johan Dahlin
16+dnl
17+dnl This file is free software; the author(s) gives unlimited
18+dnl permission to copy and/or distribute it, with or without
19+dnl modifications, as long as this notice is preserved.
20+dnl
21+
22+# serial 1
23+
24+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
25+[
26+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
27+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
28+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
29+
30+ dnl enable/disable introspection
31+ m4_if([$2], [require],
32+ [dnl
33+ enable_introspection=yes
34+ ],[dnl
35+ AC_ARG_ENABLE(introspection,
36+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
37+ [Enable introspection for this build]),,
38+ [enable_introspection=auto])
39+ ])dnl
40+
41+ AC_MSG_CHECKING([for gobject-introspection])
42+
43+ dnl presence/version checking
44+ AS_CASE([$enable_introspection],
45+ [no], [dnl
46+ found_introspection="no (disabled, use --enable-introspection to enable)"
47+ ],dnl
48+ [yes],[dnl
49+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
50+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
51+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
52+ found_introspection=yes,
53+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
54+ ],dnl
55+ [auto],[dnl
56+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
57+ ],dnl
58+ [dnl
59+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
60+ ])dnl
61+
62+ AC_MSG_RESULT([$found_introspection])
63+
64+ INTROSPECTION_SCANNER=
65+ INTROSPECTION_COMPILER=
66+ INTROSPECTION_GENERATE=
67+ INTROSPECTION_GIRDIR=
68+ INTROSPECTION_TYPELIBDIR=
69+ if test "x$found_introspection" = "xyes"; then
70+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
71+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
72+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
73+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
74+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
75+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
76+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
77+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
78+ fi
79+ AC_SUBST(INTROSPECTION_SCANNER)
80+ AC_SUBST(INTROSPECTION_COMPILER)
81+ AC_SUBST(INTROSPECTION_GENERATE)
82+ AC_SUBST(INTROSPECTION_GIRDIR)
83+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
84+ AC_SUBST(INTROSPECTION_CFLAGS)
85+ AC_SUBST(INTROSPECTION_LIBS)
86+ AC_SUBST(INTROSPECTION_MAKEFILE)
87+
88+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
89+])
90+
91+
92+dnl Usage:
93+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
94+
95+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
96+[
97+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
98+])
99+
100+dnl Usage:
101+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
102+
103+
104+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
105+[
106+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
107+])
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-12 15:15:07 +0000