Attachment 1634 Details for Bug 1622 – Updated patch to support xscreensaver in an alternate directory

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Updated patch to support xscreensaver in an alternate directory

tdebase-xscreensaver-directory-detection.diff (text/plain), 2.39 KB, created by Darrell on 2013-11-12 15:42:20 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2013-11-12 15:42:20 CST

Size: 2.39 KB

patch

obsolete

>diff -urN tdebase/CMakeLists.txt tdebase.new/CMakeLists.txt
>--- tdebase/CMakeLists.txt	2013-11-09 12:29:28.000000000 -0600
>+++ tdebase.new/CMakeLists.txt	2013-11-12 15:39:12.498257038 -0600
>@@ -73,6 +73,7 @@
> option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
> option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
> option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
>+option( WITH_XSCREENSAVER_DIR "Optional xscreensaver directory" OFF )
> option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" ${WITH_ALL_OPTIONS} )
> option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )
> option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" ${WITH_ALL_OPTIONS} )
>@@ -109,6 +110,7 @@
> #                              xkb initialization fails.
> # WITH_XTEST        affects tdm kxkb khotkeys
> # WITH_XSCREENSAVER affects kdesktop
>+# WITH_XSCREENSAVER_DIR optional xscreensaver location
> # WITH_LIBART       affects tdm kcontrol(icons background)
> # WITH_LIBUSB       affects kcontrol(input)
> # WITH_XDMCP        affects tdm
>diff -urN tdebase/ConfigureChecks.cmake tdebase.new/ConfigureChecks.cmake
>--- tdebase/ConfigureChecks.cmake	2013-09-12 11:51:29.000000000 -0500
>+++ tdebase.new/ConfigureChecks.cmake	2013-11-12 15:37:46.419702152 -0600
>@@ -155,15 +155,22 @@
>       pkg_search_module( XSS xext )
>     endif( )
>   endif( )
>+
>   check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
>   if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
>     set( HAVE_XSCREENSAVER 1 )
>   else( )
>     tde_message_fatal( "xscreensaver is requested, but was not found on your system" )
>   endif( )
>-  include( FindXscreensaver.cmake ) # not really good practise
>-  if( NOT XSCREENSAVER_FOUND )
>-    message( FATAL_ERROR "\nxscreensaver is requested, but was not found on your system" )
>+
>+  if( NOT XSCREENSAVER_DIR )
>+    # The xscreensaver package is not required to build, only knowing where
>+    # to find the executables. Allow the user to define XSCREENSAVER_DIR.
>+    include( FindXscreensaver.cmake ) # not really good practice
>+    if( NOT XSCREENSAVER_FOUND )
>+      tde_message_fatal( 
>+        "xscreensaver is requested, but cmake can not determine the location of XSCREENSAVER_DIR. Either specify manually with -DXSCREENSAVER_DIR or ensure xscreensaver installed properly." )
>+    endif( )
>   endif( )
> endif( )
>

Actions: View | Diff

Attachments on bug 1622: 1462 | 1634 | 2020