Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 devel/pkgconfig/DEPENDS |    8 +-------
 devel/pkgconfig/DETAILS |    4 ++--
 devel/pkgconfig/HISTORY |    4 ++++
 3 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 54d63bcb724e78bf43543f5d5ce1520fad8c0bf1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    pkgconfig 0.26
    
    This creates problem with casting glib2 and pkgconfig after new
    Source Mage installation. pkgconfig depends on glib2 and glib2 depends
    on pkgconfig. glib2's DEPENDS now contains depends pkgconfig, this must
    be changed.  optional_depends pkgconfig is not enough. For the first
    time (if pkgconfig isn't installed) glib2 must be cast with
    PCRE_LIBS and PCRE_CFLAGS defined:
    
    PCRE_LIBS="-L/usr/lib -lpcre" PCRE_CFLAGS="-I/usr/include" default_build
    
    Another option is installation of pkg-config 0.25 with internal glib 
after fresh
    installation and later update into 0.26. Something like:
    if spell_ok glib2 then VERSION=0.26 else VERSION=0.25.
    Probably better solution.
    
    Need some discussion and testing.

diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
index 7349c44..150d45a 100755
--- a/devel/pkgconfig/DEPENDS
+++ b/devel/pkgconfig/DEPENDS
@@ -1,7 +1 @@
-# only allow dependency if glib2 is installed, otherwise a cycle is created
-if spell_ok glib2; then
-   optional_depends  glib2                       \
-                  "--with-installed-glib"        \
-                  "--without-installed-glib"     \
-                  "to use system GLib"
-fi
+depends glib2
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index 7c58683..ef95a61 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pkgconfig
-         VERSION=0.25
-     
SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
+         VERSION=0.26
+     
SOURCE_HASH=sha512:9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
           SOURCE=pkg-config-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
    SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 6a29c2d..7fbfa21 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,7 @@
+2011-08-01 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.26
+       * DEPENDS: embedded glib has been removed, depends on glib2 now
+
 2010-08-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: let's not try running a subshell in description