From owner-dev-commits-ports-main@freebsd.org Thu Aug 5 13:09:23 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 621E9663A06; Thu, 5 Aug 2021 13:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GgTTb1rGyz53g4; Thu, 5 Aug 2021 13:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25FFA1AE95; Thu, 5 Aug 2021 13:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 175D9Nx7000450; Thu, 5 Aug 2021 13:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 175D9NgA000449; Thu, 5 Aug 2021 13:09:23 GMT (envelope-from git) Date: Thu, 5 Aug 2021 13:09:23 GMT Message-Id: <202108051309.175D9NgA000449@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: c7ba224d3f94 - main - databases/kexi: fix build after glib20 bump MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7ba224d3f94a120fa9d13ddbdebe183066b630c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2021 13:09:23 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7ba224d3f94a120fa9d13ddbdebe183066b630c commit c7ba224d3f94a120fa9d13ddbdebe183066b630c Author: Dima Panov AuthorDate: 2021-08-05 13:07:51 +0000 Commit: Dima Panov CommitDate: 2021-08-05 13:07:51 +0000 databases/kexi: fix build after glib20 bump While here, recognize PgSQL 9.6+ PR: 256200 Pointy hat: nc Obtained from: gentoo --- databases/kexi/Makefile | 2 +- databases/kexi/files/patch-gentoo-glib-2.68 | 40 +++++++++++++++++++++++ databases/kexi/files/patch-gentoo-postgresql-9.12 | 24 ++++++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile index 6396d984d8d0..261295c2ead4 100644 --- a/databases/kexi/Makefile +++ b/databases/kexi/Makefile @@ -1,6 +1,6 @@ PORTNAME= kexi DISTVERSION= 3.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases kde MASTER_SITES= KDE/stable/${PORTNAME}/src DIST_SUBDIR= KDE/${PORTNAME} diff --git a/databases/kexi/files/patch-gentoo-glib-2.68 b/databases/kexi/files/patch-gentoo-glib-2.68 new file mode 100644 index 000000000000..67efb82a3e77 --- /dev/null +++ b/databases/kexi/files/patch-gentoo-glib-2.68 @@ -0,0 +1,40 @@ +From 73d3fa8e7a1028c89b20c74f6444a76a722d8041 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 18 Apr 2021 11:47:30 +0200 +Subject: [PATCH] Include outside of the extern block + +This fixes the build with glib >= 2.68. It's caused by [1] and glib +upstream did not want to include a workaround because the fixes +downstream seem trivial [2][3]. + +[1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715 +[2] https://gitlab.gnome.org/GNOME/glib/-/issues/2331 +[3] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1935 +--- + src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h +index 31f48c171..56276e2d6 100644 +--- src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h ++++ src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h +@@ -18,6 +18,8 @@ + #ifndef _mdbtools_h_ + #define _mdbtools_h_ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -32,7 +34,6 @@ + #endif + #include + #include +-#include + + #ifdef HAVE_ICONV + #include +-- +GitLab + diff --git a/databases/kexi/files/patch-gentoo-postgresql-9.12 b/databases/kexi/files/patch-gentoo-postgresql-9.12 new file mode 100644 index 000000000000..0e1acc2c5ce3 --- /dev/null +++ b/databases/kexi/files/patch-gentoo-postgresql-9.12 @@ -0,0 +1,24 @@ +From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Sat, 25 May 2019 07:12:17 +0200 +Subject: cmake: find PostgreSQL 12 + +--- + cmake/modules/FindPostgreSQL.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake +index 56e6e56..1579be0 100644 +--- cmake/modules/FindPostgreSQL.cmake ++++ cmake/modules/FindPostgreSQL.cmake +@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e + set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4") + + set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} +- "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") ++ "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") + + # Define additional search paths for root directories. + foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} ) +-- +cgit v1.1