Restore uclibc patch for execinfo.h

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 149 insertions, 15 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 406a671064e1..8774d508218f 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.168 2014/11/07 08:09:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.169 2015/01/02 16:49:20 blueness Exp $
+
+  02 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/icewm-1.3.8-uclibc.patch, +files/icewm-1.3.9-uclibc.patch:
+  Restore uclibc patch for execinfo.h
 
   07 Nov 2014; Lars Wendler <polynomial-c@gentoo.org> icewm-1.3.9.ebuild,
   files/icewm-1.3.9-fribidi.patch:
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index a98dbab7b87b..b5aa0f524b9e 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -10,7 +10,9 @@ AUX icewm-1.3.7-thermal.patch 1335 SHA256 fe69b7994764e1c3fbf90ec3547e85e8dc92a3
 AUX icewm-1.3.8-build-fixes.patch 3821 SHA256 243db61d3c5b27a70061fb806387e18c1418d7b6b526cc37c7c3e7027089edbf SHA512 7fce22f361dbff6635acbcb91b91235221b1d85f9639a38f12c081305a3b1eb1de7e8825048d39a84495bb6b443e78eff5b9af315a9beb2b20d4205646e47362 WHIRLPOOL e0971a26dde9b74cdd3b259fab32fd5569f838ec8c17fd1674cf08264385a1b5109411716ff375a574647f1cd964645622cb334f1153eb98bbbb8e8f49b03d60
 AUX icewm-1.3.8-deprecated.patch 317 SHA256 05c464c0abbf65a1ea01f81a514c3022939ec0f0a3152583969f6c022dd38451 SHA512 7f0649853c78ea553a20d07bb3d88c3481a033d0fc143585f3bc2e39e9b66572b068f2ffd1660fcbf7d805c7d2f064d6d8900ddf01b61244a84aa13466061aaa WHIRLPOOL 5653fbabd227438b754371daf4a8d483d5d84a2e34be831b400591bf32630616cf9cdafacf15351a54f3953c33ca53cccb29b34a5b617d9e7833f04685effc2c
 AUX icewm-1.3.8-menu.patch 928 SHA256 22d1929f34f377eeb776e993d3052bed06987922b8f6fffb9183c8c986b5ea8e SHA512 837720dc620a02d225f5df82f8fc8b8bb8512e846f6360b058c02fb1e2483186bdccbeaf997bb690c6d8482555f710494a0d534a4add1009ecc3060e180f8baa WHIRLPOOL 50c07457c67802c67b789a42f489c4dace8cf2f912cecf7abe2d1551a951ef25c4d0c66970adb277b37a0041b630c77250c13ac741884ed198e1b51618c7c3b1
+AUX icewm-1.3.8-uclibc.patch 1830 SHA256 7ee3a62e956d1c8c1b2563a1a85356405cc11b06d8f67e65b63d364355acab52 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e WHIRLPOOL 5e5b89cdb7b76f06541001b9f72b7da0cde8235528b57fc2fb7d6d7c816aefea82a314b34959e3987145228ae98c0e9dfa2c9575cefedc3aa95acfb7731e21cd
 AUX icewm-1.3.9-fribidi.patch 4391 SHA256 3f4c15775da53d860e5590ad09089bcfb62b42e4a3dad53d2e673ca9f0747525 SHA512 8b6d825566ad6a058332a47c896d3df4aedf1fdf444f5cf8038eeb43bad616b738a5893d141b45a47f983900869b33229ab469742f203c48fd08f7d341a00d88 WHIRLPOOL cc4bf8a15ef34328531988e6bb11c39ae054e4bd35a48f9e56a10565b526a0dd9dbe182b1e0779e1f4a26dd07260647880b772fa4b386feb4c83012e868a0e89
+AUX icewm-1.3.9-uclibc.patch 1646 SHA256 10388d5e4726e7c375ef1cb100181c2d8e2bbd00f5140ecaaf06e70607506f2c SHA512 009c171e065e3961c2d78810be359a2c46a4d5914f44742e17c6aaa9b347bd6fbd481fd69323f44cbe071f4c501bfcd5d912ebf08c9b5daa355dd42820a380ec WHIRLPOOL 78a0f7b1cd2229949cac7418a5dd2f3fe1f6b35d8b2532686ee100d7e3ee430cbf1269bc8b78fa3798dfc505b19b9bfc5ef1974a40673a6a5c6bb47a145309ee
 AUX icewm-defaults.patch 694 SHA256 ce43d1a20428cecf2198422e87f5092c6378d97e3987925b2c494ea87323bf8c SHA512 41832e4d23af4790991703a502e3c5f5b0189bceac34b3e2e133ed60efd164f0521a90c39aab6fbac81ffb00a07313e1607cd7fb961bda9c5062bd1623a37919 WHIRLPOOL d243a0434ec9217ba8ccd29d9160d8028ce2db8b727e1619021b96304edac10f0969fa581749d387e6ebf7a1ef595a2ff3bb9a49109d3fb416487059140ad0ab
 AUX icewm-fribidi.patch 2168 SHA256 15865e8642ccc9fc5da221cc803176db2acc4a7afc500d199bc33c893a703649 SHA512 85f1f6f12a68f0e64d847ade924755e7f5eac3e443a8c8efeb44400e6403c10d5739b178f540d4337687c0c55159e81ebaaf6c53ae5c14d73a1e4352bd5d1fb5 WHIRLPOOL 9801fde474805e825e0f88a32560192fd45444d194c76e32dc5e82f7d0045022c695713b5d93babbc3a14ee8944c53ea0ef2efc4d618ea6d4c9d6bd12f9824c6
 AUX icewm-keys.patch 1870 SHA256 8e64cf50489fc27b0ddd44faa1e04651981e2d13c8a48bb6270636e7c7d3d7c7 SHA512 c5206e2c4e98d89e71ccd46c3838941101e009036abd6026cf445b2e01315d9d70d6835b45def978d101d575e0c4dc48514883406c0bef67f11f24e4404daf43 WHIRLPOOL 517e63604d1730a3f9895e6d20d3c8b6d9d2b9c79b565e486190682417cff82245292211f09ff6b2659cdd830dde06f6eee8535887da11696370bffd7991823d
@@ -21,22 +23,22 @@ DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894e
 DIST icewm-1.3.9.tar.gz 890170 SHA256 2d47f8cda48a91ac14fb20890c2df0f304cf8278adf50c3e4070ef68b61a687d SHA512 9c28b004d3a13470e61a3ecbea489d67134b5d1651d84677e8ab0fb732b630d30b7be047553833c818a0ae05841ec808d37d7d50e21e5a562d407cdc74b4943e WHIRLPOOL 8ecba1325da50655524b414280bf4c87f7bcf4c5d0e7edb0df8c6b341680443f961eddf7fd653ac75229aea88100ba8c06b8268196b48f63f6683231f972eb97
 EBUILD icewm-1.3.8.ebuild 3430 SHA256 8c2b5777eb0d2e882355afa78fe8bf2d68750f65587ffda448a7cbbc9582ecd4 SHA512 25b4e2f37def4a32b0c18bef5bf8f85059056186174c2b4c6711732a77076293747254b4e4f18c5ac026318dd489cb9e6f0e81cef8aa25218e400c59459d5526 WHIRLPOOL 1a129945ad6e93e9c21d190f415bdfeeab9b8293fbed39c12a0e883ea6408894ff45c155cb4e01373900b0a7b5277af3bff13fd139f6e7dcce759e16627fa1ff
 EBUILD icewm-1.3.9.ebuild 3296 SHA256 3524c30905134b3c6c7cbdc60e6371a00b55f7c640c193c51ae249551697b2d2 SHA512 69db960a3d243c0e31783bdcd57e7e81268b8189e6e426cd2daabf0e366e85f15ea97384a3a1b3af5b366eb61907b515e043e3a9a7f61c8cccd7608283593fc8 WHIRLPOOL 2136eea6fa71cf65566a10cf6b20763e489c0180d80f544b5749b05914b96fef1d2a9d1854b5dc20b7a497643232f3ec429ccb92dc56fbd77fc8665e9c5df777
-MISC ChangeLog 26483 SHA256 045c9a97d1981c4f101764edea40774b5304fa70238e48ed9e7a2ae3cc195b8a SHA512 e8dc444e1d18821cc96b6773454442642ba7095c01e6eb9ee9663aa6596faf3781268554020329e8651a358aae64deb48c94f9446c5ad847390bcc9ee8b0c62f WHIRLPOOL 2127b929d2629bd93286afbea14d904ac47cbb605d21be404910025420e81b6622681ab3b08a1943acdc807855ac3d9815399ad6dc3b91ff67663062d83d9e8c
+MISC ChangeLog 26641 SHA256 a21e65fd5f6ecbde61bd296198446787e70eeddcb9f48e0969ad9f318f7174d2 SHA512 4dd696e0497cec440cf423721d46357d145bf6f4a0ea77b9e2c81008140c438975818007ecd1a51577df983a8efe8da39862d7eb2b81ffe30cfe9e9c87dc9cc2 WHIRLPOOL a0e13f3c448fd33d1a6ba6299352c08b536a8e1ce9b4614b436192bf39e9692c14c00b734d08fe6d4581b9832e23a4ba29852cf12f6254ea763e694d532d4b07
 MISC metadata.xml 475 SHA256 ab567633101459c7952b19014cc0cca71f5cf90e5ff7bc322ef8e39755e24826 SHA512 fab94ce62073fb76d3e8413444e3f43b243b5f484f5afab7c4ef2e47d020f5f013fd610109c248b247b0c78af978779da237c822bf103d2ffff7cb43dba276ad WHIRLPOOL d817f0e0c27ed472d7ebef46fd2d11c4e71e5b092ee46ccb6a60caf3a11d54051d20e03074b7167d585e225bf27302cbf27b48bc0ddb5f036ada359fde03f2a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUXH4rAAoJEPiazRVxLXTFS+IQAMFLHXYiajVv1eIpfQXNhTDl
-DnFv8M9qg/+vW2AACApUoHPn3mdQIoHOgTUghfoyE7CGGmOC69+qeD5Cc3Nm/xTW
-HLZhFZjcI9AzS1UO3Z17q/k95vsxqixI5jiru3IFwUXQLBSEqreEjQGjFZJqriaj
-KZGNAZUzzlSjRgfHYFHrs0Dxdi+6akZ6FyC3rIOjjlsrNSq59q3Boke74irc4u3J
-IkYIE0ziMsZUNjJ3g3ehIfekMeil8fQgYs2P+JdX+zY7mEMlcbDDrAvxCoVdM2SA
-eVmH3PgBUNjBQ+udi6gdiRP3A8wOUolPKbsjeDZTvbpw99iVVb86meN7QO3q2pwW
-VE78LSqVytf5zY+I/5UG64TIlsjTj7ronqVZh9nk9ondi6qpaoBGBlv0FlLsLMV9
-bkgFD0dOa1fTAilsV/IX6gsmUkbNNGdjKcxg2y1MEofQVNpqm+SvrC87VZ8kJR9r
-miSEr3DKTmx5R1nr/hogV1buxOrpKROSjb4qrlxbYnAOnOI0ztm9FnLMu9BfyTM3
-yW46mKsS6TeuMTVls9inD+CqN8qPtfV4tf2ywkAVBUyuqnQ1VZiMxWXEHmjVezk1
-CKjdnRkDegfeNiRA24xkbIlS+xj+CnirfBlMs/o+vCldwJIitvELLCupmjW/eaKk
-Jkwl0TNH6eapVRHLWx0J
-=wWPY
+iQIcBAEBCAAGBQJUpsxSAAoJEJOE+m71LUu6QaUQALbYC8TB9PLq29G6kN5M2F4f
+PiRfT/O58EdQZ5UnK1RoddaoEj5uuIb9mNjusXLwgD+zLO2W7G33uCJ9JE/mCO7I
+nvDVopHmCdXEkvwBwryEEw958Pq0yBDq/MV9+uecMn6BT5ku+K490mTriPA3BqLv
+rh4vmmYUkHBliDVjkorPDfozXwwvfPfBXa70KzYKvd4cvsnuUBUz8IXo4ngcO9Ds
+2DAzzYQAJ8uzg59kn2cvw7bALZgR70CrU3BIG9WWr2KwvDQ75Q3rSl7eiH3KsoPg
+XDmtdlKK5ZN1sKT6/Peygym+pkWPNL/OHpS0QJ7j4p5hBNOAE+McvMVZ1gHj9TCm
+QV0PcOiumOHjZ+gnwDjjYMRa+rlaa5AFYZJxLrzQ8H8SdPDtabjMofOHAfAHGwV2
+6DFDNFpe4QGa8Kvx9r5ou03VvQNnbs/e3OupFxeEsI23ZkpNn8Rwaa0slzznmov3
+WGkSSuHsRqgb7o1r1/4u7jNB+MzTNSiNqvmFD5gZq9e2LL02Znqqs8x2g74v1vXd
+6lIySsXV79RQmuy/+XFeZOd9gm4rXOD+LMa/PewV6INaAHEOtyiHNiBqn2z0g9En
+GEf1ux9a2CpCJ9aVS+VUQNPqZx22INbB6Vuf0KKSJFrgdStpkn2F1mSUNktaY5b6
+qNOA4O10f1P9olY9WZEr
+=6Tdk
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
new file mode 100644
index 000000000000..e790842faed8
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
@@ -0,0 +1,64 @@
+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];
diff --git a/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch
new file mode 100644
index 000000000000..5019b68f3d75
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.9-uclibc.patch
@@ -0,0 +1,64 @@
+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");