From 734e3620ab864378070e27353fac7eff81f15ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 15 Sep 2016 00:11:20 +0200 Subject: [PATCH] sonnet: do not align extra plugin search path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...e-add-valid-extra-plugin-search-path.patch | 31 ------------------- ...002-make-build-of-hunspell-optional.patch} | 0 recipes-kde/kf5/tier1/sonnet/sonnet.bb | 2 -- recipes-kde/kf5/tier1/sonnet/sonnet.inc | 2 +- 4 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 recipes-kde/kf5/tier1/sonnet/files/0002-core-add-valid-extra-plugin-search-path.patch rename recipes-kde/kf5/tier1/sonnet/files/{0003-make-build-of-hunspell-optional.patch => 0002-make-build-of-hunspell-optional.patch} (100%) diff --git a/recipes-kde/kf5/tier1/sonnet/files/0002-core-add-valid-extra-plugin-search-path.patch b/recipes-kde/kf5/tier1/sonnet/files/0002-core-add-valid-extra-plugin-search-path.patch deleted file mode 100644 index ac62a48a..00000000 --- a/recipes-kde/kf5/tier1/sonnet/files/0002-core-add-valid-extra-plugin-search-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e08552046c304df50471e639780c8effdc5b593c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 9 Feb 2015 13:55:48 +0100 -Subject: [PATCH] core: add valid extra plugin search path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - src/core/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 476bf22..a8ec795 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -14,7 +14,7 @@ set(sonnetcore_SRCS - ) - - # Dear packagers, this is just used as an extra search paths for plugins. Don't get your panties in a twist. --add_definitions(-DINSTALLATION_PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_PLUGINDIR}") -+add_definitions(-DINSTALLATION_PLUGIN_PATH="${KDE_INSTALL_PLUGINDIR}") - - - add_library(KF5SonnetCore ${sonnetcore_SRCS}) --- -1.9.3 - diff --git a/recipes-kde/kf5/tier1/sonnet/files/0003-make-build-of-hunspell-optional.patch b/recipes-kde/kf5/tier1/sonnet/files/0002-make-build-of-hunspell-optional.patch similarity index 100% rename from recipes-kde/kf5/tier1/sonnet/files/0003-make-build-of-hunspell-optional.patch rename to recipes-kde/kf5/tier1/sonnet/files/0002-make-build-of-hunspell-optional.patch diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.bb b/recipes-kde/kf5/tier1/sonnet/sonnet.bb index 8a9aef86..f0bca3fa 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet.bb +++ b/recipes-kde/kf5/tier1/sonnet/sonnet.bb @@ -4,8 +4,6 @@ inherit cmake_lib DEPENDS += "${BPN}-native" -SRC_URI += "file://0002-core-add-valid-extra-plugin-search-path.patch" - do_configure_append() { # use native parsetrigrams sed -i 's:\./parsetrigrams:${STAGING_BINDIR_NATIVE}/parsetrigrams:' ${B}/data/CMakeFiles/trigrams_sonnet.dir/build.make diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.inc b/recipes-kde/kf5/tier1/sonnet/sonnet.inc index 5b5dd121..7882b687 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet.inc +++ b/recipes-kde/kf5/tier1/sonnet/sonnet.inc @@ -7,4 +7,4 @@ inherit kde-kf5 PV = "${KF5_VERSION}" SRC_URI[md5sum] = "1863877132650a61510ee37c894a43c5" SRC_URI[sha256sum] = "c3be349e3802dfa73e0ad719f60adf454a42fee30a2c7cb7dc76073d71124f90" -SRC_URI += "file://0003-make-build-of-hunspell-optional.patch" +SRC_URI += "file://0002-make-build-of-hunspell-optional.patch"