diff options
author | Ross Burton <ross.burton@intel.com> | 2013-11-19 17:02:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-20 14:03:33 +0000 |
commit | 852ba6c72f2555def6896fd768e1a4dea37606aa (patch) | |
tree | 143574e43e6df660e225d9c80ecf19c4f909b3c1 /meta/recipes-gnome/librsvg/librsvg | |
parent | b60666e3a9a248a23a154fe14ad6569ff0a654e8 (diff) | |
download | poky-852ba6c72f2555def6896fd768e1a4dea37606aa.tar.gz |
librsvg: upgrade to 2.40.0
Add local-m4.patch and install a local vapigen.m4 so that we can autoreconf
without needing Vala installed.
Refresh build dependencies removing stale recipes and adding libcroco as it's a mandatory dependency now.
Explicitly disable Vala, with a patch from upstream until 2.40.1.
The GTK+ 2 theme engine has been removed, delete all traces of it.
Add a patch to make GTK+ use deterministic, and a disabled PACKAGECONFIG for it.
Enable parallel make, as some testing shows that it works fine.
Drop librsvg-CVE-2011-3146, merged upstream. Drop doc_Makefile.patch, our
gtk-doc.mk isn't buggy and this isn't needed anymore.
Merge multiple -dev and -dbg packages into ${PN}-dev and -dbg, and remove the
loader module .a and .la files as they are pointless.
(From OE-Core rev: ee3e2e5ce15a3bf78c7e9d76d7bf68131f2d3ef7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 59 | ||||
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/local-m4.patch | 32 | ||||
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/vapigen.m4 | 96 |
3 files changed, 187 insertions, 0 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch new file mode 100644 index 0000000000..9185041560 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 19 Nov 2013 16:00:29 +0000 | ||
4 | Subject: [PATCH] configure: add option to enable/disable use of GTK+ | ||
5 | |||
6 | Distro packagers like predictability and automatically detected optional | ||
7 | dependencies are not predicable. Add a --with-gtk3 option (default to "auto") | ||
8 | for forcibly controlling whether GTK+ will be used or not. | ||
9 | |||
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
11 | |||
12 | https://bugzilla.gnome.org/show_bug.cgi?id=712693 | ||
13 | --- | ||
14 | configure.in | 17 +++++++++++------ | ||
15 | 1 file changed, 11 insertions(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/configure.in b/configure.in | ||
18 | index f7a89dc..1498f72 100644 | ||
19 | --- a/configure.in | ||
20 | +++ b/configure.in | ||
21 | @@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) | ||
22 | # GTK | ||
23 | # =========================================================================== | ||
24 | |||
25 | -PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) | ||
26 | - | ||
27 | GTK3_BINARY_VERSION= | ||
28 | |||
29 | -if test "$have_gtk_3" = "yes"; then | ||
30 | - GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" | ||
31 | +AC_MSG_CHECKING([whether to use GTK+ 3]) | ||
32 | +AC_ARG_WITH([gtk3], | ||
33 | + [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])], | ||
34 | + [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])]) | ||
35 | +AC_MSG_RESULT([$with_gtk3]) | ||
36 | + | ||
37 | +if test "$with_gtk3" = "yes"; then | ||
38 | + PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) | ||
39 | + GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" | ||
40 | fi | ||
41 | |||
42 | AC_SUBST([GTK3_BINARY_VERSION]) | ||
43 | |||
44 | -AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"]) | ||
45 | +AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"]) | ||
46 | |||
47 | dnl =========================================================================== | ||
48 | dnl GDK-Pixbuf SVG loader | ||
49 | @@ -305,6 +310,6 @@ librsvg-$VERSION | ||
50 | Build introspectable bindings: ${found_introspection} | ||
51 | Build Vala bindings: ${enable_vala} | ||
52 | Build GdkPixbuf loader: ${enable_pixbuf_loader} | ||
53 | - GTK 3.0: ${have_gtk_3} | ||
54 | + GTK 3.0: ${with_gtk3} | ||
55 | Build miscellaenous tools: ${build_misc_tools} | ||
56 | " | ||
57 | -- | ||
58 | 1.7.10.4 | ||
59 | |||
diff --git a/meta/recipes-gnome/librsvg/librsvg/local-m4.patch b/meta/recipes-gnome/librsvg/librsvg/local-m4.patch new file mode 100644 index 0000000000..e523076fd1 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/local-m4.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | This patch is required to make autoreconf use the local macros (so that it can | ||
2 | autoreconf without vala being installed). | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | From 6c3b8eee243204678574e162b7d480f6f83b71e6 Mon Sep 17 00:00:00 2001 | ||
8 | From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org> | ||
9 | Date: Tue, 29 Oct 2013 13:05:39 -0700 | ||
10 | Subject: [PATCH] build: Use local macros to detect vala | ||
11 | |||
12 | Fixes build when vala < 0.19 is present. | ||
13 | --- | ||
14 | Makefile.am | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/Makefile.am b/Makefile.am | ||
18 | index d95f008..e881100 100644 | ||
19 | --- a/Makefile.am | ||
20 | +++ b/Makefile.am | ||
21 | @@ -3,7 +3,7 @@ SUBDIRS = . gdk-pixbuf-loader tests tools doc | ||
22 | NULL = | ||
23 | BUILT_SOURCES = | ||
24 | |||
25 | -ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} | ||
26 | +ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 | ||
27 | |||
28 | lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la | ||
29 | |||
30 | -- | ||
31 | 1.7.10.4 | ||
32 | |||
diff --git a/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 b/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 new file mode 100644 index 0000000000..f2df12f23f --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/vapigen.m4 | |||
@@ -0,0 +1,96 @@ | |||
1 | dnl vapigen.m4 | ||
2 | dnl | ||
3 | dnl Copyright 2012 Evan Nemerson | ||
4 | dnl | ||
5 | dnl This library is free software; you can redistribute it and/or | ||
6 | dnl modify it under the terms of the GNU Lesser General Public | ||
7 | dnl License as published by the Free Software Foundation; either | ||
8 | dnl version 2.1 of the License, or (at your option) any later version. | ||
9 | dnl | ||
10 | dnl This library is distributed in the hope that it will be useful, | ||
11 | dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | dnl Lesser General Public License for more details. | ||
14 | dnl | ||
15 | dnl You should have received a copy of the GNU Lesser General Public | ||
16 | dnl License along with this library; if not, write to the Free Software | ||
17 | dnl 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 | ||
24 | AC_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 | ]) | ||