Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
25088061 Need to remove subversion dependency on libgnome-keyring
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 21 Dec 2016 11:02:41 -0800
changeset 7521 149969f54db5
parent 7520 7b33249790c8
child 7522 feedb7e27aaf
25088061 Need to remove subversion dependency on libgnome-keyring
components/subversion/Makefile file | annotate | diff | comparison | revisions
components/subversion/subversion.p5m file | annotate | diff | comparison | revisions 
--- a/components/subversion/Makefile	Wed Dec 21 14:15:33 2016 -0800
+++ b/components/subversion/Makefile	Wed Dec 21 11:02:41 2016 -0800
@@ -176,6 +176,9 @@
 CONFIGURE_OPTIONS += --with-apr=$(APR-CONFIG.$(BITS))
 CONFIGURE_OPTIONS += --with-apr-util=$(APU-CONFIG.$(BITS))
 CONFIGURE_OPTIONS += --with-apache-libexecdir=$(APACHE_LIBEXECDIR)
+# libgnome-keyring was obsoleted upstream, disable support for storing svn
+# passwords in gnome-keyring until svn is updated to use libsecret instead
+CONFIGURE_OPTIONS += --without-gnome-keyring
 
 COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
 COMPONENT_BUILD_ENV += CXXFLAGS="$(CXXFLAGS)"
@@ -214,12 +217,10 @@
 REQUIRED_PACKAGES += database/sqlite-3
 REQUIRED_PACKAGES += developer/versioning/subversion
 REQUIRED_PACKAGES += developer/build/scons
-REQUIRED_PACKAGES += gnome/gnome-keyring
 REQUIRED_PACKAGES += library/apr-15
 REQUIRED_PACKAGES += library/apr-util-15
 REQUIRED_PACKAGES += library/expat
 REQUIRED_PACKAGES += library/glib2
-REQUIRED_PACKAGES += library/gnome/gnome-keyring
 REQUIRED_PACKAGES += library/libserf
 REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-522
--- a/components/subversion/subversion.p5m	Wed Dec 21 14:15:33 2016 -0800
+++ b/components/subversion/subversion.p5m	Wed Dec 21 11:02:41 2016 -0800
@@ -106,11 +106,7 @@
 file usr/include/subversion-1/svn_wc.h path=usr/include/svn/svn_wc.h
 file usr/include/subversion-1/svn_x509.h path=usr/include/svn/svn_x509.h
 file usr/include/subversion-1/svn_xml.h path=usr/include/svn/svn_xml.h
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc \
-    path=usr/lib/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc
 #
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc \
-    path=usr/lib/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc
 file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_client.pc \
     path=usr/lib/$(MACH64)/pkgconfig/libsvn_client.pc
 file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_client.pc \
@@ -168,8 +164,6 @@
 file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_wc.pc \
     path=usr/lib/$(MACH64)/pkgconfig/libsvn_wc.pc
 #
-file usr/lib/svn/pkgconfig/libsvn_auth_gnome_keyring.pc \
-    path=usr/lib/pkgconfig/libsvn_auth_gnome_keyring.pc
 file usr/lib/svn/pkgconfig/libsvn_client.pc \
     path=usr/lib/pkgconfig/libsvn_client.pc
 file usr/lib/svn/pkgconfig/libsvn_delta.pc \
@@ -193,11 +187,6 @@
 file usr/lib/svn/pkgconfig/libsvn_subr.pc path=usr/lib/pkgconfig/libsvn_subr.pc
 file usr/lib/svn/pkgconfig/libsvn_wc.pc path=usr/lib/pkgconfig/libsvn_wc.pc
 #
-link path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so \
-    target=libsvn_auth_gnome_keyring-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so.0 \
-    target=libsvn_auth_gnome_keyring-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so.0.0.0
 link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so \
     target=libsvn_client-1.so.0.0.0
 link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so.0 \
@@ -254,11 +243,6 @@
 link path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0
 file path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so.0.0.0
 #
-link path=usr/lib/svn/libsvn_auth_gnome_keyring-1.so \
-    target=libsvn_auth_gnome_keyring-1.so.0.0.0
-link path=usr/lib/svn/libsvn_auth_gnome_keyring-1.so.0 \
-    target=libsvn_auth_gnome_keyring-1.so.0.0.0
-file path=usr/lib/svn/libsvn_auth_gnome_keyring-1.so.0.0.0
 link path=usr/lib/svn/libsvn_client-1.so target=libsvn_client-1.so.0.0.0
 link path=usr/lib/svn/libsvn_client-1.so.0 target=libsvn_client-1.so.0.0.0
 file path=usr/lib/svn/libsvn_client-1.so.0.0.0
upstream/oracle/userland-gate