Attachment 1524 Details for Bug 1553 – 0001-added-new-build-option-WITH_XRANDR.patch

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] 0001-added-new-build-option-WITH_XRANDR.patch

0001-added-new-build-option-WITH_XRANDR.patch (text/plain), 1.87 KB, created by Alexander Golubev (Fat-Zer) on 2013-09-24 22:37:37 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Golubev (Fat-Zer)

Created: 2013-09-24 22:37:37 CDT

Size: 1.87 KB

patch

obsolete

>From 773599b9c03c18694661d17beae191f1f81796df Mon Sep 17 00:00:00 2001
>From: Golubev Alexander <fatzer2@gmail.com>
>Date: Sun, 30 Jun 2013 01:25:43 +0400
>Subject: [PATCH 1/2] added new build option: WITH_XRANDR
>
>---
> CMakeLists.txt | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 722dddf..4a07369 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -95,6 +95,7 @@ OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)"
> OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF )
> OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
>+OPTION( WITH_XRANDR "Build the tderandr library" ON )
> OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
> 
> OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
>@@ -599,10 +600,14 @@ endif( NOT FONTCONFIG_FOUND )
> 
> ##### check for Xrandr ##########################
> 
>-pkg_search_module( XRANDR xrandr>=1.2 )
>-if( XRANDR_FOUND )
>-  set( XRANDR_SUPPORT 1 )
>-endif( XRANDR_FOUND )
>+if( WITH_XRANDR )
>+  pkg_search_module( XRANDR xrandr>=1.2 )
>+  if( XRANDR_FOUND )
>+    set( XRANDR_SUPPORT 1 )
>+  else( XRANDR_FOUND )
>+	message(FATAL_ERROR "\nxrandr support was required, but not found on your system" )
>+  endif( XRANDR_FOUND )
>+endif( WITH_XRANDR )
> 
> 
> ##### check for xrender #########################
>@@ -1025,9 +1030,7 @@ add_subdirectory( arts )
> add_subdirectory( interfaces )
> add_subdirectory( kate )
> add_subdirectory( tdecert )
>-if( XRANDR_FOUND )
>-  add_subdirectory( tderandr )
>-endif( XRANDR_FOUND )
>+tde_conditional_add_subdirectory( WITH_XRANDR tderandr )
> add_subdirectory( tdehtml )
> add_subdirectory( tdecmshell )
> add_subdirectory( tdeconf_update )
>-- 
>1.8.1.5
>

Actions: View | Diff

Attachments on bug 1553: 1312 | 1524