[csw-devel] SF.net SVN: gar:[16941] csw/mgar/pkg/git/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Tue Jan 31 02:44:14 CET 2012


Revision: 16941
          http://gar.svn.sourceforge.net/gar/?rev=16941&view=rev
Author:   bdwalton
Date:     2012-01-31 01:44:13 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
git/trunk: drop an old (merged) patch and create a new one (still needs cleanup before submission)

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile
    csw/mgar/pkg/git/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2012-01-31 01:09:31 UTC (rev 16940)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-01-31 01:44:13 UTC (rev 16941)
@@ -1,13 +1,13 @@
 NAME = git
-VERSION = 1.7.8.3
+VERSION = 1.7.9
 #PATCHLEVEL = rc1
 CATEGORIES = devel
 GARTYPE = v2
 
 VENDOR_URL = http://git-scm.org/
 
-NO_SVN_TESTS=YesPlease
-EXTRA_TEST_EXPORTS = NO_SVN_TESTS
+# NO_SVN_TESTS=YesPlease
+# EXTRA_TEST_EXPORTS = NO_SVN_TESTS
 
 # disable tests until next version bump (at the top so it stands out)
 # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
@@ -111,7 +111,7 @@
 # to the selection of available utf8 locales.
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch
-PATCHFILES += 0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
+PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2012-01-31 01:09:31 UTC (rev 16940)
+++ csw/mgar/pkg/git/trunk/checksums	2012-01-31 01:44:13 UTC (rev 16941)
@@ -1 +1 @@
-7a4bc5160166537d4da5eb48a7670dff  git-1.7.8.3.tar.gz
+d94314eb49622a945b22595b36b7fc47  git-1.7.9.tar.gz

Deleted: csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2012-01-31 01:09:31 UTC (rev 16940)
+++ csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2012-01-31 01:44:13 UTC (rev 16941)
@@ -1,43 +0,0 @@
-From df9fcdc3e9f415416b86ec572f0a248264483c06 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 31 Dec 2011 05:02:05 +0100
-Subject: [PATCH] Use perl instead of sed for t8006-blame-textconv test
-
-In test 'blame --textconv with local changes' of t8006-blame-textconv,
-using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional
-newline was added to the output from the 'helper' script.
-
-This was noted by sed with a message such as:
-sed: Missing newline at end of file zero.bin.
-
-Sed then exits with status 2 causing the helper script to also exit
-with status 2.
-
-In turn, this was triggering a fatal error from git blame:
-fatal: unable to read files to diff
-
-To work around this difference in sed behaviour, use perl -p instead
-of sed -e as it exits cleanly and does not insert the additional
-newline.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/t8006-blame-textconv.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
-index 4ee42f1..c3c22f7 100755
---- a/t/t8006-blame-textconv.sh
-+++ b/t/t8006-blame-textconv.sh
-@@ -10,7 +10,7 @@ find_blame() {
- cat >helper <<'EOF'
- #!/bin/sh
- grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; }
--sed 's/^bin: /converted: /' "$1"
-+perl -p -e 's/^bin: /converted: /' "$1"
- EOF
- chmod +x helper
- 
--- 
-1.7.8.2
-

Added: csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch	2012-01-31 01:44:13 UTC (rev 16941)
@@ -0,0 +1,26 @@
+From a62835b110e5111939d599108ee887c1ddf3e40f Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Tue, 31 Jan 2012 01:46:04 +0100
+Subject: [PATCH] on solaris, we need to use -lintl to allow the new i18n work
+ to build
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ Makefile |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a782409..3a2662e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -939,6 +939,7 @@ ifeq ($(uname_S),SunOS)
+ 	NO_REGEX = YesPlease
+ 	NO_FNMATCH_CASEFOLD = YesPlease
+ 	NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
++	EXTLIBS += -lintl
+ 	ifeq ($(uname_R),5.6)
+ 		SOCKLEN_T = int
+ 		NO_HSTRERROR = YesPlease
+-- 
+1.7.8.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list