Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 dev/null                              |binary
 gnome2-apps/dia/DETAILS               |    4 +-
 gnome2-apps/dia/HISTORY               |    4 ++
 gnome2-apps/dia/PRE_BUILD             |    6 +--
 gnome2-apps/dia/dia-0.97.3.tar.xz.sig |binary
 gnome2-apps/dia/glib-2.31.patch       |   53 
----------------------------------
 6 files changed, 8 insertions(+), 59 deletions(-)

New commits:
commit c15a91f8e8bc0e7da9e123a8ba3e0cc5a0c4f51c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    dia: => 0.97.3

diff --git a/gnome2-apps/dia/DETAILS b/gnome2-apps/dia/DETAILS
index 33d0771..775352b 100755
--- a/gnome2-apps/dia/DETAILS
+++ b/gnome2-apps/dia/DETAILS
@@ -1,12 +1,12 @@
            SPELL=dia
-         VERSION=0.97.2
+         VERSION=0.97.3
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_HASH
       LICENSE[0]=GPL
-        WEB_SITE=http://www.gnome.org/projects/dia/
+        WEB_SITE=https://wiki.gnome.org/Apps/Dia
          ENTERED=20010922
         KEYWORDS="gnome2"
            SHORT="GTK-based diagram drawing program, similar to Visio"
diff --git a/gnome2-apps/dia/HISTORY b/gnome2-apps/dia/HISTORY
index aa37fb0..d7ec8ac 100644
--- a/gnome2-apps/dia/HISTORY
+++ b/gnome2-apps/dia/HISTORY
@@ -1,3 +1,7 @@
+2014-09-06 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.97.3; fixed WEB_SITE
+       * glib-2.31.patch: removed, fixed by upstream
+
 2012-07-26 Vlad Glagolev <stealth AT sourcemage.org>
        * PRE_BUILD: detect docbook-xsl man path and use instead of online one
        * DEPENDS: added docbook-xsl required dep
diff --git a/gnome2-apps/dia/PRE_BUILD b/gnome2-apps/dia/PRE_BUILD
index c3f34d0..e3208ed 100755
--- a/gnome2-apps/dia/PRE_BUILD
+++ b/gnome2-apps/dia/PRE_BUILD
@@ -1,13 +1,11 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $BUILD_DIRECTORY &&
 verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
 cd $SOURCE_DIRECTORY &&
 
 # dockbook's dir
 local DB_VER=$(installed_version docbook-xsl | cut -c -4) &&
 local DB_DIR="$INSTALL_ROOT/usr/share/xml/docbook/xsl-stylesheets-${DB_VER}" 
&&
 
-sedit 
"s:http\://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl:${DB_DIR}/manpages/docbook.xsl:"
 configure &&
-
-patch -p1 < $SPELL_DIRECTORY/glib-2.31.patch
+sedit 
"s:http\://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl:${DB_DIR}/manpages/docbook.xsl:"
 configure
diff --git a/gnome2-apps/dia/dia-0.97.2.tar.xz.sig 
b/gnome2-apps/dia/dia-0.97.2.tar.xz.sig
deleted file mode 100644
index fa8da34..0000000
Binary files a/gnome2-apps/dia/dia-0.97.2.tar.xz.sig and /dev/null differ
diff --git a/gnome2-apps/dia/dia-0.97.3.tar.xz.sig 
b/gnome2-apps/dia/dia-0.97.3.tar.xz.sig
new file mode 100644
index 0000000..a11cfeb
Binary files /dev/null and b/gnome2-apps/dia/dia-0.97.3.tar.xz.sig differ
diff --git a/gnome2-apps/dia/glib-2.31.patch b/gnome2-apps/dia/glib-2.31.patch
deleted file mode 100644
index 209d196..0000000
--- a/gnome2-apps/dia/glib-2.31.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: dia-0.97.1/objects/custom/shape_typeinfo.c
-===================================================================
---- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
-+++ dia-0.97.1/objects/custom/shape_typeinfo.c
-@@ -27,7 +27,7 @@
- #include "custom_util.h"
- #include <string.h>
- #include <stdarg.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
- #include <libxml/parser.h>
- 
-Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
-===================================================================
---- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
-+++ dia-0.97.1/plug-ins/pgf/render_pgf.c
-@@ -61,7 +61,7 @@ TODO:
- #endif
- #include <errno.h>
- 
--#include <glib/gprintf.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
- 
- #include "intl.h"
-Index: dia-0.97.1/tests/test-boundingbox.c
-===================================================================
---- dia-0.97.1.orig/tests/test-boundingbox.c
-+++ dia-0.97.1/tests/test-boundingbox.c
-@@ -28,7 +28,7 @@
- #include <glib.h>
- #include <glib-object.h>
- 
--#if GLIB_CHECK_VERSION(2,16,0)
-+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
- #include <glib/gtestutils.h>
- #endif
- #include "dialib.h"
-Index: dia-0.97.1/tests/test-objects.c
-===================================================================
---- dia-0.97.1.orig/tests/test-objects.c
-+++ dia-0.97.1/tests/test-objects.c
-@@ -28,7 +28,7 @@
- #include <glib.h>
- #include <glib-object.h>
- 
--#if GLIB_CHECK_VERSION(2,16,0)
-+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
- #include <glib/gtestutils.h>
- #endif
- 
-