diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2011-02-21 04:16:56 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2011-02-21 04:16:56 +0000 |
| commit | 245fdf00ffc4484fc307d0239078e0893f98ad4c (patch) | |
| tree | 95d3087903ce52360899bc9ad42ed2bb3f1df749 /app-misc | |
| parent | Update for man pages, working tests, and missing header file. (diff) | |
| download | gentoo-2-245fdf00ffc4484fc307d0239078e0893f98ad4c.tar.gz gentoo-2-245fdf00ffc4484fc307d0239078e0893f98ad4c.tar.bz2 gentoo-2-245fdf00ffc4484fc307d0239078e0893f98ad4c.zip | |
Updated with patch for bug 339751 (adds gdk-pixbuf2 detection).
(Portage version: 2.1.9.40/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/gpsdrive/ChangeLog | 5 | ||||
| -rw-r--r-- | app-misc/gpsdrive/files/gpsdrive-2.11-add-gdk-pixbuf2.patch | 31 | ||||
| -rw-r--r-- | app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild | 8 |
3 files changed, 40 insertions, 4 deletions
diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog index 33e0312462a9..5fb5e5ffa3f7 100644 --- a/app-misc/gpsdrive/ChangeLog +++ b/app-misc/gpsdrive/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/gpsdrive # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.42 2011/01/26 10:54:22 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.43 2011/02/21 04:16:56 nerdboy Exp $ + + 21 Feb 2011; Steve Arnold <nerdboy@gentoo.org> gpsdrive-2.11-r1.ebuild: + Updated with patch for bug 339751 (adds gdk-pixbuf2 detection). 26 Jan 2011; Thilo Bangert <bangert@gentoo.org> -files/gpsdrive-drawmarkers-remove.patch: diff --git a/app-misc/gpsdrive/files/gpsdrive-2.11-add-gdk-pixbuf2.patch b/app-misc/gpsdrive/files/gpsdrive-2.11-add-gdk-pixbuf2.patch new file mode 100644 index 000000000000..6f4befd4920c --- /dev/null +++ b/app-misc/gpsdrive/files/gpsdrive-2.11-add-gdk-pixbuf2.patch @@ -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} + ) diff --git a/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild b/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild index 9eabd2eccff6..1afc91433da6 100644 --- a/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild +++ b/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild,v 1.1 2010/10/30 01:12:00 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r1.ebuild,v 1.2 2011/02/21 04:16:56 nerdboy Exp $ EAPI=2 @@ -25,6 +25,7 @@ COMMON_DEP=">=sci-geosciences/gpsd-2.94 dev-libs/libxml2 dev-db/sqlite:3 x11-libs/gtk+:2 + x11-libs/gdk-pixbuf:2 dbus? ( dev-libs/dbus-glib ) gdal? ( sci-libs/gdal ) kismet? ( net-wireless/kismet ) @@ -67,7 +68,8 @@ src_prepare() { -e "s:Graphics;Network;Geography:Education;Science;Geography;GPS:g" \ data/gpsdrive.desktop || die "sed failed" - epatch "${FILESDIR}"/gpsdrive-2.11_DefineOptions_gpsd.patch + epatch "${FILESDIR}"/${P}_DefineOptions_gpsd.patch + epatch "${FILESDIR}"/${P}-add-gdk-pixbuf2.patch } src_configure() { |