| 1 |
commit: b6b864e63cde66af402d6c842fea0ecd7f5f1363 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 29 22:21:48 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 29 22:21:48 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b6b864e6 |
| 7 |
|
| 8 |
app-cdr/k3b: Remove upstreamed patch |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
app-cdr/k3b/files/k3b-tests-optional.patch | 24 ------------------------ |
| 13 |
app-cdr/k3b/k3b-9999.ebuild | 2 -- |
| 14 |
2 files changed, 26 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-cdr/k3b/files/k3b-tests-optional.patch b/app-cdr/k3b/files/k3b-tests-optional.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 81d982f..0000000 |
| 19 |
--- a/app-cdr/k3b/files/k3b-tests-optional.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,24 +0,0 @@ |
| 22 |
---- a/CMakeLists.txt 2015-01-20 00:28:45.286789787 +0100 |
| 23 |
-+++ b/CMakeLists.txt 2015-01-20 00:30:11.829341844 +0100 |
| 24 |
-@@ -48,7 +48,7 @@ |
| 25 |
- include(GenerateExportHeader) |
| 26 |
- include(ECMInstallIcons) |
| 27 |
- |
| 28 |
--find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui Test WebKitWidgets) |
| 29 |
-+find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui WebKitWidgets) |
| 30 |
- find_package(KF5 REQUIRED COMPONENTS Archive Config CoreAddons DocTools FileMetaData I18n IconThemes JobWidgets |
| 31 |
- KCMUtils KIO Notifications NotifyConfig Service Solid WidgetsAddons XmlGui) |
| 32 |
- find_package(Iconv) |
| 33 |
-@@ -274,7 +274,11 @@ |
| 34 |
- add_subdirectory( kioslaves ) |
| 35 |
- add_subdirectory( plugins ) |
| 36 |
- add_subdirectory( doc ) |
| 37 |
--add_subdirectory( tests ) |
| 38 |
-+ |
| 39 |
-+if(BUILD_TESTING) |
| 40 |
-+ find_package(Qt5Test REQUIRED) |
| 41 |
-+ add_subdirectory( tests ) |
| 42 |
-+endif() |
| 43 |
- |
| 44 |
- ################### K3b config summary ################################ |
| 45 |
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
| 46 |
|
| 47 |
diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild |
| 48 |
index e1c882e..7de8828 100644 |
| 49 |
--- a/app-cdr/k3b/k3b-9999.ebuild |
| 50 |
+++ b/app-cdr/k3b/k3b-9999.ebuild |
| 51 |
@@ -77,8 +77,6 @@ REQUIRED_USE=" |
| 52 |
sox? ( encode ) |
| 53 |
" |
| 54 |
|
| 55 |
-PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" ) |
| 56 |
- |
| 57 |
src_configure() { |
| 58 |
local mycmakeargs=( |
| 59 |
-DK3B_BUILD_API_DOCS=OFF |
Archives