mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
vala, bump to version 0.40.4 (#2256)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: remove the dbus tests
|
||||
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 4b6b882..e6b4df1 100644
|
||||
index 19d71f9..79614ba 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -320,22 +320,6 @@ TESTS = \
|
||||
@@ -355,23 +355,6 @@ TESTS = \
|
||||
asynchronous/closures.vala \
|
||||
asynchronous/generator.vala \
|
||||
asynchronous/yield.vala \
|
||||
@@ -27,6 +27,7 @@ index 4b6b882..e6b4df1 100644
|
||||
- dbus/bug596862.vala \
|
||||
- dbus/bug602003.test \
|
||||
- dbus/bug782719.test \
|
||||
- dbus/bug792277.vala \
|
||||
- dbus/rawvariants.test \
|
||||
gir/bug651773.test \
|
||||
gir/bug667751.test \
|
||||
@@ -42,10 +43,10 @@ Subject: remove the gir tests
|
||||
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index e6b4df1..185d6dc 100644
|
||||
index 79614ba..df29247 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -320,12 +320,6 @@ TESTS = \
|
||||
@@ -355,17 +355,6 @@ TESTS = \
|
||||
asynchronous/closures.vala \
|
||||
asynchronous/generator.vala \
|
||||
asynchronous/yield.vala \
|
||||
@@ -53,8 +54,13 @@ index e6b4df1..185d6dc 100644
|
||||
- gir/bug667751.test \
|
||||
- gir/bug742012.test \
|
||||
- gir/bug788775.test \
|
||||
- gir/bug792998.test \
|
||||
- gir/array-fixed-length.test \
|
||||
- gir/class.test \
|
||||
- gir/delegate-alias-without-target.test \
|
||||
- gir/delegate-closure-destroy-index-conflict.test \
|
||||
- gir/parameter-nullable-out-simple-type.test \
|
||||
- gir/property-non-readable.test \
|
||||
annotations/deprecated.vala \
|
||||
annotations/description.vala \
|
||||
annotations/noaccessormethod.test \
|
||||
@@ -69,17 +75,53 @@ Subject: remove control-flow/bug736774-2.vala test
|
||||
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 185d6dc..bc1c8f9 100644
|
||||
index df29247..e1a370b 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -128,7 +128,6 @@ TESTS = \
|
||||
@@ -139,7 +139,6 @@ TESTS = \
|
||||
control-flow/bug665904.vala \
|
||||
control-flow/bug691514.vala \
|
||||
control-flow/bug736774-1.vala \
|
||||
- control-flow/bug736774-2.vala \
|
||||
control-flow/bug790903.test \
|
||||
enums/enum_only.vala \
|
||||
enums/enums.vala \
|
||||
control-semantic/argument-extra.test \
|
||||
control-semantic/argument-incompatible-type-out.test \
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
||||
From 76f6c0684af0a7ae7e6235026077babbb8fa9e3d Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Mon, 9 Apr 2018 21:04:39 +0200
|
||||
Subject: add check for graphviz header
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 662180b..069a84b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -120,7 +120,7 @@ LIBADD="$LIBADD $LIBGVC_LIBS"
|
||||
CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
|
||||
AC_RUN_IFELSE(
|
||||
[AC_LANG_SOURCE([
|
||||
- #include <gvc.h>
|
||||
+ #include <graphviz/gvc.h>
|
||||
|
||||
int main(void) {
|
||||
#ifdef WITH_CGRAPH
|
||||
diff --git a/libvaladoc/gvc-compat.c b/libvaladoc/gvc-compat.c
|
||||
index 9ec37e6..1ef6ba6 100644
|
||||
--- a/libvaladoc/gvc-compat.c
|
||||
+++ b/libvaladoc/gvc-compat.c
|
||||
@@ -20,7 +20,7 @@
|
||||
* Rico Tzschichholz <ricotz@ubuntu.com>
|
||||
*/
|
||||
|
||||
-#include <gvc.h>
|
||||
+#include <graphviz/gvc.h>
|
||||
|
||||
/* Compat-layer for Graphviz with/without cgraph support */
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@@ -9,7 +9,7 @@ COPYRIGHT="2006-2018 Jürg Billeter
|
||||
LICENSE="GNU LGPL v2.1"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.gnome.org/sources/vala/${portVersion%.*}/vala-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="3355829b6bd3ab395d9b1f25f99afde5bba8ec04e62684442b70a7a6a33fbf3f"
|
||||
CHECKSUM_SHA256="379354a2a2f7ee5c4d6e0f5e88b0e32620dcd5f51972baf6d90d9f18eb689198"
|
||||
PATCHES="vala-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
@@ -27,18 +27,23 @@ PROVIDES="
|
||||
cmd:vala_gen_introspect_$portVers$secondaryArchSuffix
|
||||
cmd:valac$secondaryArchSuffix
|
||||
cmd:valac_$portVers$secondaryArchSuffix
|
||||
cmd:vapicheck$secondaryArchSuffix
|
||||
cmd:vapicheck_$portVers$secondaryArchSuffix
|
||||
cmd:valadoc$secondaryArchSuffix
|
||||
cmd:valadoc_$portVers$secondaryArchSuffix
|
||||
cmd:vapigen$secondaryArchSuffix
|
||||
cmd:vapigen_$portVers$secondaryArchSuffix
|
||||
lib:libvala_$portVers$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libvaladoc_$portVers$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libvala_$portVers$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libvaladoc_$portVers$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcdt$secondaryArchSuffix
|
||||
lib:libcgraph$secondaryArchSuffix
|
||||
lib:libglib_2.0$secondaryArchSuffix
|
||||
lib:libgmodule_2.0$secondaryArchSuffix
|
||||
lib:libgobject_2.0$secondaryArchSuffix
|
||||
lib:libgvc$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
"
|
||||
REPLACES="
|
||||
@@ -47,9 +52,12 @@ REPLACES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcdt$secondaryArchSuffix
|
||||
devel:libcgraph$secondaryArchSuffix
|
||||
devel:libglib_2.0$secondaryArchSuffix
|
||||
devel:libgmodule_2.0$secondaryArchSuffix
|
||||
devel:libgobject_2.0$secondaryArchSuffix
|
||||
devel:libgvc$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
@@ -60,6 +68,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:bison
|
||||
cmd:cmp
|
||||
cmd:diff
|
||||
cmd:find
|
||||
cmd:flex
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
@@ -69,9 +78,13 @@ BUILD_PREREQUIRES="
|
||||
|
||||
defineDebugInfoPackage vala$secondaryArchSuffix \
|
||||
"$binDir"/valac-$portVers \
|
||||
"$binDir"/vapicheck-$portVers \
|
||||
"$binDir"/valadoc-$portVers \
|
||||
"$binDir"/vapigen-$portVers \
|
||||
"$libDir"/libvala-$portVers.so.$libVersion \
|
||||
"$libDir"/libvaladoc-$portVers.so.$libVersion \
|
||||
"$libDir"/valadoc/doclets/devhelp/libdoclet.so \
|
||||
"$libDir"/valadoc/doclets/gtkdoc/libdoclet.so \
|
||||
"$libDir"/valadoc/doclets/html/libdoclet.so \
|
||||
|
||||
BUILD()
|
||||
{
|
||||
@@ -84,13 +97,15 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm -f $libDir/*.la
|
||||
find "$libDir" -name '*.la' -delete
|
||||
|
||||
prepareInstalledDevelLib libvala-$portVers
|
||||
prepareInstalledDevelLibs libvala-$portVers libvaladoc-$portVers
|
||||
fixPkgconfig
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
LIBRARY_PATH="$sourceDir/vala/.libs:$sourceDir/libvaladoc/.libs\
|
||||
${LIBRARY_PATH:+:$LIBRARY_PATH}" \
|
||||
make check
|
||||
}
|
||||
Reference in New Issue
Block a user