[qgit] fix line skew (#823176)

[Dan Horák]

commit 8e519afe5e21cdfc8bfe6dec2d16913d400dc5ab
Author: Dan Horák <dan at danny.cz>
Date:   Fri Sep 14 09:00:38 2012 +0200

    fix line skew (#823176)

 qgit-2.4-fix-line-skew.patch |   15 +++++++++++++++
 qgit.spec                    |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/qgit-2.4-fix-line-skew.patch b/qgit-2.4-fix-line-skew.patch
new file mode 100644
index 0000000..29c3319
--- /dev/null
+++ b/qgit-2.4-fix-line-skew.patch
@@ -0,0 +1,15 @@
+This fixes line number skew in the file view.
+
+Signed-off-by: Valentine Barshak <gvaxon at gmail.com>
+
+--- a/src/filecontent.cpp	2012-09-14 00:30:24.493958334 +0400
++++ b/src/filecontent.cpp	2011-11-23 09:07:44.000000000 +0400
+@@ -587,7 +587,7 @@ void FileContent::setAnnList() {
+ 		for (int i = 0; i < linesNum; i++) {
+                         qreal bottom = layout->blockBoundingRect(block).bottom();
+ 			QListWidgetItem* item = listWidgetAnn->item(i);
+-                        item->setSizeHint(QSize(0, static_cast<int>(bottom - previousBottom)+1));
++                        item->setSizeHint(QSize(0, static_cast<int>(bottom - previousBottom)));
+ 			item->setTextAlignment(Qt::AlignVCenter);  // Move down a pixel or so.
+ 
+ 			previousBottom = bottom;
diff --git a/qgit.spec b/qgit.spec
index d4f12ff..d0c4390 100644
--- a/qgit.spec
+++ b/qgit.spec
@@ -1,6 +1,6 @@
 Name:           qgit
 Version:        2.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GUI browser for git repositories
 
 Group:          Development/Tools
@@ -10,6 +10,8 @@ Source0:        http://libre.tibirna.org/attachments/download/1/%{name}-%{versio
 Source1:        %{name}.desktop
 Source2:        %{name}48d.png
 Patch0:         %{name}-2.4-qmake.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=823176
+Patch1:         %{name}-2.4-fix-line-skew.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt4-devel 
@@ -22,6 +24,7 @@ and changed files, graphically following different development branches.
 %prep
 %setup -q
 %patch0 -p1 -b .qmake
+%patch1 -p1 -b .line-skew
 
 
 %build
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 14 2012 Dan Horák <dan[at]danny.cz> - 2.4-4
+- fix line skew (#823176)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild