Fix after recent tracker update.

This commit is contained in:
ajacoutot 2013-03-30 08:55:43 +00:00
parent f9e584b340
commit 922fa55bf2
3 changed files with 189 additions and 27 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2013/03/11 11:46:10 espie Exp $
# $OpenBSD: Makefile,v 1.9 2013/03/30 08:55:43 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,31 +6,32 @@ COMMENT= document manager for GNOME
GNOME_PROJECT= gnome-documents
GNOME_VERSION= 3.6.2
REVISION= 0
REVISION= 1
HOMEPAGE= https://live.gnome.org/GnomeDocuments
TRACKER_VERSION=0.14
TRACKER_VERSION=0.16
SUBST_VARS= TRACKER_VERSION
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
WANTLIB += cairo-gobject clutter-1.0 clutter-gtk-1.0 cogl cogl-pango
WANTLIB += crypto curl dbus-1 e2fs-uuid evdocument3 evview3
WANTLIB += expat ffi fontconfig freetype gailutil-3 gcrypt gdata
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0 gjs glib-2.0
WANTLIB += gmodule-2.0 gnome-desktop-3 gnome-keyring goa-1.0 gobject-2.0
WANTLIB += gpg-error gthread-2.0 gtk-3 idn json-glib-1.0 kvm m
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 tracker-sparql-0.14 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 icui18n
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += c cairo cairo-gobject clutter-1.0 clutter-gtk-1.0 cogl
WANTLIB += cogl-pango crypto curl dbus-1 e2fs-uuid evdocument3
WANTLIB += evview3 expat ffi fontconfig freetype gailutil-3 gck-1
WANTLIB += gcr-base-3 gcrypt gdata gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += girepository-1.0 gjs glib-2.0 gmodule-2.0 gnome-desktop-3
WANTLIB += gnome-keyring goa-1.0 gobject-2.0 gpg-error graphite2
WANTLIB += gthread-2.0 gtk-3 harfbuzz icudata icui18n icule icuuc
WANTLIB += idn json-glib-1.0 kvm m mozjs185 ncursesw nspr4 nss3
WANTLIB += oauth p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
WANTLIB += readline rest-0.7 smime3 softokn3 soup-2.4 soup-gnome-2.4
WANTLIB += sqlite3 ssl ssl3 xcb xcb-render xcb-shm xkbfile xml2
WANTLIB += z zapojit-0.0
WANTLIB += tracker-sparql-${TRACKER_VERSION}
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-data
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-common
@ -38,9 +39,10 @@ MODULES= devel/gettext \
devel/dconf \
x11/gnome
LIB_DEPENDS= graphics/clutter/clutter-gtk \
graphics/evince>=3.6.0 \
x11/gnome/gjs>=1.34.0 \
LIB_DEPENDS= devel/libgdata \
graphics/clutter/clutter-gtk \
graphics/evince \
x11/gnome/gjs \
x11/gnome/libzapojit \
x11/gnome/tracker

View File

@ -1,9 +1,14 @@
$OpenBSD: patch-configure,v 1.2 2012/09/29 12:12:31 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.3 2013/03/30 08:55:43 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Sep 24 22:03:58 2012
+++ configure Sat Sep 29 09:43:36 2012
From 2c769bbd622fd50f8afbfe07b6c07f436a526b2f Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Wed, 19 Dec 2012 17:10:03 +0000
Subject: build: new tracker API version is 0.16
--- configure.orig Mon Nov 12 23:28:45 2012
+++ configure Sat Mar 30 09:18:41 2013
@@ -4736,6 +4736,9 @@ else
fi
@ -14,3 +19,160 @@ Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
*)
DATADIRNAME=lib
;;
@@ -19384,7 +19387,7 @@ if test -n "$DOCUMENTS_CFLAGS"; then
gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= \$GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= \$TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= \$TRACKER_MIN_VERSION
goa-1.0 >= \$GOA_MIN_VERSION
libgdata >= \$GDATA_MIN_VERSION
zapojit-0.0 >= \$ZAPOJIT_MIN_VERSION\""; } >&5
@@ -19397,7 +19400,7 @@ if test -n "$DOCUMENTS_CFLAGS"; then
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION") 2>&5
@@ -19413,7 +19416,7 @@ if test -n "$DOCUMENTS_CFLAGS"; then
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION" 2>/dev/null`
@@ -19437,7 +19440,7 @@ if test -n "$DOCUMENTS_LIBS"; then
gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= \$GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= \$TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= \$TRACKER_MIN_VERSION
goa-1.0 >= \$GOA_MIN_VERSION
libgdata >= \$GDATA_MIN_VERSION
zapojit-0.0 >= \$ZAPOJIT_MIN_VERSION\""; } >&5
@@ -19450,7 +19453,7 @@ if test -n "$DOCUMENTS_LIBS"; then
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION") 2>&5
@@ -19466,7 +19469,7 @@ if test -n "$DOCUMENTS_LIBS"; then
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION" 2>/dev/null`
@@ -19499,7 +19502,7 @@ fi
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION" 2>&1`
@@ -19513,7 +19516,7 @@ fi
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION" 2>&1`
@@ -19530,7 +19533,7 @@ fi
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
gtk+-3.0 >= $GTK_MIN_VERSION
gnome-desktop-3.0
- tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION) were not met:
@@ -19575,13 +19578,13 @@ if test -n "$MINER_CFLAGS"; then
pkg_cv_MINER_CFLAGS="$MINER_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-sparql-0.14 >= \$TRACKER_MIN_VERSION
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-sparql-0.16 >= \$TRACKER_MIN_VERSION
glib-2.0 >= \$GLIB_MIN_VERSION
gio-2.0 >= \$GLIB_MIN_VERSION
goa-1.0 >= \$GOA_MIN_VERSION
libgdata >= \$GDATA_MIN_VERSION
zapojit-0.0 >= \$ZAPOJIT_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ ($PKG_CONFIG --exists --print-errors "tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
@@ -19590,7 +19593,7 @@ if test -n "$MINER_CFLAGS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MINER_CFLAGS=`$PKG_CONFIG --cflags "tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ pkg_cv_MINER_CFLAGS=`$PKG_CONFIG --cflags "tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
@@ -19607,13 +19610,13 @@ if test -n "$MINER_LIBS"; then
pkg_cv_MINER_LIBS="$MINER_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-sparql-0.14 >= \$TRACKER_MIN_VERSION
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-sparql-0.16 >= \$TRACKER_MIN_VERSION
glib-2.0 >= \$GLIB_MIN_VERSION
gio-2.0 >= \$GLIB_MIN_VERSION
goa-1.0 >= \$GOA_MIN_VERSION
libgdata >= \$GDATA_MIN_VERSION
zapojit-0.0 >= \$ZAPOJIT_MIN_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ ($PKG_CONFIG --exists --print-errors "tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
@@ -19622,7 +19625,7 @@ if test -n "$MINER_LIBS"; then
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MINER_LIBS=`$PKG_CONFIG --libs "tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ pkg_cv_MINER_LIBS=`$PKG_CONFIG --libs "tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
@@ -19648,14 +19651,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MINER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ MINER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
libgdata >= $GDATA_MIN_VERSION
zapojit-0.0 >= $ZAPOJIT_MIN_VERSION" 2>&1`
else
- MINER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ MINER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION
@@ -19665,7 +19668,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$MINER_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
+ as_fn_error $? "Package requirements (tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
goa-1.0 >= $GOA_MIN_VERSION

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2012/09/29 12:12:31 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2013/03/30 08:55:43 ajacoutot Exp $
bin/gnome-documents
lib/gnome-documents/
lib/gnome-documents/girepository-1.0/
@ -52,8 +52,6 @@ share/gnome-documents/js/util/tweener.js
share/gnome-documents/js/utils.js
share/gnome-documents/js/view.js
share/gnome-documents/js/windowMode.js
share/gnome-shell/
share/gnome-shell/search-providers/
share/gnome-shell/search-providers/gnome-documents-search-provider.ini
share/icons/hicolor/16x16/apps/gnome-documents.png
share/icons/hicolor/22x22/apps/gnome-documents.png