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 29C80138334 for ; Sat, 15 Sep 2018 14:22:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFBCAE0869; Sat, 15 Sep 2018 14:22:28 +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 C40CEE0869 for ; Sat, 15 Sep 2018 14:22:28 +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 BED0C335CE7 for ; Sat, 15 Sep 2018 14:22:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 70BF53A1 for ; Sat, 15 Sep 2018 14:22:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1537021307.ef9b4a902a7f556b5eb72e47ffce109bf75f9253.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlitestudio/files/, dev-db/sqlitestudio/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild X-VCS-Directories: dev-db/sqlitestudio/ dev-db/sqlitestudio/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ef9b4a902a7f556b5eb72e47ffce109bf75f9253 X-VCS-Branch: master Date: Sat, 15 Sep 2018 14:22:24 +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-Archives-Salt: 87c9a6d9-313f-4096-b0e8-83a6198418c7 X-Archives-Hash: 477378c4f992220385a13a9f170050f8 commit: ef9b4a902a7f556b5eb72e47ffce109bf75f9253 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 15 14:10:00 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 15 14:21:47 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9b4a90 dev-db/sqlitestudio: Fix build with Qt 5.11 Doing it myself then. Closes: https://bugs.gentoo.org/662968 Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../files/sqlitestudio-3.1.1-qt-5.11.patch | 21 +++++++++++++++++++++ dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch new file mode 100644 index 00000000000..0de9f4a6115 --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-3.1.1-qt-5.11.patch @@ -0,0 +1,21 @@ +From 5972e777aeb7e8e127114476c031a681862f8852 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pawe=C5=82=20Salawa?= +Date: Mon, 18 Jun 2018 23:12:18 +0200 +Subject: [PATCH] #3341 Fixed compilation with Qt 5.11. + +--- + SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp +index 643caa2d..4ca68bce 100644 +--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp ++++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + CFG_KEYS_DEFINE(MainWindow) + MainWindow* MainWindow::instance = nullptr; diff --git a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild index 5c183c9c63d..529a1a6f5e4 100644 --- a/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild +++ b/dev-db/sqlitestudio/sqlitestudio-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -39,6 +39,8 @@ S="${WORKDIR}" core_build_dir="${S}/output/build" plugins_build_dir="${core_build_dir}/Plugins" +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_prepare() { xdg_src_prepare