diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2007-10-06 07:39:20 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2007-10-06 07:39:20 +0000 |
| commit | 1f863cf60533524ff0d1b10ba408d5c578970b9a (patch) | |
| tree | d3e6c0715492e584f2f234ce83e015b74616dbfc /gnome-base/gnome-keyring/files | |
| parent | stable on ppc64, bug 193143 (diff) | |
| download | gentoo-2-1f863cf60533524ff0d1b10ba408d5c578970b9a.tar.gz gentoo-2-1f863cf60533524ff0d1b10ba408d5c578970b9a.tar.bz2 gentoo-2-1f863cf60533524ff0d1b10ba408d5c578970b9a.zip | |
patch to remove the gtk-doc dep when running eautoreconf
(Portage version: 2.1.3.11)
Diffstat (limited to 'gnome-base/gnome-keyring/files')
| -rw-r--r-- | gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch | 16 | ||||
| -rw-r--r-- | gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch | 35 |
2 files changed, 41 insertions, 10 deletions
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch new file mode 100644 index 000000000000..ded93d740efd --- /dev/null +++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch @@ -0,0 +1,16 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 845) ++++ configure.in (working copy) +@@ -26,7 +26,11 @@ + AC_TYPE_SIZE_T + AC_TYPE_UID_T + ++AC_DEFUN(GTK_DOC_CHECK, []) + GTK_DOC_CHECK ++AM_CONDITIONAL(ENABLE_GTK_DOC, 0) ++AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0) ++ + DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc" + AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) + diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch index 3e970060e031..49a1e214a2c2 100644 --- a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch +++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch @@ -1,20 +1,34 @@ Index: configure.in =================================================================== ---- configure.in (revision 841) -+++ configure.in (working copy) +--- configure.in (revision 844) ++++ configure.in (revision 845) @@ -249,7 +249,7 @@ AC_ARG_WITH([pam-dir], [AC_HELP_STRING([--with-pam-dir=DIR], [directory to install pam modules in])], - [], [with_pam_dir="/usr/lib"]) -+ [], [with_pam_dir="/lib/security"]) ++ [], [with_pam_dir="${prefix}/lib/security"]) PAM_DEST_DIR="$with_pam_dir" AC_SUBST(PAM_DEST_DIR) +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 844) ++++ Makefile.am (revision 845) +@@ -50,8 +50,4 @@ + @echo "DONE AUTOMATIC UNIT TESTS ------------------------------" + + install-pam: +- $(MAKE) -C pam install-pam +- +-uninstall-pam: +- $(MAKE) -C pam uninstall-pam +- ++ @echo "WARNING: install-pam is no longer used, use the --with-pam-dir configure option instead" Index: pam/Makefile.am =================================================================== ---- pam/Makefile.am (revision 841) -+++ pam/Makefile.am (working copy) +--- pam/Makefile.am (revision 844) ++++ pam/Makefile.am (revision 845) @@ -3,7 +3,8 @@ -I$(top_srcdir) \ -DGNOME_KEYRING_DAEMON=\""$(bindir)/gnome-keyring-daemon"\" @@ -25,12 +39,10 @@ Index: pam/Makefile.am pam_gnome_keyring_la_SOURCES = \ gkr-pam.h \ -@@ -17,15 +18,3 @@ - pam_gnome_keyring_la_LDFLAGS = \ - -module -avoid-version \ +@@ -19,13 +20,5 @@ -export-symbols-regex 'pam_sm_' -- --install-pam: install + + install-pam: install - $(mkinstalldirs) "$(DESTDIR)$(PAM_DEST_DIR)" - cp "$(DESTDIR)$(libdir)/pam_gnome_keyring.so" "$(DESTDIR)$(PAM_DEST_DIR)" - ( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so ) @@ -41,3 +53,6 @@ Index: pam/Makefile.am - rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_auth.so" - rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_session.so" - ++ @echo "WARNING: install-pam is no longer used, use the --with-pam-dir configure option instead" ++ +\ No newline at end of file |