sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (25291a9eb76feb7d7de6346be0afd85943848c30)

From: Arwed von Merkatz <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (25291a9eb76feb7d7de6346be0afd85943848c30)
Date: Tue, 30 Mar 2010 12:10:29 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

gnome2-libs/glib2/DEPENDS | 2 +-
gnome2-libs/glib2/HISTORY | 3 +++
libs/pcre/HISTORY | 5
+++++
libs/pcre/PRE_SUB_DEPENDS | 2 ++
libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS | 6
++++++
libs/pcre/SUB_DEPENDS | 4 ++++
6 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 25291a9eb76feb7d7de6346be0afd85943848c30
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

glib2: sub_depend on UTFPROP for pcre, bug 15630

commit c5d9b2170ad60ea3a051d37562ec546dd288f433
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

pcre: added sub dependency support for UTF8 properties

diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index 8381e8f..fe57abb 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -16,7 +16,7 @@ optional_depends FAM \
"--disable-fam" \
"Build with file system monitoring" &&

-optional_depends pcre \
+optional_depends -sub UTFPROP pcre \
"--with-pcre=system" \
"--with-pcre=internal" \
"Use system supplied PCRE. Otherwise, the internal PCRE
library will be used" &&
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index cfcfdb4..611d558 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2010-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added UTFPROP sub depends to pcre, bug #15630
+
2010-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.24.0

diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index bbd7531..0f2c95c 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,8 @@
+2010-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS,
+ REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS:
+ added sub depends UTFPROP for UTF8 properties support, bug #15630
+
2010-03-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 8.02

diff --git a/libs/pcre/PRE_SUB_DEPENDS b/libs/pcre/PRE_SUB_DEPENDS
index c45e4cb..3e15cf5 100755
--- a/libs/pcre/PRE_SUB_DEPENDS
+++ b/libs/pcre/PRE_SUB_DEPENDS
@@ -1,4 +1,6 @@
case "$THIS_SUB_DEPENDS" in
+ UTFPROP) if [[ $BUILDUTF8 == y ]] &&
+ [[ $UTFPROPERTIES == y ]]; then return 0; else return 1; fi ;;
CPP) is_depends_enabled $SPELL g++ ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
esac
diff --git
a/libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
b/libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..3e15cf5
--- /dev/null
+++ b/libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ UTFPROP) if [[ $BUILDUTF8 == y ]] &&
+ [[ $UTFPROPERTIES == y ]]; then return 0; else return 1; fi ;;
+ CPP) is_depends_enabled $SPELL g++ ;;
+ *) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
+esac
diff --git a/libs/pcre/SUB_DEPENDS b/libs/pcre/SUB_DEPENDS
index fd7ca05..62900e3 100755
--- a/libs/pcre/SUB_DEPENDS
+++ b/libs/pcre/SUB_DEPENDS
@@ -1,4 +1,8 @@
case "$THIS_SUB_DEPENDS" in
+ UTFPROP) message "pcre with UTF-8 properties requested, forcing support" &&
+ BUILDUTF8=y &&
+ UTFPROPERTIES=y &&
+ persistent_add UTFPROPERTIES ;;
CPP) depends g++ "--enable-cpp" ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
esac

[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (25291a9eb76feb7d7de6346be0afd85943848c30), Arwed von Merkatz, 03/30/2010