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

[wahwah at users.sourceforge.net]

Revision: 7289
          http://gar.svn.sourceforge.net/gar/?rev=7289&view=rev
Author:   wahwah
Date:     2009-11-14 22:53:30 +0000 (Sat, 14 Nov 2009)

Log Message:
-----------
wxwidgets: providing vsscanf via ncursesw

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

Added Paths:
-----------
    csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2009-11-14 22:20:33 UTC (rev 7288)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2009-11-14 22:53:30 UTC (rev 7289)
@@ -97,23 +97,18 @@
 CATALOGNAME_CSWwxwidgetsgtk2   = wxwidgets_gtk2
 TEST_SCRIPTS =
 
-EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
+# 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
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-gtk=2
 CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw
 CONFIGURE_ARGS += --with-regex
 CONFIGURE_ARGS += --with-opengl
-# Unicode-enabled build on Solaris 8 fails with:
-# "./src/common/wxchar.cpp", line 1693: Error: The function "vswscanf" must have
-# a prototype.
-# Building Unicode support for Solaris 9 and 10 only.
-CONFIGURE_ARGS_5.8  = --disable-unicode
-CONFIGURE_ARGS_5.9  = --enable-unicode
-CONFIGURE_ARGS_5.10 = --enable-unicode
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
-EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt
-EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt
+EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__
+EXTRA_CXXFLAGS = -fast -xstrconst -xnolibmopt -D__EXTENSIONS__
 EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include
 EXTRA_LIB = /opt/csw/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib

Added: csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch	                        (rev 0)
+++ csw/mgar/pkg/wxwidgets/trunk/files/0003-vsscanf-support-via-ncursesw.patch	2009-11-14 22:53:30 UTC (rev 7289)
@@ -0,0 +1,24 @@
+From 402daca1490a5ba6b0742011d72372680d261cc3 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sat, 14 Nov 2009 22:47:42 +0100
+Subject: [PATCH] vsscanf support via ncursesw
+
+---
+ src/common/wxchar.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
+index f594796..1550acc 100644
+--- a/src/common/wxchar.cpp
++++ b/src/common/wxchar.cpp
+@@ -15,6 +15,7 @@
+ 
+ // For compilers that support precompilation, includes "wx.h".
+ #include "wx/wxprec.h"
++#include "ncursesw/ncurses.h"
+ 
+ #ifdef __BORLANDC__
+     #pragma hdrstop
+-- 
+1.6.5.1
+


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