Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (1031a35bb6edec9cef25deba59afa0a3e66e6930)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (1031a35bb6edec9cef25deba59afa0a3e66e6930)
  • Date: Wed, 6 Jun 2012 09:17:14 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

gnome2-libs/glib2/HISTORY | 5 +++++
gnome2-libs/glib2/PRE_BUILD | 8 ++++++--
gnome2-libs/glib2/PRE_SUB_DEPENDS | 3 +++
gnome2-libs/glib2/SUB_DEPENDS | 1 +
gnome3-libs/gcr/DEPENDS | 10 ++++++++++
gnome3-libs/gcr/HISTORY | 4 ++++
6 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 1031a35bb6edec9cef25deba59afa0a3e66e6930
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gcr: added dependency info

commit 188266a6715331891d8426a07fd4531fedfd609e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

glib2: added sub dependency info for python and fixed patching

diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 6dc953d..f3a4b12 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,8 @@
+2012-06-06 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fixed patching, is_depends_enabled doesn't like
+ providers.
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added python
+
2012-05-27 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS, PRE_BUILD: Make python optional

diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD
index e033b33..3106958 100755
--- a/gnome2-libs/glib2/PRE_BUILD
+++ b/gnome2-libs/glib2/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-xzcat $SPELL_DIRECTORY/py3.patch.xz |patch -p1 &&
-if ! is_depends_enabled $SPELL PYTHON; then
+if is_depends_enabled $SPELL python3; then
+ message "patching for python3" &&
+ xzcat $SPELL_DIRECTORY/py3.patch.xz |patch -p1
+elif is_depends_enabled $SPELL python; then
+ message "not patching for python3"
+else
find . -name 'Makefile*' -exec sed -i -e '/^SUBDIRS =/,/[^\]$/ {;s,
tests,,g;s, gdbus-2.0/codegen,,g;}' {} +
fi
diff --git a/gnome2-libs/glib2/PRE_SUB_DEPENDS
b/gnome2-libs/glib2/PRE_SUB_DEPENDS
index 541ab10..c555d64 100755
--- a/gnome2-libs/glib2/PRE_SUB_DEPENDS
+++ b/gnome2-libs/glib2/PRE_SUB_DEPENDS
@@ -1,4 +1,7 @@
case $THIS_SUB_DEPENDS in
GLIB_DEVEL) if [[ "$GLIB_VER" == "devel" ]]; then return 0; fi;;
+ PYTHON) if is_depends_enabled $SPELL python; then return 0;
+ elif is_depends_enabled $SPELL python3; then return 0;
+ fi ;;
esac
return 1
diff --git a/gnome2-libs/glib2/SUB_DEPENDS b/gnome2-libs/glib2/SUB_DEPENDS
index 0ac9ba2..0ae7f3d 100755
--- a/gnome2-libs/glib2/SUB_DEPENDS
+++ b/gnome2-libs/glib2/SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
GLIB_DEVEL) echo "Devel release needed, forcing it." &&
GLIB_VER="devel" ;;
+ PYTHON) depends PYTHON ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac
diff --git a/gnome3-libs/gcr/DEPENDS b/gnome3-libs/gcr/DEPENDS
new file mode 100755
index 0000000..ff7fcb8
--- /dev/null
+++ b/gnome3-libs/gcr/DEPENDS
@@ -0,0 +1,10 @@
+depends -sub PYTHON glib2 &&
+depends libgcrypt &&
+optional_depends p11-kit '' '' 'for P11 support' &&
+optional_depends gobject-introspection \
+ '--enable-introspection=yes' \
+ '--enable-introspection=no' \
+ 'for introspection support'
+optional_depends gtk-doc '--enable-gtk-doc' \
+ '--disable-gtk-doc' \
+ 'to build the documentation'
diff --git a/gnome3-libs/gcr/HISTORY b/gnome3-libs/gcr/HISTORY
index 82bffa7..abf761c 100644
--- a/gnome3-libs/gcr/HISTORY
+++ b/gnome3-libs/gcr/HISTORY
@@ -1,3 +1,7 @@
+2012-06-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added the most obvious dependencies,
+ depends on glib2 with PYTHON enabed
+
2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.1




  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (1031a35bb6edec9cef25deba59afa0a3e66e6930), Arjan Bouter, 06/06/2012

Archive powered by MHonArc 2.6.24.

Top of Page