[csw-devel] SF.net SVN: gar:[9069] csw/mgar/pkg/awesome/trunk

[wahwah at users.sourceforge.net]

Revision: 9069
          http://gar.svn.sourceforge.net/gar/?rev=9069&view=rev
Author:   wahwah
Date:     2010-03-09 17:59:20 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
awesome: A patch to link against iconv

Modified Paths:
--------------
    csw/mgar/pkg/awesome/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch

Modified: csw/mgar/pkg/awesome/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awesome/trunk/Makefile	2010-03-09 17:46:52 UTC (rev 9068)
+++ csw/mgar/pkg/awesome/trunk/Makefile	2010-03-09 17:59:20 UTC (rev 9069)
@@ -17,12 +17,15 @@
 INSTALL_SCRIPTS = awesome
 CONFIGURE_ARGS = $(DIRPATHS)
 GARCOMPILER = GNU
-EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv
+# EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv
+# EXTRA_CFLAGS = -xc99 -DCE
+# EXTRA_CXXFLAGS = -xc99 -DCEPLUSPLUS
 
-BUILD_DEP_PKGS += CSWlua CSWgperf
+BUILD_DEP_PKGS += CSWlua CSWgperf CSWlibdbusdev
 EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
 PATCHFILES += gperf.sh-solarify.patch
 PATCHFILES += backtrace.c.patch
+PATCHFILES += awesomeConfig.cmake.patch
 
 include gar/category.mk
 

Added: csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch
===================================================================
--- csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch	                        (rev 0)
+++ csw/mgar/pkg/awesome/trunk/files/awesomeConfig.cmake.patch	2010-03-09 17:59:20 UTC (rev 9069)
@@ -0,0 +1,20 @@
+--- awesome-3.4.4/awesomeConfig.cmake.orig	2010-03-09 18:53:40.270578634 +0100
++++ awesome-3.4.4/awesomeConfig.cmake	2010-03-09 18:55:57.683822917 +0100
+@@ -167,6 +167,7 @@
+ 
+ # Check for libev
+ a_find_library(LIB_EV ev)
++a_find_library(LIB_ICONV iconv)
+ 
+ # Error check
+ if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
+@@ -177,7 +178,8 @@
+     ${AWESOME_COMMON_REQUIRED_LDFLAGS}
+     ${AWESOME_REQUIRED_LIBRARIES}
+     ${LIB_EV}
+-    ${LUA_LIBRARIES})
++    ${LUA_LIBRARIES}
++    ${LIB_ICONV})
+ 
+ set(AWESOME_REQUIRED_INCLUDE_DIRS
+     ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.