Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (09712c4a4e6184cd03b0d5476d77b2317eea9348)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (09712c4a4e6184cd03b0d5476d77b2317eea9348)
  • Date: Sat, 6 Jan 2007 04:04:21 -0600

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

devel/git/DETAILS | 1 +
devel/git/HISTORY | 5 +++++
devel/git/PRE_BUILD | 3 ++-
devel/git/curl_fix.patch | 10 ++++++++++
4 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 09712c4a4e6184cd03b0d5476d77b2317eea9348
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

git: Added upstream patch to make http pull work with curl 7.16.0

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 1ff1fce..0f37507 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -19,6 +19,7 @@ fi
WEB_SITE=http://git.or.cz/
KEYWORDS="scm devel"
ENTERED=20050506
+ PATCHLEVEL=1
SHORT="SCM used by the kernel developers"
DOCS="$DOCS Documentation"
cat << EOF
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index f9149e0..b8d74b5 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,8 @@
+2007-01-06 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added patch
+ * curl_fix.patch: Added upstream patch to work with curl 7.16.0
+
2006-12-20 Eric Sandall <eric AT sandall.us>
* DETAILS: Updated to 1.4.4.3

diff --git a/devel/git/PRE_BUILD b/devel/git/PRE_BUILD
index 688c117..d0a0516 100755
--- a/devel/git/PRE_BUILD
+++ b/devel/git/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
if [ $GIT_DOC != none ]; then
unpack_file 3
-fi
+fi &&
+patch -p0 < $SCRIPT_DIRECTORY/curl_fix.patch
diff --git a/devel/git/curl_fix.patch b/devel/git/curl_fix.patch
new file mode 100644
index 0000000..49de5b7
--- /dev/null
+++ b/devel/git/curl_fix.patch
@@ -0,0 +1,10 @@
+--- http.h
++++ http.h
+@@ -18,7 +18,7 @@
+ #define curl_global_init(a) do { /* nothing */ } while(0)
+ #endif
+
+-#if LIBCURL_VERSION_NUM < 0x070c04
++#if 1 || (LIBCURL_VERSION_NUM < 0x070c04)
+ #define NO_CURL_EASY_DUPHANDLE
+ #endif



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (09712c4a4e6184cd03b0d5476d77b2317eea9348), George Sherwood, 01/06/2007

Archive powered by MHonArc 2.6.24.

Top of Page