From patchwork Mon Jun 4 14:51:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 137640 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1615694lji; Mon, 4 Jun 2018 07:54:20 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIb2AxpEu8GxD+dosUiq/2PbxQiTVfwY6WGbPSQ07Zd/JRAM48o9rBDhWHDmRCblFQ1MF5d X-Received: by 2002:a37:8ac3:: with SMTP id m186-v6mr13515827qkd.6.1528124059939; Mon, 04 Jun 2018 07:54:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528124059; cv=none; d=google.com; s=arc-20160816; b=jW2ffObdy27XBKTC2sR7R7UVtfR6RfrN2Vc3zRQbCj5S8qFCUO6OmgJOBSvA4O1/u1 LBh5OCFG32z5yLBs7C01CS9+oUeCig9p/6sH9lKzXiM49iBz7p8v4bVqmZUBAccc8LjN 2iPItwQFD73PbtxUIJlKviJld64VTf685mW+BeONYtbMNA8pK6kmRocuyk/P46trI3V3 l7nrGmNzsien19gU6u3rvR//vEtkJBIazQFqkl9kU3zF9ctCuGJEmjX7Dv7k/TJnahes gm2i2rrjl8C1PpINA0mbiFRedqfW1B+4uXMKAPcAmKYQXMq4JwhojSsbRlELeCwjqqjH Ydkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=iIjVPn+JpbNcykTamxkgbBYqrOmW1dDi5DGic808kjI=; b=UH/yBP9qJb2nd2My1iHa6dsBQPi6DtKnlpPq7PdEU97lz1CajFJRkcB30k7mg4Uthj UOI2HrTe30hQgffy9Ri/XNtZNv1UryJR+Y7zM7iWRejnSFS0bIC1Mf1q/k6MFcSAqY/D 57lIo0TWMfRrnn9Mimqxo1DDePFb+8Yos4EgtXC5pP1HKhhXocPWI1JezdHdd9lPBGE2 pKdyMTrHA2zcCv3RXhd5xdJMaCGMB20/dYd0Q/EG1bJLeFvhe7g9Zf0kZAFNSZueZJ6T dij2t7wT4ZZhQNeXmfwUrFBHoEzvyJBWU0e12f5BVXGXNND2TNGYQ7W1Pya1UyXatygM n2Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZFY5iKtS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s184-v6si5858712qkc.399.2018.06.04.07.54.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Jun 2018 07:54:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZFY5iKtS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPqsF-0004qz-E5 for patch@linaro.org; Mon, 04 Jun 2018 10:54:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPqpN-0002rT-LZ for qemu-devel@nongnu.org; Mon, 04 Jun 2018 10:51:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPqpM-00044n-IG for qemu-devel@nongnu.org; Mon, 04 Jun 2018 10:51:21 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:35479) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPqpM-000445-A6 for qemu-devel@nongnu.org; Mon, 04 Jun 2018 10:51:20 -0400 Received: by mail-wr0-x234.google.com with SMTP id l10-v6so9450269wrn.2 for ; Mon, 04 Jun 2018 07:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iIjVPn+JpbNcykTamxkgbBYqrOmW1dDi5DGic808kjI=; b=ZFY5iKtSp0W6tt+B+djmrE8PYN+ANDR0fb6TPvcgj20WQL/pkIyAb5kSSOisDVN7Hk bZj4x+19pawfHNJNBvWIOdsM8uTxU7uwcq1jj8GUXckttyXQ+gxItlgPfvpP8W7hzf/C Inq+ILl3DhAFDLdI57/PKCcbxObFwe7JQLkSc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iIjVPn+JpbNcykTamxkgbBYqrOmW1dDi5DGic808kjI=; b=pZnWiI/M0U80ySB78ST/aIP0sZmYjJYGZWNhMPzMFX1ju/xpnOrqXwp2EKO4j6SvHf gQO8jrT/VrjHdWuxbSzBGfI2GOdt+8XqbVZwAXjF2iMBYXHEJXN7Sq2zhVkBVgXHkkMt A2dT5U1OGTfUiOf4cErhVZ3YRh5ooPxp7I/HnvM0CHkUZciPIBs6LJtWLNehEf8rKPa+ NJd4Ksm4S8zvdSGzkaiu7I2K1iTnj6oJdnpfm9Q67jgt2HqCeGprKwGS4IT6Pi9qGYGv mry5I7zPlkGYngRa2BPW/J4egDkxRqEuTvkhaGVRa661VFa/NF6iLo3V7rZ5Nvvkc8g+ tBJw== X-Gm-Message-State: ALKqPweUkJwuXFZQ67iEmlwbyMQtIByhQExmVLN5obVeA1boUo7dfCNU AjKmEn1yEQhmctOVRQc/dIBeSQ== X-Received: by 2002:adf:f6c9:: with SMTP id y9-v6mr17621932wrp.4.1528123879220; Mon, 04 Jun 2018 07:51:19 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l7-v6sm332968wmh.1.2018.06.04.07.51.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Jun 2018 07:51:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 991953E0A51; Mon, 4 Jun 2018 15:51:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Mon, 4 Jun 2018 15:51:08 +0100 Message-Id: <20180604145109.30498-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180604145109.30498-1-alex.bennee@linaro.org> References: <20180604145109.30498-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::234 Subject: [Qemu-devel] [PATCH v1 6/7] docker: test-mingw: use SDL2 and GTK+3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Do not test the deprecated API versions. debian-win32-cross and debian-win64-cross are already using SDL2 (they do not cover GTK+ at all). Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrangé [AJB: fix merge conflicts] Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora.docker | 8 ++++---- tests/docker/test-mingw | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.17.0 diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 65d7761cf5..7d1d008002 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -11,12 +11,12 @@ ENV PACKAGES \ numactl-devel SDL2-devel snappy-devel spice-server-devel \ systemtap-sdt-devel usbredir-devel virglrenderer-devel vte3-devel \ xen-devel \ - mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \ - mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ + mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL2 mingw32-pkg-config \ + mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \ mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \ mingw32-bzip2 \ - mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \ - mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ + mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL2 mingw64-pkg-config \ + mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \ mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ mingw64-bzip2 ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 503a6bc6f7..7cca7e16a6 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -28,8 +28,8 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do --enable-vnc \ --enable-bzip2 \ --enable-guest-agent \ - --with-sdlabi=1.2 \ - --with-gtkabi=2.0 + --with-sdlabi=2.0 \ + --with-gtkabi=3.0 install_qemu make clean