Hrvoje Senjan 2014-07-04 01:18:45 +00:00 committed by Git OBS Bridge
parent 44acf3c770
commit c797d5d5ea
3 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From f900d7d4798503479b88346a2689ec6bee417193 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Wed, 2 Jul 2014 09:32:23 +0200
Subject: [PATCH 1/1] Pass trailing slash to searched backend/helper plugin dir
Unbreaks plugin loading
CCMAIL: aleixpol@kde.org
---
src/BackendsManager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/BackendsManager.cpp b/src/BackendsManager.cpp
index cd0bf3f..0dd4661 100644
--- a/src/BackendsManager.cpp
+++ b/src/BackendsManager.cpp
@@ -44,7 +44,7 @@ QList< QObject * > BackendsManager::retrieveInstancesIn(const QString &subdir)
{
QList<QObject *> retlist;
foreach (const QString& pPath, QCoreApplication::libraryPaths()) {
- QDir pluginPath(pPath + subdir);
+ QDir pluginPath(pPath + QLatin1Char('/') + subdir);
if (!pluginPath.exists() || pPath.isEmpty()) {
continue;
}
--
2.0.0

View File

@ -7,6 +7,8 @@ Tue Jul 1 21:36:06 UTC 2014 - hrvoje.senjan@gmail.com
* Buildsystem fixes
* For more details please see:
http://www.kde.org/announcements/announce-frameworks5-5.0.0.php
- Added 0001-Pass-trailing-slash-to-searched-backend-helper-plugi.patch,
fixes helper/backend plugin loading
-------------------------------------------------------------------
Wed Jun 11 22:24:49 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -37,6 +37,8 @@ Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{v
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM polkit-qt5-support.patch -- add support for polkit-qt-1 Qt5 port, https://git.reviewboard.kde.org/r/118264/
Patch0: polkit-qt5-support.patch
# PATCH-FIX-UPSTREAM 0001-Pass-trailing-slash-to-searched-backend-helper-plugi.patch
Patch1: 0001-Pass-trailing-slash-to-searched-backend-helper-plugi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -66,6 +68,7 @@ Development files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir}