- update to libgweather-3.6.0

x11/gnome/libgweather/Makefile

@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.36 2012/06/15 08:30:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2012/09/27 07:46:28 jasper Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		weather information access library
 
 GNOME_PROJECT=		libgweather
-GNOME_VERSION=		3.4.1
-REVISION=		0
+GNOME_VERSION=		3.6.0
 
-SHARED_LIBS +=		gweather-3             0.0      # 0.3
+SHARED_LIBS +=		gweather-3             1.0      # 2.0
 
 CATEGORIES=		net
 
@@ -18,28 +17,29 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
-WANTLIB += dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype
+WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
+WANTLIB += cairo cairo-gobject dbus-1 expat ffi fontconfig freetype
 WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gnome-keyring gobject-2.0 gpg-error gthread-2.0 gtk-3
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread-stubs soup-2.4 soup-gnome-2.4 sqlite3 stdc++
-WANTLIB += xcb xcb-render xcb-shm xml2 z
+WANTLIB += harfbuzz icudata icule icuuc m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
+WANTLIB += soup-2.4 soup-gnome-2.4 sqlite3 xcb xcb-render xcb-shm
+WANTLIB += xml2 z
 
 MODULES=		devel/gettext \
-			devel/gconf2 \
+			devel/dconf \
 			x11/gnome
 
+# XXX: get_symbollist: object list is empty
+USE_LIBTOOL=		gnu
+
 MODGNOME_TOOLS= 	goi
 MODGNOME_ICON_CACHE=	Yes
 
 LIB_DEPENDS=		devel/libsoup,-gnome \
 			x11/gtk+3
 
-
-MODGCONF2_SCHEMAS_DIR=	libgweather
-
 CONFIGURE_ARGS+=	--with-zoneinfo-dir="/usr/share/zoneinfo"
 
 .include <bsd.port.mk>

x11/gnome/libgweather/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gnome/libgweather-3.4.1.tar.xz) = 7pxNCfM64rBm3R5paqPkg6aJy6bWO804jMLvld+bG2A=
-SIZE (gnome/libgweather-3.4.1.tar.xz) = 4101248
+SHA256 (gnome/libgweather-3.6.0.tar.xz) = k8nvm7o/61WcArhgkJkV+p/8fAi0eJqCWTkjbj6EtnY=
+SIZE (gnome/libgweather-3.6.0.tar.xz) = 3865156

x11/gnome/libgweather/patches/patch-configure

@@ -0,0 +1,16 @@
+$OpenBSD: patch-configure,v 1.1 2012/09/27 07:46:28 jasper Exp $
+
+Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
+
+--- configure.orig	Tue Sep 25 15:26:50 2012
++++ configure	Tue Sep 25 15:27:43 2012
+@@ -14827,6 +14827,9 @@ else
+ fi
+ 
+     ;;
++    *-*-openbsd*)
++    DATADIRNAME=share
++    ;;
+     *)
+     DATADIRNAME=lib
+     ;;

x11/gnome/libgweather/pkg/PLIST

@@ -1,22 +1,23 @@
-@comment $OpenBSD: PLIST,v 1.11 2012/06/15 08:30:20 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.12 2012/09/27 07:46:28 jasper Exp $
 @conflict gnome-applets2-<=2.22.0
 include/libgweather-3.0/
 include/libgweather-3.0/libgweather/
 include/libgweather-3.0/libgweather/gweather-enum-types.h
-include/libgweather-3.0/libgweather/gweather-gconf.h
+include/libgweather-3.0/libgweather/gweather-enums.h
 include/libgweather-3.0/libgweather/gweather-location.h
-include/libgweather-3.0/libgweather/gweather-prefs.h
 include/libgweather-3.0/libgweather/gweather-timezone.h
+include/libgweather-3.0/libgweather/gweather-weather.h
 include/libgweather-3.0/libgweather/gweather-xml.h
 include/libgweather-3.0/libgweather/location-entry.h
 include/libgweather-3.0/libgweather/timezone-menu.h
-include/libgweather-3.0/libgweather/weather.h
 lib/girepository-1.0/GWeather-3.0.typelib
 lib/libgweather-3.a
 lib/libgweather-3.la
 @lib lib/libgweather-3.so.${LIBgweather-3_VERSION}
 lib/pkgconfig/gweather-3.0.pc
 share/gir-1.0/GWeather-3.0.gir
+share/glib-2.0/schemas/org.gnome.GWeather.enums.xml
+share/glib-2.0/schemas/org.gnome.GWeather.gschema.xml
 share/gtk-doc/html/libgweather-3.0/
 share/gtk-doc/html/libgweather-3.0/GWeatherLocation.html
 share/gtk-doc/html/libgweather-3.0/GWeatherLocationEntry.html
@@ -31,10 +32,8 @@ share/gtk-doc/html/libgweather-3.0/index.html
 share/gtk-doc/html/libgweather-3.0/index.sgml
 share/gtk-doc/html/libgweather-3.0/left.png
 share/gtk-doc/html/libgweather-3.0/libgweather-3.0.devhelp2
-share/gtk-doc/html/libgweather-3.0/libgweather-gweather-gconf.html
-share/gtk-doc/html/libgweather-3.0/libgweather-gweather-prefs.html
+share/gtk-doc/html/libgweather-3.0/libgweather-GWeatherInfo.html
 share/gtk-doc/html/libgweather-3.0/libgweather-gweather-xml.html
-share/gtk-doc/html/libgweather-3.0/libgweather-weather.html
 share/gtk-doc/html/libgweather-3.0/object-tree.html
 share/gtk-doc/html/libgweather-3.0/right.png
 share/gtk-doc/html/libgweather-3.0/style.css
@@ -633,9 +632,7 @@ share/locale/xh/LC_MESSAGES/libgweather-3.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgweather-3.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgweather-3.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgweather-3.0.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}/gweather.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
 @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/gnome
 @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/gnome
+@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
+@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null