Unbreak after the tracker update.

This commit is contained in:
ajacoutot 2013-03-30 07:46:18 +00:00
parent e1b37d1002
commit 03eb397db9
2 changed files with 68 additions and 8 deletions

View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/03/28 14:54:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2013/03/30 07:46:18 ajacoutot Exp $
COMMENT= access, organize and share your photos on GNOME
GNOME_PROJECT= gnome-photos
GNOME_VERSION= 3.7.3
REVISION= 0
CATEGORIES= graphics
HOMEPAGE= https://live.gnome.org/GnomePhotos
TRACKER_VERSION= 0.14
TRACKER_VERSION= 0.16
SUBST_VARS= TRACKER_VERSION
# GPLv2+
@ -20,12 +21,12 @@ 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 croco-0.6 dbus-1 e2fs-uuid exempi exif expat
WANTLIB += ffi fontconfig freetype gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 gnome-keyring
WANTLIB += goa-1.0 gobject-2.0 gpg-error graphite2 gthread-2.0
WANTLIB += gtk-3 harfbuzz icudata icui18n icule icuuc json-glib-1.0
WANTLIB += kvm lcms2 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread pthread-stubs rsvg-2 sqlite3 tracker-miner-0.14
WANTLIB += tracker-sparql-0.14 xcb xcb-render xcb-shm xkbfile
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 goa-1.0
WANTLIB += gobject-2.0 gpg-error graphite2 gthread-2.0 gtk-3 harfbuzz
WANTLIB += icudata icui18n icule icuuc json-glib-1.0 kvm lcms2
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
WANTLIB += png pthread pthread-stubs rsvg-2 secret-1 sqlite3 tracker-miner-0.16
WANTLIB += tracker-sparql-0.16 xcb xcb-render xcb-shm xkbfile
WANTLIB += xml2 z
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-data
WANTLIB += lib/tracker-${TRACKER_VERSION}/tracker-common

View File

@ -0,0 +1,59 @@
$OpenBSD: patch-configure,v 1.1 2013/03/30 07:46:18 ajacoutot Exp $
From 3770019d954d3f65c43f7919bd7473d25d303777 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Thu, 21 Feb 2013 16:59:12 +0000
Subject: build: check for Tracker 0.16 dependency
--- configure.orig Sat Mar 30 08:28:05 2013
+++ configure Sat Mar 30 08:28:38 2013
@@ -15038,12 +15038,12 @@ if test -n "$TRACKER_CFLAGS"; then
pkg_cv_TRACKER_CFLAGS="$TRACKER_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-miner-0.14 tracker-sparql-0.14\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-miner-0.14 tracker-sparql-0.14") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-miner-0.16 tracker-sparql-0.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-miner-0.16 tracker-sparql-0.16") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-miner-0.14 tracker-sparql-0.14" 2>/dev/null`
+ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-miner-0.16 tracker-sparql-0.16" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15055,12 +15055,12 @@ if test -n "$TRACKER_LIBS"; then
pkg_cv_TRACKER_LIBS="$TRACKER_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-miner-0.14 tracker-sparql-0.14\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-miner-0.14 tracker-sparql-0.14") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-miner-0.16 tracker-sparql-0.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-miner-0.16 tracker-sparql-0.16") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-miner-0.14 tracker-sparql-0.14" 2>/dev/null`
+ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-miner-0.16 tracker-sparql-0.16" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15081,14 +15081,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tracker-miner-0.14 tracker-sparql-0.14" 2>&1`
+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tracker-miner-0.16 tracker-sparql-0.16" 2>&1`
else
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tracker-miner-0.14 tracker-sparql-0.14" 2>&1`
+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tracker-miner-0.16 tracker-sparql-0.16" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (tracker-miner-0.14 tracker-sparql-0.14) were not met:
+ as_fn_error $? "Package requirements (tracker-miner-0.16 tracker-sparql-0.16) were not met:
$TRACKER_PKG_ERRORS