From c69de47f31aad401ce78ad9f2e5affdb83658c8b Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 25 Sep 2008 15:35:03 +0530 Subject: Add gnome-base/gconf-9999 - Add intltoolize --force to the eclass to work around problems faced sometimes - Add (updated) autofoo patches from gnome bug 498934 - Add no-gconfd.patch from gnome overlay --- eclass/gnome2-live.eclass | 1 + gnome-base/gconf/Manifest | 3 + gnome-base/gconf/files/gconf-HEAD-autofoo.patch | 299 ++++++++++++++++++++++++ gnome-base/gconf/files/gconf-no-gconfd.patch | 19 ++ gnome-base/gconf/gconf-9999.ebuild | 76 ++++++ 5 files changed, 398 insertions(+) create mode 100644 gnome-base/gconf/Manifest create mode 100644 gnome-base/gconf/files/gconf-HEAD-autofoo.patch create mode 100644 gnome-base/gconf/files/gconf-no-gconfd.patch create mode 100644 gnome-base/gconf/gconf-9999.ebuild diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass index 58abc81..fd861cb 100644 --- a/eclass/gnome2-live.eclass +++ b/eclass/gnome2-live.eclass @@ -35,6 +35,7 @@ gnome2-live_src_unpack() { done gtkdocize + intltoolize --force eautoreconf ## This point onwards must stay in sync with gnome2.eclass diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest new file mode 100644 index 0000000..ad886e7 --- /dev/null +++ b/gnome-base/gconf/Manifest @@ -0,0 +1,3 @@ +AUX gconf-HEAD-autofoo.patch 9431 RMD160 6611671dfa1ac5945fe582533546fe509db55b5a SHA1 85ac3c120066fcf346d27dce297cd2ee14005a52 SHA256 e40349228788df2d2b6acb42da4a709f0efff59181b024a6f2feedf2fcf363c1 +AUX gconf-no-gconfd.patch 787 RMD160 bbcd0e1dd0f49053522e703c33a9befb392b2203 SHA1 ccc94c4766a29f1bb3f16c1d1995996ba682686a SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c +EBUILD gconf-9999.ebuild 1676 RMD160 837dbcdaf9e31f559e1fa936e14832112e3a1577 SHA1 88dc96f96047c5667f8095b3712beb28eb668989 SHA256 ee8a39b7d6a5da8f4a74495f0af406281089a67d518b3273a1e5339a6ca2eddb diff --git a/gnome-base/gconf/files/gconf-HEAD-autofoo.patch b/gnome-base/gconf/files/gconf-HEAD-autofoo.patch new file mode 100644 index 0000000..060291b --- /dev/null +++ b/gnome-base/gconf/files/gconf-HEAD-autofoo.patch @@ -0,0 +1,299 @@ +--- configure.in.old 2008-09-20 23:56:00.000000000 +0200 ++++ configure.in 2008-09-20 23:56:44.000000000 +0200 +@@ -1,11 +1,16 @@ +-AC_INIT([GConf],[2.24.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],[GConf]) ++AC_PREREQ(2.60) ++ ++AC_INIT([GConf], ++ [2.23.2], ++ [http://bugzilla.gnome.org/enter_bug.cgi?product=GConf], ++ [GConf]) + + AC_DEFUN([AC_FYI], [echo "FYI: " $1]) + + AC_CONFIG_SRCDIR([gconf/gconf.h]) +-AM_CONFIG_HEADER(config.h) ++AM_CONFIG_HEADER([config.h]) + +-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) ++AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wall]) + + AM_MAINTAINER_MODE + +@@ -19,14 +24,14 @@ + ;; + esac + +-AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"]) ++AM_CONDITIONAL(OS_WIN32, [test "x$os_win32" = "xyes"]) + +-if test "$os_win32" = "yes"; then +- if test x$enable_static = xyes -o x$enable_static = x; then ++if test "x$os_win32" = "xyes"; then ++ if test "x$enable_static" = "xyes" -o "x$enable_static" = "x"; then + AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) + enable_static=no + fi +- if test x$enable_shared = xno; then ++ if test "x$enable_shared" = "xno"; then + AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) + fi + enable_shared=yes +@@ -44,19 +49,19 @@ + changequote(,)dnl + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -Wall" ;; ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) CFLAGS="$CFLAGS -Wall" ;; + esac + + if test "x$enable_ansi" = "xyes"; then + case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -ansi" ;; ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) CFLAGS="$CFLAGS -ansi" ;; + esac + + case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -pedantic" ;; ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) CFLAGS="$CFLAGS -pedantic" ;; + esac + fi + fi +@@ -76,12 +81,12 @@ + dnl increment if the interface has additions, changes, removals. + GCONF_CURRENT=5 + +-dnl increment any time the source changes; set to ++dnl increment any time the source changes; set to + dnl 0 if you increment CURRENT + GCONF_REVISION=5 + + dnl increment if any interfaces have been added; set to 0 +-dnl if any interfaces have been removed. removal has ++dnl if any interfaces have been removed. removal has + dnl precedence over adding, so set to 0 if both happened. + GCONF_AGE=1 + +@@ -97,14 +102,16 @@ + REAL_PREFIX=$prefix + fi + +-AC_ARG_WITH(sysconfsubdir, AC_HELP_STRING([--with-sysconfsubdir], +- [directory name used under sysconfdir, default=gconf]), +- sysconfsubdir=${withval}, sysconfsubdir=gconf) ++AC_ARG_WITH(sysconfsubdir, ++ AS_HELP_STRING([--with-sysconfsubdir], ++ [directory name used under sysconfdir @<:@default=gconf@:>@]), ++ sysconfsubdir=${withval}, sysconfsubdir=gconf) + AC_SUBST(sysconfsubdir) +-if test x"${sysconfsubdir}" != x; then +- sysgconfdir='${sysconfdir}/${sysconfsubdir}' ++ ++if test "x${sysconfsubdir}" != "x"; then ++ sysgconfdir='${sysconfdir}/${sysconfsubdir}' + else +- sysgconfdir='${sysconfdir}' ++ sysgconfdir='${sysconfdir}' + fi + AC_SUBST(sysgconfdir) + +@@ -112,24 +119,29 @@ + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + dnl Default to debug spew in unstable branch +-AC_ARG_ENABLE(debug, +- [ --enable-debug=[no/yes/minimum] Compile with debug checks.],,enable_debug=minimum) ++AC_ARG_ENABLE(debug, ++ AS_HELP_STRING([--enable-debug=@<:@no/yes/minimum@:>@], ++ [Compile with debug checks.]), ++ ,enable_debug=minimum) + + if test "x$enable_debug" = "xyes"; then +- CFLAGS="$CFLAGS -DGCONF_ENABLE_DEBUG=1" +- AC_FYI("Will build with debugging spew and checks") ++ CFLAGS="$CFLAGS -DGCONF_ENABLE_DEBUG=1" ++ AC_FYI("Will build with debugging spew and checks") + else + if test "x$enable_debug" = "xno"; then +- CFLAGS="$CFLAGS -DG_DISABLE_CHECKS=1 -DG_DISABLE_ASSERT=1" +- AC_FYI("Will build without *any* debugging code") ++ CFLAGS="$CFLAGS -DG_DISABLE_CHECKS=1 -DG_DISABLE_ASSERT=1" ++ AC_FYI("Will build without *any* debugging code") + else +- AC_FYI("Will build with debug checks but no debug spew") ++ AC_FYI("Will build with debug checks but no debug spew") + fi + fi + + GTK_DOC_CHECK([1.0]) + +-AC_ARG_ENABLE(gtk, [ --enable-gtk Enable GTK+ support (for gconf-sanity-check) [default=auto]], enable_gtk="$enableval", enable_gtk=auto) ++AC_ARG_ENABLE(gtk, ++ AS_HELP_STRING([--enable-gtk], ++ [Enable GTK+ support (for gconf-sanity-check) @<:@default=auto@:>@]), ++ enable_gtk="$enableval", enable_gtk=auto) + + PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0 dbus-1 >= 1.0.0 dbus-glib-1 >= 0.74' + PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0" +@@ -141,8 +153,7 @@ + + if test "x$enable_gtk" != "xno"; then + PKG_CHECK_MODULES(DEPENDENT_WITH_GTK, $PKGCONFIG_MODULES_WITH_GTK, HAVE_GTK=yes, HAVE_GTK=no) +- PKG_CHECK_MODULES(DEPENDENT_WITH_XML_AND_GTK, $PKGCONFIG_MODULES_WITH_XML_AND_GTK, , +- DEPENDENT_WITH_XML_AND_GTK_CFLAGS=$DEPENDENT_WITH_XML_CFLAGS DEPENDENT_WITH_XML_AND_GTK_LIBS=$DEPENDENT_WITH_XML_LIBS) ++ PKG_CHECK_MODULES(DEPENDENT_WITH_XML_AND_GTK, $PKGCONFIG_MODULES_WITH_XML_AND_GTK, , DEPENDENT_WITH_XML_AND_GTK_CFLAGS=$DEPENDENT_WITH_XML_CFLAGS DEPENDENT_WITH_XML_AND_GTK_LIBS=$DEPENDENT_WITH_XML_LIBS) + + if test "x$enable_gtk" = "xyes" && test "x$HAVE_GTK" = "xno"; then + AC_MSG_ERROR([[ +@@ -155,7 +166,7 @@ + DEPENDENT_WITH_XML_AND_GTK_LIBS=$DEPENDENT_WITH_XML_LIBS + fi + +-AM_CONDITIONAL(GTK, test x$HAVE_GTK != xno) ++AM_CONDITIONAL(GTK, [test "x$HAVE_GTK" != "xno"]) + + AC_SUBST(DEPENDENT_LIBS) + AC_SUBST(DEPENDENT_CFLAGS) +@@ -166,19 +177,20 @@ + AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_LIBS) + AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) + ++enable_defaults_service=no ++HAVE_POLKIT=no + AC_ARG_ENABLE(defaults-service, +- [AC_HELP_STRING([--enable-defaults-service], +- [build the defaults DBus service [default=auto]])], +- [enable_defaults_service="$enableval"], +- [enable_defaults_service=auto]) ++ AS_HELP_STRING([--enable-defaults-service], ++ [build the defaults DBus service @<:@default=auto@:>@])], ++ [enable_defaults_service="$enableval"], ++ [enable_defaults_service=auto]) ++ + if test "x$enable_defaults_service" != "xno" ; then +- PKG_CHECK_MODULES(DEFAULTS, glib-2.0 gobject-2.0 dbus-1 dbus-glib-1 polkit-dbus, HAVE_POLKIT=yes, HAVE_POLKIT=no) ++ PKG_CHECK_MODULES(DEFAULTS, glib-2.0 gobject-2.0 dbus-1 dbus-glib-1 polkit-dbus, HAVE_POLKIT=yes) + if test "x$HAVE_POLKIT" = "xno"; then + if test "x$enable_defaults_service" = "xyes" ; then + AC_MSG_ERROR([[ + *** Could not find PolicyKit.]]) +- else +- enable_defaults_service=no + fi + else + enable_defaults_service=yes +@@ -201,42 +213,63 @@ + AC_SUBST(ORBIT_IDL) + + AC_CHECK_HEADER(pthread.h, have_pthreads=yes) +-AM_CONDITIONAL(PTHREADS, test -n "$have_pthreads") ++AM_CONDITIONAL(PTHREADS, [test -n "$have_pthreads"]) + + AC_CHECK_HEADERS(syslog.h sys/wait.h) + + AC_CHECK_FUNCS(getuid sigaction fsync fchmod fdwalk) + ++dnl ************************************************** ++dnl LDAP support. ++dnl ************************************************** ++ ++AC_ARG_WITH(openldap, ++ AS_HELP_STRING([--with-openldap], ++ [Enable LDAP backend @<:@default=auto@:>@]), ++ ,with_openldap=auto) + + LDAP_LIBS= +-AC_CHECK_HEADER(ldap.h, [ ++ ++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") + +-dnl ************************************************** +-dnl LDAP support. +-dnl ************************************************** +-if test "$os_win32" != yes; then ++ if test "x$os_win32" != "xyes"; 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 + +-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" ++ have_ldap=yes ++else ++ have_ldap=no ++fi + 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]) + +@@ -274,7 +307,7 @@ + + REBUILD=\# + if test $_found_perl -eq 1; then +- if test -n "$AWK" ; then ++ if test -n "$AWK" ; then + REBUILD= + fi + fi +@@ -296,3 +329,12 @@ + ]) + + AC_OUTPUT ++ ++echo " ++ sysconfsubdir: ${sysconfsubdir} ++ ++ gtk+: ${HAVE_GTK} ++ ldap: ${have_ldap} ++ policykit: ${HAVE_POLKIT} ++ ++" diff --git a/gnome-base/gconf/files/gconf-no-gconfd.patch b/gnome-base/gconf/files/gconf-no-gconfd.patch new file mode 100644 index 0000000..8ca6a0d --- /dev/null +++ b/gnome-base/gconf/files/gconf-no-gconfd.patch @@ -0,0 +1,19 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c +--- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -0400 ++++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400 +@@ -856,6 +856,7 @@ main (int argc, char** argv) + { + g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n")); + makefile_install_mode = FALSE; ++ return 0; + } + + if (makefile_uninstall_mode && +@@ -863,6 +864,7 @@ main (int argc, char** argv) + { + g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n")); + makefile_uninstall_mode = FALSE; ++ return 0; + } + + if (makefile_install_mode || makefile_uninstall_mode) diff --git a/gnome-base/gconf/gconf-9999.ebuild b/gnome-base/gconf/gconf-9999.ebuild new file mode 100644 index 0000000..47a97bd --- /dev/null +++ b/gnome-base/gconf/gconf-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit gnome2 gnome2-live + +DESCRIPTION="Gnome Configuration System and Daemon" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc ldap policykit" + +RDEPEND=">=dev-libs/glib-2.10 + >=x11-libs/gtk+-2.8.16 + >=gnome-base/orbit-2.4 + >=dev-libs/libxml2-2 + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + >=dev-util/gtk-doc-am-1.10 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog NEWS README TODO" +#PATCHES="${PN}-HEAD-autofoo.patch +PATCHES=" ${PN}-no-gconfd.patch" + +pkg_setup() { + G2CONF="${G2CONF} + --enable-gtk + $(use_enable debug) + $(use_enable policykit defaults-service) + $(use_with ldap openldap)" + kill_gconf +} + +src_install() { + gnome2_src_install + + # hack hack + #dodir /etc/gconf/gconf.xml.mandatory + #dodir /etc/gconf/gconf.xml.defaults + keepdir /etc/gconf/gconf.xml.mandatory + keepdir /etc/gconf/gconf.xml.defaults + + echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf + doenvd 50gconf || die "doenv failed" + dodir /root/.gconfd +} + +pkg_preinst() { + kill_gconf +} + +pkg_postinst() { + kill_gconf + + #change the permissions to avoid some gconf bugs + einfo "changing permissions for gconf dirs" + find /etc/gconf/ -type d -exec chmod ugo+rx "{}" \; + + einfo "changing permissions for gconf files" + find /etc/gconf/ -type f -exec chmod ugo+r "{}" \; +} + +kill_gconf() { + # This function will kill all running gconfd-2 that could be causing troubles + if [ -x /usr/bin/gconftool-2 ] + then + /usr/bin/gconftool-2 --shutdown + fi + + return 0 +} -- cgit v1.2.3