diff options
author | Johannes Huber <johu@gentoo.org> | 2016-07-30 00:21:48 +0200 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2016-07-30 00:21:48 +0200 |
commit | b6b864e63cde66af402d6c842fea0ecd7f5f1363 (patch) | |
tree | c0aab2c8187a2dc6ef375ac692abb86d72bd43a1 /app-cdr | |
parent | kde-apps/kdecore-meta: Drop kde-apps/kde-wallpapers for removal (diff) | |
download | kde-b6b864e63cde66af402d6c842fea0ecd7f5f1363.tar.gz kde-b6b864e63cde66af402d6c842fea0ecd7f5f1363.tar.bz2 kde-b6b864e63cde66af402d6c842fea0ecd7f5f1363.zip |
app-cdr/k3b: Remove upstreamed patch
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-cdr')
-rw-r--r-- | app-cdr/k3b/files/k3b-tests-optional.patch | 24 | ||||
-rw-r--r-- | app-cdr/k3b/k3b-9999.ebuild | 2 |
2 files changed, 0 insertions, 26 deletions
diff --git a/app-cdr/k3b/files/k3b-tests-optional.patch b/app-cdr/k3b/files/k3b-tests-optional.patch deleted file mode 100644 index 81d982f930..0000000000 --- a/app-cdr/k3b/files/k3b-tests-optional.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/CMakeLists.txt 2015-01-20 00:28:45.286789787 +0100 -+++ b/CMakeLists.txt 2015-01-20 00:30:11.829341844 +0100 -@@ -48,7 +48,7 @@ - include(GenerateExportHeader) - include(ECMInstallIcons) - --find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui Test WebKitWidgets) -+find_package(Qt5 REQUIRED COMPONENTS Core DBus Gui WebKitWidgets) - find_package(KF5 REQUIRED COMPONENTS Archive Config CoreAddons DocTools FileMetaData I18n IconThemes JobWidgets - KCMUtils KIO Notifications NotifyConfig Service Solid WidgetsAddons XmlGui) - find_package(Iconv) -@@ -274,7 +274,11 @@ - add_subdirectory( kioslaves ) - add_subdirectory( plugins ) - add_subdirectory( doc ) --add_subdirectory( tests ) -+ -+if(BUILD_TESTING) -+ find_package(Qt5Test REQUIRED) -+ add_subdirectory( tests ) -+endif() - - ################### K3b config summary ################################ - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild index e1c882e315..7de8828d81 100644 --- a/app-cdr/k3b/k3b-9999.ebuild +++ b/app-cdr/k3b/k3b-9999.ebuild @@ -77,8 +77,6 @@ REQUIRED_USE=" sox? ( encode ) " -PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" ) - src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF |