diff --git a/.cvsignore b/.cvsignore index fe0cca0..5cb0a2e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxGTK-2.6.2.tar.bz2 +wxGTK-2.6.3.tar.bz2 diff --git a/sources b/sources index dacb7e4..00b068f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba2afe7bd028062c5fff6d5ef3249c67 wxGTK-2.6.2.tar.bz2 +3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2 diff --git a/wxGTK-2.6.2-gcc41stringh.patch b/wxGTK-2.6.2-gcc41stringh.patch deleted file mode 100644 index 3e487fa..0000000 --- a/wxGTK-2.6.2-gcc41stringh.patch +++ /dev/null @@ -1,28 +0,0 @@ -=================================================================== -RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/string.h,v -retrieving revision 1.206.2.2 -retrieving revision 1.206.2.3 -diff -u -r1.206.2.2 -r1.206.2.3 ---- wxWidgets/include/wx/string.h 2005/11/01 13:32:48 1.206.2.2 -+++ wxWidgets/include/wx/string.h 2005/12/15 19:26:27 1.206.2.3 -@@ -1291,16 +1291,15 @@ - { return (wxString&)wxStringBase::operator+=(ch); } - }; - --// IBM xlC compiler needs these operators to be declared in global scope, --// although this shouldn't be a problem for the other compilers we prefer to --// only do it for it in stable 2.6 branch --#ifdef __IBMCPP__ -+// notice that even though for many compilers the friend declarations above are -+// enough, from the point of view of C++ standard we must have the declarations -+// here as friend ones are not injected in the enclosing namespace and without -+// them the code fails to compile with conforming compilers such as xlC or g++4 - wxString WXDLLIMPEXP_BASE operator+(const wxString& string1, const wxString& string2); - wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxChar ch); - wxString WXDLLIMPEXP_BASE operator+(wxChar ch, const wxString& string); - wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const wxChar *psz); - wxString WXDLLIMPEXP_BASE operator+(const wxChar *psz, const wxString& string); --#endif // __IBMCPP__ - - // define wxArrayString, for compatibility - #if WXWIN_COMPATIBILITY_2_4 && !wxUSE_STL diff --git a/wxGTK-2.6.2-intl_cpp.patch b/wxGTK-2.6.2-intl_cpp.patch deleted file mode 100644 index dc280c5..0000000 --- a/wxGTK-2.6.2-intl_cpp.patch +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v -retrieving revision 1.166 -retrieving revision 1.166.2.1 -diff -u -r1.166 -r1.166.2.1 ---- src/common/intl.cpp 2005/09/18 23:38:06 1.166 -+++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1 -@@ -5,7 +5,7 @@ - // Modified by: Michael N. Filippov - // (2003/09/30 - PluralForms support) - // Created: 29/01/98 --// RCS-ID: $Id: intl.cpp,v 1.166 2005/09/18 23:38:06 VZ Exp $ -+// RCS-ID: $Id: intl.cpp,v 1.166.2.1 2005/09/28 09:48:03 VZ Exp $ - // Copyright: (c) 1998 Vadim Zeitlin - // Licence: wxWindows licence - ///////////////////////////////////////////////////////////////////////////// -@@ -1260,9 +1260,14 @@ - inputConv = - csConv = new wxCSConv(m_charset); - } -- else // no conversion needed -+ else // no need to convert the encoding - { -+ // we still need the conversion for Unicode build -+#if wxUSE_UNICODE -+ inputConv = wxConvCurrent; -+#else // !wxUSE_UNICODE - inputConv = NULL; -+#endif - } - - // conversion to apply to msgid strings before looking them up: we only - diff --git a/wxGTK-2.6.2-socketclosefix.patch b/wxGTK-2.6.2-socketclosefix.patch deleted file mode 100644 index 4e6d618..0000000 --- a/wxGTK-2.6.2-socketclosefix.patch +++ /dev/null @@ -1,26 +0,0 @@ -=================================================================== -RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/unix/gsocket.cpp,v -retrieving revision 1.51 -retrieving revision 1.51.2.1 -diff -u -r1.51 -r1.51.2.1 ---- wxWidgets/src/unix/gsocket.cpp 2005/09/19 15:18:27 1.51 -+++ wxWidgets/src/unix/gsocket.cpp 2005/10/05 15:37:42 1.51.2.1 -@@ -8,7 +8,7 @@ - * Guillermo Rodriguez Garcia - * Purpose: GSocket main Unix and OS/2 file - * Licence: The wxWindows licence -- * CVSID: $Id: gsocket.cpp,v 1.51 2005/09/19 15:18:27 JS Exp $ -+ * CVSID: $Id: gsocket.cpp,v 1.51.2.1 2005/10/05 15:37:42 KH Exp $ - * ------------------------------------------------------------------------- - */ - -@@ -331,6 +331,9 @@ - - assert(this); - -+ /* Don't allow events to fire after socket has been closed */ -+ gs_gui_functions->Disable_Events(this); -+ - /* If socket has been created, shutdown it */ - if (m_fd != INVALID_SOCKET) - { diff --git a/wxGTK.spec b/wxGTK.spec index fad55fd..1e0d42c 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,8 +1,12 @@ %define x11libdir %{_prefix}/X11R6/%{_lib} +# Option - build an ODBC subpackage using unixODBC. (This is currently +# broken; see .) +%define withodbc 0 + Name: wxGTK -Version: 2.6.2 -Release: 5%{?dist} +Version: 2.6.3 +Release: 0%{?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 @@ -11,15 +15,15 @@ License: wxWidgets Library Licence Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2 -Patch0: wxGTK-2.6.2-intl_cpp.patch -Patch1: wxGTK-2.6.2-socketclosefix.patch -Patch2: wxGTK-2.6.2-gcc41stringh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +%if %{withodbc} +BuildRequires: unixODBC-devel +%endif # all of these are for previous Fedora Extras sub-packages Obsoletes: wxGTK2 < 2.6.2-1 @@ -68,14 +72,20 @@ Obsoletes: wxGTK2-gl < %{version}-%{release} Provides: wxGTK2-gl = %{version}-%{release} %description gl -OpenGL add-on for the wxWidgets library. +OpenGL (a 3D graphics API) 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 %prep %setup -q -%patch0 -p0 -b .intlcpp -%patch1 -p1 -b .socketclose -%patch2 -p1 -b .gcc41 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure @@ -89,6 +99,9 @@ export GDK_USE_XFT=1 --x-libraries=%{x11libdir} \ --with-gtk=2 \ --with-opengl \ +%if %{withodbc} + --with-odbc \ +%endif --with-sdl \ --with-gnomeprint \ --enable-shared \ @@ -170,8 +183,31 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_libdir}/libwx_gtk2u_gl-*.so.* +%if %{withodbc} +%files odbc +%defattr(-,root,root,-) +%{_libdir}/libwx_gtk2u_odbc-*.so.* +%endif %changelog +* Sat Mar 25 2006 Matthew Miller - 2.6.3-1 +- 2.6.3 final +- remove the locale_install thing -- that was just an issue with using the + release candidate. + +* Tue Mar 21 2006 Matthew Miller - 2.6.3-0.rc2 +- update to 2.6.3-rc2 package +- all patches now upstream -- removing 'em. +- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one, + since that's all there is for the release candidate. I'm operating under + the assumption that we'll have a wxGTK source tarball in the future -- + otherwise, I'm going to eventually have to change the name of this + package again. :) +- add ODBC support via unixODBC as subpackage (see bug #176950) +- wait, no; comment out ODBC support as it doesn't build... +- add explicit make locale_install; apparently not done as part of + the general 'make install' anymore. + * Mon Feb 13 2006 Matthew Miller - 2.6.2-5 - rebuild in preparation for FC5