Merge branch 'master' into f21
This commit is contained in:
commit
e32574a0f8
Binary file not shown.
13
qpdfview-0.4.13-arm.patch
Normal file
13
qpdfview-0.4.13-arm.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
--- sources/documentview.cpp.orig 2014-11-19 12:59:30.017166782 +0300
|
||||||
|
+++ sources/documentview.cpp 2014-11-19 13:48:55.115179111 +0300
|
||||||
|
@@ -786,8 +786,8 @@
|
||||||
|
|
||||||
|
// Fetch at most half of a line as centered on the given rectangle as possible.
|
||||||
|
const qreal pageWidth = m_pages.at(page - 1)->size().width();
|
||||||
|
- const qreal width = qMax(rect.width(), pageWidth / 2.0);
|
||||||
|
- const qreal x = qBound(0.0, rect.x() + rect.width() / 2.0 - width / 2.0, pageWidth - width);
|
||||||
|
+ const qreal width = qMax(rect.width(), pageWidth / 2.0f);
|
||||||
|
+ const qreal x = qBound(qreal(0.0), rect.x() + rect.width() / 2.0f - width / 2.0f, pageWidth - width);
|
||||||
|
|
||||||
|
const QRectF surroundingRect(x, rect.top(), width, rect.height());
|
||||||
|
|
BIN
qpdfview-0.4.13.tar.gz
Normal file
BIN
qpdfview-0.4.13.tar.gz
Normal file
Binary file not shown.
@ -1,10 +1,11 @@
|
|||||||
Name: qpdfview
|
Name: qpdfview
|
||||||
Version: 0.4.12
|
Version: 0.4.13
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Summary: Tabbed PDF Viewer
|
Summary: Tabbed PDF Viewer
|
||||||
Url: https://launchpad.net/qpdfview
|
Url: https://launchpad.net/qpdfview
|
||||||
Source0: https://launchpad.net/qpdfview/trunk/0.4.5/+download/%{name}-%{version}.tar.gz
|
Source0: https://launchpad.net/qpdfview/trunk/%{version}/+download/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: %{name}-%{version}-arm.patch
|
||||||
BuildRequires: desktop-file-utils file-devel cups-devel hicolor-icon-theme pkgconfig(poppler-qt4) pkgconfig(libspectre) pkgconfig(QtGui) pkgconfig(QtDBus) pkgconfig(zlib)
|
BuildRequires: desktop-file-utils file-devel cups-devel hicolor-icon-theme pkgconfig(poppler-qt4) pkgconfig(libspectre) pkgconfig(QtGui) pkgconfig(QtDBus) pkgconfig(zlib)
|
||||||
%if 0%{?centos_version}
|
%if 0%{?centos_version}
|
||||||
Requires: qt-sqlite
|
Requires: qt-sqlite
|
||||||
@ -17,8 +18,11 @@ qpdfview is a tabbed PDF viewer.
|
|||||||
It uses the Poppler library for rendering and CUPS for printing.
|
It uses the Poppler library for rendering and CUPS for printing.
|
||||||
It provides a clear and simple graphical user interface using the Qt framework.
|
It provides a clear and simple graphical user interface using the Qt framework.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup0 -q
|
||||||
|
%patch0 -p 0
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
lrelease-qt4 qpdfview.pro
|
lrelease-qt4 qpdfview.pro
|
||||||
@ -34,6 +38,7 @@ qmake-qt4 \
|
|||||||
qpdfview.pro
|
qpdfview.pro
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make INSTALL_ROOT=%{buildroot} install
|
make INSTALL_ROOT=%{buildroot} install
|
||||||
install -Dm 0644 icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
install -Dm 0644 icons/%{name}.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||||
@ -42,10 +47,13 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
|
|||||||
# unknown language
|
# unknown language
|
||||||
rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
|
rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%doc CHANGES CONTRIBUTORS COPYING README TODO
|
%doc CHANGES CONTRIBUTORS COPYING README TODO
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
@ -59,6 +67,9 @@ rm -f %{buildroot}/%{_datadir}/%{name}/%{name}_ast.qm
|
|||||||
%{_mandir}/man?/*
|
%{_mandir}/man?/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 18 2014 TI_Eugene <ti.eugene@gmail.com> 0.4.13-1
|
||||||
|
- Version bump
|
||||||
|
|
||||||
* Mon Oct 06 2014 TI_Eugene <ti.eugene@gmail.com> 0.4.12-1
|
* Mon Oct 06 2014 TI_Eugene <ti.eugene@gmail.com> 0.4.12-1
|
||||||
- Version bump
|
- Version bump
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user