* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2015-02-05 19:58 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-02-05 19:58 UTC (permalink / raw
To: gentoo-commits
commit: b75be2852e70e83586bc9168d1cdee999e41c3f6
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 5 18:07:49 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb 5 18:07:49 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b75be285
[kde-apps/umbrello] Add KF5 version
Package-Manager: portage-2.2.15
---
.../files/umbrello-5.9999-tests-optional.patch | 33 +++++++++++++++
kde-apps/umbrello/umbrello-5.9999.ebuild | 49 ++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch b/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch
new file mode 100644
index 0000000..e9bb603
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt 2015-02-03 20:04:23.900153480 +0100
++++ b/CMakeLists.txt 2015-02-03 20:25:08.164973819 +0100
+@@ -26,11 +26,19 @@
+ Gui
+ PrintSupport
+ Svg
+- Test
+ Widgets
+ Xml
+ )
+
++find_package(Qt5Test ${QT_MIN_VERSION} QUIET)
++set_package_properties(Qt5Test PROPERTIES
++ PURPOSE "Required for tests"
++ TYPE OPTIONAL)
++add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
++if (NOT Qt5Test_FOUND)
++ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
++endif()
++
+ # search packages used by KDE
+ find_package(KF5 REQUIRED COMPONENTS
+ Archive
+@@ -105,6 +113,8 @@
+ endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
+
+ # for automatic unit tests
+-ecm_optional_add_subdirectory(unittests)
++if (BUILD_TESTING)
++ ecm_optional_add_subdirectory(unittests)
++endif()
+
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kde-apps/umbrello/umbrello-5.9999.ebuild b/kde-apps/umbrello/umbrello-5.9999.ebuild
new file mode 100644
index 0000000..5bb65ad
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-5.9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EGIT_BRANCH="frameworks"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="
+ http://www.kde.org/applications/development/umbrello
+ http://umbrello.kde.org
+"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}"-5.9999-tests-optional.patch )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2015-06-08 21:05 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-06-08 21:05 UTC (permalink / raw
To: gentoo-commits
commit: ac5e5179132f416c4ddd7a7b19c5cc8dd8f7aa87
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jun 1 20:17:39 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 21:04:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac5e5179
[kde-apps/umbrello] Frameworks merged to master
Package-Manager: portage-2.2.20
.../files/umbrello-5.9999-tests-optional.patch | 33 ---------------
kde-apps/umbrello/umbrello-5.9999.ebuild | 49 ----------------------
kde-apps/umbrello/umbrello-9999.ebuild | 38 +++++++++++++++--
3 files changed, 35 insertions(+), 85 deletions(-)
diff --git a/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch b/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch
deleted file mode 100644
index e9bb603..0000000
--- a/kde-apps/umbrello/files/umbrello-5.9999-tests-optional.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/CMakeLists.txt 2015-02-03 20:04:23.900153480 +0100
-+++ b/CMakeLists.txt 2015-02-03 20:25:08.164973819 +0100
-@@ -26,11 +26,19 @@
- Gui
- PrintSupport
- Svg
-- Test
- Widgets
- Xml
- )
-
-+find_package(Qt5Test ${QT_MIN_VERSION} QUIET)
-+set_package_properties(Qt5Test PROPERTIES
-+ PURPOSE "Required for tests"
-+ TYPE OPTIONAL)
-+add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
-+if (NOT Qt5Test_FOUND)
-+ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
-+endif()
-+
- # search packages used by KDE
- find_package(KF5 REQUIRED COMPONENTS
- Archive
-@@ -105,6 +113,8 @@
- endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
-
- # for automatic unit tests
--ecm_optional_add_subdirectory(unittests)
-+if (BUILD_TESTING)
-+ ecm_optional_add_subdirectory(unittests)
-+endif()
-
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kde-apps/umbrello/umbrello-5.9999.ebuild b/kde-apps/umbrello/umbrello-5.9999.ebuild
deleted file mode 100644
index 5bb65ad..0000000
--- a/kde-apps/umbrello/umbrello-5.9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="
- http://www.kde.org/applications/development/umbrello
- http://umbrello.kde.org
-"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kauth)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdoctools)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kinit)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- dev-libs/libxml2
- dev-libs/libxslt
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}"-5.9999-tests-optional.patch )
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
index ae00fa2..520b1c8 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -4,8 +4,9 @@
EAPI=5
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
DESCRIPTION="KDE UML Modeller"
HOMEPAGE="
@@ -13,10 +14,41 @@ HOMEPAGE="
http://umbrello.kde.org
"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
dev-libs/libxml2
dev-libs/libxslt
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
"
DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_KF5=ON
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2015-12-29 12:48 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2015-12-29 12:48 UTC (permalink / raw
To: gentoo-commits
commit: 4894513b82f91be1407465aeb78744b20bd46778
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 21:41:45 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 12:48:13 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4894513b
kde-apps/umbrello: Remove unused include, fix build
Package-Manager: portage-2.2.24
.../files/umbrello-15.12.0-fix-compile.patch | 24 ++++++++++++++++++++++
kde-apps/umbrello/umbrello-15.12.0.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/kde-apps/umbrello/files/umbrello-15.12.0-fix-compile.patch b/kde-apps/umbrello/files/umbrello-15.12.0-fix-compile.patch
new file mode 100644
index 0000000..fd0e888
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-15.12.0-fix-compile.patch
@@ -0,0 +1,24 @@
+commit 1948e771e0e54ef0dd8290ef31cb5b09ee59f1aa
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon Dec 28 16:50:07 2015 +0100
+
+ Remove unused header from frameworks build
+
+diff --git a/umbrello/main.cpp b/umbrello/main.cpp
+index 80a9337..1a68163 100644
+--- a/umbrello/main.cpp
++++ b/umbrello/main.cpp
+@@ -26,11 +26,12 @@
+ #include <kconfig.h>
+ #include <KLocalizedString>
+ #include <ktip.h>
+-#include <kwindowsystem.h>
+
+ #if QT_VERSION >= 0x050000
+ #include <QApplication>
+ #include <QCommandLineParser>
++#else
++#include <kwindowsystem.h>
+ #endif
+
+ #include <unistd.h>
diff --git a/kde-apps/umbrello/umbrello-15.12.0.ebuild b/kde-apps/umbrello/umbrello-15.12.0.ebuild
index 8a7285e..88e8905 100644
--- a/kde-apps/umbrello/umbrello-15.12.0.ebuild
+++ b/kde-apps/umbrello/umbrello-15.12.0.ebuild
@@ -41,6 +41,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${P}-fix-compile.patch" )
+
src_configure() {
local mycmakeargs=(
-DBUILD_KF5=ON
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2020-04-03 17:53 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-04-03 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 4daa79f755bd1af87e42bd313a350b17c08b8698
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 3 17:51:11 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 3 17:51:11 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4daa79f7
kde-apps/umbrello: Replace patch with -DBUILD_APIDOC=OFF
See also: https://mail.kde.org/pipermail/release-team/2020-April/011825.html
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/umbrello-20.03.80-build-qch.patch | 37 ----------------------
kde-apps/umbrello/umbrello-20.03.90.ebuild | 3 +-
kde-apps/umbrello/umbrello-20.04.49.9999.ebuild | 3 +-
kde-apps/umbrello/umbrello-9999.ebuild | 3 +-
4 files changed, 3 insertions(+), 43 deletions(-)
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
deleted file mode 100644
index 6cc361fe2e..0000000000
--- a/kde-apps/umbrello/files/umbrello-20.03.80-build-qch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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.90.ebuild b/kde-apps/umbrello/umbrello-20.03.90.ebuild
index c7b689eef8..c6979db7aa 100644
--- a/kde-apps/umbrello/umbrello-20.03.90.ebuild
+++ b/kde-apps/umbrello/umbrello-20.03.90.ebuild
@@ -53,11 +53,10 @@ 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_APIDOC=OFF
-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 716c016eaa..704581c29b 100644
--- a/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild
+++ b/kde-apps/umbrello/umbrello-20.04.49.9999.ebuild
@@ -53,11 +53,10 @@ 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_APIDOC=OFF
-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 716c016eaa..704581c29b 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -53,11 +53,10 @@ 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_APIDOC=OFF
-DBUILD_KF5=ON
-DBUILD_PHP_IMPORT=$(usex php)
-DBUILD_unittests=$(usex test)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2020-10-31 9:26 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-10-31 9:26 UTC (permalink / raw
To: gentoo-commits
commit: d6b101980b5fc7fc565acd4c5a8ec54f08e50200
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 21:59:49 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 21:59:49 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6b10198
kde-apps/umbrello: Unbundle dev-utils/kdevelop-php and update DEPENDs
Upstream commit 57fef3b1d54959d5b719469c7c67e1d3e7be49dc
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 ++++++++++++++++++++++
kde-apps/umbrello/umbrello-20.08.49.9999.ebuild | 8 +-
kde-apps/umbrello/umbrello-9999.ebuild | 3 +-
3 files changed, 100 insertions(+), 3 deletions(-)
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
new file mode 100644
index 0000000000..cce395a837
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
@@ -0,0 +1,92 @@
+From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Fri, 30 Oct 2020 08:32:41 +0100
+Subject: [PATCH] Add support to use external KDevPHP packaga
+
+If no external development package has been found fallback to embedded
+version.
+
+This commit adds an additional optional dependency for the KDevPHP package, which
+named e.g. on openSUSE 'kdevelop5-plugin-php-devel'.
+
+BUG:428460
+FIXED-IN:2.32.80 (KDE releases 20.11.80)
+---
+ CMakeLists.txt | 20 ++++++++++++++------
+ umbrello/codeimport/phpimport.cpp | 19 +++++++++++--------
+ 2 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 221c04e31..398415f09 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,18 +129,26 @@ if(KDEVPGQT_FOUND AND KDEVPLATFORM_FOUND)
+ include_directories(
+ ${KDEVPGQT_INCLUDE_DIR}
+ ${KDEVPLATFORM_INCLUDE_DIR}
+- ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}/parser
+- ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}/parser
+ )
+- set(NO_INSTALL 1)
+- set(BUILD_PARSER_ONLY 1)
+ set(BUILD_PHP_IMPORT 1)
+ add_definitions(
+- -DKDEVPHPPARSER_EXPORT=
+ -DENABLE_PHP_IMPORT
+ )
+ add_subdirectory(lib/kdevplatform)
+- add_subdirectory(${KDEV_SOURCE_DIR})
++ find_package(KDevPHP)
++ if(NOT KDevPHP_FOUND)
++ set(NO_INSTALL 1)
++ set(BUILD_PARSER_ONLY 1)
++ set(BUILD_PHP_IMPORT 1)
++ add_definitions(
++ -DKDEVPHPPARSER_EXPORT=
++ )
++ include_directories(
++ ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}
++ ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}
++ )
++ add_subdirectory(${KDEV_SOURCE_DIR})
++ endif()
+ else()
+ set(BUILD_PHP_IMPORT 0)
+ endif()
+diff --git a/umbrello/codeimport/phpimport.cpp b/umbrello/codeimport/phpimport.cpp
+index f45f1416f..f714dcbad 100644
+--- a/umbrello/codeimport/phpimport.cpp
++++ b/umbrello/codeimport/phpimport.cpp
+@@ -39,18 +39,21 @@ QTextStream qout(stdout);
+ QTextStream qerr(stderr);
+ QTextStream qin(stdin);
+
+-#include "parsesession.h"
+-#include "phplexer.h"
+-#include "phpparser.h"
+-#include "phpdebugvisitor.h"
+-#include "phpast.h"
+-#include "tokenstream.h"
+-#include "phptokentext.h"
+-
++// kdevphp
++#include <parser/parsesession.h>
++#include <parser/phplexer.h>
++#include <parser/phpparser.h>
++#include <parser/phpdebugvisitor.h>
++#include <parser/phpast.h>
++#include <parser/tokenstream.h>
++#include <parser/phptokentext.h>
++
++// kdevplatform
+ #include <tests/autotestshell.h>
+ #include <language/duchain/duchain.h>
+ #include <language/duchain/problem.h>
+ #include <language/codegen/coderepresentation.h>
++#include <language/editor/documentrange.h>
+ #include <tests/testcore.h>
+
+ namespace Php {
+--
+GitLab
+
diff --git a/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild
index 1ec6ad0543..67eb70e963 100644
--- a/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild
+++ b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild
@@ -45,12 +45,16 @@ RDEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
php? (
dev-util/kdevelop:5=
- dev-util/kdevelop-pg-qt
+ dev-util/kdevelop-pg-qt:5
+ dev-util/kdevelop-php:5
)
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch
+ "${FILESDIR}"/${PN}-20.08.3-unbundle-kdevelop-php.patch
+)
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
index e1ac904a25..f525d40125 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -45,7 +45,8 @@ RDEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
php? (
dev-util/kdevelop:5=
- dev-util/kdevelop-pg-qt
+ dev-util/kdevelop-pg-qt:5
+ dev-util/kdevelop-php:5
)
"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
@ 2020-11-05 17:59 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-11-05 17:59 UTC (permalink / raw
To: gentoo-commits
commit: 59986c797a9aa291f6bd5cb9371ddc4188597f59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 14:14:32 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 14:14:32 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=59986c79
kde-apps/umbrello: Fix paths for Gentoo KDE_INSTALL_DOCBUNDLEDIR
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../umbrello-20.08.3-gentoo-docbundledir.patch | 41 +++++++
.../files/umbrello-20.08.3-no-qtwebkit.patch | 126 ++++++++++-----------
kde-apps/umbrello/umbrello-9999.ebuild | 5 +-
3 files changed, 105 insertions(+), 67 deletions(-)
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch
new file mode 100644
index 0000000000..e3915379be
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-gentoo-docbundledir.patch
@@ -0,0 +1,41 @@
+From 29186bb3c1c3e4de89d77340db966c660789cdab Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 5 Nov 2020 14:39:51 +0100
+Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo
+
+Gentoo sets KDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help".
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ umbrello/umlappprivate.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp
+index d8bae2cfe..8c1c58a02 100644
+--- a/umbrello/umlappprivate.cpp
++++ b/umbrello/umlappprivate.cpp
+@@ -36,17 +36,17 @@ QString UMLAppPrivate::findWelcomeFile()
+
+ // from custom install
+ foreach(const QString &lang, langList) {
+- dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang));
++ dirList.append(QCoreApplication::applicationDirPath() + QString(QLatin1String("/../share/help/%1/umbrello/apphelp")).arg(lang));
+ }
+- dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/doc/HTML/en/umbrello/apphelp"));
++ dirList.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/help/en/umbrello/apphelp"));
+
+ QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+ // from real installation
+ foreach(const QString &location, locations) {
+ foreach(const QString &lang, langList) {
+- dirList.append(QString(QLatin1String("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang));
++ dirList.append(QString(QLatin1String("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang));
+ }
+- dirList.append(QString(QLatin1String("%1/doc/HTML/en/umbrello/apphelp")).arg(location));
++ dirList.append(QString(QLatin1String("%1/help/en/umbrello/apphelp")).arg(location));
+ }
+ #else
+ KLocale *local = KGlobal::locale();
+--
+2.29.2
+
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
index 8f1a63675d..bf41c2d409 100644
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
@@ -1,55 +1,43 @@
-From 0500feddb6ff02cd42624b0d3018c5292481b031 Mon Sep 17 00:00:00 2001
+From eb753a7eb0f49c6ac5b349f81387ca4b4c64342b 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
+Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
+ QTextBrowser fallback
+
+Thanks-to: Ralf Habacker <ralf.habacker@freenet.de> for QTextBrowser fallback code.
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(-)
+ CMakeLists.txt | 7 ++++++-
+ umbrello/CMakeLists.txt | 4 +++-
+ umbrello/umlappprivate.h | 13 +++++++++++++
+ 3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d2d897683..ac70ffe4e 100644
+index 398415f09..7144f0990 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -89,7 +89,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+@@ -95,9 +95,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
Test
Widgets
Xml
- WebKitWidgets
)
++find_package(Qt5WebKitWidgets ${QT_MIN_VERSION})
++if(Qt5WebKitWidgets_FOUND)
++ add_definitions(-DWEBKIT_WELCOMEPAGE)
++ set(WEBKIT_WELCOMEPAGE 1)
++endif()
++
# 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)
+ find_package(KF5 REQUIRED COMPONENTS
+ Archive
diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index 264b25fde..22480642d 100644
+index 264b25fde..f3286ae46 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()
+@@ -549,7 +551,6 @@ else()
Qt5::Xml
Qt5::PrintSupport
Qt5::Svg
@@ -57,49 +45,55 @@ index 264b25fde..22480642d 100644
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"));
+@@ -565,6 +566,9 @@ else()
+ ${LIBXML2_LIBRARIES}
+ codeimport
+ )
++ if(WEBKIT_WELCOMEPAGE)
++ target_link_libraries(libumbrello Qt5::WebKitWidgets)
++ endif()
+ ecm_add_app_icon(umbrello_SRCS
+ ICONS
+ ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
-index a85de1f22..b9d50a5c1 100644
+index a85de1f22..a7212cc8d 100644
--- a/umbrello/umlappprivate.h
+++ b/umbrello/umlappprivate.h
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,11 @@
#include <QFileInfo>
#include <QListWidget>
#include <QObject>
--#include <QWebView>
-+// #include <QWebView>
++#ifdef WEBKIT_WELCOMEPAGE
+ #include <QWebView>
++#else
++#include <QTextBrowser>
++#endif
class QWidget;
-@@ -151,6 +151,8 @@ public slots:
-
- void createWelcomeWindow()
- {
-+ return;
-+/*
- QString file = findWelcomeFile();
- if (file.isEmpty())
- return;
-@@ -171,6 +173,7 @@ public slots:
+@@ -160,6 +164,7 @@ public slots:
+ // qDebug() << html;
+ welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
+ welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
++#ifdef WEBKIT_WELCOMEPAGE
+ QWebView *view = new QWebView;
+ view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+ view->setContextMenuPolicy(Qt::NoContextMenu);
+@@ -167,6 +172,14 @@ public slots:
+ view->setHtml(html);
+ view->show();
+ welcomeWindow->setWidget(view);
++#else
++ QTextBrowser *tb = new QTextBrowser(dynamic_cast<QWidget*>(this));
++ tb->setOpenExternalLinks(true);
++ tb->setOpenLinks(false);
++ tb->setHtml(html);
++ connect(tb, SIGNAL(anchorClicked(const QUrl)), this, SLOT(slotWelcomeWindowLinkClicked(const QUrl)));
++ welcomeWindow->setWidget(tb);
++#endif
+ parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
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
+2.29.2
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild
index f525d40125..1a532daeed 100644
--- a/kde-apps/umbrello/umbrello-9999.ebuild
+++ b/kde-apps/umbrello/umbrello-9999.ebuild
@@ -51,7 +51,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch
+ "${FILESDIR}"/${PN}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-05 18:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-31 9:26 [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-11-05 17:59 Andreas Sturmlechner
2020-04-03 17:53 Andreas Sturmlechner
2015-12-29 12:48 Michael Palimaka
2015-06-08 21:05 Johannes Huber
2015-02-05 19:58 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox