Re: [kde-sunset] sys-apps/hal
Fat-Zer <[email protected]> Thu, 29 Nov 2012 21:11:30 +0400
| Newsgroups | gmane.linux.gentoo.desktop |
|---|---|
| Message-ID | <CANi=-vKh4+h3NPrtat-hBK3udNC8dGVzK8+jsKzBOONGcH=DkA@mail.gmail.com> |
2012/11/20 Fat-Zer <[email protected]>: > 2012/11/19 Canek Peláez Valdés <[email protected]>: > I've checked gtk-doc: the dev-util/gtk-doc-1.17 was released in 2006 > and and version 1.18 in 2007. It doesn't seems that ebuilds got some > notable changes since then. > > About automake: with versions prior or equal to 1.8 it fails on > aclocal stage: https://gist.github.com/4115294 > With all newer versions got the same automake error. > It seems for some reason it doesn't includes gtk-doc.m4. Have automake > got some sort of include or includedir statement for those files? Or > does them affected by any ENV ? > I'm finally done with that: here are my patches. Can anybody, who intrested in it and/or knows more than me about autotools, look through the first one(gtk-doc) and tell me if it's alright or not. Because it seems to be just a workaround not a good solution.
hal-0.5.14-fix-gtk-doc-automake.patch
(application/octet-stream, 399 B)
--- configure.inorig 2012-11-29 19:37:25.000000000 +0300 +++ configure.in 2012-11-29 19:37:35.000000000 +0300 @@ -10,6 +10,8 @@ AC_INIT(hal, 0.5.14, [email protected]) AM_INIT_AUTOMAKE([gnu 1.9]) AM_MAINTAINER_MODE +AC_CONFIG_MACRO_DIR([.]) +m4_include([gtk-doc.m4]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
hal-0.5.14-fix-glib-includes-in-addons.patch
(application/octet-stream, 4.4 KB)
--- ./hald/linux/addons/addon-acpi-buttons-toshiba.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-acpi-buttons-toshiba.c 2012-11-29 04:47:18.000000000 +0300 @@ -40,7 +40,7 @@ #include <string.h> #include <unistd.h> -#include <glib/gmain.h> +#include <glib.h> #include "libhal/libhal.h" #include "../../logger.h" --- ./hald/linux/addons/addon-storage.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-storage.c 2012-11-29 04:47:52.000000000 +0300 @@ -39,7 +39,7 @@ #include <string.h> #include <sys/ioctl.h> #include <unistd.h> -#include <glib/gmain.h> +#include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-dell-backlight.cpp.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-dell-backlight.cpp 2012-11-29 04:46:51.000000000 +0300 @@ -29,7 +29,7 @@ #include <string.h> -#include <glib/gmain.h> +#include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-imac-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-imac-backlight.c 2012-11-29 04:47:34.000000000 +0300 @@ -29,7 +29,7 @@ #include <stdlib.h> #include <sys/io.h> -#include <glib/gmain.h> +#include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-ipw-killswitch.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-ipw-killswitch.c 2012-11-29 04:48:16.000000000 +0300 @@ -36,8 +36,6 @@ #include <unistd.h> #include <glib.h> -#include <glib/gmain.h> -#include <glib/gstdio.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-rfkill-killswitch.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-rfkill-killswitch.c 2012-11-29 04:47:12.000000000 +0300 @@ -36,8 +36,6 @@ #include <unistd.h> #include <glib.h> -#include <glib/gmain.h> -#include <glib/gstdio.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-usb-csr.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-usb-csr.c 2012-11-29 04:47:55.000000000 +0300 @@ -29,7 +29,7 @@ #include <string.h> #include <usb.h> -#include <glib/gmain.h> +#include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-input.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-input.c 2012-11-29 05:00:31.000000000 +0300 @@ -41,8 +41,7 @@ #else #include <linux/input.h> #endif -#include <glib/gmain.h> -#include <glib/gprintf.h> +#include <glib.h> #include <dbus/dbus-glib-lowlevel.h> #include "libhal/libhal.h" --- ./hald/linux/addons/addon-omap-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-omap-backlight.c 2012-11-29 04:47:38.000000000 +0300 @@ -41,7 +41,7 @@ #include <fcntl.h> #include <unistd.h> -#include <glib/gmain.h> +#include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-macbookpro-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-macbookpro-backlight.c 2012-11-29 04:47:43.000000000 +0300 @@ -39,7 +39,7 @@ #include <pci/pci.h> #include <unistd.h> -#include <glib/gmain.h> +#include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-leds.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-leds.c 2012-11-29 04:47:25.000000000 +0300 @@ -36,8 +36,6 @@ #include <unistd.h> #include <glib.h> -#include <glib/gmain.h> -#include <glib/gstdio.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> --- ./hald/linux/addons/addon-cpufreq.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-cpufreq.c 2012-11-29 04:48:01.000000000 +0300 @@ -32,7 +32,6 @@ #include <unistd.h> #include <signal.h> #include <getopt.h> -#include <glib/gprintf.h> #include "addon-cpufreq.h" #include "addon-cpufreq-userspace.h" --- ./hald/linux/addons/addon-generic-backlight.c.orig 2009-08-24 16:42:30.000000000 +0400 +++ ./hald/linux/addons/addon-generic-backlight.c 2012-11-29 05:11:49.000000000 +0300 @@ -35,7 +35,7 @@ #include <sys/stat.h> #include <unistd.h> -#include <glib/gmain.h> +#include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h>