cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libgda-5.2.5.

Browse Source
This commit is contained in:
ajacoutot 2018-09-29 08:08:19 +00:00
parent cfa070e6d0
commit dc161628e8
7 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/gnome/libgda/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.126 2018/08/05 19:04:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.127 2018/09/29 08:08:19 ajacoutot Exp $
PORTROACH= skipv:5.90.1
@ -9,7 +9,7 @@ COMMENT-pgsql= PostgreSQL backend for libgda
COMMENT-ui= GTK+ extension and tools for libgda
GNOME_PROJECT= libgda
GNOME_VERSION= 5.2.4
GNOME_VERSION= 5.2.5
GDA_MAJOR= 5.0
SUBST_VARS= GDA_MAJOR
@ -20,12 +20,6 @@ PKGNAME-mysql= libgda-mysql-${GNOME_VERSION}
PKGNAME-pgsql= libgda-pgsql-${GNOME_VERSION}
PKGNAME-ui= libgda-ui-${GNOME_VERSION}
REVISION-main= 11
REVISION-ldap= 3
REVISION-mysql= 3
REVISION-pgsql= 3
REVISION-ui= 11
EPOCH-main= 2
EPOCH-ldap= 0
EPOCH-mysql= 0
@ -95,7 +89,7 @@ MULTI_PACKAGES= -main -ui -mysql -pgsql -ldap
### -main
WANTLIB-main += ${WANTLIB}
WANTLIB-main += c gcrypt gpg-error ncurses sqlite3 gee-0.8
WANTLIB-main += c curses gcrypt gpg-error sqlite3 gee-0.8
WANTLIB-main += readline soup-2.4 crypto gdk_pixbuf-2.0 png xslt
RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS}
@ -112,7 +106,7 @@ WANTLIB-ui += Xi Xinerama Xrandr Xrender atk-1.0 c cairo atk-bridge-2.0
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 += xcb xcb-render xcb-shm epoxy Xtst atspi harfbuzz dbus-1
WANTLIB-ui += xcb xcb-render xcb-shm epoxy atspi harfbuzz dbus-1 fribidi
LIB_DEPENDS-ui= graphics/goocanvas2 \
x11/dbus \

4
x11/gnome/libgda/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/libgda-5.2.4.tar.xz) = LO443Vg8y6pb32wByl+IzAh1i5sUSTilGkeOsmhLdl4=
SIZE (gnome/libgda-5.2.4.tar.xz) = 12320228
SHA256 (gnome/libgda-5.2.5.tar.xz) = 49LkwowIoi79Ugdn+p0W6SzBgh9pMmHXyyiSzCPskMg=
SIZE (gnome/libgda-5.2.5.tar.xz) = 12786512

4
x11/gnome/libgda/patches/patch-libgda_data_Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-libgda_data_Makefile_in,v 1.2 2017/10/26 11:54:28 ajacoutot Exp $
$OpenBSD: patch-libgda_data_Makefile_in,v 1.3 2018/09/29 08:08:19 ajacoutot Exp $
XXX push upstream: traditional sed(1).
Index: libgda/data/Makefile.in
--- libgda/data/Makefile.in.orig
+++ libgda/data/Makefile.in
@@ -604,7 +604,7 @@ INTROSPECTION_GIRS = GdaData-5.0.gir
@@ -613,7 +613,7 @@ INTROSPECTION_GIRS = GdaData-5.0.gir
# Extract dlname from libfolks.la; see bug #658002.
# This is what g-ir-scanner does.
libgdadata_dlname = \

16
x11/gnome/libgda/patches/patch-libgda_sqlite_virtual_gda-vprovider-data-model_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-libgda_sqlite_virtual_gda-vprovider-data-model_c,v 1.1 2018/09/29 08:08:19 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=723777
Index: libgda/sqlite/virtual/gda-vprovider-data-model.c
--- libgda/sqlite/virtual/gda-vprovider-data-model.c.orig
+++ libgda/sqlite/virtual/gda-vprovider-data-model.c
@@ -280,7 +280,7 @@ virtual_filtered_data_free (VirtualFilteredData *data)
static VirtualFilteredData *
virtual_filtered_data_ref (VirtualFilteredData *data)
{
- g_return_if_fail (data != NULL);
+ g_return_val_if_fail (data != NULL, NULL);
data->refcount ++;
return data;
}

14
x11/gnome/libgda/patches/patch-providers_sqlcipher_sqlite3_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-providers_sqlcipher_sqlite3_c,v 1.1 2018/09/29 08:08:19 ajacoutot Exp $
Index: providers/sqlcipher/sqlite3.c
--- providers/sqlcipher/sqlite3.c.orig
+++ providers/sqlcipher/sqlite3.c
@@ -21638,7 +21638,7 @@ static unsigned int openssl_external_init = 0;
static unsigned int openssl_init_count = 0;
static sqlite3_mutex* openssl_rand_mutex = NULL;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
static HMAC_CTX *HMAC_CTX_new(void)
{
HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));

18
x11/gnome/libgda/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.35 2015/06/13 08:30:55 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.36 2018/09/29 08:08:20 ajacoutot Exp $
@conflict libgda-db4-*
@conflict libgda-ldap-<4.2.8p0v0
@conflict libgda-ui-<5.1.1
@ -129,7 +129,7 @@ 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}
@lib lib/libgda-${GDA_MAJOR}.so.${LIBgda-${GDA_MAJOR}_VERSION}
lib/libgda-${GDA_MAJOR}/plugins/
lib/libgda-${GDA_MAJOR}/providers/
lib/libgda-${GDA_MAJOR}/providers/libgda-bdb.so
@ -137,11 +137,11 @@ lib/libgda-${GDA_MAJOR}/providers/libgda-sqlcipher.so
lib/libgda-${GDA_MAJOR}/providers/libgda-sqlite.so
lib/libgda-${GDA_MAJOR}/providers/libgda-web.so
lib/libgda-report-${GDA_MAJOR}.la
@lib lib/libgda-report-${GDA_MAJOR}.so.${LIBgda-report-5.0_VERSION}
@lib lib/libgda-report-${GDA_MAJOR}.so.${LIBgda-report-${GDA_MAJOR}_VERSION}
lib/libgda-xslt-${GDA_MAJOR}.la
@lib lib/libgda-xslt-${GDA_MAJOR}.so.${LIBgda-xslt-5.0_VERSION}
@lib lib/libgda-xslt-${GDA_MAJOR}.so.${LIBgda-xslt-${GDA_MAJOR}_VERSION}
lib/libgdadata-${GDA_MAJOR}.la
@lib lib/libgdadata-${GDA_MAJOR}.so.${LIBgdadata-5.0_VERSION}
@lib lib/libgdadata-${GDA_MAJOR}.so.${LIBgdadata-${GDA_MAJOR}_VERSION}
lib/pkgconfig/libgda-${GDA_MAJOR}.pc
lib/pkgconfig/libgda-bdb-${GDA_MAJOR}.pc
lib/pkgconfig/libgda-report-${GDA_MAJOR}.pc
@ -170,7 +170,6 @@ 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
@ -357,7 +356,6 @@ share/gtk-doc/html/libgda-${GDA_MAJOR}/index-5-0.html
share/gtk-doc/html/libgda-${GDA_MAJOR}/index-5-2-0.html
share/gtk-doc/html/libgda-${GDA_MAJOR}/index-deprecated.html
share/gtk-doc/html/libgda-${GDA_MAJOR}/index.html
share/gtk-doc/html/libgda-${GDA_MAJOR}/index.sgml
share/gtk-doc/html/libgda-${GDA_MAJOR}/index_main.html
share/gtk-doc/html/libgda-${GDA_MAJOR}/information_schema.html
share/gtk-doc/html/libgda-${GDA_MAJOR}/information_schema.png
@ -373,6 +371,7 @@ 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
@ -589,9 +588,6 @@ share/locale/sk/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
share/locale/sl/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
share/locale/sq/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
share/locale/sr/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
share/locale/sr@Latn/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
share/locale/sr@latin/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
share/locale/sv/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
share/locale/tg/LC_MESSAGES/libgda-${GDA_MAJOR}.mo
@ -601,5 +597,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/vapi/gdadata-${GDA_MAJOR}.vapi
share/vala/vapi/libgda-${GDA_MAJOR}.vapi

6
x11/gnome/libgda/pkg/PLIST-ui
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ui,v 1.28 2018/06/29 22:16:24 espie Exp $
@comment $OpenBSD: PLIST-ui,v 1.29 2018/09/29 08:08:20 ajacoutot Exp $
@conflict libgda-<5.1.2p4v2
@bin bin/gda-browser-${GDA_MAJOR}
@bin bin/gda-control-center-${GDA_MAJOR}
@ -40,7 +40,7 @@ lib/libgda-${GDA_MAJOR}/plugins/gdaui-entry-pict-spec_string.xml
lib/libgda-${GDA_MAJOR}/plugins/gdaui-entry-text-spec.xml
lib/libgda-${GDA_MAJOR}/plugins/libgda-ui-plugins.so
lib/libgda-ui-${GDA_MAJOR}.la
@lib lib/libgda-ui-${GDA_MAJOR}.so.${LIBgda-ui-5.0_VERSION}
@lib lib/libgda-ui-${GDA_MAJOR}.so.${LIBgda-ui-${GDA_MAJOR}_VERSION}
lib/pkgconfig/libgda-ui-${GDA_MAJOR}.pc
share/appdata/
share/appdata/gda-browser-${GDA_MAJOR}.appdata.xml
@ -81,7 +81,6 @@ share/gtk-doc/html/gda-browser/gda-browser-popup-container.html
share/gtk-doc/html/gda-browser/gda-browser.devhelp2
share/gtk-doc/html/gda-browser/home.png
share/gtk-doc/html/gda-browser/index.html
share/gtk-doc/html/gda-browser/index.sgml
share/gtk-doc/html/gda-browser/left-insensitive.png
share/gtk-doc/html/gda-browser/left.png
share/gtk-doc/html/gda-browser/part_api.html
@ -680,6 +679,5 @@ 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
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor