rpms/unixODBC
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix bug preventing drivers from being selected in ODBCConfig

Browse Source
This commit is contained in:
Tom Lane 2009-12-19 23:49:26 +00:00
parent 6e5ced7854
commit 12cd7af65f
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
enable-items.patch Normal file
View File

@ -0,0 +1,52 @@
Allow drivers to be selected in ODBCConfig, per bug 544852.
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp 2008-09-04 10:55:54.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp 2009-12-19 18:31:39.000000000 -0500
@@ -346,15 +346,15 @@
setRowCount( nElement + 1 );
ptablewidgetitem = new QTableWidgetItem( szSectionName );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nElement, 0, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDescription );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nElement, 1, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDriver );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nElement, 2, ptablewidgetitem );
}
SQLSetConfigMode( ODBC_BOTH_DSN );
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp 2008-09-04 11:57:53.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp 2009-12-19 18:31:29.000000000 -0500
@@ -852,19 +852,19 @@
setRowCount( nRow + 1 );
ptablewidgetitem = new QTableWidgetItem( szDriverName );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 0, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDescription );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 1, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDriver );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 2, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szSetup );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 3, ptablewidgetitem );
nRow++;

8
unixODBC.spec
View File

@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux Summary: A complete ODBC driver manager for Linux
Name: unixODBC Name: unixODBC
Version: 2.2.14 Version: 2.2.14
Release: 8%{?dist} Release: 9%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.unixODBC.org/ URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL. # Programs are GPL, libraries are LGPL, except News Server library is GPL.
@ -20,6 +20,7 @@ Patch7: libtool-config.patch
Patch8: so-version-bump.patch Patch8: so-version-bump.patch
Patch9: keep-typedefs.patch Patch9: keep-typedefs.patch
Patch10: odbcint64-config.patch Patch10: odbcint64-config.patch
Patch11: enable-items.patch
Conflicts: iodbc Conflicts: iodbc
BuildRequires: libX11-devel libXt-devel libXext-devel BuildRequires: libX11-devel libXt-devel libXext-devel
@ -62,6 +63,7 @@ This package contains components for the ODBCConfig
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
chmod 0644 Drivers/MiniSQL/*.c chmod 0644 Drivers/MiniSQL/*.c
chmod 0644 Drivers/nn/*.c chmod 0644 Drivers/nn/*.c
@ -183,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Sat Dec 19 2009 Tom Lane <tgl@redhat.com> 2.2.14-9
- Fix bug preventing drivers from being selected in ODBCConfig
Resolves: #544852
* Wed Nov 25 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.2.14-8 * Wed Nov 25 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.2.14-8
- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) - Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)