There's some small support for meson(1) in gnome.port.mk so this patch is

not needed anymore. While here, regen DEPENDS/WANTLIB.
This commit is contained in:
ajacoutot 2017-10-30 10:15:46 +00:00
parent f23910dbd5
commit 1f73df6112
2 changed files with 5 additions and 21 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.78 2017/10/29 06:59:08 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.79 2017/10/30 10:15:46 ajacoutot Exp $
COMMENT= GObject-based parsing library
GNOME_PROJECT= totem-pl-parser
GNOME_VERSION= 3.26.0
REVISION= 0
REVISION= 1
SHARED_LIBS += totem-plparser 19.0 # 18.1.1
SHARED_LIBS += totem-plparser-mini 18.0 # 18.1.1
@ -14,8 +14,8 @@ CATEGORIES= multimedia net textproc
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += archive c gio-2.0 glib-2.0 gmime-3.0 gobject-2.0 intl
WANTLIB += quvi-0.9 xml2
WANTLIB += archive c gcrypt gio-2.0 glib-2.0 gmime-3.0 gobject-2.0
WANTLIB += intl quvi-0.9 xml2
MODULES= devel/meson \
x11/gnome
@ -26,13 +26,11 @@ BUILD_DEPENDS= devel/libsoup
LIB_DEPENDS= archivers/libarchive \
mail/gmime30 \
net/quvi/libquvi \
security/libgcrypt \
textproc/libxml
MODGNOME_TOOLS= gobject-introspection
TEST_DEPENDS= ${BASE_PKGPATH}=${GNOME_VERSION}
pre-configure:
${SUBST_CMD} ${WRKSRC}/meson.build
.include <bsd.port.mk>

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-meson_build,v 1.3 2017/10/29 06:59:08 ajacoutot Exp $
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -210,7 +210,7 @@ have_libgcrypt = false
pkgconf.set('GCRYPT', '')
if enable_libgcrypt != 'no'
# presented without further comment: https://dev.gnupg.org/T2037
- libgcrypt_dep = cc.find_library('gcrypt', required : false)
+ libgcrypt_dep = cc.find_library('gcrypt', dirs : ['${LOCALBASE}/lib'], required : false)
if enable_libgcrypt == 'yes' and not libgcrypt_dep.found()
error('libgcrypt support requested but not available.')