From 87a73cd88437d196424cb995f3e7e9ae8103e8e3 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 23 Apr 2010 23:45:29 +0000 Subject: [PATCH] - update deskbar-applet to 2.30.0 --- x11/gnome/deskbar-applet/Makefile | 23 +++++++++--------- x11/gnome/deskbar-applet/distinfo | 10 ++++---- .../deskbar-applet/patches/patch-configure | 24 +++++++++++++++++++ .../patch-deskbar_handlers_Makefile_in | 8 +++---- x11/gnome/deskbar-applet/pkg/PLIST | 3 ++- 5 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 x11/gnome/deskbar-applet/patches/patch-configure diff --git a/x11/gnome/deskbar-applet/Makefile b/x11/gnome/deskbar-applet/Makefile index dd8938fdc76..f281e328f84 100644 --- a/x11/gnome/deskbar-applet/Makefile +++ b/x11/gnome/deskbar-applet/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.27 2009/10/14 09:30:21 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.28 2010/04/23 23:45:29 jasper Exp $ COMMENT= universal search and navigation for GNOME -GNOME_VERSION= 2.28.0 GNOME_PROJECT= deskbar-applet +GNOME_VERSION= 2.30.0 CATEGORIES= sysutils @@ -15,17 +15,16 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite -WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender asn1 atk-1.0 bonobo-2 bonobo-activation cairo -WANTLIB += com_err crypto dbus-1 dbus-glib-1 execinfo expat ffi +WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 +WANTLIB += cairo com_err crypto dbus-1 dbus-glib-1 execinfo expat WANTLIB += fontconfig freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-desktop-2 -WANTLIB += gnutls gobject-2.0 gpg-error gssapi gthread-2.0 gtk-x11-2.0 -WANTLIB += krb5 m nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 plc4 plds4 png pthread-stubs smime3 softokn3 -WANTLIB += soup-2.4 sqlite3 ssl3 startup-notification-1 tasn1 -WANTLIB += xcb xcb-atom xcb-aux xcb-event xml2 z +WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gnutls gobject-2.0 +WANTLIB += gpg-error gssapi gthread-2.0 gtk-x11-2.0 krb5 m nspr4 +WANTLIB += nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += plc4 plds4 png pthread-stubs smime3 soup-2.4 sqlite3 +WANTLIB += ssl3 startup-notification-1 tasn1 xcb xcb-atom xcb-aux +WANTLIB += xcb-event xcb-render xcb-render-util xml2 z MODULES= devel/gettext \ lang/python \ diff --git a/x11/gnome/deskbar-applet/distinfo b/x11/gnome/deskbar-applet/distinfo index 0db2db880d6..533973c1596 100644 --- a/x11/gnome/deskbar-applet/distinfo +++ b/x11/gnome/deskbar-applet/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/deskbar-applet-2.28.0.tar.bz2) = 2uaGspWGiPFbs2Wv2Ehcjg== -RMD160 (gnome/deskbar-applet-2.28.0.tar.bz2) = MI+NWgn4IlQzTed6o/v2l+EhFrA= -SHA1 (gnome/deskbar-applet-2.28.0.tar.bz2) = SQGn4LYsCS0NO16/SgurU5t7xew= -SHA256 (gnome/deskbar-applet-2.28.0.tar.bz2) = vaxcijWVB4kRwaup8QE8k2zartQe+9h9CS37wEsOoss= -SIZE (gnome/deskbar-applet-2.28.0.tar.bz2) = 1087593 +MD5 (gnome/deskbar-applet-2.30.0.tar.bz2) = ry7+W6gQDzb5Y6b/KmwFoQ== +RMD160 (gnome/deskbar-applet-2.30.0.tar.bz2) = Is/7/63IN902if6Al5/mVSjZG8Y= +SHA1 (gnome/deskbar-applet-2.30.0.tar.bz2) = VI7bNt1YR0y52/gbpbqz9KEMVBg= +SHA256 (gnome/deskbar-applet-2.30.0.tar.bz2) = VntPAcuBmOAYp3K6X+NG1erpEJWWJRJra1XFwTKvwpA= +SIZE (gnome/deskbar-applet-2.30.0.tar.bz2) = 1054283 diff --git a/x11/gnome/deskbar-applet/patches/patch-configure b/x11/gnome/deskbar-applet/patches/patch-configure new file mode 100644 index 00000000000..754628841ca --- /dev/null +++ b/x11/gnome/deskbar-applet/patches/patch-configure @@ -0,0 +1,24 @@ +$OpenBSD: patch-configure,v 1.1 2010/04/23 23:45:30 jasper Exp $ + +The test cannot open the display and crashes. + +--- configure.orig Fri Apr 23 20:29:05 2010 ++++ configure Fri Apr 23 20:31:59 2010 +@@ -13318,7 +13318,7 @@ $as_echo "yes" >&6; } + fi + + +- ++if false; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnomeapplet module" >&5 + $as_echo_n "checking for gnomeapplet module... " >&6; } + if { { $as_echo "$as_me:${as_lineno-$LINENO}: DISPLAY= \$PYTHON -c ' +@@ -13355,7 +13355,7 @@ else + $as_echo "no" >&6; } + as_fn_error "gnomeapplet Python module required to build deskbar" "$LINENO" 5 + fi +- ++fi + + py_mod_var=`echo dbus'_' | sed 'y%./+-%__p_%'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module dbus" >&5 diff --git a/x11/gnome/deskbar-applet/patches/patch-deskbar_handlers_Makefile_in b/x11/gnome/deskbar-applet/patches/patch-deskbar_handlers_Makefile_in index 4c0adb50642..9beab613e65 100644 --- a/x11/gnome/deskbar-applet/patches/patch-deskbar_handlers_Makefile_in +++ b/x11/gnome/deskbar-applet/patches/patch-deskbar_handlers_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-deskbar_handlers_Makefile_in,v 1.3 2009/10/14 09:30:21 ajacoutot Exp $ ---- deskbar/handlers/Makefile.in.orig Tue Sep 22 11:59:01 2009 -+++ deskbar/handlers/Makefile.in Wed Oct 14 11:14:29 2009 -@@ -292,7 +292,7 @@ SUBDIRS = actions $(am__append_1) +$OpenBSD: patch-deskbar_handlers_Makefile_in,v 1.4 2010/04/23 23:45:30 jasper Exp $ +--- deskbar/handlers/Makefile.in.orig Mon Mar 29 13:17:39 2010 ++++ deskbar/handlers/Makefile.in Fri Apr 23 20:24:06 2010 +@@ -300,7 +300,7 @@ SUBDIRS = actions $(am__append_1) deskbar_handlers_modulesdir = $(pythondir)/deskbar/handlers deskbar_handlers_modules_PYTHON = __init__.py deskbar_handlersdir = $(libexecdir)/deskbar-applet/modules-2.20-compatible diff --git a/x11/gnome/deskbar-applet/pkg/PLIST b/x11/gnome/deskbar-applet/pkg/PLIST index 8e11c48c9dc..b675e56d59c 100644 --- a/x11/gnome/deskbar-applet/pkg/PLIST +++ b/x11/gnome/deskbar-applet/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2009/10/14 09:30:21 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.8 2010/04/23 23:45:30 jasper Exp $ lib/bonobo/servers/Deskbar_Applet.server lib/pkgconfig/deskbar-applet.pc lib/python${MODPY_VERSION}/site-packages/deskbar/ @@ -434,6 +434,7 @@ share/locale/da/LC_MESSAGES/deskbar-applet.mo share/locale/de/LC_MESSAGES/deskbar-applet.mo share/locale/dz/LC_MESSAGES/deskbar-applet.mo share/locale/el/LC_MESSAGES/deskbar-applet.mo +share/locale/en@shaw/LC_MESSAGES/deskbar-applet.mo share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo share/locale/es/LC_MESSAGES/deskbar-applet.mo