Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (407b511fe8b9ea93599203dd48e9f10688a2af6f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (407b511fe8b9ea93599203dd48e9f10688a2af6f)
  • Date: Sat, 25 Apr 2015 08:41:27 -0500

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

crypto/libgcrypt/HISTORY | 4 ++++
crypto/libgcrypt/UP_TRIGGERS | 27 +++++++++++++++++++--------
gnome2-libs/gvfs/DEPENDS | 6 +++++-
gnome2-libs/gvfs/HISTORY | 3 +++
4 files changed, 31 insertions(+), 9 deletions(-)

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

libgcrypt: added missing trigger for libgnome-keyring

commit 0438ee46eba01f34dff251d7eb1ac559da642c23
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gvfs: added missing libsecret dependency (required for keyring)

diff --git a/crypto/libgcrypt/HISTORY b/crypto/libgcrypt/HISTORY
index 2df841c..8a45c61 100644
--- a/crypto/libgcrypt/HISTORY
+++ b/crypto/libgcrypt/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: rewritten -- get a branch version more accurately,
+ added missing trigger for libgnome-keyring
+
2015-02-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.3; SECURITY_PATCH++ (CVE-2014-3591,
CVE-2015-0837); added missing key identifier
diff --git a/crypto/libgcrypt/UP_TRIGGERS b/crypto/libgcrypt/UP_TRIGGERS
index f5ec3f0..eba92dd 100755
--- a/crypto/libgcrypt/UP_TRIGGERS
+++ b/crypto/libgcrypt/UP_TRIGGERS
@@ -1,9 +1,20 @@
-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" || return 0
-if [ "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}" ]; then
- message "This is a possibly incompatible update of $SPELL..."
- message "Figuring out what spells need to be recast, this may take a
while."
- for each in $(show_up_depends $SPELL 1); do
- up_trigger $each check_self
- done
+if spell_ok $SPELL; then
+ local NEW_SPELL_BRANCH="$(echo $VERSION | cut -d. -f1,2)" &&
+ local OLD_SPELL_BRANCH="$(installed_version $SPELL | cut -d. -f1,2)" &&
+
+ if test "${NEW_SPELL_BRANCH}" != "${OLD_SPELL_BRANCH}"; then
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of
${SPELL_COLOR}$SPELL${MESSAGE_COLOR}..." &&
+ message "Figuring out what spells need to be recast, this may take a
while.${DEFAULT_COLOR}" &&
+
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each check_self
+ done &&
+
+ # LDFLAGS are taken from /usr/lib/libgnome-keyring.la
+ if spell_ok libgnome-keyring; then
+ for each in $(show_up_depends libgnome-keyring 1); do
+ up_trigger $each check_self
+ done
+ fi
+ fi
fi
diff --git a/gnome2-libs/gvfs/DEPENDS b/gnome2-libs/gvfs/DEPENDS
index 9c1a9cb..3ad680a 100755
--- a/gnome2-libs/gvfs/DEPENDS
+++ b/gnome2-libs/gvfs/DEPENDS
@@ -64,7 +64,11 @@ optional_depends libgphoto2 \
optional_depends libgnome-keyring \
"--enable-keyring" \
"--disable-keyring" \
- "build with GNOME keyring support" &&
+ "build with GNOME keyring support (requires
${SPELL_COLOR}libsecret${DEFAULT_COLOR})" &&
+
+if is_depends_enabled $SPELL libgnome-keyring; then
+ depends libsecret
+fi &&

optional_depends samba \
"--enable-samba" \
diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index a7f4379..d486939 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,6 @@
+2015-04-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing libsecret dependency (required for keyring)
+
2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing optional libarchive dependency




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (407b511fe8b9ea93599203dd48e9f10688a2af6f), Vlad Glagolev, 04/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page