package/x11/gpsdrive/gnome2.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gpsdrive/gnome2.patch
   5 # Copyright (C) 2009 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 diff -Nur gpsdrive-2.10pre6-orig/cmake/Modules/FindGTK2.cmake gpsdrive-2.10pre6/cmake/Modules/FindGTK2.cmake
  18 --- gpsdrive-2.10pre6-orig/cmake/Modules/FindGTK2.cmake 2009-02-09 07:09:21.000000000 +0000
  19 +++ gpsdrive-2.10pre6/cmake/Modules/FindGTK2.cmake      2009-02-09 07:11:14.000000000 +0000
  20 @@ -89,7 +89,7 @@
  21        ${_GTK2_INCLUDEDIR}
  22        /usr/include/gtk-2.0
  23        /usr/local/include/gtk-2.0
  24 -      /opt/gnome/include/gtk-2.0
  25 +      /opt/gnome2/include/gtk-2.0
  26      )
  27
  28      # Some Linux distributions (e.g. Red Hat) have glibconfig.h
  29 @@ -106,11 +106,11 @@
  30        endif (PKG_CONFIG_FOUND)
  31      endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
  32
  33 -    SET(GDIR /opt/gnome/lib/glib-2.0/include)
  34 +    SET(GDIR /opt/gnome2/lib/glib-2.0/include)
  35      FIND_PATH(GTK2_GLIBCONFIG_INCLUDE_PATH glibconfig.h
  36        ${_GLIB2_INCLUDEDIR}
  37 -      /opt/gnome/lib64/glib-2.0/include
  38 -      /opt/gnome/lib/glib-2.0/include
  39 +      /opt/gnome2/lib64/glib-2.0/include
  40 +      /opt/gnome2/lib/glib-2.0/include
  41        /usr/lib64/glib-2.0/include
  42        /usr/lib/glib-2.0/include
  43      )
  44 @@ -118,7 +118,7 @@
  45
  46      FIND_PATH(GTK2_GLIB_INCLUDE_PATH glib.h
  47        ${_GLIB2_INCLUDEDIR}
  48 -      /opt/gnome/include/glib-2.0
  49 +      /opt/gnome2/include/glib-2.0
  50        /usr/include/glib-2.0
  51      )
  52      #MESSAGE(STATUS "DEBUG: GTK2_GLIBCONFIG_INCLUDE_PATH = ${GTK2_GLIBCONFIG_INCLUDE_PATH}")
  53 @@ -128,7 +128,7 @@
  54        /usr/include
  55        /usr/local/include
  56        /usr/openwin/share/include
  57 -      /opt/gnome/include
  58 +      /opt/gnome2/include
  59      )
  60
  61      if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
  62 @@ -141,7 +141,7 @@
  63
  64      FIND_PATH(GTK2_PANGO_INCLUDE_PATH pango/pango.h
  65        ${_PANGO_INCLUDEDIR}
  66 -      /opt/gnome/include/pango-1.0
  67 +      /opt/gnome2/include/pango-1.0
  68        /usr/include/pango-1.0
  69      )
  70
  71 @@ -155,8 +155,8 @@
  72
  73      FIND_PATH(GTK2_GDKCONFIG_INCLUDE_PATH gdkconfig.h
  74        ${_GDK2_INCLUDEDIR}
  75 -      /opt/gnome/lib/gtk-2.0/include
  76 -      /opt/gnome/lib64/gtk-2.0/include
  77 +      /opt/gnome2/lib/gtk-2.0/include
  78 +      /opt/gnome2/lib64/gtk-2.0/include
  79        /usr/lib/gtk-2.0/include
  80        /usr/lib64/gtk-2.0/include
  81      )
  82 @@ -171,7 +171,7 @@
  83
  84      FIND_PATH(GTK2_CAIRO_INCLUDE_PATH cairo.h
  85        ${_CAIRO_INCLUDEDIR}
  86 -      /opt/gnome/include/cairo
  87 +      /opt/gnome2/include/cairo
  88        /usr/include
  89        /usr/include/cairo
  90      )
  91 @@ -187,7 +187,7 @@
  92
  93      FIND_PATH(GTK2_ATK_INCLUDE_PATH atk/atk.h
  94        ${_ATK_INCLUDEDIR}
  95 -      /opt/gnome/include/atk-1.0
  96 +      /opt/gnome2/include/atk-1.0
  97        /usr/include/atk-1.0
  98      )
  99      #MESSAGE(STATUS "DEBUG: GTK2_ATK_INCLUDE_PATH = ${GTK2_ATK_INCLUDE_PATH}")
 100 @@ -201,7 +201,7 @@
 101          /usr/local/lib
 102          /usr/openwin/lib
 103          /usr/X11R6/lib
 104 -        /opt/gnome/lib
 105 +        /opt/gnome2/lib
 106      )
 107
 108      FIND_LIBRARY(GTK2_GTK_LIBRARY
 109 @@ -213,7 +213,7 @@
 110          /usr/local/lib
 111          /usr/openwin/lib
 112          /usr/X11R6/lib
 113 -        /opt/gnome/lib
 114 +        /opt/gnome2/lib
 115      )
 116
 117      FIND_LIBRARY(GTK2_GDK_LIBRARY
 118 @@ -225,7 +225,7 @@
 119          /usr/local/lib
 120          /usr/openwin/lib
 121          /usr/X11R6/lib
 122 -        /opt/gnome/lib
 123 +        /opt/gnome2/lib
 124      )
 125
 126      FIND_LIBRARY(GTK2_GMODULE_LIBRARY
 127 @@ -237,7 +237,7 @@
 128          /usr/local/lib
 129          /usr/openwin/lib
 130          /usr/X11R6/lib
 131 -        /opt/gnome/lib
 132 +        /opt/gnome2/lib
 133      )
 134
 135      FIND_LIBRARY(GTK2_GLIB_LIBRARY
 136 @@ -249,7 +249,7 @@
 137          /usr/local/lib
 138          /usr/openwin/lib
 139          /usr/X11R6/lib
 140 -        /opt/gnome/lib
 141 +        /opt/gnome2/lib
 142      )
 143
 144      FIND_LIBRARY(GTK2_Xi_LIBRARY
 145 @@ -260,7 +260,7 @@
 146          /usr/local/lib
 147          /usr/openwin/lib
 148          /usr/X11R6/lib
 149 -        /opt/gnome/lib
 150 +        /opt/gnome2/lib
 151      )
 152
 153      FIND_LIBRARY(GTK2_GTHREAD_LIBRARY
 154 @@ -271,7 +271,7 @@
 155          /usr/local/lib
 156          /usr/openwin/lib
 157          /usr/X11R6/lib
 158 -        /opt/gnome/lib
 159 +        /opt/gnome2/lib
 160      )
 161
 162
 163 @@ -283,7 +283,7 @@
 164          /usr/local/lib
 165          /usr/openwin/lib
 166          /usr/X11R6/lib
 167 -        /opt/gnome/lib
 168 +        /opt/gnome2/lib
 169      )
 170
 171      IF(GTK2_GTK_INCLUDE_PATH)