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

- update gpx-viewer to 0.2.0

Browse Source 
- add ugly hack to make it build, as upstream doesn't build their own releases

it's slightly broken at runtime, this will be dealt with soon.

ok landry@
This commit is contained in:
jasper 2010-09-30 07:32:54 +00:00
parent 0ba118740d
commit 4a39c44a1d
7 changed files with 56 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
geo/gpx-viewer/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2010/04/03 23:24:09 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2010/09/30 07:32:54 jasper Exp $
COMMENT = gpx file viewer
VERSION = 0.1.2
VERSION = 0.2.0
DISTNAME = gpx-viewer-${VERSION}
PKGNAME= ${DISTNAME}p1
CATEGORIES = geo x11
@ -19,7 +18,8 @@ PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = http://edge.launchpad.net/gpx-viewer/trunk/${VERSION}/+download/
CONFIGURE_STYLE = gnu
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.62
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_path_VALAC=""
@ -27,7 +27,9 @@ USE_GMAKE = yes
MODULES = devel/gettext \
textproc/intltool
LIB_DEPENDS = champlain-0.4,champlain-gtk-0.4:libchamplain->=0.4.0:geo/libchamplain/core
LIB_DEPENDS = ::devel/libunique \
:libchamplain->=0.8.0:geo/libchamplain/core \
::x11/gnome/gdl
RUN_DEPENDS = ::devel/desktop-file-utils
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
@ -39,6 +41,11 @@ WANTLIB += gtk-x11-2.0 json-glib-1.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += soup-2.4 sqlite3 tasn1 xcb xml2 z Xxf86vm drm
WANTLIB += ORBit-2 dbus-1 dbus-glib-1 gconf-2 gnome-keyring proxy
WANTLIB += soup-gnome-2.4
WANTLIB += soup-gnome-2.4 champlain-0.8 champlain-gtk-0.8
WANTLIB += gdl-1 eggdbus-1 xcb-render xcb-render-util unique-1.0
# Upstream doesn't build their own releases.
post-configure:
echo "#define PACKAGE_URL \"${HOMEPAGE}\"" >> ${WRKSRC}/config.h
.include <bsd.port.mk>

10
geo/gpx-viewer/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gpx-viewer-0.1.2.tar.gz) = 688ua9em0gkTI16171vHPQ==
RMD160 (gpx-viewer-0.1.2.tar.gz) = NUSHmHzHhgpq+9n94AuvLPptdyY=
SHA1 (gpx-viewer-0.1.2.tar.gz) = CEr594MGVzMkWYTyWwAH8kBl8R0=
SHA256 (gpx-viewer-0.1.2.tar.gz) = AsRM/P5R59qL3p2Wfv09bZiW5KthpstmC5pD6PgL89w=
SIZE (gpx-viewer-0.1.2.tar.gz) = 356559
MD5 (gpx-viewer-0.2.0.tar.gz) = +4S8JlZoWyAiGzogUNkERQ==
RMD160 (gpx-viewer-0.2.0.tar.gz) = jaB7y8+/Uz8RRMIXdQLjTjSa5o0=
SHA1 (gpx-viewer-0.2.0.tar.gz) = BRr5V/o8vlJRfQ3yOrH6UYyS6iM=
SHA256 (gpx-viewer-0.2.0.tar.gz) = WCZtKL5QnMitZ6WtcuL80r+e/zB5gXPQNsi+7XSIt0w=
SIZE (gpx-viewer-0.2.0.tar.gz) = 445901

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

@ -1,97 +0,0 @@
$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:

14
geo/gpx-viewer/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure_ac,v 1.1 2010/09/30 07:32:54 jasper Exp $
--- configure.ac.orig Tue Sep 28 13:34:35 2010
+++ configure.ac Tue Sep 28 13:34:58 2010
@@ -34,8 +34,8 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([modules],[
gtk+-2.0 >= 2.16
- champlain-gtk-0.4 >= 0.4.3
- champlain-0.4 >= 0.4.3
+ champlain-gtk-0.8 >= 0.8.0
+ champlain-0.8 >= 0.8.0
gmodule-2.0
libxml-2.0
gdl-1.0

24
geo/gpx-viewer/patches/patch-src_gpx-parser_c
View File

@ -1,9 +1,11 @@
$OpenBSD: patch-src_gpx-parser_c,v 1.1.1.1 2009/08/23 17:37:07 landry Exp $
remove leading second digits, and adjust strptime() call
$OpenBSD: patch-src_gpx-parser_c,v 1.2 2010/09/30 07:32:54 jasper Exp $
Remove leading second digits, and adjust strptime() call
ours doesn't support %z nor %F, GNU extensions
--- src/gpx-parser.c.orig Thu Jul 16 23:05:19 2009
+++ src/gpx-parser.c Fri Aug 21 14:59:46 2009
@@ -21,6 +21,7 @@
--- src/gpx-parser.c.orig Tue Sep 28 13:30:21 2010
+++ src/gpx-parser.c Tue Sep 28 13:33:06 2010
@@ -24,6 +24,7 @@
#include <glib-object.h>
#include <float.h>
#include <math.h>
@ -11,18 +13,18 @@ ours doesn't support %z nor %F, GNU extensions
#include <stdlib.h>
#include <string.h>
#include <time.h>
@@ -218,6 +219,7 @@ void gpx_point_set_position (GpxPoint* self, double la
/* Get the unix time. (calculated on first request, then cached ) */
@@ -234,6 +235,7 @@ void gpx_point_set_position (GpxPoint* self, double la
time_t gpx_point_get_time (GpxPoint* self) {
time_t result;
+ char *c;
struct tm _tmp0_ = {0};
struct tm ta;
struct tm ta = {0};
if (self->time == NULL) {
@@ -229,7 +231,13 @@ time_t gpx_point_get_time (GpxPoint* self) {
result = (time_t) 0;
@@ -244,7 +246,13 @@ time_t gpx_point_get_time (GpxPoint* self) {
return result;
}
ta = (memset (&_tmp0_, 0, sizeof (struct tm)), _tmp0_);
memset (&ta, 0, sizeof (struct tm));
- strptime (self->time, "%FT%T%z", &ta);
+ /* remove trailing non-digits, strptime doesn't support %z */
+ for (c = self->time + strlen(self->time); !isdigit(*c); *c='\0', c--);

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

@ -1,12 +0,0 @@
$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"

12
geo/gpx-viewer/pkg/PLIST
View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.3 2009/12/21 21:21:59 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/09/30 07:32:54 jasper Exp $
@bin bin/gpx-viewer
share/applications/gpx-viewer.desktop
share/gpx-viewer/
share/gpx-viewer/gpx-viewer-file-chooser.ui
share/gpx-viewer/gpx-viewer-preferences.ui
share/gpx-viewer/gpx-viewer-tracklist.ui
share/gpx-viewer/gpx-viewer.ui
share/gpx-viewer/icons/
share/gpx-viewer/icons/hicolor/
@ -26,9 +28,15 @@ share/icons/hicolor/22x22/apps/gpx-viewer.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/gpx-viewer.png
share/icons/hicolor/256x256/
share/icons/hicolor/256x256/apps/
share/icons/hicolor/256x256/apps/gpx-viewer.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/gpx-viewer.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/gpx-viewer.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/gpx-viewer.svg
@ -38,8 +46,10 @@ share/locale/ar/LC_MESSAGES/gpx-viewer.mo
share/locale/cs/LC_MESSAGES/gpx-viewer.mo
share/locale/de/LC_MESSAGES/gpx-viewer.mo
share/locale/es/LC_MESSAGES/gpx-viewer.mo
share/locale/hu/LC_MESSAGES/gpx-viewer.mo
share/locale/it/LC_MESSAGES/gpx-viewer.mo
share/locale/ru/LC_MESSAGES/gpx-viewer.mo
share/locale/uk/LC_MESSAGES/gpx-viewer.mo
share/locale/zh_CN/LC_MESSAGES/gpx-viewer.mo
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true