D9861.id25908.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9861.id25908.diff
View Options

	Index: head/devel/qgit/Makefile
	===================================================================
	--- head/devel/qgit/Makefile
	+++ head/devel/qgit/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= qgit
	PORTVERSION= 2.3
	-PORTREVISION= 1
	+PORTREVISION= 2
	CATEGORIES= devel
	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
	PKGNAMESUFFIX= -qt4
	Index: head/devel/qgit/files/patch-src_git.cpp
	===================================================================
	--- head/devel/qgit/files/patch-src_git.cpp
	+++ head/devel/qgit/files/patch-src_git.cpp
	@@ -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