* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-php/files/, dev-util/kdevelop-php/
@ 2018-10-07 11:18 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-10-07 11:18 UTC (permalink / raw
To: gentoo-commits
commit: daf6157fb4363c960c5667b54707128c8f7755e7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 11:14:07 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 11:16:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf6157f
dev-util/kdevelop-php: Fix build w/o Qt5Test
Closes: https://bugs.gentoo.org/667922
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../files/kdevelop-php-5.2.4-tests-optional.patch | 28 ++++++++++++++++++++++
dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild | 6 +++--
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
new file mode 100644
index 00000000000..3e376161d38
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
@@ -0,0 +1,28 @@
+From 5cee4d7ea10de55af2d421f5f596eb9f09830740 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 7 Oct 2018 12:05:45 +0200
+Subject: [PATCH] Make Qt5Test optional
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c09ca29..c1e25d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,10 @@ include(GenerateExportHeader)
+ include(FeatureSummary)
+
+ set(QT_MIN_VERSION "5.5.0")
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
++if(BUILD_TESTING)
++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ set(KF5_DEP_VERSION "5.15.0")
+ find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+--
+2.19.1
+
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
index bdc85574736..e8a5c29a01b 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ EGIT_BRANCH="5.2"
KDEBASE="kdevelop"
KDE_DOC_DIR="docs"
KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
KMNAME="kdev-php"
VIRTUALX_REQUIRED="test"
inherit kde5
@@ -38,3 +38,5 @@ DEPEND="
RDEPEND="${DEPEND}
!dev-util/kdevelop-php-docs
"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-php/files/, dev-util/kdevelop-php/
@ 2018-10-10 5:33 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-10-10 5:33 UTC (permalink / raw
To: gentoo-commits
commit: 29cb544ad154b8a2f9e3354dd141abc60f45060a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 9 23:44:12 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 05:32:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29cb544a
dev-util/kdevelop-php: Fix test DEPENDs, disable hanging tests
This time for real.
Closes: https://bugs.gentoo.org/667922
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/kdevelop-php-5.2.4-tests-optional.patch | 52 +++++++++++++++++++++-
...p-5.2.4.ebuild => kdevelop-php-5.2.4-r1.ebuild} | 16 +++++--
2 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
index 3e376161d38..853952f11ac 100644
--- a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
+++ b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
@@ -1,8 +1,15 @@
-From 5cee4d7ea10de55af2d421f5f596eb9f09830740 Mon Sep 17 00:00:00 2001
+From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 7 Oct 2018 12:05:45 +0200
-Subject: [PATCH] Make Qt5Test optional
+Subject: [PATCH 1/2] Make Qt5Test optional
+Test Plan: Builds fine w/o Qt5Test present.
+
+Subscribers: kdevelop-devel
+
+Tags: #kdevelop
+
+Differential Revision: https://phabricator.kde.org/D16012
---
CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
@@ -26,3 +33,44 @@ index c09ca29..c1e25d6 100644
--
2.19.1
+
+From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed, 10 Oct 2018 01:35:19 +0200
+Subject: [PATCH 2/2] Drop unused KF5Archive
+
+---
+ CMakeLists.txt | 2 +-
+ completion/tests/CMakeLists.txt | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1e25d6..5f1070a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@ if(BUILD_TESTING)
+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+ endif()
+ set(KF5_DEP_VERSION "5.15.0")
+-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
++find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop-PG-Qt REQUIRED)
+
+diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt
+index dbe37c1..214cc05 100644
+--- a/completion/tests/CMakeLists.txt
++++ b/completion/tests/CMakeLists.txt
+@@ -23,9 +23,5 @@ ecm_add_test(
+ Qt5::Test
+ KDev::Tests
+ KDev::Language
+-
+- # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure
+- # we can work-around it :)
+- KF5::Archive
+ )
+
+--
+2.19.1
+
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
similarity index 80%
rename from dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
rename to dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
index e8a5c29a01b..9b59bf0dfaf 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
@@ -17,8 +17,7 @@ LICENSE="GPL-2 LGPL-2"
IUSE=""
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-DEPEND="
- $(add_frameworks_dep karchive)
+COMMON_DEPEND="
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -35,8 +34,19 @@ DEPEND="
dev-util/kdevelop-pg-qt:5
dev-util/kdevelop:5
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
!dev-util/kdevelop-php-docs
"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-util/kdevelop:5[test] )
+"
PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+src_test() {
+ # tests hang
+ local myctestargs=(
+ -E "(completionbenchmark|duchain_multiplefiles)"
+ )
+ kde5_src_test
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-php/files/, dev-util/kdevelop-php/
@ 2019-04-01 20:45 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-04-01 20:45 UTC (permalink / raw
To: gentoo-commits
commit: de4190feda960c6a4c49a72ee2a787aa75f17edd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 20:33:19 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 20:44:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de4190fe
dev-util/kdevelop-php: Drop 5.2.4-r1
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/kdevelop-php/Manifest | 1 -
.../files/kdevelop-php-5.2.4-tests-optional.patch | 76 ----------------------
dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild | 55 ----------------
3 files changed, 132 deletions(-)
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 7f7618f614d..d87e2026b8a 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,2 +1 @@
-DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd
DIST kdev-php-5.3.2.tar.xz 1008036 BLAKE2B 33940afeeb7b8594f0dbf56e444ba05f9665c7e4c9bc1d55c9d6a5b85bd2e03a04db1b8f27d968d627e26cfa573a3da519bb1d0eb592dc784296c9db7ea1fad8 SHA512 d8649bca173eccc1aa6568715e5976beb762ad7a377adbdab8f55aad76176ca5c8d16477ec70fa231b5699105d2a827c2ffda1c4835419c670c561b4444605b4
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
deleted file mode 100644
index 853952f11ac..00000000000
--- a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 7 Oct 2018 12:05:45 +0200
-Subject: [PATCH 1/2] Make Qt5Test optional
-
-Test Plan: Builds fine w/o Qt5Test present.
-
-Subscribers: kdevelop-devel
-
-Tags: #kdevelop
-
-Differential Revision: https://phabricator.kde.org/D16012
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c09ca29..c1e25d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,10 @@ include(GenerateExportHeader)
- include(FeatureSummary)
-
- set(QT_MIN_VERSION "5.5.0")
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
-+if(BUILD_TESTING)
-+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+endif()
- set(KF5_DEP_VERSION "5.15.0")
- find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
- find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
---
-2.19.1
-
-
-From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 10 Oct 2018 01:35:19 +0200
-Subject: [PATCH 2/2] Drop unused KF5Archive
-
----
- CMakeLists.txt | 2 +-
- completion/tests/CMakeLists.txt | 4 ----
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c1e25d6..5f1070a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,7 @@ if(BUILD_TESTING)
- find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
- endif()
- set(KF5_DEP_VERSION "5.15.0")
--find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
-+find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils)
- find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
- find_package(KDevelop-PG-Qt REQUIRED)
-
-diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt
-index dbe37c1..214cc05 100644
---- a/completion/tests/CMakeLists.txt
-+++ b/completion/tests/CMakeLists.txt
-@@ -23,9 +23,5 @@ ecm_add_test(
- Qt5::Test
- KDev::Tests
- KDev::Language
--
-- # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure
-- # we can work-around it :)
-- KF5::Archive
- )
-
---
-2.19.1
-
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
deleted file mode 100644
index ff68ee5e3fd..00000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDEBASE="kdevelop"
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="PHP plugin for KDevelop"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
- dev-util/kdevelop-pg-qt:5
- dev-util/kdevelop:5
-"
-RDEPEND="${COMMON_DEPEND}
- !dev-util/kdevelop-php-docs
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-util/kdevelop:5[test] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
- # tests hang, bug 667922
- local myctestargs=(
- -E "(completionbenchmark|duchain_multiplefiles)"
- )
- kde5_src_test
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-01 20:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-07 11:18 [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-php/files/, dev-util/kdevelop-php/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-10-10 5:33 Andreas Sturmlechner
2019-04-01 20:45 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox