[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 65945] kdebase HEAD fails to compile on Solaris 8 due to
From:       Stephan Kulow <coolo () kde ! org>
Date:       2003-11-09 13:02:16
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
     
http://bugs.kde.org/show_bug.cgi?id=65945     
coolo@kde.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From coolo@kde.org  2003-11-09 14:02 -------
Subject: /

CVS commit by coolo: 

applying slightly modified patch to fix DPMS compilation on Solaris
CCMAIL: 65945-done@bugs.kde.org


  M +20 -3     kde-common/admin/acinclude.m4.in   2.429
  M +11 -1     kdebase/kcontrol/energy/energy.cpp   1.30
  M +4 -0      kdebase/kdesktop/lockeng.cc   1.65
  M +4 -0      kdebase/kdesktop/lock/lockprocess.cc   1.32


--- kde-common/admin/acinclude.m4.in  #2.428:2.429
@@ -1950,5 +1950,6 @@
 EOF
 
- ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext'
+ ac_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$all_includes $CPPFLAGS"
  if AC_TRY_EVAL(ac_compile); then
    AC_MSG_RESULT(yes)
@@ -1958,4 +1959,5 @@
 For more details about this problem, look at the end of config.log.])
   fi
+  CPPFLAGS=$ac_save_CPPFLAGS
 
   AC_LANG_RESTORE
@@ -3541,4 +3543,18 @@
   fi
  fi
+ ac_save_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS $X_INCLUDES"
+ test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
+ AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
+   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
+ AC_CHECK_DECL(DPMSCapable,
+   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
+   [#include <X11/extensions/dpms.h>])
+ AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
+   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
+ AC_CHECK_DECL(DPMSInfo,
+   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
+   [#include <X11/extensions/dpms.h>])
+ CFLAGS="$ac_save_cflags"
  AC_SUBST(DPMSINC)
  AC_SUBST(DPMSLIB)
@@ -5213,7 +5229,7 @@
 EOF
 
-    ac_compile='${CC-gcc} $CFLAGS conftest.$ac_ext -o conftest'
+    ac_save_CPPFLAGS=$CPPFLAGS
     if test "$ac_ssl_includes" != "/usr/include"; then
-        ac_compile="$ac_compile -I$ac_ssl_includes"
+        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
     fi
 
@@ -5241,4 +5257,5 @@
       David Faure <faure@kde.org>, attaching your config.log])
     fi 
+    CPPFLAGS=$ac_save_CPPFLAGS
 
   ])

--- kdebase/kdesktop/lockeng.cc  #1.64:1.65
@@ -31,4 +31,8 @@ extern "C" {
 #endif
 #include <X11/extensions/dpms.h>
+
+#ifndef HAVE_DPMSINFO_PROTO
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
+#endif
 }
 #endif

--- kdebase/kdesktop/lock/lockprocess.cc  #1.31:1.32
@@ -62,4 +62,8 @@ extern "C" {
 #endif
 #include <X11/extensions/dpms.h>
+
+#ifndef HAVE_DPMSINFO_PROTO
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
+#endif
 }
 #endif

--- kdebase/kcontrol/energy/energy.cpp  #1.29:1.30
@@ -51,5 +51,15 @@
 extern "C" {
 #include <X11/extensions/dpms.h>
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
+Bool DPMSCapable( Display * );
 int __kde_do_not_unload = 1;
+
+#ifndef HAVE_DPMSCAPABLE_PROTO
+Bool DPMSCapable ( Display * );
+#endif
+
+#ifndef HAVE_DPMSINFO_PROTO
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
+#endif
 }
[prev in list] [next in list] [prev in thread] [next in thread]