SOURCES: xorg-app-xsm-xaw.patch - updated

[arekm]

Author: arekm                        Date: Tue Nov 11 16:32:25 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   xorg-app-xsm-xaw.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/xorg-app-xsm-xaw.patch
diff -u SOURCES/xorg-app-xsm-xaw.patch:1.2 SOURCES/xorg-app-xsm-xaw.patch:1.3
--- SOURCES/xorg-app-xsm-xaw.patch:1.2	Tue Nov 11 17:30:54 2008
+++ SOURCES/xorg-app-xsm-xaw.patch	Tue Nov 11 17:32:20 2008
@@ -1,13 +1,41 @@
---- xsm-1.0.1/configure.ac~	2008-11-11 17:29:28.324414036 +0100
-+++ xsm-1.0.1/configure.ac	2008-11-11 17:30:08.924297932 +0100
-@@ -63,8 +63,7 @@
+commit cfb89d84fa8ea3f42b130d676125a530bd0e1e94
+Author: Alan Coopersmith <alan.coopersmith at sun.com>
+Date:   Thu Feb 21 08:51:42 2008 -0800
+
+    Add PKG_CHECK_MODULES entries for the libraries xsm calls directly
+
+diff --git a/configure.ac b/configure.ac
+index 836ae57..269bf84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,10 @@ AC_CHECK_FUNC([putenv], [],
     AC_DEFINE(NOPUTENV,1,[Define to 1 if you DO NOT have the `putenv' function.]))
  
  # Checks for pkg-config packages
 -XAW_CHECK_XPRINT_SUPPORT(XSM)
--
-+PKG_CHECK_MODULES(XSM_XAW, xaw7)
++PKG_CHECK_MODULES(XSM, x11 xt ice sm)
++XAW_CHECK_XPRINT_SUPPORT(XSM_XAW)
++XSM_CFLAGS="$XSM_XAW_CFLAGS $XSM_CFLAGS"
++XSM_LIBS="$XSM_XAW_LIBS $XSM_LIBS"
+ 
  AC_SUBST(XSM_CFLAGS)
  AC_SUBST(XSM_LIBS)
- 
+commit 6f1ebee7cba16f31c6201d6654d0c4ff9502ec12
+Author: James Cloos <cloos at jhcloos.com>
+Date:   Wed Aug 20 10:32:53 2008 -0400
 
+    xaw8 is gone, use xaw7
+
+diff --git a/configure.ac b/configure.ac
+index 269bf84..0b15075 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,7 +64,7 @@ AC_CHECK_FUNC([putenv], [],
+ 
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XSM, x11 xt ice sm)
+-XAW_CHECK_XPRINT_SUPPORT(XSM_XAW)
++PKG_CHECK_MODULES(XSM_XAW, xaw7)
+ XSM_CFLAGS="$XSM_XAW_CFLAGS $XSM_CFLAGS"
+ XSM_LIBS="$XSM_XAW_LIBS $XSM_LIBS"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-app-xsm-xaw.patch?r1=1.2&r2=1.3&f=u