* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/
@ 2020-03-21 12:16 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-03-21 12:16 UTC (permalink / raw
To: gentoo-commits
commit: beb9939a8a0a1834820a3ac5a7e24dfc378e4d18
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 11:59:29 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 12:16:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=beb9939a
kde-apps/umbrello: Add BUILD_QCH build switch and disable Doxygen
Breaks cmake install right now.
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/umbrello-20.03.80-build-qch.patch | 37 ++++++++++++++++++++++
kde-apps/umbrello/umbrello-20.03.80.ebuild | 4 +++
kde-apps/umbrello/umbrello-20.04.49.9999.ebuild | 4 +++
kde-apps/umbrello/umbrello-9999.ebuild | 4 +++
4 files changed, 49 insertions(+)
diff --git a/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch b/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch
new file mode 100644
index 0000000000..6cc361fe2e
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch
@@ -0,0 +1,37 @@
+From fd272f86829c41a32c06fa8440eae5a4bfd7483e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 21 Mar 2020 12:46:15 +0100
+Subject: [PATCH] Use quasi standard BUILD_QCH option
+
+As found in use consistently in KDE Frameworks and some other libraries.
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 588f2e000..886916c5a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,8 @@ option(BUILD_KF5 "Build for KDE Frameworks 5" ON)
+
+ option(BUILD_PHP_IMPORT "Build with php import support" ON)
+
++option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
++
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ include(Macros)
+@@ -236,7 +238,9 @@ add_unstable_feature(OBJECT_DIAGRAM) # see https://bugs.kde.org/show_bug.cgi?id=
+ find_package(Doxygen OPTIONAL_COMPONENTS dot)
+ if(DOXYGEN_FOUND)
+ message(STATUS "found doxygen package")
+- find_program(QHELPGENERATOR_EXECUTABLE qhelpgenerator)
++ if (BUILD_QCH)
++ find_program(QHELPGENERATOR_EXECUTABLE qhelpgenerator)
++ endif()
+
+ set(DOXYGEN_ABBREVIATE_BRIEF "The $name class" "The $name widget")
+ set(DOXYGEN_CALL_GRAPH YES)
+--
+2.25.2
+
diff --git a/kde-apps/umbrello/umbrello-20.03.80.ebuild b/kde-apps/umbrello/umbrello-20.03.80.ebuild
index 8ec7f754bd..1283d94963 100644
--- a/kde-apps/umbrello/umbrello-20.03.80.ebuild
+++ b/kde-apps/umbrello/umbrello-20.03.80.ebuild
@@ -4,6 +4,7 @@
EAPI=7
ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false" # TODO: figure out install error
ECM_TEST="forceoptional"
KFMIN=5.68.0
QTMIN=5.12.3
@@ -52,8 +53,11 @@ DEPEND="${RDEPEND}
>=kde-frameworks/kdelibs4support-${KFMIN}:5
"
+PATCHES=( "${FILESDIR}/${P}-build-qch.patch" )
+
src_configure() {
local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
-DBUILD_KF5=ON
-DBUILD_PHP_IMPORT=$(usex php)
-DBUILD_unittests=$(usex test)
diff --git a/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild b/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild
index c2fffdbb39..f26171dbf6 100644
--- a/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild
+++ b/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild
@@ -4,6 +4,7 @@
EAPI=7
ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false" # TODO: figure out install error
ECM_TEST="forceoptional"
KFMIN=5.68.0
QTMIN=5.12.3
@@ -52,8 +53,11 @@ DEPEND="${RDEPEND}
>=kde-frameworks/kdelibs4support-${KFMIN}:5
"
+PATCHES=( "${FILESDIR}/${PN}-20.03.80-build-qch.patch" )
+
src_configure() {
local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
-DBUILD_KF5=ON
-DBUILD_PHP_IMPORT=$(usex php)
-DBUILD_unittests=$(usex test)
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
index c2fffdbb39..f26171dbf6 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -4,6 +4,7 @@
EAPI=7
ECM_HANDBOOK="forceoptional"
+ECM_QTHELP="false" # TODO: figure out install error
ECM_TEST="forceoptional"
KFMIN=5.68.0
QTMIN=5.12.3
@@ -52,8 +53,11 @@ DEPEND="${RDEPEND}
>=kde-frameworks/kdelibs4support-${KFMIN}:5
"
+PATCHES=( "${FILESDIR}/${PN}-20.03.80-build-qch.patch" )
+
src_configure() {
local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON # broken, re-enable w/ ECM_QTHELP
-DBUILD_KF5=ON
-DBUILD_PHP_IMPORT=$(usex php)
-DBUILD_unittests=$(usex test)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/
@ 2020-10-12 16:26 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-10-12 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 7e0b86ffcfea5131615561ef631204ba4bf2a11a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 14:32:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 15:00:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e0b86ff
kde-apps/umbrello: Patch out dev-qt/qtwebkit dependency, fix DEPENDs
- Update HOMEPAGE
- kde-frameworks/kdelibs4support is being linked to
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/umbrello-20.08.3-no-qtwebkit.patch | 105 +++++++++++++++++++++
.../files/umbrello-20.08.3-unused-qtwebkit.patch | 25 +++++
kde-apps/umbrello/umbrello-20.08.49.9999.ebuild | 11 +--
kde-apps/umbrello/umbrello-9999.ebuild | 11 +--
4 files changed, 140 insertions(+), 12 deletions(-)
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
new file mode 100644
index 0000000000..8f1a63675d
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
@@ -0,0 +1,105 @@
+From 0500feddb6ff02cd42624b0d3018c5292481b031 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Oct 2020 11:46:24 +0200
+Subject: [PATCH] Disable defunct WelcomePage to get rid of QtWebKit
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ cmake/modules/ECMKDE4Macros.cmake | 2 +-
+ umbrello/CMakeLists.txt | 2 --
+ umbrello/uml.cpp | 2 +-
+ umbrello/umlappprivate.h | 5 ++++-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d2d897683..ac70ffe4e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,7 +89,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ Test
+ Widgets
+ Xml
+- WebKitWidgets
+ )
+
+ # search packages used by KDE
+diff --git a/cmake/modules/ECMKDE4Macros.cmake b/cmake/modules/ECMKDE4Macros.cmake
+index 3de472295..28eb1c180 100644
+--- a/cmake/modules/ECMKDE4Macros.cmake
++++ b/cmake/modules/ECMKDE4Macros.cmake
+@@ -106,7 +106,7 @@ macro(find_package package)
+ #message("-- ${ARGV} --")
+ if("${package}" MATCHES "^(Qt5)")
+ #message("-- replaced by finding Qt4 --")
+- _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest QtWebKit)
++ _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest)
+ elseif("${package}" MATCHES "^(KF5)$")
+ #message("-- replaced by finding KDE4 --")
+ _find_package(KDE4 REQUIRED)
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
+index 264b25fde..22480642d 100644
+--- a/umbrello/CMakeLists.txt
++++ b/umbrello/CMakeLists.txt
+@@ -525,7 +525,6 @@ if(NOT BUILD_KF5)
+ Qt4::QtCore
+ Qt4::QtGui
+ Qt4::QtXml
+- Qt4::QtWebKit
+ ${LIBXML2_LIBRARIES}
+ ${LIBXSLT_LIBRARIES}
+ ${KDE4_KTEXTEDITOR_LIBS}
+@@ -549,7 +548,6 @@ else()
+ Qt5::Xml
+ Qt5::PrintSupport
+ Qt5::Svg
+- Qt5::WebKitWidgets
+ KF5::Archive
+ KF5::Completion
+ KF5::CoreAddons
+diff --git a/umbrello/uml.cpp b/umbrello/uml.cpp
+index 1e0be0c5a..98ce70aef 100644
+--- a/umbrello/uml.cpp
++++ b/umbrello/uml.cpp
+@@ -996,7 +996,7 @@ void UMLApp::initView()
+ m_d->createObjectsWindow();
+ #endif
+ m_d->createStereotypesWindow();
+- m_d->createWelcomeWindow();
++// m_d->createWelcomeWindow();
+
+ m_debugDock = new QDockWidget(i18n("&Debug"), this);
+ m_debugDock->setObjectName(QLatin1String("DebugDock"));
+diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
+index a85de1f22..b9d50a5c1 100644
+--- a/umbrello/umlappprivate.h
++++ b/umbrello/umlappprivate.h
+@@ -42,7 +42,7 @@
+ #include <QFileInfo>
+ #include <QListWidget>
+ #include <QObject>
+-#include <QWebView>
++// #include <QWebView>
+
+ class QWidget;
+
+@@ -151,6 +151,8 @@ public slots:
+
+ void createWelcomeWindow()
+ {
++ return;
++/*
+ QString file = findWelcomeFile();
+ if (file.isEmpty())
+ return;
+@@ -171,6 +173,7 @@ public slots:
+
+ viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
+ connect(viewWelcomeWindow, SIGNAL(triggered(bool)), welcomeWindow, SLOT(setVisible(bool)));
++*/
+ }
+
+ void slotWelcomeWindowLinkClicked(const QUrl &url)
+--
+2.28.0
+
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
new file mode 100644
index 0000000000..bb1fde2878
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
@@ -0,0 +1,25 @@
+From 5263f4e391c50c72e000da6c2bcf1123c28192e5 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Wed, 21 Jun 2017 14:05:28 +0200
+Subject: [PATCH] Remove finding WebKitWidgets, not used
+
+---
+ lib/kdev5-php/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/kdev5-php/CMakeLists.txt b/lib/kdev5-php/CMakeLists.txt
+index 2a40b48ae..6ef58b0c9 100644
+--- a/lib/kdev5-php/CMakeLists.txt
++++ b/lib/kdev5-php/CMakeLists.txt
+@@ -28,7 +28,7 @@ include(KDECMakeSettings)
+ include(GenerateExportHeader)
+ include(FeatureSummary)
+
+-find_package(Qt5 REQUIRED Core Widgets Test WebKitWidgets)
++find_package(Qt5 REQUIRED Core Widgets Test)
+ find_package(KF5 REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop-PG-Qt REQUIRED)
+--
+2.28.0
+
diff --git a/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild
index 91d98e8993..8bcf216d57 100644
--- a/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild
+++ b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild
@@ -12,8 +12,7 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
+HOMEPAGE="https://kde.org/applications/en/umbrello https://umbrello.kde.org"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -26,7 +25,6 @@ RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwebkit-5.212.0_pre20180120:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
@@ -35,6 +33,7 @@ RDEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
@@ -49,9 +48,9 @@ RDEPEND="
dev-util/kdevelop-pg-qt
)
"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch )
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
index 7801f5d544..02559c7bca 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -12,8 +12,7 @@ VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello
-https://umbrello.kde.org"
+HOMEPAGE="https://kde.org/applications/en/umbrello https://umbrello.kde.org"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -26,7 +25,6 @@ RDEPEND="
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwebkit-5.212.0_pre20180120:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
@@ -35,6 +33,7 @@ RDEPEND="
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
@@ -49,9 +48,9 @@ RDEPEND="
dev-util/kdevelop-pg-qt
)
"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-12 16:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-12 16:26 [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-03-21 12:16 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox