diff --git a/dev-lang/vala/patches/vala-0.47.1.patchset b/dev-lang/vala/patches/vala-0.54.1.patchset similarity index 55% rename from dev-lang/vala/patches/vala-0.47.1.patchset rename to dev-lang/vala/patches/vala-0.54.1.patchset index f8d2cef38..92e8c21da 100644 --- a/dev-lang/vala/patches/vala-0.47.1.patchset +++ b/dev-lang/vala/patches/vala-0.54.1.patchset @@ -1,37 +1,22 @@ -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 +From 1a7600bbffd04641445790cd5cc6900c4f27f48c Mon Sep 17 00:00:00 2001 +From: Kostadin Damyanov +Date: Thu, 4 Feb 2016 05:01:46 +0200 +Subject: remove the dbus and gir tests diff --git a/tests/Makefile.am b/tests/Makefile.am -index 3a7d6d0..dac5280 100644 +index ed1ef59..13d6d4a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -513,46 +513,6 @@ TESTS = \ +@@ -2,7 +2,6 @@ NULL = + + SUBDIRS = \ + fastvapi \ +- girwriter \ + gtktemplate \ + $(NULL) + +@@ -718,68 +717,6 @@ TESTS = \ generics/bug694765-1.vala \ generics/bug694765-2.vala \ generics/bug694765-3.vala \ @@ -40,8 +25,16 @@ index 3a7d6d0..dac5280 100644 - dbus/structs.test \ - dbus/errors.test \ - dbus/async.test \ +- dbus/async-bus.test \ +- dbus/async-connection.test \ - dbus/async-errors.test \ +- dbus/async-no-reply.test \ +- dbus/connection.test \ +- dbus/dbus-name-missing.test \ +- dbus/dynamic-method.test \ - dbus/enum-string-marshalling.vala \ +- dbus/generics.test \ +- dbus/no-reply.test \ - dbus/signals.test \ - dbus/filedescriptor.test \ - dbus/filedescriptor-async.test \ @@ -54,30 +47,44 @@ index 3a7d6d0..dac5280 100644 - dbus/bug783002.test \ - dbus/bug792277.vala \ - dbus/rawvariants.test \ +- dbus/interface-info.test \ - gir/bug651773.test \ - gir/bug667751.test \ - gir/bug742012.test \ - gir/bug788775.test \ - gir/bug792998.test \ +- gir/alias.test \ - gir/array-fixed-length.test \ +- gir/async-creation-method.test \ - gir/async-result-pos.test \ - gir/async-sync-out.test \ - gir/class.test \ +- gir/class-final.test \ +- gir/constant.test \ - gir/delegate-alias-without-target.test \ +- gir/delegate-anonymous.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/gtype-struct-name.test \ - gir/instance-parameter-owned.test \ - gir/method-array-length-type.test \ +- gir/method-class.test \ +- gir/method-nowrapper.test \ - gir/parameter-array-length-type.test \ - gir/parameter-nullable-out-simple-type.test \ - gir/property-non-readable.test \ +- gir/signal-virtual.test \ - gir/symbol-type-csuffix.test \ - annotations/deprecated.vala \ - annotations/description.vala \ - annotations/noaccessormethod.test \ +- gir/union.test \ +- gir/union-transparent.test \ +- girwriter/class-final.test \ +- girwriter/combined.test \ + gtktemplate/gtkcallback-incompatible.test \ + gtktemplate/gtkcallback-unknown.test \ + gtktemplate/gtkchild-field-assignment.test \ -- -2.24.0 +2.30.2 diff --git a/dev-lang/vala/vala-0.47.1.recipe b/dev-lang/vala/vala-0.54.1.recipe similarity index 80% rename from dev-lang/vala/vala-0.47.1.recipe rename to dev-lang/vala/vala-0.54.1.recipe index c528707d8..fc0255c90 100644 --- a/dev-lang/vala/vala-0.47.1.recipe +++ b/dev-lang/vala/vala-0.54.1.recipe @@ -4,12 +4,32 @@ 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-2019 Jürg Billeter - 2006-2019 Raffaele Sandrini" +COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + 1997-2000 GLib Team and others + 1997 Sandro Sigala + 2004-2005 Novell, Inc + 2005 David Waite + 2005 Matthias Clasen + 2006-2021 Jürg Billeter + 2006-2021 Raffaele Sandrini + 2007 Johan Dahlin + 2007 Mathias Hasselmann + 2008-2012 Jamie McCracken + 2008-2011 Florian Brosch + 2008 Philip Van Hoof + 2009 Didier Villevalois + 2009 Jiří Zárevúcky + 2009 Mark Lee + 2010 Jukka-Pekka Iivonen + 2010 Marc-Andre Lureau + 2011-2014 Luca Bruno + 2011 Rodney Dawes + 2014 Richard Wiedenhöft + 2016-2020 Rico Tzschichholz" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.gnome.org/sources/vala/${portVersion%.*}/vala-$portVersion.tar.xz" -CHECKSUM_SHA256="b694b2edc09315ac53c27767069d321705744e36d206a3ea4c2eb53d0d890e07" +CHECKSUM_SHA256="5dde77ac86f0633cb78a1eba7399edc77d5bbfe1e830c1203c51d594a169904a" PATCHES="vala-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -24,7 +44,7 @@ fi libVersion="0.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" -portVers="0.48" +portVers="${portVersion%.*}" PROVIDES=" vala$secondaryArchSuffix = $portVersion @@ -47,6 +67,7 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libcdt$secondaryArchSuffix lib:libcgraph$secondaryArchSuffix +# lib:libgirepository_1.0$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libgmodule_2.0$secondaryArchSuffix lib:libgobject_2.0$secondaryArchSuffix @@ -61,6 +82,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcdt$secondaryArchSuffix devel:libcgraph$secondaryArchSuffix +# devel:libgirepository_1.0$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libgmodule_2.0$secondaryArchSuffix devel:libgobject_2.0$secondaryArchSuffix @@ -97,7 +119,7 @@ defineDebugInfoPackage vala$secondaryArchSuffix \ BUILD() { - autoreconf -fi + autoreconf -vfi runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" make $jobArgs }