Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Nov 3rd, 2013  |  syntax: Diff  |  size: 1.78 KB  |  views: 38  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 7d52601..55c4da1 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -103,7 +103,8 @@ macro(qtc_check_x11)
  6.      set(QTC_ENABLE_X11 Off)
  7.      return()
  8.    endif()
  9. -  pkg_check_modules(QTC_X11 xcb xcb-image x11-xcb)
  10. +  unset(__pkg_config_checked_QTC_X11 CACHE)
  11. +  pkg_check_modules(QTC_X11 xcb x11-xcb)
  12.    if(NOT QTC_X11_FOUND)
  13.      message(WARNING
  14.        "Cannot find required modules for x11, disable x11 support.")
  15. @@ -132,6 +133,7 @@ endif()
  16.  
  17.  if(ENABLE_GTK2)
  18.    find_package(PkgConfig REQUIRED)
  19. +  unset(__pkg_config_checked_GTK2 CACHE)
  20.    pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
  21.    if(GTK2_THEME_PREFIX)
  22.      set(GTK2_PREIX "${GTK2_THEME_PREFIX}")
  23. diff --git a/qtcurve-utils/x11helpers.c b/qtcurve-utils/x11helpers.c
  24. index bcd5a6c..be7aa36 100644
  25. --- a/qtcurve-utils/x11helpers.c
  26. +++ b/qtcurve-utils/x11helpers.c
  27. @@ -24,6 +24,5 @@
  28.  #include "x11icccm.h"
  29.  #include "log.h"
  30. -#include <xcb/xcb_image.h>
  31.  #include <X11/Xlib.h>
  32.  #include <X11/Xatom.h>
  33.  #include <shadow0-png.h>
  34. diff --git a/qtcurve-utils/x11utils.c b/qtcurve-utils/x11utils.c
  35. index ed1ea70..c3c58b1 100644
  36. --- a/qtcurve-utils/x11utils.c
  37. +++ b/qtcurve-utils/x11utils.c
  38. @@ -24,7 +24,6 @@
  39.  #include "x11shadow_p.h"
  40.  #include "log.h"
  41.  
  42. -#include <xcb/xcb_image.h>
  43.  #include <X11/Xlib-xcb.h>
  44.  
  45.  static Display *qtc_disp = NULL;
  46. diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
  47. index 3615487..c1397f9 100644
  48. --- a/tools/CMakeLists.txt
  49. +++ b/tools/CMakeLists.txt
  50. @@ -27,6 +27,7 @@ elseif(ENABLE_QT4)
  51.    set(gen_image_header_DEFS)
  52.  else()
  53.    find_package(PkgConfig REQUIRED)
  54. +  unset(__pkg_config_checked_GEN_IMG_GTK CACHE)
  55.    pkg_check_modules(GEN_IMG_GTK REQUIRED cairo-png)
  56.    set(gen_image_header_SRCS
  57.      gen_image_header_cairo.c)
  58. --
  59. 1.8.4
clone this paste RAW Paste Data