| 1 |
remi 07/10/06 07:39:21 |
| 2 |
|
| 3 |
Modified: gnome-keyring-2.20.0-fix_pam.patch |
| 4 |
Added: gnome-keyring-2.20.0-fix_gtk_doc.patch |
| 5 |
Log: |
| 6 |
patch to remove the gtk-doc dep when running eautoreconf |
| 7 |
(Portage version: 2.1.3.11) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: gnome-keyring-2.20.0-fix_pam.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- gnome-keyring-2.20.0-fix_pam.patch 3 Oct 2007 09:11:21 -0000 1.1 |
| 23 |
+++ gnome-keyring-2.20.0-fix_pam.patch 6 Oct 2007 07:39:20 -0000 1.2 |
| 24 |
@@ -1,20 +1,34 @@ |
| 25 |
Index: configure.in |
| 26 |
=================================================================== |
| 27 |
---- configure.in (revision 841) |
| 28 |
-+++ configure.in (working copy) |
| 29 |
+--- configure.in (revision 844) |
| 30 |
++++ configure.in (revision 845) |
| 31 |
@@ -249,7 +249,7 @@ |
| 32 |
AC_ARG_WITH([pam-dir], |
| 33 |
[AC_HELP_STRING([--with-pam-dir=DIR], |
| 34 |
[directory to install pam modules in])], |
| 35 |
- [], [with_pam_dir="/usr/lib"]) |
| 36 |
-+ [], [with_pam_dir="/lib/security"]) |
| 37 |
++ [], [with_pam_dir="${prefix}/lib/security"]) |
| 38 |
PAM_DEST_DIR="$with_pam_dir" |
| 39 |
AC_SUBST(PAM_DEST_DIR) |
| 40 |
|
| 41 |
+Index: Makefile.am |
| 42 |
+=================================================================== |
| 43 |
+--- Makefile.am (revision 844) |
| 44 |
++++ Makefile.am (revision 845) |
| 45 |
+@@ -50,8 +50,4 @@ |
| 46 |
+ @echo "DONE AUTOMATIC UNIT TESTS ------------------------------" |
| 47 |
+ |
| 48 |
+ install-pam: |
| 49 |
+- $(MAKE) -C pam install-pam |
| 50 |
+- |
| 51 |
+-uninstall-pam: |
| 52 |
+- $(MAKE) -C pam uninstall-pam |
| 53 |
+- |
| 54 |
++ @echo "WARNING: install-pam is no longer used, use the --with-pam-dir configure option instead" |
| 55 |
Index: pam/Makefile.am |
| 56 |
=================================================================== |
| 57 |
---- pam/Makefile.am (revision 841) |
| 58 |
-+++ pam/Makefile.am (working copy) |
| 59 |
+--- pam/Makefile.am (revision 844) |
| 60 |
++++ pam/Makefile.am (revision 845) |
| 61 |
@@ -3,7 +3,8 @@ |
| 62 |
-I$(top_srcdir) \ |
| 63 |
-DGNOME_KEYRING_DAEMON=\""$(bindir)/gnome-keyring-daemon"\" |
| 64 |
@@ -25,12 +39,10 @@ |
| 65 |
|
| 66 |
pam_gnome_keyring_la_SOURCES = \ |
| 67 |
gkr-pam.h \ |
| 68 |
-@@ -17,15 +18,3 @@ |
| 69 |
- pam_gnome_keyring_la_LDFLAGS = \ |
| 70 |
- -module -avoid-version \ |
| 71 |
+@@ -19,13 +20,5 @@ |
| 72 |
-export-symbols-regex 'pam_sm_' |
| 73 |
-- |
| 74 |
--install-pam: install |
| 75 |
+ |
| 76 |
+ install-pam: install |
| 77 |
- $(mkinstalldirs) "$(DESTDIR)$(PAM_DEST_DIR)" |
| 78 |
- cp "$(DESTDIR)$(libdir)/pam_gnome_keyring.so" "$(DESTDIR)$(PAM_DEST_DIR)" |
| 79 |
- ( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so ) |
| 80 |
@@ -41,3 +53,6 @@ |
| 81 |
- rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_auth.so" |
| 82 |
- rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_session.so" |
| 83 |
- |
| 84 |
++ @echo "WARNING: install-pam is no longer used, use the --with-pam-dir configure option instead" |
| 85 |
++ |
| 86 |
+\ No newline at end of file |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.1 gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch?rev=1.1&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch?rev=1.1&content-type=text/plain |
| 94 |
|
| 95 |
Index: gnome-keyring-2.20.0-fix_gtk_doc.patch |
| 96 |
=================================================================== |
| 97 |
Index: configure.in |
| 98 |
=================================================================== |
| 99 |
--- configure.in (revision 845) |
| 100 |
+++ configure.in (working copy) |
| 101 |
@@ -26,7 +26,11 @@ |
| 102 |
AC_TYPE_SIZE_T |
| 103 |
AC_TYPE_UID_T |
| 104 |
|
| 105 |
+AC_DEFUN(GTK_DOC_CHECK, []) |
| 106 |
GTK_DOC_CHECK |
| 107 |
+AM_CONDITIONAL(ENABLE_GTK_DOC, 0) |
| 108 |
+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0) |
| 109 |
+ |
| 110 |
DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc" |
| 111 |
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) |
| 112 |
|
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
-- |
| 117 |
gentoo-commits@g.o mailing list |
Archives