summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gtk-doc/files/conditionaltests.patch')
-rw-r--r--meta/recipes-gnome/gtk-doc/files/conditionaltests.patch14
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
index 21c2db7826..55cae34b46 100644
--- a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
+++ b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
@@ -1,23 +1,22 @@
1From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001 1From 9aa9230a305e964b2417daea2b51e43b2dee607c Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 27 Jun 2017 21:00:58 +0100 3Date: Tue, 27 Jun 2017 21:00:58 +0100
4Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency 4Subject: [PATCH] gtk-doc: Handle floating gtk-doc dependency
5 5
6Allow the tests to be explicitly disabled to avoid floating dependnecy 6Allow the tests to be explicitly disabled to avoid floating dependnecy
7issues. This is not really an issue with RSS but is on previous releases. 7issues. This is not really an issue with RSS but is on previous releases.
8 8
9RP 2017/6/27 9RP 2017/6/27
10Upstream-Status: Pending 10Upstream-Status: Pending
11
12--- 11---
13 configure.ac | 10 ++++++++++ 12 configure.ac | 10 ++++++++++
14 1 file changed, 10 insertions(+) 13 1 file changed, 10 insertions(+)
15 14
16diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
17index 684e2d1..e5e3aab 100644 16index 0491090..4270c88 100644
18--- a/configure.ac 17--- a/configure.ac
19+++ b/configure.ac 18+++ b/configure.ac
20@@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then 19@@ -82,6 +82,11 @@ if test "x$GCC" = "xyes"; then
21 fi 20 fi
22 fi 21 fi
23 22
@@ -29,7 +28,7 @@ index 684e2d1..e5e3aab 100644
29 dnl if glib is available we can enable the tests 28 dnl if glib is available we can enable the tests
30 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], 29 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
31 [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" 30 [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`"
32@@ -156,6 +161,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], 31@@ -92,6 +97,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
33 build_tests="no" 32 build_tests="no"
34 ] 33 ]
35 ) 34 )
@@ -41,6 +40,3 @@ index 684e2d1..e5e3aab 100644
41 AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) 40 AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes )
42 dnl this enables the rule in test/Makefile.am 41 dnl this enables the rule in test/Makefile.am
43 AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) 42 AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes)
44--
452.14.1
46