[arch-commits] Commit in qgit/trunk (2 files)
Jakob Gruber
schuay at nymeria.archlinux.org
Sun Sep 29 11:30:50 UTC 2013
Date: Sunday, September 29, 2013 @ 13:30:50
Author: schuay
Revision: 97766
qgit-2.5-1
Modified:
qgit/trunk/PKGBUILD
Deleted:
qgit/trunk/0001-Cause-qgit-to-use-git-config-everywhere.patch
----------------------------------------------------+
0001-Cause-qgit-to-use-git-config-everywhere.patch | 39 -------------------
PKGBUILD | 27 +++++--------
2 files changed, 12 insertions(+), 54 deletions(-)
Deleted: 0001-Cause-qgit-to-use-git-config-everywhere.patch
===================================================================
--- 0001-Cause-qgit-to-use-git-config-everywhere.patch 2013-09-29 05:06:21 UTC (rev 97765)
+++ 0001-Cause-qgit-to-use-git-config-everywhere.patch 2013-09-29 11:30:50 UTC (rev 97766)
@@ -1,39 +0,0 @@
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-09-29 05:06:21 UTC (rev 97765)
+++ PKGBUILD 2013-09-29 11:30:50 UTC (rev 97766)
@@ -5,32 +5,29 @@
# Contributor: Dan McGee <dan at archlinux.org>
pkgname=qgit
-pkgver=2.3
-pkgrel=4
+pkgver=2.5
+pkgrel=1
pkgdesc="A GIT GUI viewer built on Qt/C++"
-url="http://digilander.libero.it/mcostalba/"
+url='http://libre.tibirna.org/projects/qgit/wiki/QGit'
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')
+source=("http://libre.tibirna.org/attachments/download/9/${pkgname}-${pkgver}.tar.gz"
+ 'qgit.desktop' 'qgit.png')
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
+ cd ${srcdir}/redivivus
+ qmake-qt4 qgit.pro
make
}
package() {
- cd ${srcdir}/${pkgname}
+ cd ${srcdir}/redivivus
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
}
+
+md5sums=('0e70fc4468b060ab042933497f6a6f3c'
+ 'ecb8b35e17163a7ec6893ffa71445c40'
+ '85138f44d577b03dfc738d3f27e04992')
More information about the arch-commits
mailing list