SF.net SVN: gar:[24498] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 24498
          http://sourceforge.net/p/gar/code/24498
Author:   bdwalton
Date:     2014-12-21 10:58:57 +0000 (Sun, 21 Dec 2014)
Log Message:
-----------
git/trunk: remove a patch that is now released in the upstream

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

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2014-12-21 10:50:37 UTC (rev 24497)
+++ csw/mgar/pkg/git/trunk/Makefile	2014-12-21 10:58:57 UTC (rev 24498)
@@ -98,8 +98,6 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
-# TODO(bdwalton) Remove this post 2.1.1
-PATCHFILES += 0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
 
 PATCHFILES += 0006-Do-not-make-trace.c-getnanotime-and-inlined-function.patch
 PATCHFILES += 0007-Fix-a-hashbang-issue-in-the-test-suite.patch

Deleted: csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch	2014-12-21 10:50:37 UTC (rev 24497)
+++ csw/mgar/pkg/git/trunk/files/0005-Backport-a-fix-for-trace_strbuf-from-origin-next.patch	2014-12-21 10:58:57 UTC (rev 24498)
@@ -1,26 +0,0 @@
-From b5283517ab288ed1efee604e646894b08e995eae Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 27 Sep 2014 12:01:20 +0100
-Subject: [PATCH] Backport a fix for trace_strbuf from origin/next.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- trace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trace.c b/trace.c
-index e583dc6..17015fd 100644
---- a/trace.c
-+++ b/trace.c
-@@ -216,7 +216,7 @@ void trace_argv_printf(const char **argv, const char *format, ...)
- 	va_end(ap);
- }
- 
--void trace_strbuf(const char *key, const struct strbuf *data)
-+void trace_strbuf(struct trace_key *key, const struct strbuf *data)
- {
- 	trace_strbuf_fl(NULL, 0, key, data);
- }
--- 
-2.0.3
-

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