SLFO-pool/unixODBC
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main unixODBC revision 1b78262730f3a68d4c6fc6f9fca46abd

Browse Source
This commit is contained in:
Adrian Schröter 2024-10-03 18:03:26 +02:00
parent 9ce6bd717f
commit aaf35df010
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
unixODBC-gcc14.patch Normal file
View File

@ -0,0 +1,31 @@
Upstream: 249bfcc511e89431b910ce2c62ae0b62bb9cc214
Index: unixODBC-2.3.12/Drivers/Postgre7.1/info.c
===================================================================
--- unixODBC-2.3.12.orig/Drivers/Postgre7.1/info.c
+++ unixODBC-2.3.12/Drivers/Postgre7.1/info.c
@@ -1779,14 +1779,14 @@ char *table_name;
char index_name[MAX_INFO_STRING];
short fields_vector[8];
char isunique[10], isclustered[10];
-SDWORD index_name_len, fields_vector_len;
+SQLLEN index_name_len, fields_vector_len;
TupleNode *row;
int i;
HSTMT hcol_stmt;
StatementClass *col_stmt, *indx_stmt;
char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
char **column_names = 0;
-Int4 column_name_len;
+SQLLEN column_name_len;
int total_columns = 0;
char error = TRUE;
ConnInfo *ci;
@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt;
StatementClass *tbl_stmt;
char tables_query[STD_STATEMENT_LEN];
char attname[MAX_INFO_STRING];
-SDWORD attname_len;
+SQLLEN attname_len;
char pktab[MAX_TABLE_LEN + 1];
Int2 result_cols;

11
unixODBC.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Mar 20 07:56:32 UTC 2024 - Michael Vetter <mvetter@suse.com>
- bsc#1221709: Fix build with gcc14
Add unixODBC-gcc14.patch
-------------------------------------------------------------------
Tue Feb 20 15:44:12 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Tue Aug 8 11:29:18 UTC 2023 - Michael Vetter <mvetter@suse.com>

9
unixODBC.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package unixODBC
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,6 +28,8 @@ Source1: baselibs.conf
Source2: unixODBC-rpmlintrc
Patch0: unixODBC-paths.patch
Patch1: unixODC-etc-location.patch
# bsc#1221709 gh#157
Patch2: unixODBC-gcc14.patch
BuildRequires: automake
BuildRequires: bison
BuildRequires: gcc-c++
@ -64,8 +66,9 @@ Includes for ODBC development (based on unixODBC).
%prep
%setup -q
%patch0
%patch1 -p1
%patch -P 0
%patch -P 1 -p1
%patch -P 2 -p1
chmod -x NEWS README doc/*.html doc/*.gif Drivers/README