Skip to Content.
Sympa Menu

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

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č (2317a69982f507d4a9b13f6a9d9c2eea0cae1dd4)
  • Date: Thu, 15 Sep 2011 03:47:30 -0500

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

science/viking/HISTORY | 4 ++++
science/viking/PRE_BUILD | 2 ++
science/viking/curl_types.patch | 24 ++++++++++++++++++++++++
3 files changed, 30 insertions(+)

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

viking: added upstream patch so it builds after curl update

upstream bug:

http://sourceforge.net/tracker/?func=detail&aid=3376584&group_id=83870&atid=570954

upstream commit:

http://viking.git.sourceforge.net/git/gitweb.cgi?p=viking/viking;a=commit;h=f715a77fbdc11aafff35f066380b34a99401a698

diff --git a/science/viking/HISTORY b/science/viking/HISTORY
index 43a30f2..79c4c3f 100644
--- a/science/viking/HISTORY
+++ b/science/viking/HISTORY
@@ -1,3 +1,7 @@
+2011-09-15 Bor Kraljič <pyrobor AT ver.si>
+ * curl_types.patch: fixes build after curl update (upstream patch)
+ * PRE_BUILD: apply the patch for curl/types.h
+
2011-06-17 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.2.1

diff --git a/science/viking/PRE_BUILD b/science/viking/PRE_BUILD
new file mode 100755
index 0000000..1273ebd
--- /dev/null
+++ b/science/viking/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/curl_types.patch
diff --git a/science/viking/curl_types.patch b/science/viking/curl_types.patch
new file mode 100644
index 0000000..803e12d
--- /dev/null
+++ b/science/viking/curl_types.patch
@@ -0,0 +1,24 @@
+From f715a77fbdc11aafff35f066380b34a99401a698 Mon Sep 17 00:00:00 2001
+From: Hanno Boeck <ctulhu AT users.sourceforge.net>
+Date: Mon, 25 Jul 2011 19:39:59 +0100
+Subject: [PATCH] Fix compilation with curl 7.21.7 (SF#3376584)
+
+Remove include of curl/types.h, which has been deprecated for a long time.
+---
+ src/osm-traces.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/osm-traces.c b/src/osm-traces.c
+index 6ef5bb5..f5088ce 100644
+--- a/src/osm-traces.c
++++ b/src/osm-traces.c
+@@ -27,7 +27,6 @@
+ #include <errno.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <glib.h>
+--
+1.7.4.1



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (2317a69982f507d4a9b13f6a9d9c2eea0cae1dd4), Bor Kraljič, 09/15/2011

Archive powered by MHonArc 2.6.24.

Top of Page