summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-04-04 14:13:03 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:02 +0100
commit263370b4f704cc38a37ff75798e89eecf64b23cb (patch)
treee7167c3860b9ef947e406a567263669545d04b99 /meta
parent916215921916b46d76a7e7f07823ee81214d35cc (diff)
downloadpoky-263370b4f704cc38a37ff75798e89eecf64b23cb.tar.gz
vala: update to 0.40.2
(From OE-Core rev: 0c29f94d38fa24c72375599325b23c714102d02f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/vala/vala/disable-graphviz.patch26
-rw-r--r--meta/recipes-devtools/vala/vala_0.40.2.bb (renamed from meta/recipes-devtools/vala/vala_0.38.8.bb)4
2 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-devtools/vala/vala/disable-graphviz.patch b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
index 15d186de05..8fb94dc149 100644
--- a/meta/recipes-devtools/vala/vala/disable-graphviz.patch
+++ b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
@@ -1,4 +1,4 @@
1From eb716dc856c20b3da146a4e83e9800bd1f53c739 Mon Sep 17 00:00:00 2001 1From 500f4220f79c660a70a1ffc0d5b762d70088af5e Mon Sep 17 00:00:00 2001
2From: Rico Tzschichholz <ricotz@ubuntu.com> 2From: Rico Tzschichholz <ricotz@ubuntu.com>
3Date: Wed, 6 Sep 2017 18:52:55 +0200 3Date: Wed, 6 Sep 2017 18:52:55 +0200
4Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of 4Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
@@ -7,6 +7,7 @@ Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
7https://bugzilla.gnome.org/show_bug.cgi?id=787375 7https://bugzilla.gnome.org/show_bug.cgi?id=787375
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9Upstream-Status: Submitted [bugzilla link above] 9Upstream-Status: Submitted [bugzilla link above]
10
10--- 11---
11 configure.ac | 60 +++++++++++++++++++---------------- 12 configure.ac | 60 +++++++++++++++++++----------------
12 libvaladoc/Makefile.am | 25 +++++++++++---- 13 libvaladoc/Makefile.am | 25 +++++++++++----
@@ -15,10 +16,10 @@ Upstream-Status: Submitted [bugzilla link above]
15 4 files changed, 63 insertions(+), 34 deletions(-) 16 4 files changed, 63 insertions(+), 34 deletions(-)
16 17
17diff --git a/configure.ac b/configure.ac 18diff --git a/configure.ac b/configure.ac
18index c73d5d6b1..291e503d5 100644 19index 662180b..82d7015 100644
19--- a/configure.ac 20--- a/configure.ac
20+++ b/configure.ac 21+++ b/configure.ac
21@@ -98,34 +98,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) 22@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
22 AC_SUBST(GMODULE_CFLAGS) 23 AC_SUBST(GMODULE_CFLAGS)
23 AC_SUBST(GMODULE_LIBS) 24 AC_SUBST(GMODULE_LIBS)
24 25
@@ -86,10 +87,10 @@ index c73d5d6b1..291e503d5 100644
86 87
87 AC_PATH_PROG([XSLTPROC], [xsltproc], :) 88 AC_PATH_PROG([XSLTPROC], [xsltproc], :)
88diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am 89diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
89index 89245d86b..7c07498b9 100644 90index 384292f..cce50d8 100644
90--- a/libvaladoc/Makefile.am 91--- a/libvaladoc/Makefile.am
91+++ b/libvaladoc/Makefile.am 92+++ b/libvaladoc/Makefile.am
92@@ -127,10 +127,6 @@ libvaladoc_la_VALASOURCES = \ 93@@ -126,10 +126,6 @@ libvaladoc_la_VALASOURCES = \
93 content/tablerow.vala \ 94 content/tablerow.vala \
94 content/taglet.vala \ 95 content/taglet.vala \
95 content/text.vala \ 96 content/text.vala \
@@ -100,7 +101,7 @@ index 89245d86b..7c07498b9 100644
100 parser/manyrule.vala \ 101 parser/manyrule.vala \
101 parser/oneofrule.vala \ 102 parser/oneofrule.vala \
102 parser/optionalrule.vala \ 103 parser/optionalrule.vala \
103@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ 104@@ -156,13 +152,24 @@ libvaladoc_la_VALASOURCES = \
104 highlighter/codetoken.vala \ 105 highlighter/codetoken.vala \
105 highlighter/highlighter.vala \ 106 highlighter/highlighter.vala \
106 html/basicdoclet.vala \ 107 html/basicdoclet.vala \
@@ -126,17 +127,18 @@ index 89245d86b..7c07498b9 100644
126 libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ 127 libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
127 libvaladoc.vala.stamp \ 128 libvaladoc.vala.stamp \
128 $(libvaladoc_la_VALASOURCES:.vala=.c) \ 129 $(libvaladoc_la_VALASOURCES:.vala=.c) \
129@@ -182,8 +189,8 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) 130@@ -182,9 +189,9 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
130 --library valadoc \ 131 --library valadoc \
131 --vapi valadoc@PACKAGE_SUFFIX@.vapi \ 132 --vapi valadoc@PACKAGE_SUFFIX@.vapi \
132 --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ 133 --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
133- --vapidir $(top_srcdir)/vapi --pkg libgvc \ 134- --vapidir $(top_srcdir)/vapi --pkg libgvc \
134 --vapidir $(top_srcdir)/gee --pkg gee \ 135 --vapidir $(top_srcdir)/gee --pkg gee \
136 --vapidir $(top_srcdir)/vala --pkg vala \
135+ $(LIBGVC_PKG) \ 137+ $(LIBGVC_PKG) \
136 --pkg config \ 138 --pkg config \
137 $(filter %.vala %.c,$^) 139 $(filter %.vala %.c,$^)
138 touch $@ 140 touch $@
139@@ -209,6 +216,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc 141@@ -211,6 +218,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
140 142
141 valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc 143 valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
142 cp $< $@ 144 cp $< $@
@@ -146,7 +148,7 @@ index 89245d86b..7c07498b9 100644
146 148
147 vapidir = $(datadir)/vala/vapi 149 vapidir = $(datadir)/vala/vapi
148 dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi 150 dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
149@@ -216,6 +226,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps 151@@ -218,6 +228,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
150 152
151 valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps 153 valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
152 cp $< $@ 154 cp $< $@
@@ -157,7 +159,7 @@ index 89245d86b..7c07498b9 100644
157 EXTRA_DIST = \ 159 EXTRA_DIST = \
158 $(libvaladoc_la_VALASOURCES) \ 160 $(libvaladoc_la_VALASOURCES) \
159diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala 161diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
160index cc9ea4ed7..432c3818f 100644 162index cc9ea4e..432c381 100644
161--- a/libvaladoc/html/basicdoclet.vala 163--- a/libvaladoc/html/basicdoclet.vala
162+++ b/libvaladoc/html/basicdoclet.vala 164+++ b/libvaladoc/html/basicdoclet.vala
163@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 165@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
@@ -199,7 +201,7 @@ index cc9ea4ed7..432c3818f 100644
199 201
200 public void write_namespace_content (Namespace node, Api.Node? parent) { 202 public void write_namespace_content (Namespace node, Api.Node? parent) {
201diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala 203diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
202index 15ed9efd1..fe0d705d4 100644 204index 15ed9ef..fe0d705 100644
203--- a/libvaladoc/html/htmlmarkupwriter.vala 205--- a/libvaladoc/html/htmlmarkupwriter.vala
204+++ b/libvaladoc/html/htmlmarkupwriter.vala 206+++ b/libvaladoc/html/htmlmarkupwriter.vala
205@@ -43,12 +43,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { 207@@ -43,12 +43,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
@@ -219,5 +221,3 @@ index 15ed9efd1..fe0d705d4 100644
219 221
220 return this; 222 return this;
221 } 223 }
222--
2232.14.1
diff --git a/meta/recipes-devtools/vala/vala_0.38.8.bb b/meta/recipes-devtools/vala/vala_0.40.2.bb
index e2baf65559..3176a9127e 100644
--- a/meta/recipes-devtools/vala/vala_0.38.8.bb
+++ b/meta/recipes-devtools/vala/vala_0.40.2.bb
@@ -6,5 +6,5 @@ SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pa
6 file://0001-Disable-valadoc.patch \ 6 file://0001-Disable-valadoc.patch \
7" 7"
8 8
9SRC_URI[md5sum] = "37edd0467d056fd9e3937d0bbceda80b" 9SRC_URI[md5sum] = "e7d05683bcac0306fc8d7c875eb3fef1"
10SRC_URI[sha256sum] = "2fa746b51cd66e43577d1da06a80b708c2875cadaafee77e9700ea35cf23882c" 10SRC_URI[sha256sum] = "75a3dc2de36873d8ceab168b2fde1b2c378a1f7104a3b3391ba3acf579c674b3"