- fix GI typelib file location

This commit is contained in:
jasper 2011-09-29 13:35:41 +00:00
parent 13d913156d
commit de9eaeff42
4 changed files with 11 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2011/09/28 09:47:47 jasper Exp $
# $OpenBSD: Makefile,v 1.50 2011/09/29 13:35:41 jasper Exp $
SHARED_ONLY= Yes
@ -22,7 +22,8 @@ PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION}
PKGNAME-ui= libgda-ui-${GNOME_VERSION}
REVISION = 0
REVISION-main = 1
REVISION-main = 2
REVISION-ui = 0
EPOCH-main= 2
EPOCH-ldap= 0

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.20 2011/09/12 15:31:15 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.21 2011/09/29 13:35:41 jasper Exp $
- Don't do bash pattern substitutions.
@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.20 2011/09/12 15:31:15 ajacoutot Exp $
+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e 's,$datadir,\$\(datadir\),g'`
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e 's,$libdir,\$\($libdir\),g'`
+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e 's,$libdir,\$\($libdir\),g'`
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=$introspection_makefile

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.21 2011/09/12 15:31:15 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.22 2011/09/29 13:35:41 jasper Exp $
@conflict libgda-db4-*
@conflict libgda-ldap-<4.2.8p0v0
@pkgpath x11/gnome/libgda,-mdb
@ -119,6 +119,7 @@ include/libgda-${GDA_MAJOR}/libgda/virtual/gda-virtual-provider.h
include/libgda-${GDA_MAJOR}/libgda/virtual/gda-vprovider-data-model.h
include/libgda-${GDA_MAJOR}/libgda/virtual/gda-vprovider-hub.h
include/libgda-${GDA_MAJOR}/libgda/virtual/libgda-virtual.h
lib/girepository-1.0/Gda-${GDA_MAJOR}.typelib
lib/libgda-${GDA_MAJOR}/
lib/libgda-${GDA_MAJOR}.la
@lib lib/libgda-${GDA_MAJOR}.so.${LIBgda-5.0_VERSION}
@ -150,7 +151,8 @@ share/examples/libgda/config
share/examples/libgda/sales_test.db
@sample ${SYSCONFDIR}/libgda-${GDA_MAJOR}/sales_test.db
share/gir-1.0/Gda-${GDA_MAJOR}.gir
share/gir-1.0/Gda-${GDA_MAJOR}.typelib
share/gnome/
share/gnome/help/
share/gtk-doc/html/libgda-${GDA_MAJOR}/
share/gtk-doc/html/libgda-${GDA_MAJOR}/DataModels.png
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaBatch.html

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ui,v 1.12 2011/09/12 15:31:15 ajacoutot Exp $
@comment $OpenBSD: PLIST-ui,v 1.13 2011/09/29 13:35:41 jasper Exp $
@conflict libgda-<4.2.8p1v2
@bin bin/gda-browser-${GDA_MAJOR}
@bin bin/gda-control-center-${GDA_MAJOR}
@ -31,6 +31,7 @@ include/libgda-${GDA_MAJOR}/libgda-ui/gdaui-rt-editor.h
include/libgda-${GDA_MAJOR}/libgda-ui/gdaui-server-operation.h
include/libgda-${GDA_MAJOR}/libgda-ui/gdaui-tree-store.h
include/libgda-${GDA_MAJOR}/libgda-ui/libgda-ui.h
lib/girepository-1.0/Gdaui-${GDA_MAJOR}.typelib
lib/libgda-${GDA_MAJOR}/plugins/
lib/libgda-${GDA_MAJOR}/plugins/gdaui-entry-filesel-spec.xml
lib/libgda-${GDA_MAJOR}/plugins/gdaui-entry-password.xml
@ -45,7 +46,6 @@ lib/pkgconfig/libgda-ui-${GDA_MAJOR}.pc
share/applications/gda-browser-${GDA_MAJOR}.desktop
share/applications/gda-control-center-${GDA_MAJOR}.desktop
share/gir-1.0/Gdaui-${GDA_MAJOR}.gir
share/gir-1.0/Gdaui-${GDA_MAJOR}.typelib
share/gnome/help/gda-browser/
share/gnome/help/gda-browser/C/
share/gnome/help/gda-browser/C/actions.page