From e180d70cba1756dcfb0b526fbb37c8aa0fa538cb Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 25 Jan 2012 13:26:05 +0000 Subject: [PATCH] Update to libgda-5.0.3. --- x11/gnome/libgda/Makefile | 11 +++++------ x11/gnome/libgda/distinfo | 10 +++++----- x11/gnome/libgda/patches/patch-configure | 10 +++++----- x11/gnome/libgda/pkg/PLIST-main | 12 +++++++----- x11/gnome/libgda/pkg/PLIST-ui | 3 +-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/x11/gnome/libgda/Makefile b/x11/gnome/libgda/Makefile index 651c8439075..76a9a1d81ad 100644 --- a/x11/gnome/libgda/Makefile +++ b/x11/gnome/libgda/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2012/01/25 11:30:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.58 2012/01/25 13:26:05 ajacoutot Exp $ SHARED_ONLY= Yes @@ -9,7 +9,7 @@ COMMENT-pgsql= PostreSQL backend for libgda COMMENT-ui= GTK+ extension and tools for libgda GNOME_PROJECT= libgda -GNOME_VERSION= 5.0.2 +GNOME_VERSION= 5.0.3 # NOTE: when major version changes, increment GDA_MAJOR accordingly and # bump "x11/gnome/libgdamm" @@ -21,9 +21,6 @@ PKGNAME-mysql= libgda-mysql-${GNOME_VERSION} PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION} PKGNAME-ui= libgda-ui-${GNOME_VERSION} -REVISION-main= 1 -REVISION-ui= 0 - EPOCH-main= 2 EPOCH-ldap= 0 EPOCH-mysql= 0 @@ -72,7 +69,9 @@ BUILD_DEPENDS= databases/db/v4 \ REGRESS_DEPENDS= devel/check -MODGNOME_TOOLS= goi yelp vala +# XXX check if still necessary when updating to >5.0.3: +# vala should be added but this tarball misses a few needed files +MODGNOME_TOOLS= goi yelp LIBTOOL_FLAGS= --tag=disable-static USE_GROFF = Yes diff --git a/x11/gnome/libgda/distinfo b/x11/gnome/libgda/distinfo index 5b71ad330f1..97eae23909e 100644 --- a/x11/gnome/libgda/distinfo +++ b/x11/gnome/libgda/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/libgda-5.0.2.tar.xz) = yLO2Gr+Cd25lBzaPFkkeCQ== -RMD160 (gnome/libgda-5.0.2.tar.xz) = 5TdFFELZziZTq1oHrBh1JByK9Os= -SHA1 (gnome/libgda-5.0.2.tar.xz) = y6n9f3NHguAhgB4FIUqJv0t1KjM= -SHA256 (gnome/libgda-5.0.2.tar.xz) = U+cQp2KYoiRUaAPs7nEeYQxoz2k4vZCObX48m6sYNZM= -SIZE (gnome/libgda-5.0.2.tar.xz) = 11596872 +MD5 (gnome/libgda-5.0.3.tar.xz) = WO/fj3J7WgseX7NdGe52pw== +RMD160 (gnome/libgda-5.0.3.tar.xz) = tyeBYzrsLxOc5v4dNABlE81Y9+8= +SHA1 (gnome/libgda-5.0.3.tar.xz) = FRFZE09Ag+hqO1Vv2AxIN25YQpA= +SHA256 (gnome/libgda-5.0.3.tar.xz) = gtIENht5QQPDZrtpBITSWBS/xlPLl9oN/PfAoTQJ0cw= +SIZE (gnome/libgda-5.0.3.tar.xz) = 11623340 diff --git a/x11/gnome/libgda/patches/patch-configure b/x11/gnome/libgda/patches/patch-configure index f8e6a9f4d8b..b6f6f0dcb37 100644 --- a/x11/gnome/libgda/patches/patch-configure +++ b/x11/gnome/libgda/patches/patch-configure @@ -1,13 +1,13 @@ -$OpenBSD: patch-configure,v 1.24 2012/01/25 11:30:41 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.25 2012/01/25 13:26:05 ajacoutot Exp $ Don't do bash pattern substitutions. Our libdb does not follow upstream naming (libdb.so.XX versus libdb-5.0.so). ---- configure.orig Sun Nov 20 15:26:59 2011 -+++ configure Wed Jan 25 12:09:40 2012 -@@ -20173,9 +20173,9 @@ $as_echo_n "checking if gobject-introspection is corre +--- configure.orig Tue Jan 24 19:06:55 2012 ++++ configure Wed Jan 25 12:34:57 2012 +@@ -20171,9 +20171,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` @@ -19,7 +19,7 @@ libdb-5.0.so). INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` INTROSPECTION_MAKEFILE=$introspection_makefile -@@ -21023,9 +21023,9 @@ $as_echo_n "checking for Berkeley DB files in $d... " +@@ -21061,9 +21061,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 diff --git a/x11/gnome/libgda/pkg/PLIST-main b/x11/gnome/libgda/pkg/PLIST-main index 5060f84dfef..545b6a4b76c 100644 --- a/x11/gnome/libgda/pkg/PLIST-main +++ b/x11/gnome/libgda/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.25 2011/11/21 07:38:23 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.26 2012/01/25 13:26:05 ajacoutot Exp $ @conflict libgda-db4-* @conflict libgda-ldap-<4.2.8p0v0 @pkgpath x11/gnome/libgda,-mdb @@ -158,6 +158,9 @@ share/examples/libgda/sales_test.db share/gir-1.0/Gda-${GDA_MAJOR}.gir share/gnome/ share/gnome/help/ +share/gnome/help/gda-sql/ +share/gnome/help/gda-sql/C/ +share/gnome/help/gda-sql/C/gda-sql-help.xml 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 @@ -168,6 +171,7 @@ share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaConnectionEvent.html share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaDataAccessWrapper.html share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaDataModel.html share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaDataModelArray.html +share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaDataModelBdb.html share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaDataModelDir.html share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaDataModelImport.html share/gtk-doc/html/libgda-${GDA_MAJOR}/GdaDataModelIter.html @@ -348,6 +352,7 @@ share/gtk-doc/html/libgda-${GDA_MAJOR}/index-4-2-8.html share/gtk-doc/html/libgda-${GDA_MAJOR}/index-4-2-9.html share/gtk-doc/html/libgda-${GDA_MAJOR}/index-4-2.html share/gtk-doc/html/libgda-${GDA_MAJOR}/index-5-0-2.html +share/gtk-doc/html/libgda-${GDA_MAJOR}/index-5-0-3.html share/gtk-doc/html/libgda-${GDA_MAJOR}/index-5-0.html share/gtk-doc/html/libgda-${GDA_MAJOR}/index-deprecated.html share/gtk-doc/html/libgda-${GDA_MAJOR}/index.html @@ -366,7 +371,6 @@ share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-Configuration.html share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-Default-Data-handlers.html share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-Gda-Value.html share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-GdaDataComparator.html -share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-GdaDataModelBdb.html share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-GdaDataPivot.html share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-GdaMutex.html share/gtk-doc/html/libgda-${GDA_MAJOR}/libgda-${GDA_MAJOR}-GdaRepetitiveStatement.html @@ -469,6 +473,7 @@ share/gtk-doc/html/libgda-${GDA_MAJOR}/writable_data_model.png share/libgda-${GDA_MAJOR}/ share/libgda-${GDA_MAJOR}/bdb_specs_dsn.xml share/libgda-${GDA_MAJOR}/dtd/ +share/libgda-${GDA_MAJOR}/dtd/gdaui-layout.dtd share/libgda-${GDA_MAJOR}/dtd/libgda-array.dtd share/libgda-${GDA_MAJOR}/dtd/libgda-paramlist.dtd share/libgda-${GDA_MAJOR}/dtd/libgda-server-operation.dtd @@ -582,6 +587,3 @@ 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-0.14/ -share/vala-0.14/vapi/ -share/vala-0.14/vapi/libgda-${GDA_MAJOR}.vapi diff --git a/x11/gnome/libgda/pkg/PLIST-ui b/x11/gnome/libgda/pkg/PLIST-ui index 560a364167f..c8e8f02687a 100644 --- a/x11/gnome/libgda/pkg/PLIST-ui +++ b/x11/gnome/libgda/pkg/PLIST-ui @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-ui,v 1.15 2011/12/03 22:17:16 ajacoutot Exp $ +@comment $OpenBSD: PLIST-ui,v 1.16 2012/01/25 13:26:05 ajacoutot Exp $ @conflict libgda-<4.2.8p1v2 @bin bin/gda-browser-${GDA_MAJOR} @bin bin/gda-control-center-${GDA_MAJOR} @@ -386,7 +386,6 @@ share/gnome/help/gda-browser/zh_CN/virtual-connections.page share/gtk-doc/html/gda-browser/ share/gtk-doc/html/gda-browser/BrowserConnection.html share/gtk-doc/html/gda-browser/BrowserCore.html -share/gtk-doc/html/gda-browser/BrowserFavorites.html share/gtk-doc/html/gda-browser/BrowserPerspective.html share/gtk-doc/html/gda-browser/BrowserWindow.html share/gtk-doc/html/gda-browser/CcGrayBar.html