blueness 15/01/02 16:49:20 Added: icewm-1.3.9-uclibc.patch icewm-1.3.8-uclibc.patch Log: Restore uclibc patch for execinfo.h (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.1 x11-wm/icewm/files/icewm-1.3.9-uclibc.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch?rev=1.1&content-type=text/plain Index: icewm-1.3.9-uclibc.patch =================================================================== diff -Naur a/configure.ac b/configure.ac --- a/configure.ac 2015-01-02 16:27:05.093088172 +0000 +++ b/configure.ac 2015-01-02 16:29:58.563094214 +0000 @@ -75,6 +75,7 @@ AC_CHECK_HEADERS([libgen.h]) AC_CHECK_HEADERS([machine/apmvar.h]) AC_CHECK_HEADERS([machine/apm_bios.h]) +AC_CHECK_HEADERS([execinfo.h]) # Checks for typedefs, structures, and compiler characteristics. AC_CHECK_HEADER_STDBOOL diff -Naur a/src/acpustatus.cc b/src/acpustatus.cc --- a/src/acpustatus.cc 2014-09-01 10:21:57.000000000 +0000 +++ b/src/acpustatus.cc 2015-01-02 16:28:35.738091329 +0000 @@ -25,17 +25,12 @@ #include "sysdep.h" #include "default.h" -#if defined(linux) -//#include <linux/kernel.h> -#include <sys/sysinfo.h> -#endif #if defined(sun) && defined(SVR4) #include <sys/loadavg.h> #endif #ifdef HAVE_KSTAT_H #include <sys/resource.h> #include <kstat.h> -#include <sys/sysinfo.h> #endif #ifdef HAVE_SYS_PARAM_H @@ -56,6 +51,10 @@ #include <dirent.h> #include "intl.h" +#if defined(linux) || defined(HAVE_KSTAT_H) +#include <sys/sysinfo.h> +#endif + #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME) extern ref<YPixmap> taskbackPixmap; diff -Naur a/src/misc.cc b/src/misc.cc --- a/src/misc.cc 2014-09-01 10:21:57.000000000 +0000 +++ b/src/misc.cc 2015-01-02 16:31:00.722096379 +0000 @@ -15,7 +15,7 @@ #include <libgen.h> #endif -#ifdef linux +#if defined(linux) && defined(HAVE_EXECINFO_H) #include <execinfo.h> #endif @@ -543,7 +543,7 @@ } void show_backtrace() { -#ifdef linux +#if defined(linux) && defined(HAVE_EXECINFO_H) void *array[20]; fprintf(stderr, "\nbacktrace:\n"); 1.1 x11-wm/icewm/files/icewm-1.3.8-uclibc.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch?rev=1.1&content-type=text/plain Index: icewm-1.3.8-uclibc.patch =================================================================== diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in --- icewm-1.3.7.orig/configure.in 2010-10-31 10:09:37.000000000 -0400 +++ icewm-1.3.7/configure.in 2013-10-19 06:20:22.947520430 -0400 @@ -113,6 +113,7 @@ AC_CHECK_HEADERS(libgen.h) dnl -- basename() for FreeBSD AC_CHECK_HEADERS(machine/apmvar.h) AC_CHECK_HEADERS(machine/apm_bios.h) +AC_CHECK_HEADERS(execinfo.h) AC_CHECK_HEADERS(kstat.h, [ CORE_LIBS="${CORE_LIBS} -lkstat" diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc --- icewm-1.3.7.orig/src/acpustatus.cc 2010-10-31 10:09:36.000000000 -0400 +++ icewm-1.3.7/src/acpustatus.cc 2013-10-19 06:20:18.355519888 -0400 @@ -25,17 +25,12 @@ #include "sysdep.h" #include "default.h" -#if defined(linux) -//#include <linux/kernel.h> -#include <sys/sysinfo.h> -#endif #if defined(sun) && defined(SVR4) #include <sys/loadavg.h> #endif #ifdef HAVE_KSTAT_H #include <sys/resource.h> #include <kstat.h> -#include <sys/sysinfo.h> #endif #ifdef HAVE_SYS_PARAM_H @@ -56,6 +51,10 @@ #include <dirent.h> #include "intl.h" +#if defined(linux) || defined(HAVE_KSTAT_H) +#include <sys/sysinfo.h> +#endif + #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME) extern ref<YPixmap> taskbackPixmap; diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc --- icewm-1.3.7.orig/src/misc.cc 2010-10-31 10:09:36.000000000 -0400 +++ icewm-1.3.7/src/misc.cc 2013-10-19 06:20:22.947520430 -0400 @@ -15,7 +15,7 @@ #include <libgen.h> #endif -#ifdef linux +#if defined(linux) && defined(HAVE_EXECINFO_H) #include <execinfo.h> #endif @@ -503,7 +503,7 @@ } void show_backtrace() { -#ifdef linux +#if defined(linux) && defined(HAVE_EXECINFO_H) const char head[] = "\nbacktrace:\n"; const char tail[] = "end\n"; void *array[20];
