From 2b36e608b95e654d05cee247b0884f7c7785a888 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 30 Nov 2019 11:30:51 +0100 Subject: [PATCH] vala, bump version (#3679) --- dev-lang/vala/patches/vala-0.42.3.patchset | 129 ------------------ dev-lang/vala/patches/vala-0.47.1.patchset | 83 +++++++++++ ...{vala-0.42.3.recipe => vala-0.47.1.recipe} | 16 +-- 3 files changed, 91 insertions(+), 137 deletions(-) delete mode 100644 dev-lang/vala/patches/vala-0.42.3.patchset create mode 100644 dev-lang/vala/patches/vala-0.47.1.patchset rename dev-lang/vala/{vala-0.42.3.recipe => vala-0.47.1.recipe} (88%) diff --git a/dev-lang/vala/patches/vala-0.42.3.patchset b/dev-lang/vala/patches/vala-0.42.3.patchset deleted file mode 100644 index fadec19a7..000000000 --- a/dev-lang/vala/patches/vala-0.42.3.patchset +++ /dev/null @@ -1,129 +0,0 @@ -From 3d22d5df574d2c9031ebbd007072d454cbd4007e Mon Sep 17 00:00:00 2001 -From: Kostadin Damyanov -Date: Thu, 4 Feb 2016 05:01:46 +0200 -Subject: remove the dbus tests - - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index c2f5389..61dcb3b 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -388,25 +388,6 @@ TESTS = \ - generics/bug694765-1.vala \ - generics/bug694765-2.vala \ - generics/bug694765-3.vala \ -- dbus/basic-types.test \ -- dbus/arrays.test \ -- dbus/structs.test \ -- dbus/errors.test \ -- dbus/async.test \ -- dbus/async-errors.test \ -- dbus/enum-string-marshalling.vala \ -- dbus/signals.test \ -- dbus/filedescriptor.test \ -- dbus/filedescriptor-async.test \ -- dbus/filedescriptor-errors.test \ -- dbus/dicts.test \ -- dbus/bug596862.vala \ -- dbus/bug602003.test \ -- dbus/bug735437.test \ -- dbus/bug782719.test \ -- dbus/bug783002.test \ -- dbus/bug792277.vala \ -- dbus/rawvariants.test \ - gir/bug651773.test \ - gir/bug667751.test \ - gir/bug742012.test \ --- -2.17.0 - - -From 416e5a2e094594c4cfcdd6bc58484509b1f2d520 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Tue, 19 Dec 2017 14:43:04 +0100 -Subject: remove the gir tests - - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 61dcb3b..8787f04 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -388,17 +388,6 @@ TESTS = \ - generics/bug694765-1.vala \ - generics/bug694765-2.vala \ - generics/bug694765-3.vala \ -- gir/bug651773.test \ -- 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 \ --- -2.17.0 - - -From f06e57dd7e08384c3a7d605da4508dae9faa2fb2 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Tue, 19 Dec 2017 15:13:02 +0100 -Subject: remove control-flow/bug736774-2.vala test - - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 8787f04..924aa99 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -154,7 +154,6 @@ TESTS = \ - control-flow/bug665904.vala \ - control-flow/bug691514.vala \ - control-flow/bug736774-1.vala \ -- control-flow/bug736774-2.vala \ - control-flow/bug790903.test \ - 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 -Date: Mon, 9 Apr 2018 21:04:39 +0200 -Subject: add check for graphviz header - - -diff --git a/configure.ac b/configure.ac -index 730c72d..737f653 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -127,7 +127,7 @@ LIBADD="$LIBADD $LIBGVC_LIBS" - CFLAGS="$CFLAGS $LIBGVC_CFLAGS" - AC_RUN_IFELSE( - [AC_LANG_SOURCE([ -- #include -+ #include - - 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 - */ - --#include -+#include - - /* Compat-layer for Graphviz with/without cgraph support */ - --- -2.17.0 - diff --git a/dev-lang/vala/patches/vala-0.47.1.patchset b/dev-lang/vala/patches/vala-0.47.1.patchset new file mode 100644 index 000000000..f8d2cef38 --- /dev/null +++ b/dev-lang/vala/patches/vala-0.47.1.patchset @@ -0,0 +1,83 @@ +From 6d90c4b62afedf5dc123194f3b06c5ad560f817a Mon Sep 17 00:00:00 2001 +From: begasus +Date: Wed, 27 Nov 2019 14:26:35 +0100 +Subject: Fix header path for gvc.h + + +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 + */ + +-#include ++#include + + /* Compat-layer for Graphviz with/without cgraph support */ + +-- +2.24.0 + + +From f2d14c4d2598b74d81e3927baf21761ced4ba03c Mon Sep 17 00:00:00 2001 +From: begasus +Date: Fri, 29 Nov 2019 10:10:28 +0100 +Subject: Remove dbus and gir tests + + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 3a7d6d0..dac5280 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -513,46 +513,6 @@ TESTS = \ + generics/bug694765-1.vala \ + generics/bug694765-2.vala \ + generics/bug694765-3.vala \ +- dbus/basic-types.test \ +- dbus/arrays.test \ +- dbus/structs.test \ +- dbus/errors.test \ +- dbus/async.test \ +- dbus/async-errors.test \ +- dbus/enum-string-marshalling.vala \ +- dbus/signals.test \ +- dbus/filedescriptor.test \ +- dbus/filedescriptor-async.test \ +- dbus/filedescriptor-errors.test \ +- dbus/dicts.test \ +- dbus/bug596862.vala \ +- dbus/bug602003.test \ +- dbus/bug735437.test \ +- dbus/bug782719.test \ +- dbus/bug783002.test \ +- dbus/bug792277.vala \ +- dbus/rawvariants.test \ +- gir/bug651773.test \ +- gir/bug667751.test \ +- gir/bug742012.test \ +- gir/bug788775.test \ +- gir/bug792998.test \ +- gir/array-fixed-length.test \ +- gir/async-result-pos.test \ +- gir/async-sync-out.test \ +- gir/class.test \ +- gir/delegate-alias-without-target.test \ +- gir/delegate-array-length-type.test \ +- gir/delegate-closure-destroy-index-conflict.test \ +- gir/delegate-error-pos.test \ +- gir/enum.test \ +- gir/errordomain.test \ +- gir/instance-parameter-owned.test \ +- gir/method-array-length-type.test \ +- gir/parameter-array-length-type.test \ +- gir/parameter-nullable-out-simple-type.test \ +- gir/property-non-readable.test \ +- gir/symbol-type-csuffix.test \ + annotations/deprecated.vala \ + annotations/description.vala \ + annotations/noaccessormethod.test \ +-- +2.24.0 + diff --git a/dev-lang/vala/vala-0.42.3.recipe b/dev-lang/vala/vala-0.47.1.recipe similarity index 88% rename from dev-lang/vala/vala-0.42.3.recipe rename to dev-lang/vala/vala-0.47.1.recipe index 4e33b4287..d7e7fd982 100644 --- a/dev-lang/vala/vala-0.42.3.recipe +++ b/dev-lang/vala/vala-0.47.1.recipe @@ -4,12 +4,12 @@ programming language features to GNOME developers without imposing any \ additional runtime requirements and without using a different ABI \ compared to applications and libraries written in C." HOMEPAGE="https://wiki.gnome.org/Projects/Vala" -COPYRIGHT="2006-2018 Jürg Billeter - 2006-2018 Raffaele Sandrini" +COPYRIGHT="2006-2019 Jürg Billeter + 2006-2019 Raffaele Sandrini" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.gnome.org/sources/vala/${portVersion%.*}/vala-$portVersion.tar.xz" -CHECKSUM_SHA256="5fc73dd1e683dc7391bb96d02b2f671aa8289411a48611a05265629e0048587d" +CHECKSUM_SHA256="b694b2edc09315ac53c27767069d321705744e36d206a3ea4c2eb53d0d890e07" PATCHES="vala-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -24,7 +24,7 @@ fi libVersion="0.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" -portVers="${portVersion%.*}" +portVers="0.48" PROVIDES=" vala$secondaryArchSuffix = $portVersion @@ -91,9 +91,9 @@ defineDebugInfoPackage vala$secondaryArchSuffix \ "$libDir"/libvaladoc-$portVers.so.$libVersion \ "$libDir"/vala-$portVers/gen-introspect-$portVers \ "$libDir"/vala-$portVers/libvalaccodegen.so \ - "$libDir"/valadoc/doclets/devhelp/libdoclet.so \ - "$libDir"/valadoc/doclets/gtkdoc/libdoclet.so \ - "$libDir"/valadoc/doclets/html/libdoclet.so \ + "$libDir"/valadoc-$portVers/doclets/devhelp/libdoclet.so \ + "$libDir"/valadoc-$portVers/doclets/gtkdoc/libdoclet.so \ + "$libDir"/valadoc-$portVers/doclets/html/libdoclet.so \ BUILD() { @@ -115,6 +115,6 @@ INSTALL() TEST() { LIBRARY_PATH="$sourceDir/vala/.libs:$sourceDir/libvaladoc/.libs\ -${LIBRARY_PATH:+:$LIBRARY_PATH}" \ +:$sourceDir/codegen/.libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \ make check }