[gentoo-commits] proj/hardened-dev:uclibc commit in: x11-wm/awesome/, x11-wm/awesome/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     7ae0626a20748a9222940f649ee535f62bab7265
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 01:21:18 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 01:21:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=7ae0626a

x11-wm/awesome: switch to not using execinfo

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xD0455535

---
 x11-wm/awesome/awesome-3.4.11-r99.ebuild           |    5 ++-
 .../files/awesome-3.4.11-remove-backtrace.patch    |   22 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/x11-wm/awesome/awesome-3.4.11-r99.ebuild b/x11-wm/awesome/awesome-3.4.11-r99.ebuild
index 12b7e3e..9c9d769 100644
--- a/x11-wm/awesome/awesome-3.4.11-r99.ebuild
+++ b/x11-wm/awesome/awesome-3.4.11-r99.ebuild
@@ -26,8 +26,7 @@ COMMON_DEPEND=">=dev-lang/lua-5.1
 	>=x11-libs/startup-notification-0.10_p20110426
 	>=x11-libs/xcb-util-0.3.8
 	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	elibc_uclibc? ( dev-libs/libexecinfo )"
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
@@ -80,6 +79,8 @@ src_prepare() {
 
 	# bug  #408025
 	epatch "${FILESDIR}/${P}-convert-path.patch"
+
+	epatch "${FILESDIR}/${P}-remove-backtrace.patch"
 }
 
 src_configure() {

diff --git a/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch
new file mode 100644
index 0000000..e5ee561
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch
@@ -0,0 +1,22 @@
+diff -Naur awesome-3.4.11.orig/awesomeConfig.cmake awesome-3.4.11/awesomeConfig.cmake
+--- awesome-3.4.11.orig/awesomeConfig.cmake	2012-10-27 21:02:13.000000000 -0400
++++ awesome-3.4.11/awesomeConfig.cmake	2012-10-27 21:02:47.000000000 -0400
+@@ -192,12 +192,12 @@
+ endif()
+ 
+ # Check for backtrace
+-include(CheckFunctionExists)
+-CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
+-if(NOT HAVE_BACKTRACE)
+-    a_find_library(LIB_EXECINFO execinfo)
+-    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
+-endif()
++#include(CheckFunctionExists)
++#CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
++#if(NOT HAVE_BACKTRACE)
++#    a_find_library(LIB_EXECINFO execinfo)
++#    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
++#endif()
+ 
+ # Error check
+ if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug