From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 15 Dec 2014 04:05:51 +0000 (-0500)
Subject: Upgrade to gnome-keyring-3.14.0
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=d1b6aba91e85262e243c5f785f1c8094a6dac19d;p=hvlinux.git

Upgrade to gnome-keyring-3.14.0
---

diff --git a/config/packages-list b/config/packages-list
index e2e2e9d..464b994 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -129,7 +129,7 @@ GLIBMM="glibmm-2.42.0"
 GLITZ="glitz-0.5.6"
 GMP="gmp-6.0.0a"
 GNASH=" gnash-0.8.10"
-GNOME_KEYRING="gnome-keyring-2.32.1"
+GNOME_KEYRING="gnome-keyring-3.14.0"
 GNOME_ICON_THEME="gnome-icon-theme-3.12.0"
 GNOME_MEDIA="gnome-media-2.32.0"
 GNOME_MENUS="gnome-menus-2.30.5"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index ea26244..c286513 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -68,7 +68,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -c -m noac ${CERTDATA}
     ipkg ${P11KIT}
     ipkg ${GCR} "--without-gtk" # Needs Gtk3
-    ipkg ${GNOME_KEYRING}
+    ipkg ${GNOME_KEYRING} "--with-pam-dir=/lib/security --disable-debug"
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
 
     ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
diff --git a/stage5/patches/common/gnome-keyring-3.14.0-gcr.patch b/stage5/patches/common/gnome-keyring-3.14.0-gcr.patch
new file mode 100644
index 0000000..32d35e9
--- /dev/null
+++ b/stage5/patches/common/gnome-keyring-3.14.0-gcr.patch
@@ -0,0 +1,53 @@
+diff -Naur gnome-keyring-3.14.0.orig/configure gnome-keyring-3.14.0.new/configure
+--- gnome-keyring-3.14.0.orig/configure	2014-09-23 04:00:53.000000000 -0400
++++ gnome-keyring-3.14.0.new/configure	2014-12-25 13:57:44.618072088 -0500
+@@ -15612,12 +15612,12 @@
+     pkg_cv_GCR_CFLAGS="$GCR_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-3 >= \$GCR_REQ\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gcr-3 >= $GCR_REQ") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-base-3 >= \$GCR_REQ\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gcr-base-3 >= $GCR_REQ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GCR_CFLAGS=`$PKG_CONFIG --cflags "gcr-3 >= $GCR_REQ" 2>/dev/null`
++  pkg_cv_GCR_CFLAGS=`$PKG_CONFIG --cflags "gcr-base-3 >= $GCR_REQ" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15629,12 +15629,12 @@
+     pkg_cv_GCR_LIBS="$GCR_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-3 >= \$GCR_REQ\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gcr-3 >= $GCR_REQ") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gcr-base-3 >= \$GCR_REQ\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gcr-base-3 >= $GCR_REQ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GCR_LIBS=`$PKG_CONFIG --libs "gcr-3 >= $GCR_REQ" 2>/dev/null`
++  pkg_cv_GCR_LIBS=`$PKG_CONFIG --libs "gcr-base-3 >= $GCR_REQ" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15655,14 +15655,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GCR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gcr-3 >= $GCR_REQ" 2>&1`
++	        GCR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gcr-base-3 >= $GCR_REQ" 2>&1`
+         else
+-	        GCR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gcr-3 >= $GCR_REQ" 2>&1`
++	        GCR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gcr-base-3 >= $GCR_REQ" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GCR_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (gcr-3 >= $GCR_REQ) were not met:
++	as_fn_error $? "Package requirements (gcr-base-3 >= $GCR_REQ) were not met:
+ 
+ $GCR_PKG_ERRORS
+