| 1 |
commit: 47dac3a08c2c8b7402419875f1dab968ffe3a5b3 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 1 12:28:40 2019 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 1 12:28:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dac3a0 |
| 7 |
|
| 8 |
media-gfx/valentina-0.6.1: fixed bug #678670 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/678670 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 13 |
|
| 14 |
media-gfx/valentina/files/5823.patch | 50 ++++++++++++++++++++++++++++++ |
| 15 |
media-gfx/valentina/valentina-0.6.1.ebuild | 6 +++- |
| 16 |
2 files changed, 55 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/valentina/files/5823.patch b/media-gfx/valentina/files/5823.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..79df9a74c5a |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/valentina/files/5823.patch |
| 23 |
@@ -0,0 +1,50 @@ |
| 24 |
+# HG changeset patch |
| 25 |
+# User Roman Telezhynskyi <kroluku@×××××.com> |
| 26 |
+# Date 1551441739 -7200 |
| 27 |
+# Fri Mar 01 14:02:19 2019 +0200 |
| 28 |
+# Branch release |
| 29 |
+# Node ID 82e62ea2d785e093af68089e509b224f3f4f843f |
| 30 |
+# Parent 0108ef767e2447e5b5f39378bcf245e25947a25d |
| 31 |
+Don't use Qt OpenGL module since Q5.4. |
| 32 |
+ |
| 33 |
+diff -r 0108ef767e24 -r 82e62ea2d785 src/app/valentina/valentina.pro |
| 34 |
+--- a/src/app/valentina/valentina.pro Sun Feb 24 17:29:12 2019 +0200 |
| 35 |
++++ b/src/app/valentina/valentina.pro Fri Mar 01 14:02:19 2019 +0200 |
| 36 |
+@@ -297,7 +297,6 @@ |
| 37 |
+ $$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases |
| 38 |
+ $$[QT_INSTALL_BINS]/Qt5Core.dll \ |
| 39 |
+ $$[QT_INSTALL_BINS]/Qt5Concurrent.dll \ |
| 40 |
+- $$[QT_INSTALL_BINS]/Qt5OpenGL.dll \ |
| 41 |
+ $$[QT_INSTALL_BINS]/Qt5Gui.dll \ |
| 42 |
+ $$[QT_INSTALL_BINS]/Qt5Network.dll \ |
| 43 |
+ $$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \ |
| 44 |
+@@ -309,6 +308,11 @@ |
| 45 |
+ $$[QT_INSTALL_BINS]/libstdc++-6.dll \ |
| 46 |
+ $$[QT_INSTALL_BINS]/libwinpthread-1.dll |
| 47 |
+ |
| 48 |
++ # Don't use Qt OpenGL module since Q5.4 |
| 49 |
++ equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) { |
| 50 |
++ package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll |
| 51 |
++ } |
| 52 |
++ |
| 53 |
+ # For support Windows 7+ |
| 54 |
+ greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) { |
| 55 |
+ package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll |
| 56 |
+diff -r 0108ef767e24 -r 82e62ea2d785 src/libs/vwidgets/vwidgets.pro |
| 57 |
+--- a/src/libs/vwidgets/vwidgets.pro Sun Feb 24 17:29:12 2019 +0200 |
| 58 |
++++ b/src/libs/vwidgets/vwidgets.pro Fri Mar 01 14:02:19 2019 +0200 |
| 59 |
+@@ -7,7 +7,12 @@ |
| 60 |
+ # File with common stuff for whole project |
| 61 |
+ include(../../../common.pri) |
| 62 |
+ |
| 63 |
+-QT += widgets printsupport opengl |
| 64 |
++QT += widgets printsupport |
| 65 |
++ |
| 66 |
++# Don't use Qt OpenGL module since Q5.4 |
| 67 |
++equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) { |
| 68 |
++ QT += opengl |
| 69 |
++} |
| 70 |
+ |
| 71 |
+ # Name of the library |
| 72 |
+ TARGET = vwidgets |
| 73 |
+ |
| 74 |
|
| 75 |
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1.ebuild |
| 76 |
index c9b39504031..a59fb86953a 100644 |
| 77 |
--- a/media-gfx/valentina/valentina-0.6.1.ebuild |
| 78 |
+++ b/media-gfx/valentina/valentina-0.6.1.ebuild |
| 79 |
@@ -1,4 +1,4 @@ |
| 80 |
-# Copyright 1999-2018 Gentoo Authors |
| 81 |
+# Copyright 1999-2019 Gentoo Authors |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
EAPI=6 |
| 85 |
@@ -38,6 +38,10 @@ DEPEND="${CDEPEND} |
| 86 |
|
| 87 |
S=${WORKDIR}/dismine-${PN}-b639b75d1688 |
| 88 |
|
| 89 |
+PATCHES=( |
| 90 |
+ "${FILESDIR}/5823.patch" |
| 91 |
+) |
| 92 |
+ |
| 93 |
src_configure() { |
| 94 |
local locales="" |
| 95 |
local locale |
Archives