OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

172 lines
4.7 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../gpsdrive/gnome2.patch
  5. # Copyright (C) 2009 The OpenSDE 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. # --- SDE-COPYRIGHT-NOTE-END ---
  16. diff -Nur gpsdrive-2.10pre6-orig/cmake/Modules/FindGTK2.cmake gpsdrive-2.10pre6/cmake/Modules/FindGTK2.cmake
  17. --- gpsdrive-2.10pre6-orig/cmake/Modules/FindGTK2.cmake 2009-02-09 07:09:21.000000000 +0000
  18. +++ gpsdrive-2.10pre6/cmake/Modules/FindGTK2.cmake 2009-02-09 07:11:14.000000000 +0000
  19. @@ -89,7 +89,7 @@
  20. ${_GTK2_INCLUDEDIR}
  21. /usr/include/gtk-2.0
  22. /usr/local/include/gtk-2.0
  23. - /opt/gnome/include/gtk-2.0
  24. + /opt/gnome2/include/gtk-2.0
  25. )
  26. # Some Linux distributions (e.g. Red Hat) have glibconfig.h
  27. @@ -106,11 +106,11 @@
  28. endif (PKG_CONFIG_FOUND)
  29. endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
  30. - SET(GDIR /opt/gnome/lib/glib-2.0/include)
  31. + SET(GDIR /opt/gnome2/lib/glib-2.0/include)
  32. FIND_PATH(GTK2_GLIBCONFIG_INCLUDE_PATH glibconfig.h
  33. ${_GLIB2_INCLUDEDIR}
  34. - /opt/gnome/lib64/glib-2.0/include
  35. - /opt/gnome/lib/glib-2.0/include
  36. + /opt/gnome2/lib64/glib-2.0/include
  37. + /opt/gnome2/lib/glib-2.0/include
  38. /usr/lib64/glib-2.0/include
  39. /usr/lib/glib-2.0/include
  40. )
  41. @@ -118,7 +118,7 @@
  42. FIND_PATH(GTK2_GLIB_INCLUDE_PATH glib.h
  43. ${_GLIB2_INCLUDEDIR}
  44. - /opt/gnome/include/glib-2.0
  45. + /opt/gnome2/include/glib-2.0
  46. /usr/include/glib-2.0
  47. )
  48. #MESSAGE(STATUS "DEBUG: GTK2_GLIBCONFIG_INCLUDE_PATH = ${GTK2_GLIBCONFIG_INCLUDE_PATH}")
  49. @@ -128,7 +128,7 @@
  50. /usr/include
  51. /usr/local/include
  52. /usr/openwin/share/include
  53. - /opt/gnome/include
  54. + /opt/gnome2/include
  55. )
  56. if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
  57. @@ -141,7 +141,7 @@
  58. FIND_PATH(GTK2_PANGO_INCLUDE_PATH pango/pango.h
  59. ${_PANGO_INCLUDEDIR}
  60. - /opt/gnome/include/pango-1.0
  61. + /opt/gnome2/include/pango-1.0
  62. /usr/include/pango-1.0
  63. )
  64. @@ -155,8 +155,8 @@
  65. FIND_PATH(GTK2_GDKCONFIG_INCLUDE_PATH gdkconfig.h
  66. ${_GDK2_INCLUDEDIR}
  67. - /opt/gnome/lib/gtk-2.0/include
  68. - /opt/gnome/lib64/gtk-2.0/include
  69. + /opt/gnome2/lib/gtk-2.0/include
  70. + /opt/gnome2/lib64/gtk-2.0/include
  71. /usr/lib/gtk-2.0/include
  72. /usr/lib64/gtk-2.0/include
  73. )
  74. @@ -171,7 +171,7 @@
  75. FIND_PATH(GTK2_CAIRO_INCLUDE_PATH cairo.h
  76. ${_CAIRO_INCLUDEDIR}
  77. - /opt/gnome/include/cairo
  78. + /opt/gnome2/include/cairo
  79. /usr/include
  80. /usr/include/cairo
  81. )
  82. @@ -187,7 +187,7 @@
  83. FIND_PATH(GTK2_ATK_INCLUDE_PATH atk/atk.h
  84. ${_ATK_INCLUDEDIR}
  85. - /opt/gnome/include/atk-1.0
  86. + /opt/gnome2/include/atk-1.0
  87. /usr/include/atk-1.0
  88. )
  89. #MESSAGE(STATUS "DEBUG: GTK2_ATK_INCLUDE_PATH = ${GTK2_ATK_INCLUDE_PATH}")
  90. @@ -201,7 +201,7 @@
  91. /usr/local/lib
  92. /usr/openwin/lib
  93. /usr/X11R6/lib
  94. - /opt/gnome/lib
  95. + /opt/gnome2/lib
  96. )
  97. FIND_LIBRARY(GTK2_GTK_LIBRARY
  98. @@ -213,7 +213,7 @@
  99. /usr/local/lib
  100. /usr/openwin/lib
  101. /usr/X11R6/lib
  102. - /opt/gnome/lib
  103. + /opt/gnome2/lib
  104. )
  105. FIND_LIBRARY(GTK2_GDK_LIBRARY
  106. @@ -225,7 +225,7 @@
  107. /usr/local/lib
  108. /usr/openwin/lib
  109. /usr/X11R6/lib
  110. - /opt/gnome/lib
  111. + /opt/gnome2/lib
  112. )
  113. FIND_LIBRARY(GTK2_GMODULE_LIBRARY
  114. @@ -237,7 +237,7 @@
  115. /usr/local/lib
  116. /usr/openwin/lib
  117. /usr/X11R6/lib
  118. - /opt/gnome/lib
  119. + /opt/gnome2/lib
  120. )
  121. FIND_LIBRARY(GTK2_GLIB_LIBRARY
  122. @@ -249,7 +249,7 @@
  123. /usr/local/lib
  124. /usr/openwin/lib
  125. /usr/X11R6/lib
  126. - /opt/gnome/lib
  127. + /opt/gnome2/lib
  128. )
  129. FIND_LIBRARY(GTK2_Xi_LIBRARY
  130. @@ -260,7 +260,7 @@
  131. /usr/local/lib
  132. /usr/openwin/lib
  133. /usr/X11R6/lib
  134. - /opt/gnome/lib
  135. + /opt/gnome2/lib
  136. )
  137. FIND_LIBRARY(GTK2_GTHREAD_LIBRARY
  138. @@ -271,7 +271,7 @@
  139. /usr/local/lib
  140. /usr/openwin/lib
  141. /usr/X11R6/lib
  142. - /opt/gnome/lib
  143. + /opt/gnome2/lib
  144. )
  145. @@ -283,7 +283,7 @@
  146. /usr/local/lib
  147. /usr/openwin/lib
  148. /usr/X11R6/lib
  149. - /opt/gnome/lib
  150. + /opt/gnome2/lib
  151. )
  152. IF(GTK2_GTK_INCLUDE_PATH)