Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=60aa7ba3ed29ce5263166940b82acfd5be3acc23

commit 60aa7ba3ed29ce5263166940b82acfd5be3acc23
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Thu Oct 28 13:59:36 2010 +0000

gpsdrive-2.11-1-i686
*version bump

diff --git a/source/xapps-extra/gpsdrive/FrugalBuild 
b/source/xapps-extra/gpsdrive/FrugalBuild
index 2912756..a561e54 100644
--- a/source/xapps-extra/gpsdrive/FrugalBuild
+++ b/source/xapps-extra/gpsdrive/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=gpsdrive
-pkgver=2.10pre7
-pkgrel=2
+pkgver=2.11
+pkgrel=1
pkgdesc="a car (bike, ship, plane) navigation system"
depends=('gtk+2>=2.16.5' 'curl' 'libgda' 'mapnik' 'speech-dispatcher' 'gpsd' 
'dejavu-ttf')
makedepends=('boost' 'libboost')
@@ -12,10 +12,12 @@ groups=('xapps-extra')
Finclude cmake sourceforge
archs=('i686')
source=($source
-       ${source/$pkgname-$pkgver/openstreetmap-map-icons-minimal})
+       ${source/$pkgname-$pkgver/openstreetmap-map-icons-minimal} \
+       gdk-pixbuf.diff)
url="http://www.gpsdrive.de/";
-sha1sums=('f8cfddfffa74378cb4a06a3014ae893ac90c3fd6' \
-          'd5315e25a9c8f7e5a6c90e21fe5f8d8d8d77d47f')
+sha1sums=('9636116c219098fd00cc2500c4d2dd2676253a80' \
+          'd5315e25a9c8f7e5a6c90e21fe5f8d8d8d77d47f' \
+          'f2634985a24267918dd7903146618ffdb60ecd48')

build() {
Fcd
@@ -24,5 +26,5 @@ build() {
#Copy map
Fmkdir usr/share/icons/map-icons/
mv ../usr/share/icons/map-icons/* $Fdestdir/usr/share/icons/map-icons/ || Fdie
-       CMake_build
+       CMake_build -DLIBGPS_OLD=OFF
}
diff --git a/source/xapps-extra/gpsdrive/gdk-pixbuf.diff 
b/source/xapps-extra/gpsdrive/gdk-pixbuf.diff
new file mode 100644
index 0000000..6f4befd
--- /dev/null
+++ b/source/xapps-extra/gpsdrive/gdk-pixbuf.diff
@@ -0,0 +1,31 @@
+--- gpsdrive-2.11/cmake/Modules/FindGTK2.cmake.gdk-pixbuf2     2010-07-28 
18:21:37.000000000 +0100
++++ gpsdrive-2.11/cmake/Modules/FindGTK2.cmake 2010-07-28 18:23:09.000000000 
+0100
+@@ -192,6 +192,20 @@
+     )
+     #MESSAGE(STATUS "DEBUG: GTK2_ATK_INCLUDE_PATH = ${GTK2_ATK_INCLUDE_PATH}")
+
++    if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
++      pkgconfig(gdk-pixbuf-2.0 _GDKPIXBUF2_INCLUDEDIR _GDKPIXBUF2inkDir 
_GDKPIXBUF2_LDFLAGS _GDKPIXBUF2_CFLAGS)
++    else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
++      if (PKG_CONFIG_FOUND)
++        pkg_check_modules(_GDKPIXBUF2 gdk-pixbuf-2.0)
++      endif (PKG_CONFIG_FOUND)
++    endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
++
++    FIND_PATH(GTK2_GDKPIXBUF2_INCLUDE_PATH gdk-pixbuf/gdk-pixbuf.h
++      ${_GDKPIXBUF2_INCLUDEDIR} /usr/include/gdk-pixbuf-2.0 
/usr/include/gtk-2.0
++    )
++
++    #MESSAGE(STATUS "DEBUG:GTK2_GDKPIXBUF2_INCLUDE_PATH = 
${GTK2_GDKPIXBUF2_INCLUDE_PATH}")
++
+     FIND_LIBRARY(GTK2_GTKGL_LIBRARY
+       NAMES
+         gtkgl
+@@ -329,6 +343,7 @@
+                       ${GTK2_GLIB_INCLUDE_PATH}
+                       ${GTK2_PANGO_INCLUDE_PATH}
+                       ${GTK2_GDKCONFIG_INCLUDE_PATH}
++                      ${GTK2_GDKPIXBUF2_INCLUDE_PATH}
+                       ${GTK2_ATK_INCLUDE_PATH}
+                       ${GTK2_CAIRO_INCLUDE_PATH}
+                     )
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to