[CutyCapt] Fix QPrinter FTBFS
Jamie Nguyen
jamielinux at fedoraproject.org
Wed Oct 22 22:24:25 UTC 2014
commit 9110cbe48a71c4608d7864d4eec36d7bedabc4ac
Author: Jamie Nguyen <j at jamielinux.com>
Date: Wed Oct 22 23:24:19 2014 +0100
Fix QPrinter FTBFS
CutyCapt-0.4.20130714svn-Fix-QPrinter-FTBFS.patch | 38 +++++++++++++++++++++
CutyCapt.spec | 11 +++++-
2 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/CutyCapt-0.4.20130714svn-Fix-QPrinter-FTBFS.patch b/CutyCapt-0.4.20130714svn-Fix-QPrinter-FTBFS.patch
new file mode 100644
index 0000000..e5fef7a
--- /dev/null
+++ b/CutyCapt-0.4.20130714svn-Fix-QPrinter-FTBFS.patch
@@ -0,0 +1,38 @@
+From 4e33e6dc91cb307100907e1a388d8f539ce93b5d Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j at jamielinux.com>
+Date: Wed, 22 Oct 2014 23:14:32 +0100
+Subject: [PATCH] Fix QPrinter FTBFS
+
+---
+ CutyCapt.cpp | 3 ---
+ CutyCapt.pro | 2 +-
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/CutyCapt.cpp b/CutyCapt.cpp
+index 066def7..7773015 100644
+--- a/CutyCapt.cpp
++++ b/CutyCapt.cpp
+@@ -27,10 +27,7 @@
+ #include <QtWebKit>
+ #include <QtGui>
+ #include <QSvgGenerator>
+-
+-#if QT_VERSION < 0x050000
+ #include <QPrinter>
+-#endif
+
+ #include <QTimer>
+ #include <QByteArray>
+diff --git a/CutyCapt.pro b/CutyCapt.pro
+index 10dda79..049293e 100644
+--- a/CutyCapt.pro
++++ b/CutyCapt.pro
+@@ -1,4 +1,4 @@
+-QT += webkit svg network
++QT += webkit svg network printsupport
+ SOURCES = CutyCapt.cpp
+ HEADERS = CutyCapt.hpp
+ CONFIG += qt console
+--
+1.9.3
+
diff --git a/CutyCapt.spec b/CutyCapt.spec
index 806f76c..fc466e4 100644
--- a/CutyCapt.spec
+++ b/CutyCapt.spec
@@ -3,7 +3,7 @@
Name: CutyCapt
Version: 0
-Release: 0.4.%{checkout}%{?dist}
+Release: 0.5.%{checkout}%{?dist}
Summary: A small command-line utility to capture WebKit's rendering of a web page
License: GPLv2+ and LGPLv2+
@@ -17,6 +17,9 @@ Source0: cutycapt-%{date}.tar.xz
Source1: COPYING
Source2: COPYING.lesser
+# Fix QPrinter FTBFS
+Patch0: %{name}-0.4.20130714svn-Fix-QPrinter-FTBFS.patch
+
BuildRequires: qt5-qtwebkit-devel
BuildRequires: qt5-qtsvg-devel
@@ -28,13 +31,14 @@ including SVG, PDF, PS, PNG, JPEG, TIFF, GIF, and BMP.
%prep
%setup -q -n CutyCapt
+%patch0 -p1
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
%build
%{_qt5_qmake}
-make %{?_smp_mflags}
+make %{?_smp_mflags}
%install
@@ -48,6 +52,9 @@ install -p -m0755 CutyCapt %{buildroot}%{_bindir}/CutyCapt
%changelog
+* Wed Oct 22 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0-0.5.20130714svn
+- fix QPrinter FBTFS
+
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.4.20130714svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list