[gnome-commander] Remove unnecessary gnome-keyring dependency
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Remove unnecessary gnome-keyring dependency
- Date: Thu, 18 Jun 2020 19:50:20 +0000 (UTC)
commit e5f873db80dbcb8b37dd502996839846ae2246f4
Author: Uwe Scholz <u scholz83 gmx de>
Date: Thu Jun 18 10:24:43 2020 +0200
Remove unnecessary gnome-keyring dependency
README.in | 3 +--
configure.ac | 5 -----
data/gnome-commander.spec.in | 5 +++--
src/Makefile.am | 2 --
4 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/README.in b/README.in
index 965cad3f..c1022104 100644
--- a/README.in
+++ b/README.in
@@ -68,8 +68,7 @@ Plugins:
3. Building
--------------------------------
-GNOME Commander requires glib >= @GLIB_REQ@, GTK+ >= @GTK_REQ@
-and gnome-keyring >= @GNOME_KEYRING_REQ@ libraries.
+GNOME Commander requires glib >= @GLIB_REQ@ and GTK+ >= @GTK_REQ@ libraries.
Additionally GNOME Commander may require:
diff --git a/configure.ac b/configure.ac
index d33e4a87..1228ef56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ GLIB_REQ=2.44.0
GMODULE_REQ=2.0.0
GTK_REQ=2.24.0
GNOMEVFS_REQ=2.0.0
-GNOME_KEYRING_REQ=2.22
UNIQUE_REQ=0.9.3
PYTHON_REQ=2.5
EXIV2_REQ=0.14
@@ -49,7 +48,6 @@ POPPLER_REQ=0.18
AC_SUBST(GLIB_REQ)
AC_SUBST(GTK_REQ)
AC_SUBST(GNOMEVFS_REQ)
-AC_SUBST(GNOME_KEYRING_REQ)
AC_SUBST(UNIQUE_REQ)
AC_SUBST(PYTHON_REQ)
AC_SUBST(EXIV2_REQ)
@@ -77,9 +75,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= ${GTK_REQ}])
dnl Check for gnome-vfs
PKG_CHECK_MODULES([GNOMEVFS], [gnome-vfs-2.0 >= ${GNOMEVFS_REQ}], have_gnomevfs=yes, have_gnomevfs=no)
-dnl Check for gnome-keyring
-PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1 >= ${GNOME_KEYRING_REQ}])
-
dnl Check for libUnique
AC_ARG_WITH([unique], AS_HELP_STRING([--without-unique], [disable unique support]))
AS_IF([test "x$with_unique" != "xno"],
diff --git a/data/gnome-commander.spec.in b/data/gnome-commander.spec.in
index 2bbbf8c6..83ed2bfd 100644
--- a/data/gnome-commander.spec.in
+++ b/data/gnome-commander.spec.in
@@ -42,7 +42,6 @@ BuildRequires: gettext >= 0.19.7
BuildRequires: glib2-devel >= @GLIB_REQ@
BuildRequires: gtk2-devel >= @GTK_REQ@
BuildRequires: gnome-vfs2-devel >= @GNOMEVFS_REQ@
-BuildRequires: gnome-keyring-devel >= @GNOME_KEYRING_REQ@
BuildRequires: yelp-tools
BuildRequires: perl(XML::Parser)
@@ -50,7 +49,6 @@ Requires: glib2 >= @GLIB_REQ@
Requires: gtk2 >= @GTK_REQ@
Requires: gnome-vfs2 >= @GNOMEVFS_REQ@
Requires: gnome-vfs2-smb >= @GNOMEVFS_REQ@
-Requires: gnome-keyring >= @GNOME_KEYRING_REQ@
# For CentOS:
Requires: gnome-icon-theme-legacy >= 3.0
@@ -162,6 +160,9 @@ scrollkeeper-update -q || :
%{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml
%changelog
+* Thu Jun 18 2020 Uwe Scholz <u scholz83 gmx de>
+- remove gnome-keyring-1 dependency
+
* Mon May 20 2019 Uwe Scholz <u scholz83 gmx de>
- set epoch to 4
diff --git a/src/Makefile.am b/src/Makefile.am
index d2d1d32b..d47c323a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GNOMEVFS_CFLAGS) \
- $(GNOME_KEYRING_CFLAGS) \
$(UNIQUE_CFLAGS) \
$(PYTHON_CFLAGS) \
-DGTK_DISABLE_SINGLE_INCLUDES \
@@ -99,7 +98,6 @@ gnome_commander_LDADD = \
intviewer/libgviewer.a \
$(GTK_LIBS) \
$(GNOMEVFS_LIBS) \
- $(GNOME_KEYRING_LIBS) \
$(UNIQUE_LIBS) \
$(EXIV2_LIBS) \
$(TAGLIB_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]