svn commit: r435291 - in head/devel/qgit: . files

[Tobias C. Berner]

Author: tcberner
Date: Thu Mar  2 18:12:37 2017
New Revision: 435291
URL: https://svnweb.freebsd.org/changeset/ports/435291

Log:
  Fix devel/qgit with newer git versions
  
  repo-config is no longer supported by any upstream-supported
  git version. Instead, use git config (which is implicitly
  git config --file, corresponding to the earlier config-in-repo).
  
  PR:		196745
  Submitted by:	Adriaan de Groot <groot at kde.org>, swills
  Reported by:	swills, groot at kde.org
  Reviewed by:	tcberner, rakuco
  Approved by:	rakuco (mentor)
  Differential Revision:	https://reviews.freebsd.org/D9861

Added:
  head/devel/qgit/files/
  head/devel/qgit/files/patch-src_git.cpp   (contents, props changed)
Modified:
  head/devel/qgit/Makefile

Modified: head/devel/qgit/Makefile
==============================================================================
--- head/devel/qgit/Makefile	Thu Mar  2 18:10:09 2017	(r435290)
+++ head/devel/qgit/Makefile	Thu Mar  2 18:12:37 2017	(r435291)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qgit
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
 PKGNAMESUFFIX=	-qt4

Added: head/devel/qgit/files/patch-src_git.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qgit/files/patch-src_git.cpp	Thu Mar  2 18:12:37 2017	(r435291)
@@ -0,0 +1,24 @@
+repo-config was aliased to config as of git 1.7 (2010)
+and was removed, it seems, in 1.8.5 (2012). None of those
+git versions are still supported upstream; switch to git config.
+
+--- src/git.cpp.orig	2009-03-12 17:14:31 UTC
++++ src/git.cpp
+@@ -425,7 +425,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) {
+@@ -435,7 +435,7 @@ QTextCodec* Git::getTextCodec(bool* isGi
+ 		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