| 1 |
commit: f18b894051766d5e3ebe8e0d834b86f84354dd58 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 27 08:22:20 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 27 08:22:20 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f18b8940 |
| 7 |
|
| 8 |
kde-frameworks/kdeclarative: Drop revert patch |
| 9 |
|
| 10 |
Upstream came to the same conclusion ;) |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
...declarative-5.14.0-revert-plasma-breakage.patch | 73 ---------------------- |
| 15 |
.../kdeclarative/kdeclarative-9999.ebuild | 2 - |
| 16 |
2 files changed, 75 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index f5c984b..0000000 |
| 21 |
--- a/kde-frameworks/kdeclarative/files/kdeclarative-5.14.0-revert-plasma-breakage.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,73 +0,0 @@ |
| 24 |
-commit 8d629ddadfdf2d11c83d871f058f375c6dec9a75 |
| 25 |
-Author: Johannes Huber <johu@g.o> |
| 26 |
-Date: Wed Aug 26 11:32:06 2015 +0200 |
| 27 |
- |
| 28 |
- Revert "kdeclarative plugins should be built as a bundle plugin and not a shared library" |
| 29 |
- |
| 30 |
- This reverts commit 383aa77ebf0b08adca13ce67a90f61c9c6a65851. |
| 31 |
- |
| 32 |
-diff --git a/src/qmlcontrols/draganddrop/CMakeLists.txt b/src/qmlcontrols/draganddrop/CMakeLists.txt |
| 33 |
-index 10694bb..e8127e4 100644 |
| 34 |
---- a/src/qmlcontrols/draganddrop/CMakeLists.txt |
| 35 |
-+++ b/src/qmlcontrols/draganddrop/CMakeLists.txt |
| 36 |
-@@ -9,7 +9,7 @@ set(declarativedragdrop_SRCS |
| 37 |
- MimeDataWrapper.cpp |
| 38 |
- ) |
| 39 |
- |
| 40 |
--add_library(draganddropplugin MODULE ${declarativedragdrop_SRCS}) |
| 41 |
-+add_library(draganddropplugin SHARED ${declarativedragdrop_SRCS}) |
| 42 |
- target_link_libraries(draganddropplugin |
| 43 |
- Qt5::Core |
| 44 |
- Qt5::Quick |
| 45 |
-diff --git a/src/qmlcontrols/kcoreaddons/CMakeLists.txt b/src/qmlcontrols/kcoreaddons/CMakeLists.txt |
| 46 |
-index 585fb1f..3f77f2d 100644 |
| 47 |
---- a/src/qmlcontrols/kcoreaddons/CMakeLists.txt |
| 48 |
-+++ b/src/qmlcontrols/kcoreaddons/CMakeLists.txt |
| 49 |
-@@ -6,7 +6,7 @@ set(kcoreaddonsplugin_SRCS |
| 50 |
- kuserproxy.cpp |
| 51 |
- ) |
| 52 |
- |
| 53 |
--add_library(kcoreaddonsplugin MODULE ${kcoreaddonsplugin_SRCS}) |
| 54 |
-+add_library(kcoreaddonsplugin SHARED ${kcoreaddonsplugin_SRCS}) |
| 55 |
- target_link_libraries(kcoreaddonsplugin |
| 56 |
- Qt5::Core |
| 57 |
- Qt5::Quick |
| 58 |
-diff --git a/src/qmlcontrols/kioplugin/CMakeLists.txt b/src/qmlcontrols/kioplugin/CMakeLists.txt |
| 59 |
-index 3cc6b83..7b258e0 100644 |
| 60 |
---- a/src/qmlcontrols/kioplugin/CMakeLists.txt |
| 61 |
-+++ b/src/qmlcontrols/kioplugin/CMakeLists.txt |
| 62 |
-@@ -5,7 +5,7 @@ set(kioplugin_SRCS |
| 63 |
- krunproxy.cpp |
| 64 |
- ) |
| 65 |
- |
| 66 |
--add_library(kio MODULE ${kioplugin_SRCS}) |
| 67 |
-+add_library(kio SHARED ${kioplugin_SRCS}) |
| 68 |
- target_link_libraries(kio |
| 69 |
- Qt5::Core |
| 70 |
- Qt5::Qml |
| 71 |
-diff --git a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt |
| 72 |
-index 4e7f192..da355c1 100644 |
| 73 |
---- a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt |
| 74 |
-+++ b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt |
| 75 |
-@@ -6,7 +6,7 @@ set(kquickcontrolsprivate_SRCS |
| 76 |
- translationcontext.cpp |
| 77 |
- ) |
| 78 |
- |
| 79 |
--add_library(kquickcontrolsprivateplugin MODULE ${kquickcontrolsprivate_SRCS}) |
| 80 |
-+add_library(kquickcontrolsprivateplugin SHARED ${kquickcontrolsprivate_SRCS}) |
| 81 |
- |
| 82 |
- target_link_libraries(kquickcontrolsprivateplugin |
| 83 |
- Qt5::Core |
| 84 |
-diff --git a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt |
| 85 |
-index b0b48b9..5b711e1 100644 |
| 86 |
---- a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt |
| 87 |
-+++ b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt |
| 88 |
-@@ -19,7 +19,7 @@ if (NOT WIN32) |
| 89 |
- include_directories(${epoxy_INCLUDE_DIR}) |
| 90 |
- endif() |
| 91 |
- |
| 92 |
--add_library(kquickcontrolsaddonsplugin MODULE ${kquickcontrolsaddons_SRCS}) |
| 93 |
-+add_library(kquickcontrolsaddonsplugin SHARED ${kquickcontrolsaddons_SRCS}) |
| 94 |
- |
| 95 |
- target_link_libraries(kquickcontrolsaddonsplugin |
| 96 |
- Qt5::Core |
| 97 |
|
| 98 |
diff --git a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild |
| 99 |
index 7d47457..d73585b 100644 |
| 100 |
--- a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild |
| 101 |
+++ b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild |
| 102 |
@@ -30,5 +30,3 @@ DEPEND=" |
| 103 |
media-libs/libepoxy |
| 104 |
" |
| 105 |
RDEPEND="${DEPEND}" |
| 106 |
- |
| 107 |
-PATCHES=( "${FILESDIR}/${PN}-5.14.0-revert-plasma-breakage.patch" ) |
Archives