From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C2B5B13989A for ; Thu, 27 Aug 2015 08:22:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EEBA141E9; Thu, 27 Aug 2015 08:22:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD2B3141E9 for ; Thu, 27 Aug 2015 08:22:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92F30340A78 for ; Thu, 27 Aug 2015 08:22:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50A0413B for ; Thu, 27 Aug 2015 08:22:32 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1440663740.f18b894051766d5e3ebe8e0d834b86f84354dd58.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdeclarative/files/, kde-frameworks/kdeclarative/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kdeclarative/files/kdeclarative-5.14.0-revert-plasma-breakage.patch kde-frameworks/kdeclarative/kdeclarative-9999.ebuild X-VCS-Directories: kde-frameworks/kdeclarative/files/ kde-frameworks/kdeclarative/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f18b894051766d5e3ebe8e0d834b86f84354dd58 X-VCS-Branch: master Date: Thu, 27 Aug 2015 08:22:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4f48836c-adb2-4648-86f3-4b180beff3b0 X-Archives-Hash: 3440cb84c613b52dd3363ce4cdb7f88f commit: f18b894051766d5e3ebe8e0d834b86f84354dd58 Author: Johannes Huber gentoo org> AuthorDate: Thu Aug 27 08:22:20 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Aug 27 08:22:20 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f18b8940 kde-frameworks/kdeclarative: Drop revert patch Upstream came to the same conclusion ;) Package-Manager: portage-2.2.20.1 ...declarative-5.14.0-revert-plasma-breakage.patch | 73 ---------------------- .../kdeclarative/kdeclarative-9999.ebuild | 2 - 2 files changed, 75 deletions(-) diff --git a/kde-frameworks/kdeclarative/files/kdeclarative-5.14.0-revert-plasma-breakage.patch b/kde-frameworks/kdeclarative/files/kdeclarative-5.14.0-revert-plasma-breakage.patch deleted file mode 100644 index f5c984b..0000000 --- a/kde-frameworks/kdeclarative/files/kdeclarative-5.14.0-revert-plasma-breakage.patch +++ /dev/null @@ -1,73 +0,0 @@ -commit 8d629ddadfdf2d11c83d871f058f375c6dec9a75 -Author: Johannes Huber -Date: Wed Aug 26 11:32:06 2015 +0200 - - Revert "kdeclarative plugins should be built as a bundle plugin and not a shared library" - - This reverts commit 383aa77ebf0b08adca13ce67a90f61c9c6a65851. - -diff --git a/src/qmlcontrols/draganddrop/CMakeLists.txt b/src/qmlcontrols/draganddrop/CMakeLists.txt -index 10694bb..e8127e4 100644 ---- a/src/qmlcontrols/draganddrop/CMakeLists.txt -+++ b/src/qmlcontrols/draganddrop/CMakeLists.txt -@@ -9,7 +9,7 @@ set(declarativedragdrop_SRCS - MimeDataWrapper.cpp - ) - --add_library(draganddropplugin MODULE ${declarativedragdrop_SRCS}) -+add_library(draganddropplugin SHARED ${declarativedragdrop_SRCS}) - target_link_libraries(draganddropplugin - Qt5::Core - Qt5::Quick -diff --git a/src/qmlcontrols/kcoreaddons/CMakeLists.txt b/src/qmlcontrols/kcoreaddons/CMakeLists.txt -index 585fb1f..3f77f2d 100644 ---- a/src/qmlcontrols/kcoreaddons/CMakeLists.txt -+++ b/src/qmlcontrols/kcoreaddons/CMakeLists.txt -@@ -6,7 +6,7 @@ set(kcoreaddonsplugin_SRCS - kuserproxy.cpp - ) - --add_library(kcoreaddonsplugin MODULE ${kcoreaddonsplugin_SRCS}) -+add_library(kcoreaddonsplugin SHARED ${kcoreaddonsplugin_SRCS}) - target_link_libraries(kcoreaddonsplugin - Qt5::Core - Qt5::Quick -diff --git a/src/qmlcontrols/kioplugin/CMakeLists.txt b/src/qmlcontrols/kioplugin/CMakeLists.txt -index 3cc6b83..7b258e0 100644 ---- a/src/qmlcontrols/kioplugin/CMakeLists.txt -+++ b/src/qmlcontrols/kioplugin/CMakeLists.txt -@@ -5,7 +5,7 @@ set(kioplugin_SRCS - krunproxy.cpp - ) - --add_library(kio MODULE ${kioplugin_SRCS}) -+add_library(kio SHARED ${kioplugin_SRCS}) - target_link_libraries(kio - Qt5::Core - Qt5::Qml -diff --git a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt -index 4e7f192..da355c1 100644 ---- a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt -+++ b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt -@@ -6,7 +6,7 @@ set(kquickcontrolsprivate_SRCS - translationcontext.cpp - ) - --add_library(kquickcontrolsprivateplugin MODULE ${kquickcontrolsprivate_SRCS}) -+add_library(kquickcontrolsprivateplugin SHARED ${kquickcontrolsprivate_SRCS}) - - target_link_libraries(kquickcontrolsprivateplugin - Qt5::Core -diff --git a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt -index b0b48b9..5b711e1 100644 ---- a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt -+++ b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt -@@ -19,7 +19,7 @@ if (NOT WIN32) - include_directories(${epoxy_INCLUDE_DIR}) - endif() - --add_library(kquickcontrolsaddonsplugin MODULE ${kquickcontrolsaddons_SRCS}) -+add_library(kquickcontrolsaddonsplugin SHARED ${kquickcontrolsaddons_SRCS}) - - target_link_libraries(kquickcontrolsaddonsplugin - Qt5::Core diff --git a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild index 7d47457..d73585b 100644 --- a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild +++ b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild @@ -30,5 +30,3 @@ DEPEND=" media-libs/libepoxy " RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-5.14.0-revert-plasma-breakage.patch" )