Tue Jun 14 22:59:43 UTC 2011

2 files changed, 53 insertions, 10 deletions

diff --git a/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch b/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch
new file mode 100644
index 000000000..a0c7e6c4d
--- /dev/null
+++ b/community/qgit/0001-Cause-qgit-to-use-git-config-everywhere.patch
@@ -0,0 +1,39 @@
+From 50b7344bc2cc941a43b3adfaebdc96dd1935e747 Mon Sep 17 00:00:00 2001
+From: Jonathan Ross Rogers <jrogers@socialserve.com>
+Date: Mon, 9 May 2011 18:16:29 -0400
+Subject: [PATCH] Cause qgit to use "git config" everywhere.
+
+Whenever starting up qgit, it pops up a dialog showing that git
+complained about the obsolete command "repo-config". This patch
+replaces remaining calls to "git repo-config" with "git config".
+
+Signed-off-by: Jonathan Ross Rogers <jrogers@socialserve.com>
+---
+ src/git.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/git.cpp b/src/git.cpp
+index 50e6dd3..8e9365c 100644
+--- a/src/git.cpp
++++ b/src/git.cpp
+@@ -427,7 +427,7 @@ void Git::setTextCodec(QTextCodec* tc) {
+ 	if (name == "Big5-HKSCS")
+ 		name = "Big5";
+ 
+-	run("git repo-config i18n.commitencoding " + name);
++	run("git config i18n.commitencoding " + name);
+ }
+ 
+ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
+@@ -437,7 +437,7 @@ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
+ 		return NULL;
+ 
+ 	QString runOutput;
+-	if (!run("git repo-config --get i18n.commitencoding", &runOutput))
++	if (!run("git config --get i18n.commitencoding", &runOutput))
+ 		return NULL;
+ 
+ 	if (runOutput.isEmpty()) // git docs says default is utf-8
+-- 
+1.7.5
+
diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD
index f06f20937..696f3c03b 100644
--- a/community/qgit/PKGBUILD
+++ b/community/qgit/PKGBUILD
@@ -1,32 +1,36 @@
-# $Id: PKGBUILD 78123 2010-04-19 12:09:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 49264 2011-06-13 14:58:16Z schuay $
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
 pkgname=qgit
 pkgver=2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A GIT GUI viewer built on Qt/C++"
 url="http://digilander.libero.it/mcostalba/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('qt' 'git')
-options=(!makeflags !ccache) #makepkg3 options, ccache is a no-go
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'qgit.desktop' 'qgit.png')
+        'qgit.desktop' 'qgit.png'
+		'0001-Cause-qgit-to-use-git-config-everywhere.patch')
 md5sums=('1f6cd60cc1b92973718b108d542e3270'
          'ecb8b35e17163a7ec6893ffa71445c40'
-         '85138f44d577b03dfc738d3f27e04992')
+         '85138f44d577b03dfc738d3f27e04992'
+		 '8b8eda62d6f4d04ed57f87d4dbda9fa9')
 
 build() {
   cd ${srcdir}/${pkgname}
+  # patch taken from http://sourceforge.net/tracker/?func=detail&aid=3299672&group_id=139897&atid=744829
+  patch -Np1 < ${srcdir}/0001-Cause-qgit-to-use-git-config-everywhere.patch
   qmake qgit.pro
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}
-  install -Dm755 bin/qgit ${pkgdir}/usr/bin/qgit || return 1
-  install -Dm644 ${srcdir}/qgit.desktop ${pkgdir}/usr/share/applications/qgit.desktop || return 1
-  install -Dm644 ${srcdir}/qgit.png ${pkgdir}/usr/share/pixmaps/qgit.png || return 1
+  install -Dm755 bin/qgit ${pkgdir}/usr/bin/qgit
+  install -Dm644 ${srcdir}/qgit.desktop ${pkgdir}/usr/share/applications/qgit.desktop
+  install -Dm644 ${srcdir}/qgit.png ${pkgdir}/usr/share/pixmaps/qgit.png
 }