Attachment 908317 Details for Bug 1107056 – Patch for rawhide

[patch] Patch for rawhide

kpilot-Fix-FTBFS-with-recent-kdelibs-qt-1107056.patch (text/plain), 2.22 KB, created by Yaakov Selkowitz on 2014-06-12 22:03:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-12 22:03:57 UTC

Size: 2.22 KB

patch

obsolete

>From d1635c2219c4a92edef62227fdc07881cac31556 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Thu, 12 Jun 2014 16:58:58 -0500
>Subject: [PATCH] Fix FTBFS with recent kdelibs/qt (#1107056)
>
>---
> kdepim-4.3.4-qtcore-includes.patch | 10 ++++++++++
> kpilot.spec                        |  7 ++++++-
> 2 files changed, 16 insertions(+), 1 deletion(-)
> create mode 100644 kdepim-4.3.4-qtcore-includes.patch
>
>diff --git a/kdepim-4.3.4-qtcore-includes.patch b/kdepim-4.3.4-qtcore-includes.patch
>new file mode 100644
>index 0000000..8b0c444
>--- /dev/null
>+++ b/kdepim-4.3.4-qtcore-includes.patch
>@@ -0,0 +1,10 @@
>+--- a/kpilot/CMakeLists.txt
>++++ b/kpilot/CMakeLists.txt
>+@@ -50,6 +50,7 @@ include_directories(
>+     ${CMAKE_CURRENT_BINARY_DIR}
>+     ${QT_INCLUDE_DIR}
>+     ${QT_QTDBUS_INCLUDE_DIR}
>++    ${QT_QTCORE_INCLUDE_DIR}
>+     ${KDE4_INCLUDE_DIR}
>+ )
>+ 
>diff --git a/kpilot.spec b/kpilot.spec
>index 25169ba..a562656 100644
>--- a/kpilot.spec
>+++ b/kpilot.spec
>@@ -1,7 +1,7 @@
> Name:    kpilot
> Summary: Sync PIM data with PalmOS devices
> Version: 5.3.0
>-Release: 12%{?dist}
>+Release: 13%{?dist}
> 
> # no pilot-link on S/390
> ExcludeArch: s390 s390x
>@@ -14,6 +14,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/4.3.4/src/kdepim-4.3.4.tar.bz2
> # http://websvn.kde.org/branches/stable/l10n-kde4/*/messages/kdepim
> # http://websvn.kde.org/branches/stable/l10n-kde4/*/docs/kdepim
> Source1: kpilot-translations-20100115.tar.bz2
>+Patch0:  kdepim-4.3.4-qtcore-includes.patch
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires: kdelibs4-devel >= 4.3.4
>@@ -47,6 +48,7 @@ Group:   System Environment/Libraries
> 
> %prep
> %setup -q -n kdepim-4.3.4 -a 1
>+%patch0 -p1
> echo 'add_subdirectory(../doc/kpilot doc)' >>kpilot/CMakeLists.txt
> echo 'add_subdirectory(../kpilot-translations-20100115 l10n)' >>kpilot/CMakeLists.txt
> pushd kpilot-translations-20100115/doc
>@@ -143,6 +145,9 @@ rm -rf %{buildroot}
> 
> 
> %changelog
>+* Thu Jun 12 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 5.3.0-13
>+- Fix FTBFS with recent kdelibs/qt (#1107056)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-12
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1107056: 905951 | 905952 | 905953 | 908317