Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (c6c7a1f0fd84b25aacf9cfa02e1815b0dd76418f)
  • Date: Tue, 18 Nov 2008 12:58:47 -0600

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

libs/gmime/DETAILS | 4 ++++
libs/gmime/HISTORY | 9 +++++++++
libs/gmime/PREPARE | 2 ++
libs/gmime/PRE_BUILD | 6 ++++++
libs/gmime/PRE_SUB_DEPENDS | 4 ++++
libs/gmime/SUB_DEPENDS | 5 +++++
libs/gmime/gmime-2.2-mono.patch | 18 ++++++++++++++++++
libs/gmime/gmime-2.2.23.tar.gz.sig |binary
8 files changed, 48 insertions(+)

New commits:
commit c6c7a1f0fd84b25aacf9cfa02e1815b0dd76418f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

gmime: Added 2.2.x branch for some spells. Needs patch to
build with mono. Added sub depends on 2.2 branch.

diff --git a/libs/gmime/DETAILS b/libs/gmime/DETAILS
index 4e01c13..3246d00 100755
--- a/libs/gmime/DETAILS
+++ b/libs/gmime/DETAILS
@@ -1,5 +1,9 @@
SPELL=gmime
+if [[ "$GMIME_22BRANCH" == "y" ]]; then
+ VERSION=2.2.23
+else
VERSION=2.4.3
+fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/gmime/HISTORY b/libs/gmime/HISTORY
index 0098d96..5c949e5 100644
--- a/libs/gmime/HISTORY
+++ b/libs/gmime/HISTORY
@@ -1,3 +1,12 @@
+2008-11-18 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Added 2.2 branch
+ * PREPARE: Added query for 2.2 branch
+ * PRE_BUILd: Added to apply patch
+ * gmime-2.2-mono.patch: older version doesn't use strong name.
+ Requires -bootstrap option for gacutil
+ * PRE_SUB_DEPENDS: Added for sub depends on 2.2 branch
+ * SUB_DEPENDS: Added for sub depends on 2.2 branch
+
2008-11-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.3

diff --git a/libs/gmime/PREPARE b/libs/gmime/PREPARE
new file mode 100755
index 0000000..f489ab9
--- /dev/null
+++ b/libs/gmime/PREPARE
@@ -0,0 +1,2 @@
+config_query GMIME_22BRANCH \
+ "Build gmime 2.2.x Branch?" n
diff --git a/libs/gmime/PRE_BUILD b/libs/gmime/PRE_BUILD
new file mode 100755
index 0000000..ae70a0d
--- /dev/null
+++ b/libs/gmime/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+if [[ "$GMIME_22BRANCH" == "y" ]]; then
+ cd "$SOURCE_DIRECTORY" &&
+ patch -p0 < $SCRIPT_DIRECTORY/gmime-2.2-mono.patch
+fi
diff --git a/libs/gmime/PRE_SUB_DEPENDS b/libs/gmime/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..f575bc9
--- /dev/null
+++ b/libs/gmime/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ 2.2) if [ $GMIME_22BRANCH=="y" ]; then return 0; fi;;
+esac
+return 1
diff --git a/libs/gmime/SUB_DEPENDS b/libs/gmime/SUB_DEPENDS
new file mode 100755
index 0000000..e57d633
--- /dev/null
+++ b/libs/gmime/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ 2.2) echo "2.22.x release needed, forcing it." &&
+ GMIME_22BRANCH="y" ;;
+ *) echo "unknown sub-depends!"; return 1 ;;
+esac
diff --git a/libs/gmime/gmime-2.2-mono.patch b/libs/gmime/gmime-2.2-mono.patch
new file mode 100644
index 0000000..4b73d92
--- /dev/null
+++ b/libs/gmime/gmime-2.2-mono.patch
@@ -0,0 +1,18 @@
+--- mono/Makefile.in.orig 2008-11-18 12:43:36.000000000 -0600
++++ mono/Makefile.in 2008-11-18 12:44:24.000000000 -0600
+@@ -488,11 +488,11 @@
+ install-data-local:
+ @if test -n '$(TARGET)'; then
\
+ if test -n '$(DESTDIR)'; then
\
+- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/root $(DESTDIR)$(prefix)/lib"; \
+- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(prefix)/lib || exit 1; \
++ echo "$(GACUTIL) -bootstrap /i $(ASSEMBLY) /f /package
$(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib"; \
++ $(GACUTIL) -bootstrap /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/root $(DESTDIR)$(prefix)/lib || exit 1; \
+ else
\
+- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/gacdir $(prefix)/lib"; \
+- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir
$(prefix)/lib || exit 1; \
++ echo "$(GACUTIL) -bootstrap /i $(ASSEMBLY) /f /package
$(PACKAGE_SHARP) /gacdir $(prefix)/lib"; \
++ $(GACUTIL) -bootstrap /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/gacdir $(prefix)/lib || exit 1; \
+ fi;
\
+ fi
+
diff --git a/libs/gmime/gmime-2.2.23.tar.gz.sig
b/libs/gmime/gmime-2.2.23.tar.gz.sig
new file mode 100644
index 0000000..a65e2cb
Binary files /dev/null and b/libs/gmime/gmime-2.2.23.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (c6c7a1f0fd84b25aacf9cfa02e1815b0dd76418f), George Sherwood, 11/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page