1 |
nerdboy 11/02/21 04:16:56 |
2 |
|
3 |
Added: gpsdrive-2.11-add-gdk-pixbuf2.patch |
4 |
Log: |
5 |
Updated with patch for bug 339751 (adds gdk-pixbuf2 detection). |
6 |
|
7 |
(Portage version: 2.1.9.40/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-misc/gpsdrive/files/gpsdrive-2.11-add-gdk-pixbuf2.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/gpsdrive/files/gpsdrive-2.11-add-gdk-pixbuf2.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/gpsdrive/files/gpsdrive-2.11-add-gdk-pixbuf2.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: gpsdrive-2.11-add-gdk-pixbuf2.patch |
16 |
=================================================================== |
17 |
--- gpsdrive-2.11/cmake/Modules/FindGTK2.cmake.gdk-pixbuf2 2010-07-28 18:21:37.000000000 +0100 |
18 |
+++ gpsdrive-2.11/cmake/Modules/FindGTK2.cmake 2010-07-28 18:23:09.000000000 +0100 |
19 |
@@ -192,6 +192,20 @@ |
20 |
) |
21 |
#MESSAGE(STATUS "DEBUG: GTK2_ATK_INCLUDE_PATH = ${GTK2_ATK_INCLUDE_PATH}") |
22 |
|
23 |
+ if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) |
24 |
+ pkgconfig(gdk-pixbuf-2.0 _GDKPIXBUF2_INCLUDEDIR _GDKPIXBUF2inkDir _GDKPIXBUF2_LDFLAGS _GDKPIXBUF2_CFLAGS) |
25 |
+ else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) |
26 |
+ if (PKG_CONFIG_FOUND) |
27 |
+ pkg_check_modules(_GDKPIXBUF2 gdk-pixbuf-2.0) |
28 |
+ endif (PKG_CONFIG_FOUND) |
29 |
+ endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) |
30 |
+ |
31 |
+ FIND_PATH(GTK2_GDKPIXBUF2_INCLUDE_PATH gdk-pixbuf/gdk-pixbuf.h |
32 |
+ ${_GDKPIXBUF2_INCLUDEDIR} /usr/include/gdk-pixbuf-2.0 /usr/include/gtk-2.0 |
33 |
+ ) |
34 |
+ |
35 |
+ #MESSAGE(STATUS "DEBUG:GTK2_GDKPIXBUF2_INCLUDE_PATH = ${GTK2_GDKPIXBUF2_INCLUDE_PATH}") |
36 |
+ |
37 |
FIND_LIBRARY(GTK2_GTKGL_LIBRARY |
38 |
NAMES |
39 |
gtkgl |
40 |
@@ -329,6 +343,7 @@ |
41 |
${GTK2_GLIB_INCLUDE_PATH} |
42 |
${GTK2_PANGO_INCLUDE_PATH} |
43 |
${GTK2_GDKCONFIG_INCLUDE_PATH} |
44 |
+ ${GTK2_GDKPIXBUF2_INCLUDE_PATH} |
45 |
${GTK2_ATK_INCLUDE_PATH} |
46 |
${GTK2_CAIRO_INCLUDE_PATH} |
47 |
) |