[arch-commits] Commit in qgit/repos (5 files)

[Jakob Gruber]

    Date: Tuesday, February 19, 2013 @ 11:18:05
  Author: schuay
Revision: 84497

archrelease: copy trunk to community-staging-x86_64

Added:
  qgit/repos/community-staging-x86_64/
  qgit/repos/community-staging-x86_64/0001-Cause-qgit-to-use-git-config-everywhere.patch
    (from rev 84496, qgit/trunk/0001-Cause-qgit-to-use-git-config-everywhere.patch)
  qgit/repos/community-staging-x86_64/PKGBUILD
    (from rev 84496, qgit/trunk/PKGBUILD)
  qgit/repos/community-staging-x86_64/qgit.desktop
    (from rev 84496, qgit/trunk/qgit.desktop)
  qgit/repos/community-staging-x86_64/qgit.png
    (from rev 84496, qgit/trunk/qgit.png)

----------------------------------------------------+
 0001-Cause-qgit-to-use-git-config-everywhere.patch |   39 +++++++++++++++++++
 PKGBUILD                                           |   36 +++++++++++++++++
 qgit.desktop                                       |   11 +++++
 3 files changed, 86 insertions(+)

Copied: qgit/repos/community-staging-x86_64/0001-Cause-qgit-to-use-git-config-everywhere.patch (from rev 84496, qgit/trunk/0001-Cause-qgit-to-use-git-config-everywhere.patch)
===================================================================
--- community-staging-x86_64/0001-Cause-qgit-to-use-git-config-everywhere.patch	                        (rev 0)
+++ community-staging-x86_64/0001-Cause-qgit-to-use-git-config-everywhere.patch	2013-02-19 10:18:05 UTC (rev 84497)
@@ -0,0 +1,39 @@
+From 50b7344bc2cc941a43b3adfaebdc96dd1935e747 Mon Sep 17 00:00:00 2001
+From: Jonathan Ross Rogers <jrogers at 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 at 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
+

Copied: qgit/repos/community-staging-x86_64/PKGBUILD (from rev 84496, qgit/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2013-02-19 10:18:05 UTC (rev 84497)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+
+pkgname=qgit
+pkgver=2.3
+pkgrel=4
+pkgdesc="A GIT GUI viewer built on Qt/C++"
+url="http://digilander.libero.it/mcostalba/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('qt4' 'git')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'qgit.desktop' 'qgit.png'
+		'0001-Cause-qgit-to-use-git-config-everywhere.patch')
+md5sums=('1f6cd60cc1b92973718b108d542e3270'
+         'ecb8b35e17163a7ec6893ffa71445c40'
+         '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
+}
+
+package() {
+  cd ${srcdir}/${pkgname}
+  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
+}

Copied: qgit/repos/community-staging-x86_64/qgit.desktop (from rev 84496, qgit/trunk/qgit.desktop)
===================================================================
--- community-staging-x86_64/qgit.desktop	                        (rev 0)
+++ community-staging-x86_64/qgit.desktop	2013-02-19 10:18:05 UTC (rev 84497)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Categories=Development;RevisionControl;
+Name=QGit
+Comment=A GIT GUI viewer built on Qt/C++
+Icon=qgit.png
+Exec=/usr/bin/qgit
+URL=http://digilander.libero.it/mcostalba/
+StartupNotify=true
+Terminal=false
+Type=Application

Copied: qgit/repos/community-staging-x86_64/qgit.png (from rev 84496, qgit/trunk/qgit.png)
===================================================================
(Binary files differ)