Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.59 grimoire by George Sherwood (ed66bfb290ccc0259f70ce93a5b7b8e068d8c18c)

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 stable-rc-0.59 grimoire by George Sherwood (ed66bfb290ccc0259f70ce93a5b7b8e068d8c18c)
  • Date: Sun, 7 Aug 2011 17:59:12 -0500

GIT changes to stable-rc-0.59 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

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

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

Revert "pkgconfig 0.26"
Failing for me in stable-rc. Need to understand better

This reverts commit 54d63bcb724e78bf43543f5d5ce1520fad8c0bf1.

commit 145b62be796163090d82a42e536509162bc5d04f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

Revert "pkgconfig: added version 0.25 for fresh install / without glib2"
Failing for me in stable-rc. Need to understand better

This reverts commit bbc81239fb0611a5a3b1ef313e7439928a653460.

diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
index 329e0ab..7349c44 100755
--- a/devel/pkgconfig/DEPENDS
+++ b/devel/pkgconfig/DEPENDS
@@ -1,3 +1,7 @@
-if [[ "$VERSION" != "0.25" ]]; then
- depends glib2
+# 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
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index a2a73fc..7c58683 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,13 +1,6 @@
SPELL=pkgconfig
-
-if spell_ok glib2; then
- VERSION=0.26
-
SOURCE_HASH=sha512:9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
- else
VERSION=0.25

SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
-fi
-
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 13bb575..6a29c2d 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,10 +1,3 @@
-2011-08-02 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS, DEPENDS: added version 0.25 for fresh install / without
glib2
-
-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




  • [SM-Commit] GIT changes to stable-rc-0.59 grimoire by George Sherwood (ed66bfb290ccc0259f70ce93a5b7b8e068d8c18c), George Sherwood, 08/07/2011

Archive powered by MHonArc 2.6.24.

Top of Page