From 475fbda9acd296dd4085047568167b3bd409e69d Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 19 Apr 2018 23:21:56 +0000 Subject: [PATCH] vala: bump to 0.36.13. --- ...0.36.12.patchset => vala-0.36.13.patchset} | 19 ++++++------ ...ala-0.36.12.recipe => vala-0.36.13.recipe} | 30 +++++++------------ 2 files changed, 21 insertions(+), 28 deletions(-) rename dev-lang/vala/patches/{vala-0.36.12.patchset => vala-0.36.13.patchset} (89%) rename dev-lang/vala/{vala-0.36.12.recipe => vala-0.36.13.recipe} (77%) diff --git a/dev-lang/vala/patches/vala-0.36.12.patchset b/dev-lang/vala/patches/vala-0.36.13.patchset similarity index 89% rename from dev-lang/vala/patches/vala-0.36.12.patchset rename to dev-lang/vala/patches/vala-0.36.13.patchset index 3be9695e2..f964e07db 100644 --- a/dev-lang/vala/patches/vala-0.36.12.patchset +++ b/dev-lang/vala/patches/vala-0.36.13.patchset @@ -5,10 +5,10 @@ Subject: remove the dbus tests diff --git a/tests/Makefile.am b/tests/Makefile.am -index 41bd338..52635c0 100644 +index 4b6b882..e6b4df1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -316,21 +316,6 @@ TESTS = \ +@@ -320,22 +320,6 @@ TESTS = \ asynchronous/closures.vala \ asynchronous/generator.vala \ asynchronous/yield.vala \ @@ -21,6 +21,7 @@ index 41bd338..52635c0 100644 - 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 \ @@ -31,7 +32,7 @@ index 41bd338..52635c0 100644 gir/bug667751.test \ gir/bug742012.test \ -- -2.15.0 +2.17.0 From 416e5a2e094594c4cfcdd6bc58484509b1f2d520 Mon Sep 17 00:00:00 2001 @@ -41,10 +42,10 @@ Subject: remove the gir tests diff --git a/tests/Makefile.am b/tests/Makefile.am -index 52635c0..119d5a6 100644 +index e6b4df1..185d6dc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -316,12 +316,6 @@ TESTS = \ +@@ -320,12 +320,6 @@ TESTS = \ asynchronous/closures.vala \ asynchronous/generator.vala \ asynchronous/yield.vala \ @@ -58,7 +59,7 @@ index 52635c0..119d5a6 100644 annotations/description.vala \ annotations/noaccessormethod.test \ -- -2.15.0 +2.17.0 From f06e57dd7e08384c3a7d605da4508dae9faa2fb2 Mon Sep 17 00:00:00 2001 @@ -68,10 +69,10 @@ Subject: remove control-flow/bug736774-2.vala test diff --git a/tests/Makefile.am b/tests/Makefile.am -index 119d5a6..d4cfd3e 100644 +index 185d6dc..bc1c8f9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -126,7 +126,6 @@ TESTS = \ +@@ -128,7 +128,6 @@ TESTS = \ control-flow/bug665904.vala \ control-flow/bug691514.vala \ control-flow/bug736774-1.vala \ @@ -80,5 +81,5 @@ index 119d5a6..d4cfd3e 100644 enums/enum_only.vala \ enums/enums.vala \ -- -2.15.0 +2.17.0 diff --git a/dev-lang/vala/vala-0.36.12.recipe b/dev-lang/vala/vala-0.36.13.recipe similarity index 77% rename from dev-lang/vala/vala-0.36.12.recipe rename to dev-lang/vala/vala-0.36.13.recipe index 607abb988..2bc9757c2 100644 --- a/dev-lang/vala/vala-0.36.12.recipe +++ b/dev-lang/vala/vala-0.36.13.recipe @@ -9,8 +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="b4081d3d313cf9c3e8d7d795983cf8f7ed99286d1abc1b5709b0f17883387cdb" -SOURCE_DIR="vala-$portVersion" +CHECKSUM_SHA256="3355829b6bd3ab395d9b1f25f99afde5bba8ec04e62684442b70a7a6a33fbf3f" PATCHES="vala-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -18,11 +17,10 @@ SECONDARY_ARCHITECTURES="x86" libVersion="0.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" -portVersionCompat="$portVersion compat >= ${portVersion%%.*}" portVers="${portVersion%.*}" PROVIDES=" - vala$secondaryArchSuffix = $portVersionCompat + vala$secondaryArchSuffix = $portVersion cmd:vala$secondaryArchSuffix cmd:vala_$portVers$secondaryArchSuffix cmd:vala_gen_introspect$secondaryArchSuffix @@ -38,11 +36,9 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libdbus_1$secondaryArchSuffix - lib:libffi$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix + lib:libgmodule_2.0$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix " REPLACES=" @@ -51,35 +47,31 @@ REPLACES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libdbus_1$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix + devel:libgmodule_2.0$secondaryArchSuffix devel:libgobject_2.0$secondaryArchSuffix + devel:libintl$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:autoconf + cmd:aclocal cmd:automake + cmd:autoreconf cmd:awk cmd:bison cmd:cmp cmd:diff cmd:flex cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " defineDebugInfoPackage vala$secondaryArchSuffix \ - $binDir/vala \ - $binDir/vala-$portVers \ - $binDir/valac \ - $binDir/valac-$portVers \ - $binDir/vapicheck \ - $binDir/vapicheck-$portVers \ - $binDir/vapigen \ - $binDir/vapigen-$portVers \ - $libDir/libvala-$portVers.so.$libVersion + "$binDir"/valac-$portVers \ + "$binDir"/vapicheck-$portVers \ + "$binDir"/vapigen-$portVers \ + "$libDir"/libvala-$portVers.so.$libVersion \ BUILD() {