From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1045369-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 BBAE7138334
for <garchives@archives.gentoo.org>; Wed, 5 Sep 2018 07:21:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 71033E08E2;
Wed, 5 Sep 2018 07:21:30 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 2F731E08E2
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Sep 2018 07:21:29 +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 AB6B0335CA7
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Sep 2018 07:21:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 88FAC3BE
for <gentoo-commits@lists.gentoo.org>; Wed, 5 Sep 2018 07:21:25 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1536132070.fcfa3986fd61784b200a8098919ca80eb98743b3.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/, app-office/skrooge/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch app-office/skrooge/skrooge-2.14.0.ebuild
X-VCS-Directories: app-office/skrooge/files/ app-office/skrooge/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: fcfa3986fd61784b200a8098919ca80eb98743b3
X-VCS-Branch: master
Date: Wed, 5 Sep 2018 07:21:25 +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-Archives-Salt: 5d15852a-227d-4310-82dc-a20c84213f21
X-Archives-Hash: 9f8b2fead4e313a0e6263611a341c34f
commit: fcfa3986fd61784b200a8098919ca80eb98743b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 5 07:19:19 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 07:21:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcfa3986
app-office/skrooge: Fix build with USE=-designer
Closes: https://bugs.gentoo.org/665042
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../files/skrooge-2.14.0-designer-optional.patch | 100 +++++++++++++++++++++
app-office/skrooge/skrooge-2.14.0.ebuild | 2 +
2 files changed, 102 insertions(+)
diff --git a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
new file mode 100644
index 00000000000..e34e80b78af
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
@@ -0,0 +1,100 @@
+From b83f0a0d1171fab0d839de23b97e0ffe3aae4d3e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 5 Sep 2018 08:46:09 +0200
+Subject: [PATCH] Fix build with SKG_DESIGNER=OFF
+
+Summary: cmake was adding designerplugin code to build with SKG_DESIGNER=OFF.
+
+Reviewers: #skrooge
+
+Differential Revision: https://phabricator.kde.org/D15282
+---
+ skgbankgui/CMakeLists.txt | 12 +++++++----
+ skgbasegui/CMakeLists.txt | 44 +++++++++++++++++++++------------------
+ 2 files changed, 32 insertions(+), 24 deletions(-)
+
+diff --git a/skgbankgui/CMakeLists.txt b/skgbankgui/CMakeLists.txt
+index 9bb197f3d..17c7c6ca2 100644
+--- a/skgbankgui/CMakeLists.txt
++++ b/skgbankgui/CMakeLists.txt
+@@ -26,12 +26,16 @@ SET(skgbankgui_SRCS
+ skgpredicatcreator.cpp
+ skgquerydelegate.cpp
+ skgunitcombobox.cpp
++)
+
+- skgquerycreatordesignerplugin.cpp
+- skgbkwidgetcollectiondesignerplugin.cpp
+- skgpredicatcreatordesignerplugin.cpp
+- skgunitcomboboxdesignerplugin.cpp
++IF(SKG_DESIGNER)
++ SET(skgbankgui_SRCS ${skgbankgui_SRCS}
++ skgquerycreatordesignerplugin.cpp
++ skgbkwidgetcollectiondesignerplugin.cpp
++ skgpredicatcreatordesignerplugin.cpp
++ skgunitcomboboxdesignerplugin.cpp
+ )
++ENDIF()
+
+ SET(LIBS Qt5::Xml skgbankmodeler skgbasemodeler skgbasegui)
+ IF(SKG_DESIGNER)
+diff --git a/skgbasegui/CMakeLists.txt b/skgbasegui/CMakeLists.txt
+index 112efe267..81b0bf8de 100644
+--- a/skgbasegui/CMakeLists.txt
++++ b/skgbasegui/CMakeLists.txt
+@@ -63,28 +63,32 @@ SET(skgbasegui_SRCS
+ skgshow.cpp
+ skgwidgetselector.cpp
+ skgsimpleperiodedit.cpp
+-
+- skgwidgetcollectiondesignerplugin.cpp
+- skgtabwidgetdesignerplugin.cpp
+- skgtablewidgetdesignerplugin.cpp
+- skgtableviewdesignerplugin.cpp
+- skgfilteredtableviewdesignerplugin.cpp
+- skgtreeviewdesignerplugin.cpp
+- skgcomboboxdesignerplugin.cpp
+- skgcolorbuttondesignerplugin.cpp
+- skgwidgetselectordesignerplugin.cpp
+- skgwebviewdesignerplugin.cpp
+- skgzoomselectordesignerplugin.cpp
+- skgcalculatoreditdesignerplugin.cpp
+- skggraphicsviewdesignerplugin.cpp
+- skgshowdesignerplugin.cpp
+- skgtablewithgraphdesignerplugin.cpp
+- skgdateeditdesignerplugin.cpp
+- skgprogressbardesignerplugin.cpp
+- skgperiodeditdesignerplugin.cpp
+- skgsimpleperiodeditdesignerplugin.cpp
+ )
+
++IF(SKG_DESIGNER)
++ SET(skgbasegui_SRCS ${skgbasegui_SRCS}
++ skgwidgetcollectiondesignerplugin.cpp
++ skgtabwidgetdesignerplugin.cpp
++ skgtablewidgetdesignerplugin.cpp
++ skgtableviewdesignerplugin.cpp
++ skgfilteredtableviewdesignerplugin.cpp
++ skgtreeviewdesignerplugin.cpp
++ skgcomboboxdesignerplugin.cpp
++ skgcolorbuttondesignerplugin.cpp
++ skgwidgetselectordesignerplugin.cpp
++ skgwebviewdesignerplugin.cpp
++ skgzoomselectordesignerplugin.cpp
++ skgcalculatoreditdesignerplugin.cpp
++ skggraphicsviewdesignerplugin.cpp
++ skgshowdesignerplugin.cpp
++ skgtablewithgraphdesignerplugin.cpp
++ skgdateeditdesignerplugin.cpp
++ skgprogressbardesignerplugin.cpp
++ skgperiodeditdesignerplugin.cpp
++ skgsimpleperiodeditdesignerplugin.cpp
++ )
++ENDIF()
++
+ SET(LIBS KF5::Parts KF5::KIOFileWidgets KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg skgbasemodeler)
+ IF(SKG_DESIGNER)
+ SET(LIBS ${LIBS} Qt5::Designer)
+--
+2.18.0
+
diff --git a/app-office/skrooge/skrooge-2.14.0.ebuild b/app-office/skrooge/skrooge-2.14.0.ebuild
index f5110fcfb09..69bfd2e405c 100644
--- a/app-office/skrooge/skrooge-2.14.0.ebuild
+++ b/app-office/skrooge/skrooge-2.14.0.ebuild
@@ -76,6 +76,8 @@ REQUIRED_USE="test? ( designer )"
# hangs + installs files
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-designer-optional.patch" )
+
src_configure() {
local mycmakeargs=(
-DSKG_BUILD_TEST=$(usex test)