From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1074975-garchives=archives.gentoo.org@lists.gentoo.org>
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 04CAF138334
for <garchives@archives.gentoo.org>; Fri, 1 Mar 2019 12:29:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D1D0AE086D;
Fri, 1 Mar 2019 12:29:06 +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 9782CE086D
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Mar 2019 12:29:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 DD066335D01
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Mar 2019 12:29:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 54F35551
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Mar 2019 12:29:03 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org>
Message-ID: <1551443320.47dac3a08c2c8b7402419875f1dab968ffe3a5b3.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/valentina/, media-gfx/valentina/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/valentina/files/5823.patch media-gfx/valentina/valentina-0.6.1.ebuild
X-VCS-Directories: media-gfx/valentina/files/ media-gfx/valentina/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: 47dac3a08c2c8b7402419875f1dab968ffe3a5b3
X-VCS-Branch: master
Date: Fri, 1 Mar 2019 12:29:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dc0c938d-641f-48ae-9dbd-d9113c9d0554
X-Archives-Hash: d27200482fa514740f621a178ea70007
commit: 47dac3a08c2c8b7402419875f1dab968ffe3a5b3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 12:28:40 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 12:28:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dac3a0
media-gfx/valentina-0.6.1: fixed bug #678670
Closes: https://bugs.gentoo.org/678670
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-gfx/valentina/files/5823.patch | 50 ++++++++++++++++++++++++++++++
media-gfx/valentina/valentina-0.6.1.ebuild | 6 +++-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch
new file mode 100644
index 00000000000..79df9a74c5a
--- /dev/null
+++ b/media-gfx/valentina/files/5823.patch
@@ -0,0 +1,50 @@
+# HG changeset patch
+# User Roman Telezhynskyi <kroluku@gmail.com>
+# Date 1551441739 -7200
+# Fri Mar 01 14:02:19 2019 +0200
+# Branch release
+# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f
+# Parent 0108ef767e2447e5b5f39378bcf245e25947a25d
+Don't use Qt OpenGL module since Q5.4.
+
+diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro
+--- a/src/app/valentina/valentina.pro Sun Feb 24 17:29:12 2019 +0200
++++ b/src/app/valentina/valentina.pro Fri Mar 01 14:02:19 2019 +0200
+@@ -297,7 +297,6 @@
+ $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
+ $$[QT_INSTALL_BINS]/Qt5Core.dll \
+ $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
+- $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \
+ $$[QT_INSTALL_BINS]/Qt5Gui.dll \
+ $$[QT_INSTALL_BINS]/Qt5Network.dll \
+ $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
+@@ -309,6 +308,11 @@
+ $$[QT_INSTALL_BINS]/libstdc++-6.dll \
+ $$[QT_INSTALL_BINS]/libwinpthread-1.dll
+
++ # Don't use Qt OpenGL module since Q5.4
++ equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++ package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll
++ }
++
+ # For support Windows 7+
+ greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
+ package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
+diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro
+--- a/src/libs/vwidgets/vwidgets.pro Sun Feb 24 17:29:12 2019 +0200
++++ b/src/libs/vwidgets/vwidgets.pro Fri Mar 01 14:02:19 2019 +0200
+@@ -7,7 +7,12 @@
+ # File with common stuff for whole project
+ include(../../../common.pri)
+
+-QT += widgets printsupport opengl
++QT += widgets printsupport
++
++# Don't use Qt OpenGL module since Q5.4
++equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
++ QT += opengl
++}
+
+ # Name of the library
+ TARGET = vwidgets
+
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1.ebuild
index c9b39504031..a59fb86953a 100644
--- a/media-gfx/valentina/valentina-0.6.1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -38,6 +38,10 @@ DEPEND="${CDEPEND}
S=${WORKDIR}/dismine-${PN}-b639b75d1688
+PATCHES=(
+ "${FILESDIR}/5823.patch"
+)
+
src_configure() {
local locales=""
local locale