diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-01-01 21:45:46 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-01-01 21:45:46 +0000 |
| commit | 8e731e8deede29e3bc5b6ca0108b5ff872c76dae (patch) | |
| tree | 1068ff323c30f64dfc13b4f8c5a6ccef63e1dba8 /gnome-base/gconf/files | |
| parent | stick musicbrainz deps to -2*, bug #203784 (diff) | |
| download | gentoo-2-8e731e8deede29e3bc5b6ca0108b5ff872c76dae.tar.gz gentoo-2-8e731e8deede29e3bc5b6ca0108b5ff872c76dae.tar.bz2 gentoo-2-8e731e8deede29e3bc5b6ca0108b5ff872c76dae.zip | |
prune old releases
add a patch to remove automagic dependency on ldap
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'gnome-base/gconf/files')
| -rw-r--r-- | gnome-base/gconf/files/digest-gconf-2.16.0 | 3 | ||||
| -rw-r--r-- | gnome-base/gconf/files/digest-gconf-2.20.0 | 3 | ||||
| -rw-r--r-- | gnome-base/gconf/files/digest-gconf-2.20.1-r1 | 3 | ||||
| -rw-r--r-- | gnome-base/gconf/files/gconf-2.20.1-automagic-ldap.patch | 85 |
4 files changed, 88 insertions, 6 deletions
diff --git a/gnome-base/gconf/files/digest-gconf-2.16.0 b/gnome-base/gconf/files/digest-gconf-2.16.0 deleted file mode 100644 index e13c5ad0a1ea..000000000000 --- a/gnome-base/gconf/files/digest-gconf-2.16.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b1a202f36661c0d9c87f8fe27a28bd52 GConf-2.16.0.tar.bz2 1307732 -RMD160 b3c429a45ac96cf79b7231666ecb8e1de645a4f8 GConf-2.16.0.tar.bz2 1307732 -SHA256 d687ea919e20e08c42eeedf32e40f0845cd6799dbfa2edec9dbc644d386805c2 GConf-2.16.0.tar.bz2 1307732 diff --git a/gnome-base/gconf/files/digest-gconf-2.20.0 b/gnome-base/gconf/files/digest-gconf-2.20.0 deleted file mode 100644 index 9d9173c107fa..000000000000 --- a/gnome-base/gconf/files/digest-gconf-2.20.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a6d82dee79df11b6e38b19cb42197d32 GConf-2.20.0.tar.bz2 1403455 -RMD160 54948f0df79fa1bd68cebb5aae97cace0c21d642 GConf-2.20.0.tar.bz2 1403455 -SHA256 171b077190db67073379d464fa45ceacfcbe099a5c6c6c80ce5cd31ec665ab06 GConf-2.20.0.tar.bz2 1403455 diff --git a/gnome-base/gconf/files/digest-gconf-2.20.1-r1 b/gnome-base/gconf/files/digest-gconf-2.20.1-r1 new file mode 100644 index 000000000000..4b902210b04c --- /dev/null +++ b/gnome-base/gconf/files/digest-gconf-2.20.1-r1 @@ -0,0 +1,3 @@ +MD5 646fc896c6282a8f103365af0fa2e303 GConf-2.20.1.tar.bz2 1404919 +RMD160 743bee341731402e5d4938ee030adf4f463d9a52 GConf-2.20.1.tar.bz2 1404919 +SHA256 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838 GConf-2.20.1.tar.bz2 1404919 diff --git a/gnome-base/gconf/files/gconf-2.20.1-automagic-ldap.patch b/gnome-base/gconf/files/gconf-2.20.1-automagic-ldap.patch new file mode 100644 index 000000000000..597e06754c95 --- /dev/null +++ b/gnome-base/gconf/files/gconf-2.20.1-automagic-ldap.patch @@ -0,0 +1,85 @@ +Index: configure.in +=================================================================== +--- configure.in (révision 2495) ++++ configure.in (copie de travail) +@@ -177,36 +182,55 @@ + + AC_CHECK_FUNCS(getuid sigaction fsync fchmod fdwalk) + ++dnl ************************************************** ++dnl LDAP support. ++dnl ************************************************** + + LDAP_LIBS= +-AC_CHECK_HEADER(ldap.h, [ +- AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"])) ++ ++AC_ARG_WITH(openldap, ++ AC_HELP_STRING([--with-openldap], ++ [Enable LDAP backend @<:@default=auto@:>@]), ++ ,with_openldap=auto) ++ ++if test x"$with_openldap" != xno; then ++ AC_CHECK_HEADER(ldap.h, [ ++ AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"])) + ]) +-AC_SUBST(LDAP_LIBS) +-AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS") ++ AC_SUBST(LDAP_LIBS) + +-dnl ************************************************** +-dnl LDAP support. +-dnl ************************************************** +-if test "$os_win32" != yes; then ++ if test "$os_win32" != yes; then ++ SAVE_CFLAGS="$CFLAGS" ++ SAVE_LIBS="$LIBS" ++ LDAP_CFLAGS="-DLDAP_DEPRECATED" ++ CFLAGS="$CFLAGS $LDAP_CFLAGS" ++ LIBS="$LIBS $LDAP_LIBS" ++ AC_CHECK_FUNCS(ldap_ntlm_bind) ++ CFLAGS="$SAVE_CFLAGS" ++ LIBS="$SAVE_LIBS" ++ ++ else # Win32 ++ LDAP_CFLAGS="-DLDAP_DEPRECATED" ++ LDAP_LIBS="-lwldap32" ++ AC_SUBST(LDAP_CFLAGS) ++ AC_SUBST(LDAP_LIBS) ++ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) ++ msg_ldap="yes" ++ fi # Win32 ++ ++ if test -z "$LDAP_LIBS"; then ++ if test x"$with_openldap" = xyes; then ++ AC_MSG_ERROR([*** LDAP support explicitely requested but not found ***]) ++ else ++ AC_MSG_WARN([*** LDAP support not found ***]) ++ fi ++ fi ++ ++else ++ AC_DEFINE(HAVE_LDAP,0,[Define if you have LDAP support]) ++fi + +-SAVE_CFLAGS="$CFLAGS" +-SAVE_LIBS="$LIBS" +-LDAP_CFLAGS="-DLDAP_DEPRECATED" +-CFLAGS="$CFLAGS $LDAP_CFLAGS" +-LIBS="$LIBS $LDAP_LIBS" +-AC_CHECK_FUNCS(ldap_ntlm_bind) +-CFLAGS="$SAVE_CFLAGS" +-LIBS="$SAVE_LIBS" +- +-else # Win32 +-LDAP_CFLAGS="-DLDAP_DEPRECATED" +-LDAP_LIBS="-lwldap32" +-AC_SUBST(LDAP_CFLAGS) +-AC_SUBST(LDAP_LIBS) +-AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) +-msg_ldap="yes" +-fi # Win32 ++AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS") + + IT_PROG_INTLTOOL([0.35.0]) + |