[csw-devel] SF.net SVN: gar:[7296] csw/mgar/pkg/wxwidgets/trunk

[wahwah at users.sourceforge.net]

Revision: 7296
          http://gar.svn.sourceforge.net/gar/?rev=7296&view=rev
Author:   wahwah
Date:     2009-11-15 15:20:40 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
wxwidgets: adding 0005-stupid-vwscanf-workaround.patch

Modified Paths:
--------------
    csw/mgar/pkg/wxwidgets/trunk/Makefile
    csw/mgar/pkg/wxwidgets/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2009-11-15 13:51:19 UTC (rev 7295)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2009-11-15 15:20:40 UTC (rev 7296)
@@ -16,7 +16,7 @@
 # The unicode version can't be currently built on Solaris 8.  Doing separate
 # builds on Solaris 8 and Solaris 9.  Unicode support will start in Solaris 9.
 # More details below, look for 'unicode'.
-PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386 solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386
 
 EXTRA_MODULATORS = GARVERSION
 MODULATIONS_GARVERSION = 2.8.5 2.8.10
@@ -29,27 +29,32 @@
 
 SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz)
 NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz,$(SOURCEFILES))
+DISTFILES  = $(SOURCEFILES)
 SPKG_SOURCEURL = http://www.wxwidgets.org/
 MASTER_SITES  = $(SF_MIRRORS)
 SF_PROJ = wxwindows
 
+
 PATCHFILES_isa-i386-garversion-2.8.5  = 0500-wxT-macro-first-iteration.patch
 PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
 PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
 PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
 PATCHFILES_isa-i386-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
+PATCHFILES_isa-i386-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.5  = 0500-wxT-macro-first-iteration.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
+PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch
 PATCHFILES_isa-i386-garversion-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
 PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
 PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-i386-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
 PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
-DISTFILES  = $(SOURCEFILES)
+PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 PACKAGES  = CSWwxwidgetscommon
 PACKAGES += CSWwxwidgetsdevel
@@ -106,7 +111,8 @@
 # To fix a problem with unresolved symbols
 EXTRA_LINKER_FLAGS  = /usr/openwin/lib/libXext.so
 # For vsscanf support
-EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so
+# EXTRA_LINKER_FLAGS += /opt/csw/lib/libncursesw.so
+EXTRA_LINKER_FLAGS += -lncursesw
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-gtk=2

Modified: csw/mgar/pkg/wxwidgets/trunk/checksums
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/checksums	2009-11-15 13:51:19 UTC (rev 7295)
+++ csw/mgar/pkg/wxwidgets/trunk/checksums	2009-11-15 15:20:40 UTC (rev 7296)
@@ -2,6 +2,7 @@
 45df2933ed2fa53f229feda01467db81  0002-Fixing-retarded-checks-for-libGL.patch
 225f6163a1c31d1f96a3b0548b338105  0003-vsscanf-support-via-ncursesw.patch
 f073300d39ce7c88db1033bbce64cdca  0004-add-monodll_appbase.so-to-wxrc.patch
+969c363847e675dc4d3ad6b8871b96db  0005-stupid-vwscanf-workaround.patch
 75ecdc04af4392f918ff6856a3ba6605  0500-wxT-macro-first-iteration.patch
 17d8d019fd2e4137b4cd44816b14e282  0501-a-possible-fix-to-wxchar.h.patch
 05b32ca051651f4b1885a90f62969faf  wxWidgets-2.8.10.tar.gz

Added: csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch	                        (rev 0)
+++ csw/mgar/pkg/wxwidgets/trunk/files/0005-stupid-vwscanf-workaround.patch	2009-11-15 15:20:40 UTC (rev 7296)
@@ -0,0 +1,28 @@
+From 739b2e9cbecf828c1f74f0e349a6ad8b3a2a0060 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 15 Nov 2009 16:07:25 +0100
+Subject: [PATCH] stupid vwscanf workaround
+
+---
+ include/wx/wxchar.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
+index 04fbd8d..e88484a 100644
+--- a/include/wx/wxchar.h
++++ b/include/wx/wxchar.h
+@@ -1011,9 +1011,9 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
+    so on but not all systems have them so use our own implementations in this
+    case.
+  */
+-#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF)
++/* #if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) */
+     #define wxNEED_WPRINTF
+-#endif
++/* #endif */
+ 
+ /*
+    More Unicode complications: although both ANSI C and C++ define a number of
+-- 
+1.6.2.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.