diff --git a/x11/gnome/devhelp/Makefile b/x11/gnome/devhelp/Makefile index 642077aca7a..9c75f5fc910 100644 --- a/x11/gnome/devhelp/Makefile +++ b/x11/gnome/devhelp/Makefile @@ -1,14 +1,15 @@ -# $OpenBSD: Makefile,v 1.28 2009/10/06 15:24:47 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2009/10/14 12:24:06 ajacoutot Exp $ -COMMENT= API documentation browser for GNOME +COMMENT= API documentation browser for GNOME + +GNOME_PROJECT= devhelp +GNOME_VERSION= 2.28.0 -GNOME_PROJECT= devhelp -GNOME_VERSION= 0.22 -PKGNAME= ${DISTNAME}p12 SHARED_LIBS += devhelp-1 1.0 # .0.0 -CATEGORIES= textproc -HOMEPAGE= http://live.gnome.org/devhelp +CATEGORIES= textproc + +HOMEPAGE= http://live.gnome.org/devhelp # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -16,34 +17,36 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += ICE ORBit-2 SM X11 XRes Xau Xcomposite Xcursor Xdamage -WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 -WANTLIB += c cairo dbus-1 dbus-glib-1 expat fontconfig freetype -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 icudata icui18n icuuc jpeg m pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread -WANTLIB += soup-2.4 sqlite3 tasn1 xml2 xslt z -WANTLIB += enchant stdc++ gailutil pthread-stubs xcb -WANTLIB += execinfo xcb-atom xcb-aux xcb-event +WANTLIB += ICE SM X11 XRes Xau Xcomposite Xcursor Xdamage Xdmcp +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c +WANTLIB += cairo dbus-1 dbus-glib-1 enchant execinfo expat fontconfig +WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gnutls gobject-2.0 +WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 icudata icui18n icuuc +WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += png pthread pthread-stubs soup-2.4 sqlite3 stdc++ tasn1 +WANTLIB += xcb xcb-atom xcb-aux xcb-event xml2 xslt z -MODULES= devel/gettext \ - lang/python \ - x11/gnome \ - devel/gconf2 +MODULES= devel/gettext \ + lang/python \ + x11/gnome -BUILD_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils -LIB_DEPENDS= wnck-1::devel/libwnck \ - startup-notification-1::devel/startup-notification \ - webkit-1.0::www/webkit +BUILD_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils +LIB_DEPENDS= wnck-1::devel/libwnck \ + startup-notification-1::devel/startup-notification \ + ORBit-2.>=3::devel/ORBit2 \ + gconf-2.>=6::devel/gconf2 \ + unique-1.0.>=1::devel/libunique \ + webkit-1.0::www/webkit -USE_X11= Yes -DESKTOP_FILES= Yes +USE_X11= Yes +DESKTOP_FILES= Yes MODGCONF2_SCHEMAS_DIR= devhelp -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= ${CONFIGURE_SHARED} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .include -CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome" +CONFIGURE_ARGS+= --sysconfdir="${SYSCONFDIR}/gnome" diff --git a/x11/gnome/devhelp/distinfo b/x11/gnome/devhelp/distinfo index 3170e8213d7..62e61bc96a3 100644 --- a/x11/gnome/devhelp/distinfo +++ b/x11/gnome/devhelp/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/devhelp-0.22.tar.bz2) = fN0GiNugGEtt0miFMq8kyw== -RMD160 (gnome/devhelp-0.22.tar.bz2) = GnAcVp3Rl9DPgKmawiC3mC1NYwc= -SHA1 (gnome/devhelp-0.22.tar.bz2) = vtmu+HTXLb/5/ySA5wGBtT5p0Xw= -SHA256 (gnome/devhelp-0.22.tar.bz2) = H6S2nJmxDeDic3Thjup5iOPo+SQwIKIqR/ecnMrZKUc= -SIZE (gnome/devhelp-0.22.tar.bz2) = 517581 +MD5 (gnome/devhelp-2.28.0.tar.bz2) = Q95mzToM5JiqeKXj+XOVxQ== +RMD160 (gnome/devhelp-2.28.0.tar.bz2) = K5MV/5ZCwLqeUwduvik8ryaOvuQ= +SHA1 (gnome/devhelp-2.28.0.tar.bz2) = y2OV7dYpuwayJg9LaxkBCVlumhk= +SHA256 (gnome/devhelp-2.28.0.tar.bz2) = BBaE7cBecx7HM4ZMQl9m5hL4W8d2vCfLmO9UevPZwmI= +SIZE (gnome/devhelp-2.28.0.tar.bz2) = 468628 diff --git a/x11/gnome/devhelp/patches/patch-src_dh-assistant-view_c b/x11/gnome/devhelp/patches/patch-src_dh-assistant-view_c deleted file mode 100644 index 85b83b78df8..00000000000 --- a/x11/gnome/devhelp/patches/patch-src_dh-assistant-view_c +++ /dev/null @@ -1,52 +0,0 @@ -$OpenBSD: patch-src_dh-assistant-view_c,v 1.2 2009/10/06 15:24:47 ajacoutot Exp $ - -From upstream SVN rev 1265: -Use file: URIs instead of local paths, fixes use with more recent webkit -versions. - -From GNOME bugzilla #588655 -g_mapped_file_free() has been deprecated in favor of g_mapped_file_unref(). - ---- src/dh-assistant-view.c.orig Fri Nov 28 16:56:04 2008 -+++ src/dh-assistant-view.c Tue Oct 6 17:16:55 2009 -@@ -169,6 +169,7 @@ assistant_view_set_link (DhAssistantView *view, - gsize length; - gchar *key; - gsize key_length; -+ gsize offset = 0; - const gchar *start; - const gchar *end; - -@@ -203,7 +204,10 @@ assistant_view_set_link (DhAssistantView *view, - return; - } - -- file = g_mapped_file_new (filename, FALSE, NULL); -+ if (g_str_has_prefix (filename, "file://")) -+ offset = 7; -+ -+ file = g_mapped_file_new (filename + offset, FALSE, NULL); - if (!file) { - g_free (filename); - return; -@@ -326,7 +330,7 @@ assistant_view_set_link (DhAssistantView *view, - * anchor links are handled internally in webkit. - */ - tmp = g_path_get_dirname (filename); -- base = g_strconcat ("file://", tmp, "/fake", NULL); -+ base = g_strconcat (tmp, "/fake", NULL); - g_free (tmp); - - webkit_web_view_load_html_string ( -@@ -340,7 +344,11 @@ assistant_view_set_link (DhAssistantView *view, - webkit_web_view_open (WEBKIT_WEB_VIEW (view), "about:blank"); - } - -+#if GLIB_CHECK_VERSION(2,21,3) -+ g_mapped_file_unref (file); -+#else - g_mapped_file_free (file); -+#endif - g_free (filename); - } - diff --git a/x11/gnome/devhelp/patches/patch-src_dh-book-tree_c b/x11/gnome/devhelp/patches/patch-src_dh-book-tree_c deleted file mode 100644 index a7fefb2cbf2..00000000000 --- a/x11/gnome/devhelp/patches/patch-src_dh-book-tree_c +++ /dev/null @@ -1,32 +0,0 @@ -$OpenBSD: patch-src_dh-book-tree_c,v 1.1 2009/03/19 14:36:53 ajacoutot Exp $ - -From upstream SVN rev 1265: -Use file: URIs instead of local paths, fixes use with more recent webkit -versions. - ---- src/dh-book-tree.c.orig Sat Oct 4 19:17:19 2008 -+++ src/dh-book-tree.c Thu Mar 19 15:28:28 2009 -@@ -245,22 +245,14 @@ book_tree_find_uri_foreach (GtkTreeModel *model, - FindURIData *data) - { - DhLink *link; -- const gchar *uri; - gchar *link_uri; - - gtk_tree_model_get (model, iter, - COL_LINK, &link, - -1); - -- /* A bit hackish, could be made more generic. */ -- if (g_str_has_prefix (data->uri, "file://")) { -- uri = data->uri + 7; -- } else { -- uri = data->uri; -- } -- - link_uri = dh_link_get_uri (link); -- if (g_str_has_prefix (uri, link_uri)) { -+ if (g_str_has_prefix (data->uri, link_uri)) { - data->found = TRUE; - data->iter = *iter; - data->path = gtk_tree_path_copy (path); diff --git a/x11/gnome/devhelp/patches/patch-src_dh-link_c b/x11/gnome/devhelp/patches/patch-src_dh-link_c deleted file mode 100644 index 384f524adef..00000000000 --- a/x11/gnome/devhelp/patches/patch-src_dh-link_c +++ /dev/null @@ -1,71 +0,0 @@ -$OpenBSD: patch-src_dh-link_c,v 1.1 2009/03/19 14:36:53 ajacoutot Exp $ - -From upstream SVN rev 1265: -Use file: URIs instead of local paths, fixes use with more recent webkit -versions. - ---- src/dh-link.c.orig Fri Oct 10 23:33:20 2008 -+++ src/dh-link.c Thu Mar 19 15:28:33 2009 -@@ -33,7 +33,7 @@ struct _DhLink { - gchar *base; - - gchar *name; -- gchar *uri; -+ gchar *filename; - - DhLink *book; - DhLink *page; -@@ -64,7 +64,7 @@ link_free (DhLink *link) - g_free (link->base); - g_free (link->id); - g_free (link->name); -- g_free (link->uri); -+ g_free (link->filename); - - if (link->book) { - dh_link_unref (link->book); -@@ -83,12 +83,12 @@ dh_link_new (DhLinkType type, - const gchar *name, - DhLink *book, - DhLink *page, -- const gchar *uri) -+ const gchar *filename) - { - DhLink *link; - - g_return_val_if_fail (name != NULL, NULL); -- g_return_val_if_fail (uri != NULL, NULL); -+ g_return_val_if_fail (filename != NULL, NULL); - - if (type == DH_LINK_TYPE_BOOK) { - g_return_val_if_fail (base != NULL, NULL); -@@ -110,7 +110,7 @@ dh_link_new (DhLinkType type, - } - - link->name = g_strdup (name); -- link->uri = g_strdup (uri); -+ link->filename = g_strdup (filename); - - if (book) { - link->book = dh_link_ref (book); -@@ -205,11 +205,16 @@ dh_link_get_book_id (DhLink *link) - gchar * - dh_link_get_uri (DhLink *link) - { -- if (link->type == DH_LINK_TYPE_BOOK) { -- return g_strconcat (link->base, "/", link->uri, NULL); -- } -+ gchar *base, *uri; - -- return g_strconcat (link->book->base, "/", link->uri, NULL); -+ if (link->type == DH_LINK_TYPE_BOOK) -+ base = link->base; -+ else -+ base = link->book->base; -+ -+ uri = g_strconcat ("file://", base, "/", link->filename, NULL, NULL); -+ -+ return uri; - } - - DhLinkType diff --git a/x11/gnome/devhelp/patches/patch-src_dh-link_h b/x11/gnome/devhelp/patches/patch-src_dh-link_h deleted file mode 100644 index ef54c8aa0ad..00000000000 --- a/x11/gnome/devhelp/patches/patch-src_dh-link_h +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_dh-link_h,v 1.1 2009/03/19 14:36:53 ajacoutot Exp $ - -From upstream SVN rev 1265: -Use file: URIs instead of local paths, fixes use with more recent webkit -versions. - ---- src/dh-link.h.orig Thu Mar 19 15:26:22 2009 -+++ src/dh-link.h Thu Mar 19 15:26:39 2009 -@@ -51,7 +51,7 @@ DhLink * dh_link_new (DhLinkType - const gchar *name, - DhLink *book, - DhLink *page, -- const gchar *uri); -+ const gchar *filename); - void dh_link_free (DhLink *link); - gint dh_link_compare (gconstpointer a, - gconstpointer b); diff --git a/x11/gnome/devhelp/pkg/PLIST b/x11/gnome/devhelp/pkg/PLIST index a18e59ca825..79f033ea1bf 100644 --- a/x11/gnome/devhelp/pkg/PLIST +++ b/x11/gnome/devhelp/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2009/06/07 09:06:20 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.8 2009/10/14 12:24:06 ajacoutot Exp $ @bin bin/devhelp include/devhelp-1.0/ include/devhelp-1.0/devhelp/ @@ -33,7 +33,6 @@ share/devhelp/assistant/assistant.js share/devhelp/devhelp.defaults share/devhelp/dtd/ share/devhelp/dtd/devhelp-1.dtd -share/devhelp/images/ share/devhelp/ui/ share/devhelp/ui/devhelp.builder share/devhelp/ui/window.ui @@ -52,6 +51,7 @@ share/locale/bg/LC_MESSAGES/devhelp.mo share/locale/bn/LC_MESSAGES/devhelp.mo share/locale/bn_IN/LC_MESSAGES/devhelp.mo share/locale/ca/LC_MESSAGES/devhelp.mo +share/locale/ca@valencia/LC_MESSAGES/devhelp.mo share/locale/cs/LC_MESSAGES/devhelp.mo share/locale/da/LC_MESSAGES/devhelp.mo share/locale/de/LC_MESSAGES/devhelp.mo @@ -76,6 +76,7 @@ share/locale/kn/LC_MESSAGES/devhelp.mo share/locale/ko/LC_MESSAGES/devhelp.mo share/locale/lt/LC_MESSAGES/devhelp.mo share/locale/lv/LC_MESSAGES/devhelp.mo +share/locale/mai/LC_MESSAGES/devhelp.mo share/locale/mk/LC_MESSAGES/devhelp.mo share/locale/ml/LC_MESSAGES/devhelp.mo share/locale/ms/LC_MESSAGES/devhelp.mo @@ -90,15 +91,14 @@ share/locale/pl/LC_MESSAGES/devhelp.mo share/locale/ps/LC_MESSAGES/devhelp.mo share/locale/pt/LC_MESSAGES/devhelp.mo share/locale/pt_BR/LC_MESSAGES/devhelp.mo +share/locale/ro/LC_MESSAGES/devhelp.mo share/locale/ru/LC_MESSAGES/devhelp.mo share/locale/rw/LC_MESSAGES/devhelp.mo share/locale/sk/LC_MESSAGES/devhelp.mo share/locale/sl/LC_MESSAGES/devhelp.mo share/locale/sq/LC_MESSAGES/devhelp.mo share/locale/sr/LC_MESSAGES/devhelp.mo -share/locale/sr@Latn/ -share/locale/sr@Latn/LC_MESSAGES/ -share/locale/sr@Latn/LC_MESSAGES/devhelp.mo +share/locale/sr@latin/LC_MESSAGES/devhelp.mo share/locale/sv/LC_MESSAGES/devhelp.mo share/locale/ta/LC_MESSAGES/devhelp.mo share/locale/te/LC_MESSAGES/devhelp.mo @@ -109,10 +109,6 @@ share/locale/vi/LC_MESSAGES/devhelp.mo share/locale/zh_CN/LC_MESSAGES/devhelp.mo share/locale/zh_HK/LC_MESSAGES/devhelp.mo share/locale/zh_TW/LC_MESSAGES/devhelp.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}/devhelp.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 -f -t %D/share/icons/hicolor 2> /dev/null || true @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true @exec %D/bin/update-desktop-database