Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (29dadc484b0252c769d5d095eee1ffd3dd1aa6b3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (29dadc484b0252c769d5d095eee1ffd3dd1aa6b3)
  • Date: Tue, 14 Jun 2011 00:33:35 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

devel/qgit4/0001-Cause-qgit-to-use-git-config-everywhere.patch | 39
++++++++++
devel/qgit4/HISTORY | 4 +
devel/qgit4/PRE_BUILD | 3
science/mathomatic/DETAILS | 4 -
science/mathomatic/HISTORY | 3
5 files changed, 50 insertions(+), 3 deletions(-)

New commits:
commit 29dadc484b0252c769d5d095eee1ffd3dd1aa6b3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

mathomatic: updated spell to 15.6.2

commit 8b82ce19c24de54a86dde659fb3a42e5e8ae7008
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

qgit4: added patch that replaces obsolete command "repo-config"

diff --git a/devel/qgit4/0001-Cause-qgit-to-use-git-config-everywhere.patch
b/devel/qgit4/0001-Cause-qgit-to-use-git-config-everywhere.patch
new file mode 100644
index 0000000..a0c7e6c
--- /dev/null
+++ b/devel/qgit4/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 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
+
diff --git a/devel/qgit4/HISTORY b/devel/qgit4/HISTORY
index 0eec8ad..d5f83f6 100644
--- a/devel/qgit4/HISTORY
+++ b/devel/qgit4/HISTORY
@@ -1,3 +1,7 @@
+2011-06-14 Bor Kraljič <pyrobor AT ver.si>
+ * 0001-Cause-qgit-to-use-git-config-everywhere.patch: replaces
obsolete
+ command "repo-config"
+
2009-10-19 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.3

diff --git a/devel/qgit4/PRE_BUILD b/devel/qgit4/PRE_BUILD
index 669a965..e2098f2 100755
--- a/devel/qgit4/PRE_BUILD
+++ b/devel/qgit4/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build
cd $SOURCE_DIRECTORY &&
# fix install location
-sed -i "s|~|${INSTALL_ROOT}/usr|" src/src.pro
+sed -i "s|~|${INSTALL_ROOT}/usr|" src/src.pro &&
+patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/0001-Cause-qgit-to-use-git-config-everywhere.patch
diff --git a/science/mathomatic/DETAILS b/science/mathomatic/DETAILS
index d849ea6..4bed9a3 100755
--- a/science/mathomatic/DETAILS
+++ b/science/mathomatic/DETAILS
@@ -1,9 +1,9 @@
SPELL=mathomatic
- VERSION=15.5.2
+ VERSION=15.6.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://mathomatic.org/$SOURCE
-
SOURCE_HASH=sha512:467ab88be12464368d02f28a6c1621e53d1d09c1b91c5353dec0bbf1946498803568b52f04183ac1504f3a8f3786d0ceeb9399a388bc777c1e8cf1ee6ab7352e
+
SOURCE_HASH=sha512:77cc47c5720fdbc69fcc3811ea6ad6f0ad8d8998dd1c7a89a627025db9203afbdbfb8bf46560056644efc07fe494a0e3fd5187e9ce0055a18ec9978b7c790a00
WEB_SITE=http://mathomatic.orgserve.de/math/
ENTERED=20041204
LICENSE[0]=LGPL
diff --git a/science/mathomatic/HISTORY b/science/mathomatic/HISTORY
index 2ae1575..7e55a57 100644
--- a/science/mathomatic/HISTORY
+++ b/science/mathomatic/HISTORY
@@ -1,3 +1,6 @@
+2011-06-14 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 15.6.2
+
2011-04-11 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 15.5.2




  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (29dadc484b0252c769d5d095eee1ffd3dd1aa6b3), Bor Kraljič, 06/14/2011

Archive powered by MHonArc 2.6.24.

Top of Page