wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

odbc-remove-unixodbc: Disable unixodbc rather than odbc32 when Unix libraries are missing.

Browse Source
This commit is contained in:
Elizabeth Figura 2024-06-28 16:32:53 -05:00
parent 1b9ef03b2c
commit 9a246d19b3
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/odbc-remove-unixodbc/0001-wineodbc-Make-an-ODBC-driver-for-unixODBC-usage.patch
View File

@ -1,10 +1,10 @@
From 0446c41060ebbdbabc0ffd820882a97db30f3680 Mon Sep 17 00:00:00 2001
From 1263e8ef51aeee619e2220477fe40e1205cb230d Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sun, 23 Jun 2024 16:05:20 +1000
Subject: [PATCH] wineodbc: Make an ODBC driver for unixODBC usage
---
configure.ac | 1 +
configure.ac | 3 +-
dlls/odbc32/Makefile.in | 5 +-
dlls/odbc32/proxyodbc.c | 2145 ++++--------------
dlls/wineodbc/Makefile.in | 9 +
@ -13,7 +13,7 @@ Subject: [PATCH] wineodbc: Make an ODBC driver for unixODBC usage
dlls/{odbc32 => wineodbc}/unixlib.c | 0
dlls/wineodbc/unixlib.h | 1291 +++++++++++
dlls/wineodbc/wineodbc.spec | 176 ++
9 files changed, 5032 insertions(+), 1731 deletions(-)
9 files changed, 5033 insertions(+), 1732 deletions(-)
create mode 100644 dlls/wineodbc/Makefile.in
create mode 100644 dlls/wineodbc/proxyodbc.c
create mode 100644 dlls/wineodbc/rsrc.rc
@ -22,10 +22,19 @@ Subject: [PATCH] wineodbc: Make an ODBC driver for unixODBC usage
create mode 100644 dlls/wineodbc/wineodbc.spec
diff --git a/configure.ac b/configure.ac
index e828083fc91..fe32b35d431 100644
index 6f48132b22a..70b9e431417 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3284,6 +3284,7 @@ WINE_CONFIG_MAKEFILE(dlls/winegstreamer)
@@ -1435,7 +1435,7 @@ then
fi
WINE_NOTICE_WITH(odbc,[test "x$ODBC_LIBS" = x],
[libodbc not found, ODBC won't be supported.],
- [enable_odbc32])
+ [enable_wineodbc])
dnl **** Check for inotify ****
if test "x$with_inotify" != "xno"
@@ -3281,6 +3281,7 @@ WINE_CONFIG_MAKEFILE(dlls/winegstreamer)
WINE_CONFIG_MAKEFILE(dlls/winehid.sys)
WINE_CONFIG_MAKEFILE(dlls/winemac.drv)
WINE_CONFIG_MAKEFILE(dlls/winemapi)
@ -8029,5 +8038,5 @@ index 00000000000..f94eaabea26
+ @ stub VRetrieveDriverErrorsRowCol
+ @ stub ValidateErrorQueue
--
2.43.0
2.45.2