[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (105bc176d7da5908479b210832a0499cf35fdbee)

Elisamuel Resto scm at sourcemage.org
Sun Apr 20 19:18:07 EDT 2008


GIT changes to master grimoire by Elisamuel Resto <ryuji at sourcemage.org>:

 crypto/hashsum/BUILD     |    4 +---
 crypto/hashsum/HISTORY   |    4 ++++
 crypto/hashsum/PRE_BUILD |   10 ++++++++++
 doc/evince/DEPENDS       |   20 +++++++++++---------
 doc/evince/HISTORY       |    3 +++
 5 files changed, 29 insertions(+), 12 deletions(-)

New commits:
commit 105bc176d7da5908479b210832a0499cf35fdbee
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    doc/evince: requires libgnome and libgnomeui

commit a15c6078409993bd2ac2fa681742d525b9812958
Author: Elisamuel Resto <ryuji at sourcemage.org>
Commit: Elisamuel Resto <ryuji at sourcemage.org>

    crypto/hashsum: patching should be done in PRE_BUILD; x86_64 patching clause now uses $SMGL_COMPAT_ARCHS; -Wall breaks compiling with gcc-4.3

diff --git a/crypto/hashsum/BUILD b/crypto/hashsum/BUILD
index 837d30f..3f0eb54 100755
--- a/crypto/hashsum/BUILD
+++ b/crypto/hashsum/BUILD
@@ -1,4 +1,2 @@
-if [[ "$HOST" == x86_64-* ]]; then
-  patch -p1 < $SCRIPT_DIRECTORY/hashsum-64-bit.patch
-fi &&
+make_normal &&
 make
diff --git a/crypto/hashsum/HISTORY b/crypto/hashsum/HISTORY
index cd6aec1..7083729 100644
--- a/crypto/hashsum/HISTORY
+++ b/crypto/hashsum/HISTORY
@@ -1,3 +1,7 @@
+2008-04-20 Elisamuel Resto <ryuji at sourcemage.org>
+	* BUILD: move patching from BUILD to PRE_BUILD, used $SMGL_COMPAT_ARCHS on the if
+	* PRE_BUILD: removed -Wall from Makefiles (breaks compilation with gcc-4.3)
+
 2007-03-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* BUILD: removed invoke_gcc #10641
 
diff --git a/crypto/hashsum/PRE_BUILD b/crypto/hashsum/PRE_BUILD
new file mode 100755
index 0000000..6ad5fe3
--- /dev/null
+++ b/crypto/hashsum/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+  patch -p1 < ${SPELL_DIRECTORY}/hashsum-64-bit.patch
+fi &&
+
+for f in Makefile hasher/Makefile; do
+  sedit "s:-Wall::g" $f
+done
diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS
index 7ef46d2..734e9eb 100755
--- a/doc/evince/DEPENDS
+++ b/doc/evince/DEPENDS
@@ -1,12 +1,14 @@
-depends autoconf &&
-depends automake &&
-depends  gettext           &&
-depends  gnome-doc-utils   &&
-depends  gnome-vfs2        &&
-depends  libgnomeprintui   &&
-depends  poppler           &&
-depends  xml-parser-expat  &&
-depends  gnome-keyring     &&
+depends autoconf         &&
+depends automake         &&
+depends gettext          &&
+depends gnome-doc-utils  &&
+depends gnome-vfs2       &&
+depends libgnomeprintui  &&
+depends poppler          &&
+depends xml-parser-expat &&
+depends gnome-keyring    &&
+depends libgnome         &&
+depends libgnomeui       &&
 
 optional_depends  dbus-glib "--enable-dbus-glib" "--disable-dbus-glib" "for DBUS (will be used when there, no disabling here)" &&
 
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 06cd120..053f081 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2008-04-20 Elisamuel Resto <ryuji at sourcemage.org>
+	* DEPENDS: evince requires libgnome and libgnomeui
+
 2008-04-10 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.22.1.1
 	* PRE_BUILD: removed as patch no longer applies



More information about the SM-Commit mailing list