Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9a6dd6c592081dd166a2ae54232ff31caffc17b5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9a6dd6c592081dd166a2ae54232ff31caffc17b5)
  • Date: Wed, 5 Jul 2006 06:43:50 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

dev/null |binary
libs/pcre/DETAILS | 6 ++----
libs/pcre/HISTORY | 5 +++++
libs/pcre/PRE_BUILD | 3 +++
libs/pcre/fix.diff | 11 +++++++++++
libs/pcre/pcre-6.4.tar.bz2.sig | 0
6 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 9a6dd6c592081dd166a2ae54232ff31caffc17b5
Merge: 715b8b799836956a6f6ff707f9a45749918a4e80
9a0fb8e0f8c2f819c9ca2ddcfcf9194d2cd511de
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit 715b8b799836956a6f6ff707f9a45749918a4e80
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

pcre-6.7

diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 8121320..4a558ae 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,6 +1,6 @@
SPELL=pcre
- VERSION=6.6
-
SOURCE_HASH=sha512:300d78ef4261b4eced7ba4511253821ec1496ee061e5f91ebaa021833659c83e7882aa82d883ad23f444490ab98bbcd6ba70a4977892e31b7d9a38b489f25a89
+ VERSION=6.7
+
SOURCE_HASH=sha512:6a485baf4ba7d029a57d5ac9b29266c2ef1427940835b4f08a2d3c15dd71da6791136179c01f8746513a1ae6995febdf0ce7faa45a2f7c3776ffe6942b2d687e
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$SOURCE
@@ -8,9 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://www.pcre.org/
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
ENTERED=20010922
- UPDATED=20030603
LICENSE[0]=http://www.pcre.org/license.txt
- BUILD_API=2
KEYWORDS="perl libs"
SHORT="Perl Compatible Regular Expression library"
cat << EOF
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 0b23658..a1216cb 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,8 @@
+2006-07-05 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 6.7
+ * PRE_BUILD, fix.diff: add
+ fixes compile problem with gcc-4.1.1
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/libs/pcre/PRE_BUILD b/libs/pcre/PRE_BUILD
new file mode 100755
index 0000000..217639b
--- /dev/null
+++ b/libs/pcre/PRE_BUILD
@@ -0,0 +1,3 @@
+ default_pre_build
+ cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/fix.diff
diff --git a/libs/pcre/fix.diff b/libs/pcre/fix.diff
new file mode 100644
index 0000000..ffd978f
--- /dev/null
+++ b/libs/pcre/fix.diff
@@ -0,0 +1,11 @@
+diff -uNr pcre-6.7/pcrecpp_unittest.cc pcre-6.7.cp/pcrecpp_unittest.cc
+--- pcre-6.7/pcrecpp_unittest.cc 2006-07-04 17:06:22.000000000 +0200
++++ pcre-6.7.cp/pcrecpp_unittest.cc 2006-07-05 13:17:27.000000000 +0200
+@@ -32,6 +32,7 @@
+ // TODO: Test extractions for PartialMatch/Consume
+
+ #include <stdio.h>
++#include <assert.h>
+ #include <vector>
+ #include "config.h"
+ #include "pcrecpp.h"
diff --git a/libs/pcre/pcre-6.4.tar.bz2.sig b/libs/pcre/pcre-6.4.tar.bz2.sig
deleted file mode 100644
index 6dd31ad..0000000
Binary files a/libs/pcre/pcre-6.4.tar.bz2.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9a6dd6c592081dd166a2ae54232ff31caffc17b5), Treeve Jelbert, 07/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page