Update to libgda-5.1.2.
This commit is contained in:
ajacoutot
parent
1f521d7d48
commit
f6771d1abc
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.69 2013/03/11 11:46:11 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.70 2013/03/16 21:56:37 ajacoutot Exp $
|
||||
|
||||
# XXX add vala to MODGNOME_TOOLS on update
|
||||
|
||||
@ -11,7 +11,7 @@ COMMENT-pgsql= PostreSQL backend for libgda
|
||||
COMMENT-ui= GTK+ extension and tools for libgda
|
||||
|
||||
GNOME_PROJECT= libgda
|
||||
GNOME_VERSION= 5.1.1
|
||||
GNOME_VERSION= 5.1.2
|
||||
|
||||
# NOTE: when GDA_MAJOR changes, increment GDA_MAJOR accordingly and bump:
|
||||
# x11/gnome/libgdamm
|
||||
@ -23,12 +23,6 @@ PKGNAME-mysql= libgda-mysql-${GNOME_VERSION}
|
||||
PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION}
|
||||
PKGNAME-ui= libgda-ui-${GNOME_VERSION}
|
||||
|
||||
REVISION-main= 0
|
||||
REVISION-ldap= 0
|
||||
REVISION-mysql= 0
|
||||
REVISION-pgsql= 0
|
||||
REVISION-ui= 0
|
||||
|
||||
EPOCH-main= 2
|
||||
EPOCH-ldap= 0
|
||||
EPOCH-mysql= 0
|
||||
@ -40,6 +34,7 @@ SHARED_LIBS += gda-5.0 1.0 # 5.1
|
||||
SHARED_LIBS += gda-report-5.0 1.0 # 5.1
|
||||
SHARED_LIBS += gda-ui-5.0 1.0 # 5.1
|
||||
SHARED_LIBS += gda-xslt-5.0 1.0 # 5.1
|
||||
SHARED_LIBS += gdadata-5.0 0.0 # 0.0
|
||||
|
||||
HOMEPAGE= http://www.gnome-db.org/
|
||||
|
||||
@ -69,21 +64,25 @@ LIB_DEPENDS= devel/glib2 \
|
||||
textproc/libxml \
|
||||
x11/gnome/libsecret
|
||||
|
||||
BUILD_DEPENDS= databases/db/v4
|
||||
BUILD_DEPENDS= databases/db/v4 \
|
||||
devel/iso-codes
|
||||
|
||||
TEST_DEPENDS= devel/check
|
||||
|
||||
MODGNOME_TOOLS= goi yelp
|
||||
MODGNOME_TOOLS= goi vala yelp
|
||||
|
||||
LIBTOOL_FLAGS= --tag=disable-static
|
||||
USE_GROFF = Yes
|
||||
CONFIGURE_ARGS+= --disable-static \
|
||||
--enable-system-sqlite \
|
||||
--enable-gda-gi \
|
||||
--enable-gdaui-gi \
|
||||
--enable-gdaui-vala \
|
||||
--enable-vala-extensions \
|
||||
--with-bdb="${LOCALBASE}" \
|
||||
--without-firebird \
|
||||
--without-oracle \
|
||||
--without-mdb \
|
||||
--with-java=no
|
||||
--without-java
|
||||
MODGNOME_CPPFLAGS= -I${LOCALBASE}/include/db4/
|
||||
MODGNOME_LDFLAGS= -lm
|
||||
CONFIGURE_ENV= LIBCRYPTO_CFLAGS="-I/usr/include/ssl" \
|
||||
@ -92,12 +91,14 @@ CONFIGURE_ENV= LIBCRYPTO_CFLAGS="-I/usr/include/ssl" \
|
||||
|
||||
FAKE_FLAGS= configdir="${PREFIX}/share/examples/libgda"
|
||||
|
||||
WANTLIB-main += ${WANTLIB} c gcrypt gpg-error ncurses
|
||||
WANTLIB-main += ${WANTLIB} c gcrypt gpg-error ncurses gee-0.8
|
||||
WANTLIB-main += readline soup-2.4 crypto gdk_pixbuf-2.0 png xslt
|
||||
|
||||
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
|
||||
${MODGNOME_RUN_DEPENDS_yelp}
|
||||
${MODGNOME_RUN_DEPENDS_yelp} \
|
||||
devel/iso-codes
|
||||
LIB_DEPENDS-main= ${LIB_DEPENDS} \
|
||||
devel/libgee \
|
||||
devel/libsoup \
|
||||
textproc/libxslt \
|
||||
graphics/gdk-pixbuf2
|
||||
@ -110,12 +111,12 @@ CONFIGURE_ARGS+= --with-ui
|
||||
# XXX graphviz depends on deprecated libgnomeui
|
||||
CONFIGURE_ARGS+= --with-graphviz=no
|
||||
WANTLIB-ui += ${WANTLIB}
|
||||
WANTLIB-ui += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB-ui += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
|
||||
WANTLIB-ui += cairo-gobject drm expat fontconfig freetype gda-${GDA_MAJOR}
|
||||
WANTLIB-ui += X11 Xcomposite Xcursor Xdamage Xext Xfixes graphite2
|
||||
WANTLIB-ui += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
|
||||
WANTLIB-ui += cairo-gobject expat fontconfig freetype gda-${GDA_MAJOR}
|
||||
WANTLIB-ui += gdk-3 gdk_pixbuf-2.0 goocanvas-2.0 gtk-3 gtksourceview-3.0
|
||||
WANTLIB-ui += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
|
||||
WANTLIB-ui += pthread-stubs xcb xcb-render xcb-shm stdc++ icuuc
|
||||
WANTLIB-ui += pthread-stubs xcb xcb-render xcb-shm icuuc
|
||||
WANTLIB-ui += ICE SM atk-bridge-2.0 atspi harfbuzz icudata icule dbus-1
|
||||
LIB_DEPENDS-ui= ${LIB_DEPENDS} \
|
||||
graphics/goocanvas2 \
|
||||
@ -166,6 +167,6 @@ pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/configure
|
||||
|
||||
post-install:
|
||||
rm ${PREFIX}/lib/libgda-${GDA_MAJOR}/providers/*.la
|
||||
rm ${PREFIX}/lib/libgda-${GDA_MAJOR}/{plugins,providers}/*.la
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gnome/libgda-5.1.1.tar.xz) = QaVOYNkXWNHSOeUSfIVv8EEqVwnpJEDpEHF4r5KO1eE=
|
||||
SIZE (gnome/libgda-5.1.1.tar.xz) = 11848808
|
||||
SHA256 (gnome/libgda-5.1.2.tar.xz) = WcRBahUSl6QGCR/P5694HqiK8zgdELNlunOx644jtsU=
|
||||
SIZE (gnome/libgda-5.1.2.tar.xz) = 12030848
|
||||
|
||||
@ -1,25 +1,11 @@
|
||||
$OpenBSD: patch-configure,v 1.26 2012/09/21 13:23:06 ajacoutot Exp $
|
||||
|
||||
Don't do bash pattern substitutions.
|
||||
$OpenBSD: patch-configure,v 1.27 2013/03/16 21:56:37 ajacoutot Exp $
|
||||
|
||||
Our libdb does not follow upstream naming (libdb.so.XX versus
|
||||
libdb-5.0.so).
|
||||
|
||||
--- configure.orig Sat Aug 25 19:18:47 2012
|
||||
+++ configure Fri Sep 21 08:57:38 2012
|
||||
@@ -20378,9 +20378,9 @@ $as_echo_n "checking if gobject-introspection is corre
|
||||
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
|
||||
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
||||
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
||||
- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
|
||||
+ 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_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
|
||||
@@ -21454,9 +21454,9 @@ $as_echo_n "checking for Berkeley DB files in $d... "
|
||||
--- configure.orig Fri Jan 25 08:57:56 2013
|
||||
+++ configure Sat Mar 16 21:15:00 2013
|
||||
@@ -21803,9 +21803,9 @@ $as_echo_n "checking for Berkeley DB files in $d... "
|
||||
db_libfile="$d/$bdb_loclibdir/libdb$sversion$bdb_libext"
|
||||
try_headers="db.h db$version/db.h db$sversion/db.h"
|
||||
else
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-libgda_sqlite_gda-sqlite-pstmt_h,v 1.3 2012/10/02 06:33:07 jasper Exp $
|
||||
|
||||
From 7f6c54ad5d4b4f8dc692758da72baf469bf69e4d Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Tue, 02 Oct 2012 06:28:41 +0000
|
||||
Subject: Fix inclusion of sqlite headers due to HAVE_SQLITE and STATIC_SQLITE confusion
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=674781
|
||||
|
||||
--- libgda/sqlite/gda-sqlite-pstmt.h.orig Tue Apr 24 19:47:33 2012
|
||||
+++ libgda/sqlite/gda-sqlite-pstmt.h Tue Apr 24 19:48:27 2012
|
||||
@@ -21,10 +21,14 @@
|
||||
#define __GDA_SQLITE_PSTMT_H__
|
||||
|
||||
#include <libgda/providers-support/gda-pstmt.h>
|
||||
-#ifdef HAVE_SQLITE
|
||||
-#include <sqlite3.h>
|
||||
-#else
|
||||
+#ifdef STATIC_SQLITE
|
||||
#include "sqlite-src/sqlite3.h"
|
||||
+#else
|
||||
+# ifdef HAVE_SQLITE
|
||||
+# include <sqlite3.h>
|
||||
+# else
|
||||
+# include "sqlite-src/sqlite3.h"
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.27 2012/09/21 13:23:06 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.28 2013/03/16 21:56:37 ajacoutot Exp $
|
||||
@conflict libgda-db4-*
|
||||
@conflict libgda-ldap-<4.2.8p0v0
|
||||
@conflict libgda-ui-<5.1.1
|
||||
@ -18,6 +18,8 @@ include/libgda-${GDA_MAJOR}/libgda-report/gda-report-rml-document.h
|
||||
include/libgda-${GDA_MAJOR}/libgda-report/libgda-report.h
|
||||
include/libgda-${GDA_MAJOR}/libgda-xslt/
|
||||
include/libgda-${GDA_MAJOR}/libgda-xslt/libgda-xslt.h
|
||||
include/libgda-${GDA_MAJOR}/libgda/data/
|
||||
include/libgda-${GDA_MAJOR}/libgda/data/libgdadata.h
|
||||
include/libgda-${GDA_MAJOR}/libgda/gda-attributes-manager.h
|
||||
include/libgda-${GDA_MAJOR}/libgda/gda-batch.h
|
||||
include/libgda-${GDA_MAJOR}/libgda/gda-binreloc.h
|
||||
@ -121,6 +123,8 @@ 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/girepository-1.0/GdaData-${GDA_MAJOR}.typelib
|
||||
lib/libgda-${GDA_MAJOR}/
|
||||
lib/libgda-${GDA_MAJOR}.la
|
||||
@lib lib/libgda-${GDA_MAJOR}.so.${LIBgda-5.0_VERSION}
|
||||
@ -133,6 +137,8 @@ lib/libgda-report-${GDA_MAJOR}.la
|
||||
@lib lib/libgda-report-${GDA_MAJOR}.so.${LIBgda-report-5.0_VERSION}
|
||||
lib/libgda-xslt-${GDA_MAJOR}.la
|
||||
@lib lib/libgda-xslt-${GDA_MAJOR}.so.${LIBgda-xslt-5.0_VERSION}
|
||||
lib/libgdadata-${GDA_MAJOR}.la
|
||||
@lib lib/libgdadata-${GDA_MAJOR}.so.${LIBgdadata-5.0_VERSION}
|
||||
lib/pkgconfig/libgda-${GDA_MAJOR}.pc
|
||||
lib/pkgconfig/libgda-bdb-${GDA_MAJOR}.pc
|
||||
lib/pkgconfig/libgda-report-${GDA_MAJOR}.pc
|
||||
@ -140,6 +146,7 @@ lib/pkgconfig/libgda-sqlcipher-${GDA_MAJOR}.pc
|
||||
lib/pkgconfig/libgda-sqlite-${GDA_MAJOR}.pc
|
||||
lib/pkgconfig/libgda-web-${GDA_MAJOR}.pc
|
||||
lib/pkgconfig/libgda-xslt-${GDA_MAJOR}.pc
|
||||
lib/pkgconfig/libgdadata-${GDA_MAJOR}.pc
|
||||
@man man/man1/gda-sql-${GDA_MAJOR}.1
|
||||
share/examples/libgda/
|
||||
@sample ${SYSCONFDIR}/libgda-${GDA_MAJOR}/
|
||||
@ -147,6 +154,8 @@ share/examples/libgda/config
|
||||
@sample ${SYSCONFDIR}/libgda-${GDA_MAJOR}/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/GdaData-${GDA_MAJOR}.gir
|
||||
share/gnome/
|
||||
share/gnome/help/
|
||||
share/gnome/help/gda-sql/
|
||||
@ -215,6 +224,7 @@ share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaVproviderHub.html
|
||||
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdauiBasicForm.html
|
||||
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdauiCloud.html
|
||||
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdauiCombo.html
|
||||
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdauiDataEntry.html
|
||||
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdauiDataFilter.html
|
||||
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdauiDataProxy.html
|
||||
share/gtk-doc/html/libgda-${GDA_MAJOR}/GdauiDataProxyInfo.html
|
||||
@ -497,6 +507,7 @@ share/libgda-${GDA_MAJOR}/php/gda-setup.php
|
||||
share/libgda-${GDA_MAJOR}/php/gda-tester.php
|
||||
share/libgda-${GDA_MAJOR}/php/gda-utils.php
|
||||
share/libgda-${GDA_MAJOR}/php/gda-worker.php
|
||||
share/libgda-${GDA_MAJOR}/server_operation.glade
|
||||
share/libgda-${GDA_MAJOR}/sqlcipher_specs_add_column.xml
|
||||
share/libgda-${GDA_MAJOR}/sqlcipher_specs_auth.xml
|
||||
share/libgda-${GDA_MAJOR}/sqlcipher_specs_create_db.xml
|
||||
@ -585,3 +596,5 @@ share/locale/vi/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
|
||||
share/locale/zh_HK/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
|
||||
share/vala/vapi/gdadata-${GDA_MAJOR}.vapi
|
||||
share/vala/vapi/libgda-${GDA_MAJOR}.vapi
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-ui,v 1.20 2012/09/21 13:23:06 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-ui,v 1.21 2013/03/16 21:56:37 ajacoutot 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-format-spec.xml
|
||||
@ -431,6 +432,18 @@ share/gtk-doc/html/gda-browser/UILayout.png
|
||||
share/gtk-doc/html/gda-browser/code_orga.html
|
||||
share/gtk-doc/html/gda-browser/core.html
|
||||
share/gtk-doc/html/gda-browser/extrawidgets.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section1.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section10.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section2.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section3.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section4.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section5.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section6.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section7.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section8.html
|
||||
share/gtk-doc/html/gda-browser/fdl-section9.html
|
||||
share/gtk-doc/html/gda-browser/fdl-using.html
|
||||
share/gtk-doc/html/gda-browser/fdl.html
|
||||
share/gtk-doc/html/gda-browser/gda-browser-BrowserPage.html
|
||||
share/gtk-doc/html/gda-browser/gda-browser-Data-Manager-perspective.html
|
||||
share/gtk-doc/html/gda-browser/gda-browser-Query-Exec-perspective.html
|
||||
@ -558,6 +571,7 @@ share/libgda-${GDA_MAJOR}/ui/gdaui-entry-number.xml
|
||||
share/libgda-${GDA_MAJOR}/ui/gdaui-entry-string.xml
|
||||
share/pixmaps/
|
||||
share/pixmaps/gda-browser-${GDA_MAJOR}.png
|
||||
share/vala/vapi/libgdaui-${GDA_MAJOR}.vapi
|
||||
@exec %D/bin/update-desktop-database
|
||||
@unexec-delete %D/bin/update-desktop-database
|
||||
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
|
||||
|
||||
Loading…
Reference in New Issue
Block a user