rpms/wxGTK/devel wxGTK-2.6.3.3-cvs.patch,NONE,1.1
Matthew Miller (mattdm)
fedora-extras-commits at redhat.com
Fri Jul 21 14:46:04 UTC 2006
- Previous message (by thread): rpms/perl-IO-Tty/FC-5 .cvsignore, 1.6, 1.7 perl-IO-Tty.spec, 1.13, 1.14 sources, 1.6, 1.7
- Next message (by thread): rpms/perl-Expect/FC-5 .cvsignore, 1.4, 1.5 perl-Expect.spec, 1.3, 1.4 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mattdm
Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13422
Added Files:
wxGTK-2.6.3.3-cvs.patch
Log Message:
add patch to update to 2.6.3.3 from CVS (for corresponding wxPython release)
wxGTK-2.6.3.3-cvs.patch:
--- NEW FILE wxGTK-2.6.3.3-cvs.patch ---
diff -ur wxWidgets-2.6.3/build/aclocal/bakefile.m4 wxWidgets-2.6.3.3/build/aclocal/bakefile.m4
--- wxWidgets-2.6.3/build/aclocal/bakefile.m4 2006-02-12 03:50:55.000000000 -0500
+++ wxWidgets-2.6.3.3/build/aclocal/bakefile.m4 2006-07-12 04:59:53.000000000 -0400
@@ -421,6 +421,7 @@
powerpc-apple-macos* | \
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
+ *-*-mirbsd* | \
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
diff -ur wxWidgets-2.6.3/configure wxWidgets-2.6.3.3/configure
--- wxWidgets-2.6.3/configure 2006-03-21 14:33:33.000000000 -0500
+++ wxWidgets-2.6.3.3/configure 2006-05-23 14:08:19.000000000 -0400
@@ -892,6 +892,7 @@
--enable-universal_binary create Mac PowerPC and Intel Universal binary (not yet working)
--enable-compat22 enable wxWidgets 2.2 compatibility
--disable-compat24 disable wxWidgets 2.4 compatibility
+ --disable-reserved_virtual do not create unused vtable entries
--disable-rpath disable use of rpath for uninstalled builds
--enable-intl use internationalization system
--enable-config use wxConfig (and derived) classes
@@ -1669,7 +1670,7 @@
wx_major_version_number=2
wx_minor_version_number=6
wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=3
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -4241,6 +4242,49 @@
fi
+DEFAULT_WX_USE_RESERVED_VIRTUALS=yes
+
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-reserved_virtual" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-reserved_virtual... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-reserved_virtual or --disable-reserved_virtual was given.
+if test "${enable_reserved_virtual+set}" = set; then
+ enableval="$enable_reserved_virtual"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS=yes'
+ else
+ ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS=no'
+ fi
+
+else
+
+ LINE=`grep "WX_USE_RESERVED_VIRTUALS" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS='$DEFAULT_WX_USE_RESERVED_VIRTUALS
+
+fi;
+
+ eval "$ac_cv_use_reserved_virtual"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_reserved_virtual >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$WX_USE_RESERVED_VIRTUALS" = yes; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
@@ -38289,6 +38333,13 @@
fi
+if test "x$WX_USE_RESERVED_VIRTUALS" != "xno"; then
+ cat >>confdefs.h <<\_ACEOF
+#define WX_USE_RESERVED_VIRTUALS 1
+_ACEOF
+
+fi
+
if test "$wxUSE_GUI" = "yes"; then
cat >>confdefs.h <<\_ACEOF
@@ -42353,11 +42404,6 @@
echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
wxUSE_TOGGLEBTN=no
fi
- if test "$wxUSE_UNIVERSAL" = "yes"; then
- { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&5
-echo "$as_me: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&2;}
- wxUSE_TOGGLEBTN=no
- fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
cat >>confdefs.h <<\_ACEOF
diff -ur wxWidgets-2.6.3/configure.in wxWidgets-2.6.3.3/configure.in
--- wxWidgets-2.6.3/configure.in 2006-03-21 14:33:57.000000000 -0500
+++ wxWidgets-2.6.3.3/configure.in 2006-07-12 04:59:50.000000000 -0400
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.23 2006/07/12 08:59:50 SN Exp $)dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -8,7 +8,7 @@
dnl
dnl This script is under the wxWidgets licence.
dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.23 2006/07/12 08:59:50 SN Exp $
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
wx_major_version_number=2
wx_minor_version_number=6
wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=3
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -185,7 +185,7 @@
AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_GTK=1
;;
- *-*-openbsd*)
+ *-*-openbsd*|*-*-mirbsd*)
USE_BSD=1
USE_OPENBSD=1
AC_DEFINE(__OPENBSD__)
@@ -857,6 +857,9 @@
WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
+DEFAULT_WX_USE_RESERVED_VIRTUALS=yes
+WX_ARG_ENABLE(reserved_virtual, [ --disable-reserved_virtual do not create unused vtable entries], WX_USE_RESERVED_VIRTUALS)
+
WX_ARG_ENABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH)
@@ -5073,6 +5076,10 @@
AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
fi
+if test "x$WX_USE_RESERVED_VIRTUALS" != "xno"; then
+ AC_DEFINE(WX_USE_RESERVED_VIRTUALS)
+fi
+
dnl ---------------------------------------------------------------------------
dnl the library may be built without GUI classes at all
dnl ---------------------------------------------------------------------------
@@ -6311,10 +6318,6 @@
AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
wxUSE_TOGGLEBTN=no
fi
- if test "$wxUSE_UNIVERSAL" = "yes"; then
- AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
- wxUSE_TOGGLEBTN=no
- fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
AC_DEFINE(wxUSE_TOGGLEBTN)
diff -ur wxWidgets-2.6.3/contrib/src/gizmos/editlbox.cpp wxWidgets-2.6.3.3/contrib/src/gizmos/editlbox.cpp
--- wxWidgets-2.6.3/contrib/src/gizmos/editlbox.cpp 2005-01-14 08:06:52.000000000 -0500
+++ wxWidgets-2.6.3.3/contrib/src/gizmos/editlbox.cpp 2006-05-23 15:30:03.000000000 -0400
@@ -2,7 +2,7 @@
// Name: editlbox.cpp
// Purpose: ListBox with editable items
// Author: Vaclav Slavik
-// RCS-ID: $Id: editlbox.cpp,v 1.21 2005/01/14 13:06:52 ABX Exp $
+// RCS-ID: $Id: editlbox.cpp,v 1.21.2.1 2006/05/23 19:30:03 ABX Exp $
// Copyright: (c) Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -228,6 +228,12 @@
// add new empty line here so that adding one more line is still
// possible:
m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString);
+
+ // Simulate a wxEVT_COMMAND_LIST_ITEM_SELECTED event for the new item,
+ // so that the buttons are enabled/disabled properly
+ wxListEvent selectionEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED, m_listCtrl->GetId());
+ selectionEvent.m_itemIndex = event.GetIndex();
+ m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent);
}
[...5852 lines suppressed...]
+
+int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
+{
+ if (pid < 1)
+ return -1;
+
+ wxProcessTerminationEventHandler* handler = new wxProcessTerminationEventHandler(proc_data);
+ wxProcessTerminationThread* thread = new wxProcessTerminationThread(proc_data, handler);
+
+ if (thread->Create() != wxTHREAD_NO_ERROR)
+ {
+ wxLogDebug(wxT("Could not create termination detection thread."));
+ delete thread;
+ delete handler;
+ return -1;
+ }
+
+ thread->Run();
+
+ return 0;
+}
+
+#else
#include <CoreFoundation/CFMachPort.h>
#include <sys/wait.h>
@@ -113,6 +209,9 @@
return 0;
}
+#endif
+ // USE_POLLING
+
// NOTE: This doens't really belong here but this was a handy file to
// put it in because it's already compiled for wxCocoa and wxMac GUI lib.
static wxStandardPathsCF gs_stdPaths;
diff -ur wxWidgets-2.6.3/src/unix/fontutil.cpp wxWidgets-2.6.3.3/src/unix/fontutil.cpp
--- wxWidgets-2.6.3/src/unix/fontutil.cpp 2006-02-12 19:24:55.000000000 -0500
+++ wxWidgets-2.6.3.3/src/unix/fontutil.cpp 2006-04-18 18:59:06.000000000 -0400
@@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 05.11.99
-// RCS-ID: $Id: fontutil.cpp,v 1.62.2.1 2006/02/13 00:24:55 VZ Exp $
+// RCS-ID: $Id: fontutil.cpp,v 1.62.2.2 2006/04/18 22:59:06 VZ Exp $
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -337,8 +337,9 @@
info->encoding = wxFONTENCODING_SYSTEM;
return true;
+ case wxFONTENCODING_ISO8859_1:
case wxFONTENCODING_UTF8:
- info->encoding = wxFONTENCODING_UTF8;
+ info->encoding = encoding;
return true;
default:
diff -ur wxWidgets-2.6.3/src/unix/mimetype.cpp wxWidgets-2.6.3.3/src/unix/mimetype.cpp
--- wxWidgets-2.6.3/src/unix/mimetype.cpp 2006-03-17 10:05:03.000000000 -0500
+++ wxWidgets-2.6.3.3/src/unix/mimetype.cpp 2006-06-18 17:38:11.000000000 -0400
@@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 23.09.98
-// RCS-ID: $Id: mimetype.cpp,v 1.53.2.3 2006/03/17 15:05:03 RR Exp $
+// RCS-ID: $Id: mimetype.cpp,v 1.53.2.4 2006/06/18 21:38:11 VZ Exp $
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin at dptmaths.ens-cachan.fr>
// Licence: wxWindows licence (part of wxExtra library)
/////////////////////////////////////////////////////////////////////////////
@@ -395,7 +395,7 @@
wxLogTrace(TRACE_MIME, wxT("--- Reading from Gnome file %s '%s' ---"),
filename.c_str(), pc);
-
+
// trim trailing space and tab
while ((*pc == wxT(' ')) || (*pc == wxT('\t')))
pc++;
@@ -406,18 +406,18 @@
{
wxString left_of_equal = sTmp.Left( equal_pos );
const wxChar *right_of_equal = pc;
- right_of_equal += equal_pos+1;
-
+ right_of_equal += equal_pos+1;
+
if (left_of_equal == wxT("icon_filename"))
{
// GNOME 2:
curIconFile = right_of_equal;
-
+
wxFileName newFile( curIconFile );
if (newFile.IsRelative() || newFile.FileExists())
{
size_t nDirs = search_dirs.GetCount();
-
+
for (size_t nDir = 0; nDir < nDirs; nDir++)
{
newFile.SetPath( search_dirs[nDir] );
@@ -2641,6 +2641,8 @@
bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
{
+ InitIfNeeded();
+
wxArrayString sMimeTypes;
ft->GetMimeTypes (sMimeTypes);
diff -ur wxWidgets-2.6.3/utils/helpview/src/helpview.cpp wxWidgets-2.6.3.3/utils/helpview/src/helpview.cpp
--- wxWidgets-2.6.3/utils/helpview/src/helpview.cpp 2005-05-30 05:24:08.000000000 -0400
+++ wxWidgets-2.6.3.3/utils/helpview/src/helpview.cpp 2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
// Author: Vaclav Slavik, Julian Smart
// Modified by:
// Created: 2002-07-09
-// RCS-ID: $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID: $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
// Copyright: (c) 2002 Vaclav Slavik, Julian Smart and others
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
#ifdef __WXMAC__
wxApp::s_macAboutMenuItemId = wxID_ABOUT;
- wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+ wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
#endif
int istyle = wxHF_DEFAULT_STYLE;
diff -ur wxWidgets-2.6.3/utils/tex2rtf/src/tex2rtf.cpp wxWidgets-2.6.3.3/utils/tex2rtf/src/tex2rtf.cpp
--- wxWidgets-2.6.3/utils/tex2rtf/src/tex2rtf.cpp 2006-01-23 10:09:03.000000000 -0500
+++ wxWidgets-2.6.3.3/utils/tex2rtf/src/tex2rtf.cpp 2006-06-13 06:36:42.000000000 -0400
@@ -5,7 +5,7 @@
// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
// Ron Lee
// Created: 7.9.93
-// RCS-ID: $Id: tex2rtf.cpp,v 1.53.2.1 2006/01/23 15:09:03 ABX Exp $
+// RCS-ID: $Id: tex2rtf.cpp,v 1.53.2.2 2006/06/13 10:36:42 ABX Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -186,6 +186,8 @@
}
}
+ TexPathList.Add(::wxGetCwd());
+
#ifdef NO_GUI
if (InputFile.empty() || OutputFile.empty())
{
diff -ur wxWidgets-2.6.3/utils/tex2rtf/src/texutils.cpp wxWidgets-2.6.3.3/utils/tex2rtf/src/texutils.cpp
--- wxWidgets-2.6.3/utils/tex2rtf/src/texutils.cpp 2006-01-26 22:08:36.000000000 -0500
+++ wxWidgets-2.6.3.3/utils/tex2rtf/src/texutils.cpp 2006-06-13 06:34:58.000000000 -0400
@@ -5,7 +5,7 @@
// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
// Ron Lee
// Created: 7.9.93
-// RCS-ID: $Id: texutils.cpp,v 1.32.2.2 2006/01/27 03:08:36 MW Exp $
+// RCS-ID: $Id: texutils.cpp,v 1.32.2.3 2006/06/13 10:34:58 ABX Exp $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -1204,6 +1204,7 @@
up.MakeUpper();
if (up.IsSameAs(_T("YES")) ||
+ up.IsSameAs(_T("TRUE")) ||
up.IsSameAs(_T("ON")) ||
up.IsSameAs(_T("OK")) |
up.IsSameAs(_T("1")))
diff -ur wxWidgets-2.6.3/version-script.in wxWidgets-2.6.3.3/version-script.in
--- wxWidgets-2.6.3/version-script.in 2006-03-18 09:25:50.000000000 -0500
+++ wxWidgets-2.6.3.3/version-script.in 2006-07-06 06:40:39.000000000 -0400
@@ -1,11 +1,21 @@
#
-# $Id: version-script.in,v 1.23.2.5 2006/03/18 14:25:50 RR Exp $
+# $Id: version-script.in,v 1.23.2.7 2006/07/06 10:40:39 ABX Exp $
#
# Note: Remove all of the tags below except for the last one when creating
# new development branch.
+# public symbols added in release 2.6.4 (please keep in alphabetical order):
+
+ at WX_VERSION_TAG@.4 {
+ global:
+ *wxString*const_reverse_iterator*;
+ *wxString*rbegin*;
+ *wxString*rend*;
+ *wxString*reverse_iterator*;
+};
+
# public symbols added in release 2.6.3 (please keep in alphabetical order):
@WX_VERSION_TAG at .3 {
- Previous message (by thread): rpms/perl-IO-Tty/FC-5 .cvsignore, 1.6, 1.7 perl-IO-Tty.spec, 1.13, 1.14 sources, 1.6, 1.7
- Next message (by thread): rpms/perl-Expect/FC-5 .cvsignore, 1.4, 1.5 perl-Expect.spec, 1.3, 1.4 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list