dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-wxGTK-2.8.10.tar.bz2

.gitignore

@@ -0,0 +1 @@
+wxGTK-2.8.11.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wxGTK
-# $Id$
-NAME := wxGTK
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-88b867bc118a183af56efc67014bdf27  wxGTK-2.8.10.tar.bz2
+6040933d200037f90f6aa1c5169e7ec6  wxGTK-2.8.11.tar.bz2

wxGTK-2.8.10-CVE-2009-2369.patch

@@ -1,75 +0,0 @@
-Index: src/common/imagpng.cpp
-===================================================================
---- src/common/imagpng.cpp	(revision 60874)
-+++ src/common/imagpng.cpp	(revision 60875)
-@@ -568,18 +568,16 @@
-     if (!image->Ok())
-         goto error;
- 
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
- 
-     for (i = 0; i < height; i++)
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
- 
-     png_read_image( png_ptr, lines );
-Index: src/common/imagtiff.cpp
-===================================================================
---- src/common/imagtiff.cpp	(revision 60875)
-+++ src/common/imagtiff.cpp	(revision 60876)
-@@ -261,7 +261,6 @@
-     }
- 
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
- 
-     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-@@ -275,10 +274,21 @@
-                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
-                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
- 
--    npixels = w * h;
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = w * h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+        if ( verbose )
-+            wxLogError( _("TIFF: Image size is abnormally big.") );
- 
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+        TIFFClose(tif);
- 
-+        return false;
-+    }
-+
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
-+
-     if (!raster)
-     {
-         if (verbose)
-Index: src/common/imagtiff.cpp
-===================================================================
---- src/common/imagtiff.cpp	(revision 60896)
-+++ src/common/imagtiff.cpp	(revision 60897)
-@@ -276,7 +276,7 @@
- 
-     // guard against integer overflow during multiplication which could result
-     // in allocating a too small buffer and then overflowing it
--    const double bytesNeeded = w * h * sizeof(uint32);
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-     if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-     {
-         if ( verbose )

wxGTK-2.8.10-gsocket.patch

@@ -1,19 +0,0 @@
-Index: 2.8/src/gtk/gsockgtk.cpp
-===================================================================
---- 2.8/src/gtk/gsockgtk.cpp (revision 60599)
-+++ 2.8/src/gtk/gsockgtk.cpp (working copy)
-@@ -15,8 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+// newer versions of glib define its own GSocket but we unfortunately use this
-+// name in our own (semi-)public header and so can't change it -- rename glib
-+// one instead
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
-
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
-

wxGTK.spec

@@ -1,24 +1,12 @@
-# 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:        4%{?dist}
+Version:        2.8.11
+Release:        1%{?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/
 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
-Patch1:         %{name}-2.8.10-CVE-2009-2369.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -29,9 +17,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}
 
@@ -74,17 +59,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
@@ -99,8 +73,6 @@ libraries or the X Window System.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .gsocket
-%patch1 -p0 -b .CVE-2009-2369
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -128,9 +100,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 \
@@ -194,11 +163,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
 
@@ -241,12 +205,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
@@ -257,6 +215,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 26 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-1
+- update to 2.8.11
+
+* 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)
+
+* Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-5
+- add fix for excessive CPU usage (#494425)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild