SOURCES: wxWidgets-ogl.patch, wxWidgets-ac.patch, wxWidgets-gif0de...

jareq jareq at pld-linux.org
Mon Nov 27 17:56:51 CET 2006 

Author: jareq                        Date: Mon Nov 27 16:56:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 2.8.0 rc1

---- Files affected:
SOURCES:
   wxWidgets-ogl.patch (1.5 -> 1.6) , wxWidgets-ac.patch (1.2 -> 1.3) , wxWidgets-gif0delay.patch (1.2 -> 1.3) , wxWidgets-x11unicode.patch (1.1 -> 1.2) , wxWidgets-gcc4.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/wxWidgets-ogl.patch
diff -u SOURCES/wxWidgets-ogl.patch:1.5 SOURCES/wxWidgets-ogl.patch:1.6
--- SOURCES/wxWidgets-ogl.patch:1.5	Thu Oct 13 18:51:36 2005
+++ SOURCES/wxWidgets-ogl.patch	Mon Nov 27 17:56:46 2006
@@ -1,6 +1,6 @@
-diff -urN wxWidgets-2.5.5.orig/contrib/build/ogl/ogl.bkl wxWidgets-2.5.5/contrib/build/ogl/ogl.bkl
---- wxWidgets-2.5.5.orig/contrib/build/ogl/ogl.bkl	2003-08-26 04:14:59.000000000 +0200
-+++ wxWidgets-2.5.5/contrib/build/ogl/ogl.bkl	2005-04-07 20:30:46.500809648 +0200
+diff -uNr wxWidgets-2.8.0-rc1.orig/contrib/build/ogl/ogl.bkl wxWidgets-2.8.0-rc1/contrib/build/ogl/ogl.bkl
+--- wxWidgets-2.8.0-rc1.orig/contrib/build/ogl/ogl.bkl	2006-11-13 11:53:15.000000000 +0100
++++ wxWidgets-2.8.0-rc1/contrib/build/ogl/ogl.bkl	2006-11-27 09:20:26.000000000 +0100
 @@ -44,6 +44,7 @@
          <define>WXUSINGDLL</define>
          <define>WXMAKINGDLL_OGL</define>
@@ -9,9 +9,10 @@
          <wx-lib>core</wx-lib>
          <wx-lib>base</wx-lib>
      </dll>
---- wxWidgets-2.6.2/contrib/src/ogl/Makefile.in.orig	2005-08-13 02:23:42.000000000 +0200
-+++ wxWidgets-2.6.2/contrib/src/ogl/Makefile.in	2005-10-13 13:24:23.000000000 +0200
-@@ -200,6 +200,9 @@
+diff -uNr wxWidgets-2.8.0-rc1.orig/contrib/src/ogl/Makefile.in wxWidgets-2.8.0-rc1/contrib/src/ogl/Makefile.in
+--- wxWidgets-2.8.0-rc1.orig/contrib/src/ogl/Makefile.in	2006-11-13 11:53:18.000000000 +0100
++++ wxWidgets-2.8.0-rc1/contrib/src/ogl/Makefile.in	2006-11-27 09:56:09.000000000 +0100
+@@ -214,6 +214,9 @@
  COND_MONOLITHIC_0___WXLIB_BASE_p = \
  	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0 at __WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
@@ -21,12 +22,12 @@
  COND_SHARED_0___ogllib___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_SHARED_0 at __ogllib___depname = $(COND_SHARED_0___ogllib___depname)
-@@ -242,7 +245,7 @@
+@@ -262,7 +265,7 @@
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
-- at COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-+ at COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__EXLIB_DEPRECATED_p) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+- at COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
++ at COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__EXLIB_DEPRECATED_p) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
  @COND_SHARED_1@	
  @COND_SHARED_1@	$(__ogldll___so_symlinks_cmd)
  

================================================================
Index: SOURCES/wxWidgets-ac.patch
diff -u SOURCES/wxWidgets-ac.patch:1.2 SOURCES/wxWidgets-ac.patch:1.3
--- SOURCES/wxWidgets-ac.patch:1.2	Sun Feb 20 23:52:36 2005
+++ SOURCES/wxWidgets-ac.patch	Mon Nov 27 17:56:46 2006
@@ -1,6 +1,6 @@
 --- wxWidgets-2.5.3/configure.in.orig	2005-02-20 19:38:45.461014000 +0100
 +++ wxWidgets-2.5.3/configure.in	2005-02-20 20:58:15.485860176 +0100
-@@ -2218,7 +2217,7 @@
+@@ -2670,7 +2670,7 @@
              dnl HAVE_STDLIB_H which are already defined and this provokes
              dnl a compiler warning which configure considers as an error...
              AC_MSG_CHECKING(for jpeglib.h)
@@ -9,7 +9,7 @@
                  AC_TRY_COMPILE(
                      [
                          #undef HAVE_STDLIB_H
-@@ -2230,7 +2229,7 @@
+@@ -2682,7 +2682,7 @@
                      ac_cv_header_jpeglib_h=yes,
                      ac_cv_header_jpeglib_h=no
                  )

================================================================
Index: SOURCES/wxWidgets-gif0delay.patch
diff -u SOURCES/wxWidgets-gif0delay.patch:1.2 SOURCES/wxWidgets-gif0delay.patch:1.3
--- SOURCES/wxWidgets-gif0delay.patch:1.2	Sun Sep  4 13:29:50 2005
+++ SOURCES/wxWidgets-gif0delay.patch	Mon Nov 27 17:56:46 2006
@@ -1,36 +1,32 @@
-Protection against 0 (too short in general) delay in GIF animation.
-It caused xchm to hang just animating GIF without actually displaying anything.
-(affected wxgtk*; not wxx11univ because of different implementation)
-
---- wxWidgets-2.5.3/src/html/m_image.cpp.orig	2004-09-28 13:18:36.000000000 +0200
-+++ wxWidgets-2.5.3/src/html/m_image.cpp	2005-02-20 21:06:55.564796160 +0100
-@@ -337,6 +337,11 @@
+--- wxWidgets-2.7.1/src/html/m_image.cpp.orig	2006-10-12 14:52:20.000000000 +0200
++++ wxWidgets-2.7.1/src/html/m_image.cpp	2006-10-15 20:32:56.000000000 +0200
+@@ -333,6 +333,11 @@
  
      DECLARE_NO_COPY_CLASS(wxGIFTimer)
  };
 +
 +static int safedelay(int ms)
 +{
-+	return (ms >= 10) ? ms : 10;
++       return (ms >= 10) ? ms : 10;
 +}
  #endif
  
  
-@@ -390,7 +395,7 @@
+@@ -388,7 +393,7 @@
                          if ( m_gifDecoder->IsAnimation() )
                          {
                              m_gifTimer = new wxGIFTimer(this);
--                            m_gifTimer->Start(m_gifDecoder->GetDelay(), true);
-+                            m_gifTimer->Start(safedelay(m_gifDecoder->GetDelay()), true);
+-                            m_gifTimer->Start(m_gifDecoder->GetDelay(0), true);
++                            m_gifTimer->Start(safedelay(m_gifDecoder->GetDelay(0)), true);
                          }
                          else
                          {
-@@ -517,7 +522,7 @@
-         m_window->Refresh(img.HasMask(), &rect);
+@@ -522,7 +527,7 @@
+         win->Refresh(img.HasMask(), &rect);
      }
  
--    timer->Start(m_gifDecoder->GetDelay(), true);
-+    timer->Start(safedelay(m_gifDecoder->GetDelay()), true);
+-    timer->Start(m_gifDecoder->GetDelay(m_nCurrFrame), true);
++    timer->Start(safedelay(m_gifDecoder->GetDelay(m_nCurrFrame)), true);
  }
  
  void wxHtmlImageCell::Layout(int w)

================================================================
Index: SOURCES/wxWidgets-x11unicode.patch
diff -u SOURCES/wxWidgets-x11unicode.patch:1.1 SOURCES/wxWidgets-x11unicode.patch:1.2
--- SOURCES/wxWidgets-x11unicode.patch:1.1	Thu Oct 13 18:52:22 2005
+++ SOURCES/wxWidgets-x11unicode.patch	Mon Nov 27 17:56:46 2006
@@ -1,10 +1,11 @@
---- wxWidgets-2.6.2/src/unix/fontutil.cpp.orig	2005-09-20 15:35:41.000000000 +0200
-+++ wxWidgets-2.6.2/src/unix/fontutil.cpp	2005-10-13 16:03:36.000000000 +0200
-@@ -48,6 +48,7 @@
- extern GtkWidget *wxGetRootWindow();
+diff -uNr wxWidgets-2.7.2.orig/src/unix/fontutil.cpp wxWidgets-2.7.2/src/unix/fontutil.cpp
+--- wxWidgets-2.7.2.orig/src/unix/fontutil.cpp	2006-11-07 15:18:20.000000000 +0100
++++ wxWidgets-2.7.2/src/unix/fontutil.cpp	2006-11-10 14:55:57.000000000 +0100
+@@ -51,6 +51,7 @@
  #else
- #include "wx/x11/private.h"
-+#include "wx/app.h"
- #endif
+     #include "wx/x11/private.h"
+     #include "wx/gtk/private/string.h"
++    #include "wx/app.h"
  
- // ----------------------------------------------------------------------------
+     #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
+ #endif

================================================================
Index: SOURCES/wxWidgets-gcc4.patch
diff -u SOURCES/wxWidgets-gcc4.patch:1.1 SOURCES/wxWidgets-gcc4.patch:1.2
--- SOURCES/wxWidgets-gcc4.patch:1.1	Wed Feb  1 19:18:28 2006
+++ SOURCES/wxWidgets-gcc4.patch	Mon Nov 27 17:56:46 2006
@@ -1,6 +1,6 @@
 --- wxWidgets-2.6.2/src/common/uri.cpp.orig	2006-02-01 08:34:16.664085500 +0100
 +++ wxWidgets-2.6.2/src/common/uri.cpp	2006-02-01 08:27:23.390257500 +0100
-@@ -886,7 +886,7 @@
+@@ -889,7 +889,7 @@
                      op += 3;
              }
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/wxWidgets-ogl.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/wxWidgets-ac.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/wxWidgets-gif0delay.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/wxWidgets-x11unicode.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/wxWidgets-gcc4.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list