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

- update emerillon to 0.1.2

Browse Source 
- update homepage
- add several fixes from upstream to make it compile with new libchamplain

ok landry@
This commit is contained in:
jasper 2010-09-30 07:33:37 +00:00
parent ff399bf557
commit 7770b16bdd
10 changed files with 160 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
geo/emerillon/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.3 2010/04/27 20:06:59 landry Exp $
# $OpenBSD: Makefile,v 1.4 2010/09/30 07:33:37 jasper Exp $
COMMENT = map viewer using Openstreetmap data
GNOME_VERSION = 0.1.1
GNOME_VERSION = 0.1.2
GNOME_PROJECT = emerillon
CATEGORIES = geo x11
HOMEPAGE = http://www.novopia.com/emerillon/
HOMEPAGE = http://projects.gnome.org/emerillon/
MAINTAINER = Landry Breuil <gaston@gcu.info>
# GPLv2
@ -23,14 +23,20 @@ MODULES= devel/gettext \
x11/gnome \
devel/gconf2
AUTOCONF_VERSION= 2.63
CONFIGURE_STYLE= autoconf
MODGCONF2_SCHEMAS_DIR= emerillon
MODGNOME_HELP_FILES= Yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--enable-introspection=no
LIB_DEPENDS = champlain-0.4,champlain-gtk-0.4:libchamplain->=0.4.0:geo/libchamplain/core \
soup-gnome-2.4::devel/libsoup,-gnome \
ethos-1.0,ethos-ui-1.0::devel/ethos \
geoclue::geo/geoclue \
rest::net/librest
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = ::lang/vala
LIB_DEPENDS = :libchamplain->=0.8.0:geo/libchamplain/core \
::devel/libsoup,-gnome \
::devel/ethos \
::geo/geoclue \
::net/librest
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
@ -39,7 +45,9 @@ 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
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += soup-2.4 sqlite3 tasn1 xcb xml2 z
WANTLIB += soup-2.4 sqlite3 tasn1 xcb xml2 z ethos-1.0 ethos-ui-1.0
WANTLIB += proxy ORBit-2 Xxf86vm dbus-1 dbus-glib-1 drm gnome-keyring
WANTLIB += champlain-0.8 champlain-gtk-0.8 soup-gnome-2.4
WANTLIB += geoclue rest eggdbus-1 xcb-render xcb-render-util
.include <bsd.port.mk>

10
geo/emerillon/distinfo
View File

@ -1,5 +1,5 @@
MD5 (emerillon-0.1.1.tar.bz2) = OcNElhEFAZtF3ItJ6NcMvg==
RMD160 (emerillon-0.1.1.tar.bz2) = OaSRCMdfpCEir3NTG8926GtT4sY=
SHA1 (emerillon-0.1.1.tar.bz2) = YtHzzPZOdLXhRv0a0ObM+cjh6wc=
SHA256 (emerillon-0.1.1.tar.bz2) = XK5Nn1YOpmd7Hh26BLsm+3s7PWAS+knqyxmGbQWt7yk=
SIZE (emerillon-0.1.1.tar.bz2) = 321758
MD5 (emerillon-0.1.2.tar.bz2) = eKMo7dGfnQIuFj6WUvouWw==
RMD160 (emerillon-0.1.2.tar.bz2) = RqqITgJn6q5/YB4sBJyhyKVwFFA=
SHA1 (emerillon-0.1.2.tar.bz2) = ADL5mvCl3fgC5hARS3jXcUtOIqg=
SHA256 (emerillon-0.1.2.tar.bz2) = kcvzEkeoMfTWTs96JtE/We1H6V6hih7jRazGAViqyr4=
SIZE (emerillon-0.1.2.tar.bz2) = 379193

11
geo/emerillon/patches/patch-bindings_vala_emerillon_deps Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-bindings_vala_emerillon_deps,v 1.1 2010/09/30 07:33:38 jasper Exp $
Fix dependency for champlain 0.8.
--- bindings/vala/emerillon.deps.orig Tue Sep 28 14:08:50 2010
+++ bindings/vala/emerillon.deps Tue Sep 28 14:08:55 2010
@@ -1,3 +1,3 @@
gtk+-2.0
-champlain-0.6
+champlain-0.8

48
geo/emerillon/patches/patch-configure
View File

@ -1,48 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2010/04/27 20:06:59 landry Exp $
our librest installs librest.pc, not librest-0.6.pc
--- configure.orig Tue Apr 27 21:16:38 2010
+++ configure Tue Apr 27 21:17:57 2010
@@ -13209,18 +13209,18 @@ if test -n "$PKG_CONFIG"; then
else
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- rest-0.6 >= 0.6
+ rest >= 0.6
\""; } >&5
($PKG_CONFIG --exists --print-errors "
- rest-0.6 >= 0.6
+ rest >= 0.6
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_SEARCH_DEPS_CFLAGS=`$PKG_CONFIG --cflags "
- rest-0.6 >= 0.6
+ rest >= 0.6
" 2>/dev/null`
else
@@ -13236,18 +13236,18 @@ if test -n "$PKG_CONFIG"; then
else
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- rest-0.6 >= 0.6
+ rest >= 0.6
\""; } >&5
($PKG_CONFIG --exists --print-errors "
- rest-0.6 >= 0.6
+ rest >= 0.6
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_SEARCH_DEPS_LIBS=`$PKG_CONFIG --libs "
- rest-0.6 >= 0.6
+ rest >= 0.6
" 2>/dev/null`
else

37
geo/emerillon/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-configure_ac,v 1.1 2010/09/30 07:33:38 jasper Exp $
Adjust for champlain 0.8 and rest.
--- configure.ac.orig Tue Sep 28 14:09:27 2010
+++ configure.ac Tue Sep 28 14:09:45 2010
@@ -85,8 +85,8 @@ GLIB_REQUIRED=2.12.0
GTHREAD_REQUIRED=2.12.0
GTK_REQUIRED=2.20.0
GCONF_REQUIRED=2.5.90
-CHAMPLAIN_REQUIRED=0.6.0
-CHAMPLAIN_GTK_REQUIRED=0.6.0
+CHAMPLAIN_REQUIRED=0.8.0
+CHAMPLAIN_GTK_REQUIRED=0.8.0
GEOCLUE_REQUIRED=0.11.1
ETHOS_REQUIRED=0.2
ETHOS_UI_REQUIRED=0.2
@@ -96,8 +96,8 @@ PKG_CHECK_MODULES(EMERILLON, [
gthread-2.0 >= $GTHREAD_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
- champlain-0.6 >= $CHAMPLAIN_REQUIRED
- champlain-gtk-0.6 >= $CHAMPLAIN_GTK_REQUIRED
+ champlain-0.8 >= $CHAMPLAIN_REQUIRED
+ champlain-gtk-0.8 >= $CHAMPLAIN_GTK_REQUIRED
geoclue >= $GEOCLUE_REQUIRED
ethos-1.0 >= $ETHOS_REQUIRED
ethos-ui-1.0 >= $ETHOS_UI_REQUIRED
@@ -116,7 +116,7 @@ if test x$enable_search = xyes; then
AC_SUBST(SEARCH_DEPS_LIBS)
PKG_CHECK_MODULES(SEARCH_DEPS,
[
- rest-0.6 >= 0.6
+ rest >= 0.6
]
)

14
geo/emerillon/patches/patch-data_emerillon_pc_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-data_emerillon_pc_in,v 1.1 2010/09/30 07:33:38 jasper Exp $
Fix dependency for champlain 0.8.
--- data/emerillon.pc.in.orig Tue Sep 28 13:55:45 2010
+++ data/emerillon.pc.in Tue Sep 28 13:55:50 2010
@@ -6,6 +6,6 @@ pluginsdir=@libdir@/emerillon/plugins
Name: Emerillon
Description: A map viewer for the GNOME desktop
-Requires: gtk+-2.0, gconf-2.0, clutter-1.0, champlain-0.6
+Requires: gtk+-2.0, gconf-2.0, clutter-1.0, champlain-0.8
Version: @VERSION@
Cflags: -I${includedir}

15
geo/emerillon/patches/patch-emerillon_Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-emerillon_Makefile_in,v 1.1 2010/09/30 07:33:38 jasper Exp $
Fix for champlain 0.8.
--- emerillon/Makefile.in.orig Tue Sep 28 13:56:16 2010
+++ emerillon/Makefile.in Tue Sep 28 13:56:36 2010
@@ -381,7 +381,7 @@ API_H_FILES = \
@HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = Emerillon-0.1.gir
@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libemerillon_la_SOURCES)
-@HAVE_INTROSPECTION_TRUE@Emerillon_0_1_gir_INCLUDES = GObject-2.0 Gtk-2.0 Clutter-1.0 Champlain-0.6 GtkChamplain-0.6
+@HAVE_INTROSPECTION_TRUE@Emerillon_0_1_gir_INCLUDES = GObject-2.0 Gtk-2.0 Clutter-1.0 Champlain-0.8 GtkChamplain-0.8
@HAVE_INTROSPECTION_TRUE@Emerillon_0_1_gir_CFLAGS = -I$(top_srcdir) $(EMERILLON_CFLAGS) -DEMERILLON_COMPILATION
@HAVE_INTROSPECTION_TRUE@Emerillon_0_1_gir_PROGRAM = ./$(bin_PROGRAMS)
@HAVE_INTROSPECTION_TRUE@Emerillon_0_1_gir_FILES = $(top_srcdir)/emerillon/emerillon.h $(top_srcdir)/emerillon/window.h $(top_srcdir)/emerillon/sidebar.h

12
geo/emerillon/patches/patch-emerillon_sidebar_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-emerillon_sidebar_c,v 1.1 2010/04/27 20:06:59 landry Exp $
--- emerillon/sidebar.c.orig Tue Apr 27 21:12:51 2010
+++ emerillon/sidebar.c Tue Apr 27 21:13:23 2010
@@ -239,7 +239,7 @@ emerillon_sidebar_menu_position_under (GtkMenu *menu,
GtkWidget *widget;
g_return_if_fail (GTK_IS_BUTTON (user_data));
- g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
+ g_return_if_fail (gtk_widget_get_has_window (GTK_WIDGET (user_data)));
widget = GTK_WIDGET (user_data);

12
geo/emerillon/patches/patch-emerillon_window_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-emerillon_window_c,v 1.1 2010/04/27 20:06:59 landry Exp $
--- emerillon/window.c.orig Tue Dec 15 23:56:26 2009
+++ emerillon/window.c Tue Apr 27 21:15:13 2010
@@ -593,7 +593,7 @@ sidebar_visibility_changed_cb (GtkWidget *widget,
GtkAction *action;
gboolean visible;
- visible = GTK_WIDGET_VISIBLE (self->priv->sidebar);
+ visible = gtk_widget_get_visible(self->priv->sidebar);
gconf_client_set_bool (self->priv->client, EMERILLON_CONF_UI_SIDEBAR,
visible, NULL);

68
geo/emerillon/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2010/04/27 20:06:59 landry Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/09/30 07:33:38 jasper Exp $
@bin bin/emerillon
include/emerillon-0.1/
include/emerillon-0.1/emerillon/
@ -8,9 +8,6 @@ include/emerillon-0.1/emerillon/window.h
lib/emerillon/
lib/emerillon/plugins/
lib/emerillon/plugins/copy-link.emerillon-plugin
lib/emerillon/plugins/map-position.emerillon-plugin
lib/emerillon/plugins/placemarks.emerillon-plugin
lib/emerillon/plugins/search.emerillon-plugin
@comment lib/emerillon/plugins/libcopy-link.a
@comment lib/emerillon/plugins/libcopy-link.la
lib/emerillon/plugins/libcopy-link.so
@ -23,25 +20,82 @@ lib/emerillon/plugins/libplacemarks.so
@comment lib/emerillon/plugins/libsearch.a
@comment lib/emerillon/plugins/libsearch.la
lib/emerillon/plugins/libsearch.so
lib/emerillon/plugins/map-position.emerillon-plugin
lib/emerillon/plugins/placemarks.emerillon-plugin
lib/emerillon/plugins/search.emerillon-plugin
lib/pkgconfig/emerillon.pc
share/applications/emerillon.desktop
share/emerillon/
share/emerillon/emerillon-ui.xml
share/gnome/help/
share/gnome/help/emerillon/
share/gnome/help/emerillon/C/
share/gnome/help/emerillon/C/about.page
share/gnome/help/emerillon/C/index.page
share/gnome/help/emerillon/C/intro.page
share/gnome/help/emerillon/C/legal.xml
share/gnome/help/emerillon/C/license.page
share/gnome/help/emerillon/C/plugins-copylink.page
share/gnome/help/emerillon/C/plugins-mapposition.page
share/gnome/help/emerillon/C/plugins-placemarks.page
share/gnome/help/emerillon/C/plugins.page
share/gnome/help/emerillon/C/usage.page
share/gnome/help/emerillon/de/
share/gnome/help/emerillon/de/about.page
share/gnome/help/emerillon/de/index.page
share/gnome/help/emerillon/de/intro.page
share/gnome/help/emerillon/de/legal.xml
share/gnome/help/emerillon/de/license.page
share/gnome/help/emerillon/de/plugins-copylink.page
share/gnome/help/emerillon/de/plugins-mapposition.page
share/gnome/help/emerillon/de/plugins-placemarks.page
share/gnome/help/emerillon/de/plugins.page
share/gnome/help/emerillon/de/usage.page
share/gtk-doc/html/emerillon/
share/gtk-doc/html/emerillon/EmerillonManager.html
share/gtk-doc/html/emerillon/EmerillonPreferences.html
share/gtk-doc/html/emerillon/EmerillonSidebar.html
share/gtk-doc/html/emerillon/EmerillonWindow.html
share/gtk-doc/html/emerillon/annotation-glossary.html
share/gtk-doc/html/emerillon/api-index-full.html
share/gtk-doc/html/emerillon/ch01.html
share/gtk-doc/html/emerillon/emerillon-config-keys.html
share/gtk-doc/html/emerillon/emerillon.devhelp
share/gtk-doc/html/emerillon/emerillon.devhelp2
share/gtk-doc/html/emerillon/home.png
share/gtk-doc/html/emerillon/index.html
share/gtk-doc/html/emerillon/index.sgml
share/gtk-doc/html/emerillon/left.png
share/gtk-doc/html/emerillon/object-tree.html
share/gtk-doc/html/emerillon/right.png
share/gtk-doc/html/emerillon/style.css
share/gtk-doc/html/emerillon/up.png
share/locale/ar/LC_MESSAGES/emerillon.mo
share/locale/cs/LC_MESSAGES/emerillon.mo
share/locale/da/LC_MESSAGES/emerillon.mo
share/locale/de/LC_MESSAGES/emerillon.mo
share/locale/es/LC_MESSAGES/emerillon.mo
share/locale/fr/LC_MESSAGES/emerillon.mo
share/locale/gl/LC_MESSAGES/emerillon.mo
share/locale/id/LC_MESSAGES/emerillon.mo
share/locale/is/LC_MESSAGES/emerillon.mo
share/locale/it/LC_MESSAGES/emerillon.mo
share/locale/ja/LC_MESSAGES/emerillon.mo
share/locale/lv/LC_MESSAGES/emerillon.mo
share/locale/nb/LC_MESSAGES/emerillon.mo
share/locale/pl/LC_MESSAGES/emerillon.mo
share/locale/pt/LC_MESSAGES/emerillon.mo
share/locale/pt_BR/LC_MESSAGES/emerillon.mo
share/locale/sl/LC_MESSAGES/emerillon.mo
share/locale/sv/LC_MESSAGES/emerillon.mo
share/applications/emerillon.desktop
share/emerillon/
share/emerillon/emerillon-ui.xml
share/locale/zh_CN/LC_MESSAGES/emerillon.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/emerillon.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
share/vala/
share/vala/vapi/
share/vala/vapi/emerillon.deps
share/vala/vapi/emerillon.vapi
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database