From d3d6dcd4dc03859e2a91d66356fc2c2ba55cf7af Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 29 Sep 2012 12:12:30 +0000 Subject: [PATCH] Update to gnome-documents-3.6.0. --- x11/gnome/documents/Makefile | 15 ++++++++++----- x11/gnome/documents/distinfo | 4 ++-- x11/gnome/documents/patches/patch-configure | 8 ++++---- .../patch-src_gnome-documents-debug_in | 15 --------------- ...tch-src_gnome-documents-search-provider_in | 15 --------------- .../patches/patch-src_gnome-documents_in | 15 --------------- x11/gnome/documents/pkg/PLIST | 19 +++++++++++-------- 7 files changed, 27 insertions(+), 64 deletions(-) delete mode 100644 x11/gnome/documents/patches/patch-src_gnome-documents-debug_in delete mode 100644 x11/gnome/documents/patches/patch-src_gnome-documents-search-provider_in delete mode 100644 x11/gnome/documents/patches/patch-src_gnome-documents_in diff --git a/x11/gnome/documents/Makefile b/x11/gnome/documents/Makefile index 10c15c1d1c9..046dbbb2a61 100644 --- a/x11/gnome/documents/Makefile +++ b/x11/gnome/documents/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2012/09/01 14:36:59 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2012/09/29 12:12:30 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= document manager for GNOME GNOME_PROJECT= gnome-documents -GNOME_VERSION= 0.4.2 -REVISION= 0 +GNOME_VERSION= 3.6.0 HOMEPAGE= https://live.gnome.org/GnomeDocuments @@ -31,6 +30,8 @@ WANTLIB += mozjs185 nspr4 nss3 oauth pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread-stubs WANTLIB += smime3 softokn3 soup-2.4 soup-gnome-2.4 sqlite3 ssl WANTLIB += ssl3 stdc++ tracker-sparql-0.14 unistring xcb xcb-render +WANTLIB += ICE SM atk-bridge-2.0 atspi gck-1 gcr-base-3 harfbuzz +WANTLIB += icudata icule icuuc p11-kit rest-0.7 xkbfile zapojit-0.0 WANTLIB += xcb-shm xml2 z WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-data WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-common @@ -40,8 +41,9 @@ MODULES= devel/gettext \ x11/gnome LIB_DEPENDS= graphics/clutter/clutter-gtk \ - graphics/evince \ - x11/gnome/gjs \ + graphics/evince>=3.6.0 \ + x11/gnome/gjs>=1.34.0 \ + x11/gnome/libzapojit \ x11/gnome/tracker MODGNOME_ICON_CACHE= Yes @@ -51,4 +53,7 @@ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_ARGS= --disable-static +post-install: + rm ${PREFIX}/lib/gnome-documents/*.la + .include diff --git a/x11/gnome/documents/distinfo b/x11/gnome/documents/distinfo index 9c11b9a333a..2f6937a6372 100644 --- a/x11/gnome/documents/distinfo +++ b/x11/gnome/documents/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/gnome-documents-0.4.2.tar.xz) = jDRczy5xz8ItPxEY58hnbhplfIo/1AUscZvhtKMRrIw= -SIZE (gnome/gnome-documents-0.4.2.tar.xz) = 500428 +SHA256 (gnome/gnome-documents-3.6.0.tar.xz) = pKXFJcugR6bI9xL4oNc/wm3ARF1MgnjBDsvqxO/TQuI= +SIZE (gnome/gnome-documents-3.6.0.tar.xz) = 528256 diff --git a/x11/gnome/documents/patches/patch-configure b/x11/gnome/documents/patches/patch-configure index d06d0497feb..3402294155b 100644 --- a/x11/gnome/documents/patches/patch-configure +++ b/x11/gnome/documents/patches/patch-configure @@ -1,10 +1,10 @@ -$OpenBSD: patch-configure,v 1.1 2012/09/11 07:58:06 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.2 2012/09/29 12:12:31 ajacoutot Exp $ Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4} ---- configure.orig Mon May 14 21:27:56 2012 -+++ configure Tue Sep 11 09:32:12 2012 -@@ -4666,6 +4666,9 @@ else +--- configure.orig Mon Sep 24 22:03:58 2012 ++++ configure Sat Sep 29 09:43:36 2012 +@@ -4736,6 +4736,9 @@ else fi ;; diff --git a/x11/gnome/documents/patches/patch-src_gnome-documents-debug_in b/x11/gnome/documents/patches/patch-src_gnome-documents-debug_in deleted file mode 100644 index 7c74a8a95a2..00000000000 --- a/x11/gnome/documents/patches/patch-src_gnome-documents-debug_in +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_gnome-documents-debug_in,v 1.1.1.1 2012/07/08 08:57:55 ajacoutot Exp $ - -From fffb37e1ea849578ac34561bc6fb076e61ff2fb9 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sun, 08 Jul 2012 06:56:26 +0000 -Subject: /bin/bash -> /bin/sh - ---- src/gnome-documents-debug.in.orig Mon Feb 20 15:07:20 2012 -+++ src/gnome-documents-debug.in Sun Jul 8 09:18:48 2012 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - if test x"$GJS_PATH" = x ; then - export GJS_PATH=@pkgdatadir@/js diff --git a/x11/gnome/documents/patches/patch-src_gnome-documents-search-provider_in b/x11/gnome/documents/patches/patch-src_gnome-documents-search-provider_in deleted file mode 100644 index 4ef0b4628c7..00000000000 --- a/x11/gnome/documents/patches/patch-src_gnome-documents-search-provider_in +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_gnome-documents-search-provider_in,v 1.1.1.1 2012/07/08 08:57:55 ajacoutot Exp $ - -From fffb37e1ea849578ac34561bc6fb076e61ff2fb9 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sun, 08 Jul 2012 06:56:26 +0000 -Subject: /bin/bash -> /bin/sh - ---- src/gnome-documents-search-provider.in.orig Sun Mar 4 03:37:42 2012 -+++ src/gnome-documents-search-provider.in Sun Jul 8 09:18:48 2012 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - if test x"$GJS_PATH" = x ; then - export GJS_PATH=@pkgdatadir@/js diff --git a/x11/gnome/documents/patches/patch-src_gnome-documents_in b/x11/gnome/documents/patches/patch-src_gnome-documents_in deleted file mode 100644 index 0fed72d1d75..00000000000 --- a/x11/gnome/documents/patches/patch-src_gnome-documents_in +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_gnome-documents_in,v 1.1.1.1 2012/07/08 08:57:55 ajacoutot Exp $ - -From fffb37e1ea849578ac34561bc6fb076e61ff2fb9 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Sun, 08 Jul 2012 06:56:26 +0000 -Subject: /bin/bash -> /bin/sh - ---- src/gnome-documents.in.orig Mon Feb 20 15:05:05 2012 -+++ src/gnome-documents.in Sun Jul 8 09:18:48 2012 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - if test x"$GJS_PATH" = x ; then - export GJS_PATH=@pkgdatadir@/js diff --git a/x11/gnome/documents/pkg/PLIST b/x11/gnome/documents/pkg/PLIST index d18d4f91565..bbf287f0658 100644 --- a/x11/gnome/documents/pkg/PLIST +++ b/x11/gnome/documents/pkg/PLIST @@ -1,20 +1,26 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/08 08:57:55 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.2 2012/09/29 12:12:31 ajacoutot Exp $ bin/gnome-documents lib/gnome-documents/ lib/gnome-documents/girepository-1.0/ lib/gnome-documents/girepository-1.0/Gd-1.0.typelib -@comment lib/gnome-documents/libgdprivate-1.0.la +lib/gnome-documents/girepository-1.0/GdPrivate-1.0.typelib +lib/gnome-documents/libgd.so +lib/gnome-documents/libgdminer-1.0.so lib/gnome-documents/libgdprivate-1.0.so @bin libexec/gd-tracker-gdata-miner +@bin libexec/gd-tracker-zpj-miner libexec/gnome-documents-search-provider share/applications/gnome-documents.desktop share/dbus-1/services/org.gnome.Documents.GDataMiner.service share/dbus-1/services/org.gnome.Documents.SearchProvider.service +share/dbus-1/services/org.gnome.Documents.ZpjMiner.service share/glib-2.0/schemas/org.gnome.Documents.enums.xml share/glib-2.0/schemas/org.gnome.documents.gschema.xml share/gnome-documents/ share/gnome-documents/gir-1.0/ share/gnome-documents/gir-1.0/Gd-1.0.gir +share/gnome-documents/gir-1.0/GdPrivate-1.0.gir +share/gnome-documents/gnome-documents.gresource share/gnome-documents/icons/ share/gnome-documents/icons/thumbnail-frame.png share/gnome-documents/js/ @@ -23,26 +29,22 @@ share/gnome-documents/js/changeMonitor.js share/gnome-documents/js/config.js share/gnome-documents/js/documents.js share/gnome-documents/js/embed.js -share/gnome-documents/js/error.js -share/gnome-documents/js/errorBox.js -share/gnome-documents/js/format.js -share/gnome-documents/js/gDataMiner.js share/gnome-documents/js/global.js -share/gnome-documents/js/loadMore.js share/gnome-documents/js/main.js share/gnome-documents/js/mainToolbar.js share/gnome-documents/js/mainWindow.js share/gnome-documents/js/manager.js +share/gnome-documents/js/miners.js share/gnome-documents/js/notifications.js share/gnome-documents/js/offsetController.js share/gnome-documents/js/path.js share/gnome-documents/js/preview.js +share/gnome-documents/js/properties.js share/gnome-documents/js/query.js share/gnome-documents/js/searchbar.js share/gnome-documents/js/selections.js share/gnome-documents/js/shellSearchProvider.js share/gnome-documents/js/sources.js -share/gnome-documents/js/spinnerBox.js share/gnome-documents/js/trackerController.js share/gnome-documents/js/trackerUtils.js share/gnome-documents/js/util/ @@ -69,6 +71,7 @@ share/locale/ca@valencia/LC_MESSAGES/gnome-documents.mo share/locale/cs/LC_MESSAGES/gnome-documents.mo share/locale/da/LC_MESSAGES/gnome-documents.mo share/locale/de/LC_MESSAGES/gnome-documents.mo +share/locale/el/LC_MESSAGES/gnome-documents.mo share/locale/en_GB/LC_MESSAGES/gnome-documents.mo share/locale/eo/LC_MESSAGES/gnome-documents.mo share/locale/es/LC_MESSAGES/gnome-documents.mo