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

Unbreak emerillon after gtk+2 update by updating to 0.1.1 and backport

Browse Source 
the upstream commit that fixes the use of deprecated gtk macros.
This commit is contained in:
landry 2010-04-27 20:06:59 +00:00
parent 05aece0a8e
commit 1dd697606e
7 changed files with 100 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geo/emerillon/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2009/12/21 21:21:59 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2010/04/27 20:06:59 landry Exp $
COMMENT = map viewer using Openstreetmap data
GNOME_VERSION = 0.1.0
GNOME_VERSION = 0.1.1
GNOME_PROJECT = emerillon
PKGNAME= ${DISTNAME}p0
CATEGORIES = geo x11

10
geo/emerillon/distinfo
View File

@ -1,5 +1,5 @@
MD5 (emerillon-0.1.0.tar.bz2) = uKWnvzxUsFvksTWPKF0NQA==
RMD160 (emerillon-0.1.0.tar.bz2) = D8zFJJT3DBEUqfYaOtNfVVB1cS8=
SHA1 (emerillon-0.1.0.tar.bz2) = 56saN1GTuOVVIgYfQBqKN3JF3Zo=
SHA256 (emerillon-0.1.0.tar.bz2) = 22X92XSm4wAhoeyKnpHRBgwNN1sk1GI7sQqVbNUxT+M=
SIZE (emerillon-0.1.0.tar.bz2) = 314078
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

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

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

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

@ -0,0 +1,12 @@
$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 Normal file
View File

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

12
geo/emerillon/patches/patch-emerillon_window_c.orig Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-emerillon_window_c.orig,v 1.1 2010/04/27 20:06:59 landry Exp $
--- emerillon/window.c.orig Tue Apr 27 21:13:30 2010
+++ emerillon/window.c Tue Apr 27 21:14:05 2010
@@ -571,7 +571,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);

11
geo/emerillon/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2009/12/21 21:21:59 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2010/04/27 20:06:59 landry Exp $
@bin bin/emerillon
include/emerillon-0.1/
include/emerillon-0.1/emerillon/
@ -23,12 +23,19 @@ lib/emerillon/plugins/libplacemarks.so
@comment lib/emerillon/plugins/libsearch.a
@comment lib/emerillon/plugins/libsearch.la
lib/emerillon/plugins/libsearch.so
lib/pkgconfig/emerillon.pc
share/locale/ar/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/id/LC_MESSAGES/emerillon.mo
share/locale/is/LC_MESSAGES/emerillon.mo
share/locale/ja/LC_MESSAGES/emerillon.mo
share/locale/lv/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
lib/pkgconfig/emerillon.pc
share/applications/emerillon.desktop
share/emerillon/
share/emerillon/emerillon-ui.xml