summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-12-31 12:33:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-07 23:35:01 +0000
commit67786c471a608e5feb3935d1136af8dd213c3c07 (patch)
tree23b003a1cbcaf73cb9fff2bc594d226f4a9b41b9 /meta/recipes-gnome
parent450a4aaf1ae325d37258205d69535dd00c18a1ba (diff)
downloadpoky-67786c471a608e5feb3935d1136af8dd213c3c07.tar.gz
librsvg: upgrade to 2.40.6
Upstream now ships it's own vapigen.m4, so don't install our own copy. (From OE-Core rev: 7235da88c6ed6555cfa271714331595a8c3dd2e4) (From OE-Core rev: a06bdaf8c25fbe838c416e67aaf4a6bc0335681c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/vapigen.m496
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.40.6.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.40.2.bb)16
2 files changed, 3 insertions, 109 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 b/meta/recipes-gnome/librsvg/librsvg/vapigen.m4
deleted file mode 100644
index f2df12f23f..0000000000
--- a/meta/recipes-gnome/librsvg/librsvg/vapigen.m4
+++ /dev/null
@@ -1,96 +0,0 @@
1dnl vapigen.m4
2dnl
3dnl Copyright 2012 Evan Nemerson
4dnl
5dnl This library is free software; you can redistribute it and/or
6dnl modify it under the terms of the GNU Lesser General Public
7dnl License as published by the Free Software Foundation; either
8dnl version 2.1 of the License, or (at your option) any later version.
9dnl
10dnl This library is distributed in the hope that it will be useful,
11dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
12dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13dnl Lesser General Public License for more details.
14dnl
15dnl You should have received a copy of the GNU Lesser General Public
16dnl License along with this library; if not, write to the Free Software
17dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
19# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT])
20# --------------------------------------
21# Check vapigen existence and version
22#
23# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
24AC_DEFUN([VAPIGEN_CHECK],
25[
26 AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0])
27 AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0])
28
29 AC_ARG_ENABLE([vala],
30 [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
31 AS_IF([test "x$4" = "x"], [
32 enable_vala=auto
33 ], [
34 enable_vala=$4
35 ])
36 ])
37
38 AS_CASE([$enable_vala], [no], [enable_vala=no],
39 [yes], [
40 AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
41 AC_MSG_ERROR([Vala bindings require GObject Introspection])
42 ])
43 ], [auto], [
44 AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
45 enable_vala=no
46 ])
47 ], [
48 AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
49 ])
50
51 AS_IF([test "x$2" = "x"], [
52 vapigen_pkg_name=vapigen
53 ], [
54 vapigen_pkg_name=vapigen-$2
55 ])
56 AS_IF([test "x$1" = "x"], [
57 vapigen_pkg="$vapigen_pkg_name"
58 ], [
59 vapigen_pkg="$vapigen_pkg_name >= $1"
60 ])
61
62 PKG_PROG_PKG_CONFIG
63
64 PKG_CHECK_EXISTS([$vapigen_pkg], [
65 AS_IF([test "$enable_vala" = "auto"], [
66 enable_vala=yes
67 ])
68 ], [
69 AS_CASE([$enable_vala], [yes], [
70 AC_MSG_ERROR([$vapigen_pkg not found])
71 ], [auto], [
72 enable_vala=no
73 ])
74 ])
75
76 AC_MSG_CHECKING([for vala])
77
78 AS_CASE([$enable_vala],
79 [yes], [
80 VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen`
81 VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen
82 AS_IF([test "x$2" = "x"], [
83 VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen`
84 ], [
85 VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen`
86 ])
87 ])
88
89 AC_MSG_RESULT([$enable_vala])
90
91 AC_SUBST([VAPIGEN])
92 AC_SUBST([VAPIGEN_VAPIDIR])
93 AC_SUBST([VAPIGEN_MAKEFILE])
94
95 AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
96])
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb
index e2b26f5ae7..483d30980f 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.6.bb
@@ -14,11 +14,10 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache
14 14
15GNOME_COMPRESS_TYPE = "xz" 15GNOME_COMPRESS_TYPE = "xz"
16 16
17SRC_URI += "file://gtk-option.patch \ 17SRC_URI += "file://gtk-option.patch"
18 file://vapigen.m4"
19 18
20SRC_URI[archive.md5sum] = "acdecdb9f08f3bf662a68bf7dafb8b82" 19SRC_URI[archive.md5sum] = "259fd160b47ec11f3c27d7e18e507c99"
21SRC_URI[archive.sha256sum] = "48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c" 20SRC_URI[archive.sha256sum] = "8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06"
22 21
23EXTRA_OECONF = "--disable-introspection --disable-vala" 22EXTRA_OECONF = "--disable-introspection --disable-vala"
24 23
@@ -32,15 +31,6 @@ PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-p
32# GTK+ test application (rsvg-view) 31# GTK+ test application (rsvg-view)
33PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3" 32PACKAGECONFIG[gtk] = "--with-gtk3,--without-gtk3,gtk+3"
34 33
35# The tarball doesn't ship with macros, so drop a vapigen in there so we don't
36# need to build vala to configure.
37do_configure_prepend() {
38 if test ! -e ${S}/m4/vapigen.m4; then
39 mkdir --parents ${S}/m4
40 mv ${WORKDIR}/vapigen.m4 ${S}/m4/
41 fi
42}
43
44do_install_append() { 34do_install_append() {
45 # Loadable modules don't need .a or .la on Linux 35 # Loadable modules don't need .a or .la on Linux
46 rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la 36 rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la