cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a pair of patches to make it compile against libchamplain 0.4.0,

Browse Source 
upstream notified and will integrate patches in next release. Bump
PKGNAME.
This commit is contained in:
landry 2009-10-10 23:35:26 +00:00
parent 58a4a31a4e
commit 01be7e117a
3 changed files with 114 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
geo/gpx-viewer/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2009/09/01 06:37:57 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2009/10/10 23:35:26 landry Exp $
COMMENT = gpx file viewer
VERSION = 0.1.1
DISTNAME = gpx-viewer-${VERSION}
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES = geo x11
@ -25,12 +25,12 @@ USE_GMAKE = yes
MODULES = devel/gettext \
textproc/intltool
LIB_DEPENDS = champlain-0.3,champlain-gtk-0.3:libchamplain->=0.3.5:geo/libchamplain/core
LIB_DEPENDS = champlain-0.4,champlain-gtk-0.4:libchamplain->=0.4.0:geo/libchamplain/core
RUN_DEPENDS = ::devel/desktop-file-utils
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo clutter-cairo-0.8
WANTLIB += clutter-glx-0.8 clutter-gtk-0.8 expat fontconfig freetype
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
WANTLIB += clutter-glx-1.0 clutter-gtk-0.10 expat fontconfig freetype
WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += glitz gmodule-2.0 gnutls gobject-2.0 gpg-error gthread-2.0
WANTLIB += gtk-x11-2.0 json-glib-1.0 m pango-1.0 pangocairo-1.0

97
geo/gpx-viewer/patches/patch-configure Normal file
View File

@ -0,0 +1,97 @@
$OpenBSD: patch-configure,v 1.1 2009/10/10 23:35:26 landry Exp $
--- configure.orig Sat Oct 10 18:25:53 2009
+++ configure Sat Oct 10 18:29:15 2009
@@ -13827,15 +13827,15 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
\"") >&5
($PKG_CONFIG --exists --print-errors "
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
") 2>&5
@@ -13844,8 +13844,8 @@ if test -n "$PKG_CONFIG"; then
(exit $ac_status); }; then
pkg_cv_modules_CFLAGS=`$PKG_CONFIG --cflags "
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
" 2>/dev/null`
@@ -13863,15 +13863,15 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
\"") >&5
($PKG_CONFIG --exists --print-errors "
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
") 2>&5
@@ -13880,8 +13880,8 @@ if test -n "$PKG_CONFIG"; then
(exit $ac_status); }; then
pkg_cv_modules_LIBS=`$PKG_CONFIG --libs "
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
" 2>/dev/null`
@@ -13905,16 +13905,16 @@ fi
if test $_pkg_short_errors_supported = yes; then
modules_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
"`
else
modules_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
"`
@@ -13924,8 +13924,8 @@ fi
{ { $as_echo "$as_me:$LINENO: error: Package requirements (
gtk+-2.0 >= 2.16
- champlain-gtk-0.3 >= 0.3.3
- champlain-0.3 >= 0.3.3
+ champlain-gtk-0.4 >= 0.3.3
+ champlain-0.4 >= 0.3.3
gmodule-2.0
libxml-2.0
) were not met:

12
geo/gpx-viewer/patches/patch-src_gpx-viewer_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gpx-viewer_c,v 1.1 2009/10/10 23:35:26 landry Exp $
--- src/gpx-viewer.c.orig Thu Sep 24 21:30:58 2009
+++ src/gpx-viewer.c Thu Sep 24 21:31:08 2009
@@ -23,7 +23,7 @@
#include <glib/gi18n.h>
#include <champlain/champlain.h>
#include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
#include "gpx.h"
//#include "gpx-graph.h"