From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 804A3138334 for ; Sun, 4 Aug 2019 10:29:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0766E0874; Sun, 4 Aug 2019 10:29:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93E17E0874 for ; Sun, 4 Aug 2019 10:29:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 809E93497F3 for ; Sun, 4 Aug 2019 10:29:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 029A7741 for ; Sun, 4 Aug 2019 10:29:37 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1564914547.7594a51367ad57aad6162a26892faeaa685db177.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/files/, x11-libs/vte/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/vte/files/0.54.4-vala-0.44-compat.patch x11-libs/vte/vte-0.48.4.ebuild x11-libs/vte/vte-0.54.4.ebuild X-VCS-Directories: x11-libs/vte/ x11-libs/vte/files/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 7594a51367ad57aad6162a26892faeaa685db177 X-VCS-Branch: master Date: Sun, 4 Aug 2019 10:29:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b57eda52-86ba-498c-8c77-fec08089aa38 X-Archives-Hash: acc66f53dab2f3f725d76fd6b805ad93 commit: 7594a51367ad57aad6162a26892faeaa685db177 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Aug 4 10:28:52 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Aug 4 10:29:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7594a513 x11-libs/vte: fix vala:0.44 compatibility properly Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> x11-libs/vte/files/0.54.4-vala-0.44-compat.patch | 29 ++++++++++++++++++++++++ x11-libs/vte/vte-0.48.4.ebuild | 3 +++ x11-libs/vte/vte-0.54.4.ebuild | 6 +++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch new file mode 100644 index 00000000000..5da32bea838 --- /dev/null +++ b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch @@ -0,0 +1,29 @@ +From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 1 Dec 2018 19:04:59 +0100 +Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty + struct definition + +This should get a proper refactoring as the FIXME suggests. + +See https://gitlab.gnome.org/GNOME/vte/issues/76 +--- + bindings/vala/app.vala | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala +index 8663d63c..a534e76b 100644 +--- a/bindings/vala/app.vala ++++ b/bindings/vala/app.vala +@@ -819,6 +819,8 @@ class App : Gtk.Application + + public struct Options + { ++ //FIXME Merge this struct into App class ++ public int dummy; + public static bool audible = false; + public static string? command = null; + private static string? cjk_ambiguous_width_string = null; +-- +2.20.1 + diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild index 23c0c8fdfbd..779dabd7b87 100644 --- a/x11-libs/vte/vte-0.48.4.ebuild +++ b/x11-libs/vte/vte-0.48.4.ebuild @@ -52,6 +52,9 @@ src_prepare() { eapply "${WORKDIR}"/${P}-command-notify.patch fi + # Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76 + eapply "${FILESDIR}"/0.54.4-vala-0.44-compat.patch + use vala && vala_src_prepare # build fails because of -Werror with gcc-5.x diff --git a/x11-libs/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild index 54d35883929..e11d9d2ec6b 100644 --- a/x11-libs/vte/vte-0.54.4.ebuild +++ b/x11-libs/vte/vte-0.54.4.ebuild @@ -3,8 +3,7 @@ EAPI="6" VALA_USE_DEPEND="vapigen" -VALA_MIN_API_VERSION="0.36" -VALA_MAX_API_VERSION="0.42" +VALA_MIN_API_VERSION="0.32" inherit gnome2 vala @@ -53,6 +52,9 @@ src_prepare() { eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch fi + # Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76 + eapply "${FILESDIR}"/${PV}-vala-0.44-compat.patch + use vala && vala_src_prepare # build fails because of -Werror with gcc-5.x