From 9d30430183625a80cef2e882fe7666c02ffc744b Mon Sep 17 00:00:00 2001
From: Dan Horák <sharkcz@fedoraproject.org>
Date: Nov 10 2009 13:00:00 +0000
Subject: - added fix for html tables rendering (#534030)

- removed the long time disabled odbc subpackage

---

diff --git a/wxGTK-2.8.10-htmltable.patch b/wxGTK-2.8.10-htmltable.patch
new file mode 100644
index 0000000..15b4e78
--- /dev/null
+++ b/wxGTK-2.8.10-htmltable.patch
@@ -0,0 +1,20 @@
+Index: src/html/m_tables.cpp
+===================================================================
+--- src/html/m_tables.cpp	(revision 59686)
++++ src/html/m_tables.cpp	(revision 59687)
+@@ -684,6 +684,7 @@
+         {
+             wxHtmlTableCell *oldt = m_Table;
+ 
++            wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;
+             m_enclosingContainer = c = m_WParser->OpenContainer();
+ 
+             m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
+@@ -722,6 +723,7 @@
+             m_WParser->CloseContainer();
+ 
+             m_Table = oldt;
++            m_enclosingContainer = oldEnclosing;
+ 
+             return true; // ParseInner() called
+         }
diff --git a/wxGTK.spec b/wxGTK.spec
index 85db633..ebd9de0 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,14 +1,7 @@
-# Option - build an ODBC subpackage using unixODBC. (This is currently 
-# broken; see <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176950>.)
-%define withodbc 0
-
 Name:           wxGTK
 Version:        2.8.10
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
-# The wxWindows licence is the LGPL with a specific exemption allowing
-# distribution of derived binaries under any terms. (This will eventually
-# change to be "wxWidgets License" once that is approved by OSI.)
 License:        wxWidgets
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
@@ -16,12 +9,14 @@ Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
 
 # http://trac.wxwidgets.org/ticket/10883
 Patch0:         %{name}-2.8.10-gsocket.patch
-# http://trac.wxwidgets.org/ticket/10993
+# http://trac.wxwidgets.org/ticket/10993 (#511279)
 Patch1:         %{name}-2.8.10-CVE-2009-2369.patch
-# http://trac.wxwidgets.org/ticket/11315
+# http://trac.wxwidgets.org/ticket/11315 (#494425)
 Patch2:         %{name}-2.8.10-wxTimer-fix.patch
-# http://trac.wxwidgets.org/ticket/11310
+# http://trac.wxwidgets.org/ticket/11310 (#528376)
 Patch3:         %{name}-2.8.10-menubar-height.patch
+# http://trac.wxwidgets.org/ticket/10370 (#534030)
+Patch4:         %{name}-2.8.10-htmltable.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,9 +28,6 @@ BuildRequires:  libSM-devel
 BuildRequires:  gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  GConf2-devel
 BuildRequires:  autoconf, gettext
-%if %{withodbc}
-BuildRequires:  unixODBC-devel
-%endif
 
 Requires:       wxBase = %{version}-%{release}
 
@@ -78,17 +70,6 @@ Requires:       %{name} = %{version}-%{release}
 Multimedia add-on for the wxWidgets library.
 
 
-%if %{withodbc}
-%package        odbc
-Summary:        ODBC add-on for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description odbc
-ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
-%endif
-
-
 %package -n     wxBase
 Summary:        Non-GUI support classes from the wxWidgets library
 Group:          System Environment/Libraries
@@ -107,6 +88,7 @@ libraries or the X Window System.
 %patch1 -p0 -b .CVE-2009-2369
 %patch2 -p0 -b .wxTimer-fix
 %patch3 -p0 -b .menubar-height
+%patch4 -p0 -b .htmltable
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -134,9 +116,6 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 # (see OPTIMISE in configure).
 %configure \
   --with-opengl \
-%if %{withodbc}
-  --with-odbc \
-%endif
   --with-sdl \
   --with-gnomeprint \
   --enable-shared \
@@ -200,11 +179,6 @@ rm -rf $RPM_BUILD_ROOT
 %post media -p /sbin/ldconfig
 %postun media -p /sbin/ldconfig
 
-%if %{withodbc}
-%post odbc -p /sbin/ldconfig
-%postun odbc -p /sbin/ldconfig
-%endif
-
 %post -n wxBase -p /sbin/ldconfig
 %postun -n wxBase -p /sbin/ldconfig
 
@@ -247,12 +221,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libwx_gtk2u_media-*.so.*
 
-%if %{withodbc}
-%files odbc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2u_odbc-*.so.*
-%endif
-
 %files -n wxBase
 %defattr(-,root,root,-)
 %doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
@@ -263,6 +231,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 10 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-7
+- added fix for html tables rendering (#534030)
+- removed the long time disabled odbc subpackage
+
 * Sun Oct 25 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-6
 - add fix for wrong menubar height when using larger system font (#528376)