Source Mage code commit list

[Bor Kraljič <scm AT sourcemage.org>]

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

 science/viking/DETAILS          |    4 ++--
 science/viking/HISTORY          |    4 ++++
 science/viking/PRE_BUILD        |    2 --
 science/viking/curl_types.patch |   24 ------------------------
 4 files changed, 6 insertions(+), 28 deletions(-)

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

    viking: updated spell to 1.2.2

diff --git a/science/viking/DETAILS b/science/viking/DETAILS
index ef043aa..171d61f 100755
--- a/science/viking/DETAILS
+++ b/science/viking/DETAILS
@@ -1,6 +1,6 @@
            SPELL=viking
-         VERSION=1.2.1
-     
SOURCE_HASH=sha512:53c6f55e21e9ebf1ff4720aa547eb01ec7b42335568bd01055dc455f0fd3b4d811eaa48ffab84351703fa3501846dfa408ef18ec67e10889098a6286fa6c26f7
+         VERSION=1.2.2
+     
SOURCE_HASH=sha512:50bb2d253cae6f58227c679cafe5747766475962290b14afa6c9604dfe7c358e80275fd0fc5455211331399a91ef4f763ff672277db0d23b9293bff759c19061
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/science/viking/HISTORY b/science/viking/HISTORY
index 79c4c3f..900cd07 100644
--- a/science/viking/HISTORY
+++ b/science/viking/HISTORY
@@ -1,3 +1,7 @@
+2011-11-08 Bor Kraljič <pyrobor AT ver.si>
+       * DETAILS: updated spell to 1.2.2
+       * PRE_BUILD,curl_types.patch: removed, no longer needed
+
 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
diff --git a/science/viking/PRE_BUILD b/science/viking/PRE_BUILD
deleted file mode 100755
index 1273ebd..0000000
--- a/science/viking/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 803e12d..0000000
--- a/science/viking/curl_types.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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