File wxWidgets-to-wxpython-2.9.4.0.patch of Package wxWidgets-2_9
diff -ur wxWidgets-2.9.4/build/tools/build-wxwidgets.py wxPython-src-2.9.4.0/build/tools/build-wxwidgets.py
--- wxWidgets-2.9.4/build/tools/build-wxwidgets.py 2012-10-25 20:29:11.911426734 +0200
+++ wxPython-src-2.9.4.0/build/tools/build-wxwidgets.py 2012-10-25 20:29:43.531307394 +0200
@@ -196,7 +196,8 @@
"installdir" : ("", "Directory where built wxWidgets will be installed"),
"mac_distdir" : (None, "If set on Mac, will create an installer package in the specified dir."),
"mac_universal_binary"
- : ("", "Comma separated list of architectures to include in the Mac universal binary"),
+ : (False, "Build Mac version as a universal binary"),
+ "mac_arch" : ("", "Build just the specified architecture on Mac"),
"mac_framework" : (False, "Install the Mac build as a framework"),
"mac_framework_prefix"
: (defFwPrefix, "Prefix where the framework should be installed. Default: %s" % defFwPrefix),
@@ -256,6 +257,9 @@
if options.osx_cocoa:
configure_opts.append("--with-osx_cocoa")
+ if options.mac_arch:
+ configure_opts.append("--enable-macosx_arch=%s" % options.mac_arch)
+
wxpy_configure_opts = [
"--with-opengl",
"--enable-sound",
@@ -320,6 +324,11 @@
# TODO: Should options.install be automatically turned on if the
# mac_framework flag is given?
+ # The framework build is always a universal binary, unless we are
+ # explicitly told to build only one architecture
+ if not options.mac_arch:
+ options.mac_universal_binary = True
+
# framework builds always need to be monolithic
if not "--enable-monolithic" in configure_opts:
configure_opts.append("--enable-monolithic")
@@ -337,7 +346,7 @@
shutil.rmtree(frameworkRootDir)
if options.mac_universal_binary:
- configure_opts.append("--enable-universal_binary=%s" % options.mac_universal_binary)
+ configure_opts.append("--enable-universal_binary")
print("Configure options: " + repr(configure_opts))
diff -ur wxWidgets-2.9.4/docs/changes.txt wxPython-src-2.9.4.0/docs/changes.txt
--- wxWidgets-2.9.4/docs/changes.txt 2012-10-25 20:29:29.626359872 +0200
+++ wxPython-src-2.9.4.0/docs/changes.txt 2012-10-25 20:30:23.817155370 +0200
@@ -524,7 +524,7 @@
was added.
-2.9.4: (release 2012-07-03)
+2.9.4: (release 2012-07-09)
------
INCOMPATIBLE CHANGES SINCE 2.9.3
diff -ur wxWidgets-2.9.4/docs/publicity/announce.txt wxPython-src-2.9.4.0/docs/publicity/announce.txt
--- wxWidgets-2.9.4/docs/publicity/announce.txt 2012-10-25 20:29:28.519364051 +0200
+++ wxPython-src-2.9.4.0/docs/publicity/announce.txt 2012-10-25 20:29:59.485247188 +0200
@@ -1,93 +1,78 @@
-Announcing wxWidgets 2.7.0: a cross-platform GUI toolkit
-----------------------------------------------------------------
+July 9, 2012 -- The wxWidgets team is pleased to announce the
+latest 2.9.4 release of wxWidgets library.
-August 5th, 2006 -- the wxWidgets team is pleased to announce
-a new release of the mature cross-platform C++ application framework.
+wxWidgets 2.9.4 is available at
-The following platforms are supported:
+ https://sourceforge.net/downloads/wxwindows/2.9.4/
-- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP
-- Windows 64 on Itanium and x86-64 architectures
-- Windows CE, including Pocket PC 2003 and Smartphone 2003
-- Unix (Linux, *BSD, Solaris, AIX, HP-UX, IRIX, Tru64) and VMS with GTK+
-- Unix with X11 (beta)
-- Unix with Motif/Lesstif
-- Mac OS X using Carbon
-- Mac OS X using Cocoa (beta)
-- OS/2 (beta)
-
-To get wxWidgets, please go to the Download page at:
-
- http://www.wxwidgets.org/
-
-This is the first version in the new 2.7 development series. Please
-notice that this series is called "development" and not "stable"
-solely because ABI or API compatibility is not assured between
-different 2.7.x series versions. Rest assured however that these
-potentially incompatible changes are made in order to evolve the
-toolkit to the next ABI stable release series (2.8.x) and that
-normally efforts are made to preserve compilation compatibility, so
-often moving to a new development release just requires a full
-recompile of the application using wxWidgets. There are currently no
-known issues with the stability of the programs using this version.
-
-There have been many changes since the 2.6 series, please see the
-change log file included in the distribution for more details. The
-most significant additions to the GUI part of the libraries were:
-
- - AUI (advanced user interface) library providing dockable
- windows and much more
- - richtext library implementing wxRichTextCtrl
- - New wxComboCtrl and wxOwnerDrawnComboBox controls
- - New wxTreebook book-like control
- - New wxColour/Dir/File/Font/PickerCtrls
- - wxHyperlinkCtrl control
-
-
-*** About wxWidgets
-
-wxWidgets is a comprehensive open-source, multi-platform C++ GUI
-framework, that can be used to build commercial and free
-software. First released in 1992 under the name wxWindows, it's
-increasingly used by organisations and individuals all over the
-world due to its winning combination of sophistication, wide
-platform coverage, ease of use, unrestrictive licence and
-vibrant user community.
-
-For most ports, wxWidgets adopts the native look and feel of
-each platform since it uses the native widget sets. There is also
-a generic widget set, used for example by the wxX11 port - no
-other widget set is required, giving the potential for embedded
-use.
-
-An extraordinary range of classes is provided - but don't be put
-off by this because most people find wxWidgets easier to learn
-and use than MFC and other frameworks.
-
-As well as comprehensive support for the usual widgets, advanced
-features include: HTML viewing/printing, wxImage class providing
-handlers for reading and writing many image types, resizable panels
-and dialogs on all platforms, document/view, OpenGL support,
-HTML-based and context-sensitive help, wizards, drag and drop,
-a grid class, ODBC support, threads, sockets, container classes,
-a styled text control, and much more. A 2,000-page reference manual
-is provided in HTML, MS HTML Help, WinHelp, wxWidgets Help and PDF
-formats, and there are over eighty samples and demos.
-
-If you're an MFC user, you'll find many wxWidgets concepts
-reassuringly familiar, while often clearer and more consistent.
-If you're not, you should still find it intuitive from the start.
-
-wxWidgets bindings for many other languages are available,
-including Python, Perl, Basic, Lua, JavaScript and Eiffel.
-
-If you're considering wxWidgets, do check out some of these links:
-
- http://www.wxwidgets.org/about/feedback.htm ; Comments from users
- http://www.wxwidgets.org/about/screensh.htm ; Screenshots
- http://www.wxwidgets.org/about/users.htm ; Some of our users
+and soon will also appear at our FTP mirror at
-Have fun!
+ ftp://ftp.wxwidgets.org/pub/2.9.4/
-The wxWidgets team
+Please choose the archive format suitable for your platform, i.e. 7z
+or ZIP for Windows platforms and tar.bz2 for the Unix systems
+including OS X (all archives contain sources for all wxWidgets ports
+but they use different line endings) and follow the instructions in
+readme.txt file for installing it. Notice that if you decide to use
+the Windows installer (.exe file) you still need to build wxWidgets
+as only sources, not binaries, are installed.
+However, for the first time ever, we also experimentally provide the
+pre-built versions of wxMSW libraries built with several version of
+Microsoft Visual C++ compiler. You can download them from
+
+ https://sourceforge.net/downloads/wxwindows/2.9.4/binaries/
+
+Please see the README file there for the descriptions of the
+individual files.
+
+
+This release mostly focuses on bug fixes in preparation for 3.0
+release, in particular there are a lot of improvements in wxOSX/Cocoa
+port. The most important new feature in this release is experimental
+support for building wxGTK with GTK+ 3 version of the toolkit. Other
+noteworthy additions are:
+
+- Transparent background is now support for wxGTK windows.
+- New style directory selection dialog is now used in wxMSW.
+- Native wxDatePickerCtrl and wxTimePickerCtrl for wxOSX.
+- wxFSInputStream stream class for reading data from wxFileSystem.
+- wxGrid::Render() method allows to print or save wxGrid contents.
+- Strike-through fonts are now supported.
+- Horizontal mouse wheel events are now generated.
+
+
+The list of of changes since the 2.8 series is much too long to be
+listed here but the most important ones are:
+
+- Completely overhauled Unicode support which is much easier to use.
+- New Cocoa-based wxOSX port for Mac OS X for both 32 and 64 bits.
+- New property grid and ribbon libraries are now included in wxWidgets.
+- Better interoperability with standard library classes.
+- Totally revised and more readable manual.
+- Improved debugging support.
+
+Please see the changes.txt file in the "docs" subdirectory of
+wxWidgets distribution or also available online at
+https://sourceforge.net/projects/wxwindows/files/2.9.4/changes.txt/docs/changes.txt
+for more details and http://docs.wxwidgets.org/2.9.4/overview_changes_since28.html
+if you are upgrading from wxWidgets 2.8.
+
+
+Note about naming: while 2.9.4 is called a "development" release,
+this only means that API is not guaranteed to remain unchanged in
+the subsequent 2.9.x releases (although it is very unlikely to change
+in incompatible ways at this stage), unlike in the stable 2.8.x branch
+where source and binary compatibility is always preserved between the
+different micro releases. We believe the current version is stable and
+suitable for use in production environment and recommend using it for
+any new projects using wxWidgets.
+
+We are especially looking forward to your feedback about the changes
+in this release compared to 2.8 version if you're upgrading. Please
+let us know about any regressions (http://trac.wxwidgets.org/newticket)
+so that we could fix them in the upcoming 3.0. Thanks in advance!
+
+ Enjoy!
+
+Vadim Zeitlin, on behalf of wxWidgets development team.
diff -ur wxWidgets-2.9.4/docs/readme.txt wxPython-src-2.9.4.0/docs/readme.txt
--- wxWidgets-2.9.4/docs/readme.txt 2012-10-25 20:29:28.512364076 +0200
+++ wxPython-src-2.9.4.0/docs/readme.txt 2012-10-25 20:29:59.477247217 +0200
@@ -108,6 +108,11 @@
for Microsoft Windows. Notice that you will still need to compile
wxWidgets even when using the installer.
+Experimentally, we also supply binaries of wxMSW libraries built
+with several versions of Microsoft Visual C++ compiler for this
+release. They are available in the "binaries" subdirectory, see
+the description of the files in the README file there.
+
Installation
------------
diff -ur wxWidgets-2.9.4/docs/release_files.mdwn wxPython-src-2.9.4.0/docs/release_files.mdwn
--- wxWidgets-2.9.4/docs/release_files.mdwn 2012-10-25 20:29:29.615359913 +0200
+++ wxPython-src-2.9.4.0/docs/release_files.mdwn 2012-10-25 20:30:23.808155404 +0200
@@ -11,9 +11,14 @@
between these files is that the ZIP (and 7z) archives contain files with DOS
line endings while the tar balls contain files with Unix line endings.
-Windows users: note that the provided wxWidgets-2.9.4-Setup.exe file installs
-the sources for wxMSW and does *not* include wxWidgets binaries and you still
-need to build the library, please see `docs/msw/install.txt` for instructions.
+
+Note for Windows users: as an experiment, we also provide, for the first time,
+pre-built binaries of wxMSW port built using several versions of Microsoft
+Visual C++ compiler. They are available from the `binaries` subdirectory.
+Please notice that the files in this directory, including
+wxWidgets-2.9.4-Setup.exe file, contain *only* the sources and do **not**
+include any binaries, so you will need to build the library after downloading
+them. Please see `docs/msw/install.txt` for instructions.
Reporting Problems
@@ -28,8 +33,8 @@
To verify your download you can use the following sha1sums:
- 0b8921c5f115bd335cde24f0cf4f579067815195 wxWidgets-2.9.4.7z
- 231c3e6b411ab3ab4c787e9bfa2bb5743ea8317d wxWidgets-2.9.4.tar.bz2
- 2031902d1bd0c69d559e5c98e49fc232cfaba87b wxWidgets-2.9.4.zip
- 1c46c67f0db0fd89d86ab03f8cd1aa2016dcd95f wxWidgets-docs-html-2.9.4.tar.bz2
- e1a8ccc1032df673900e8d9248f32969a0d3ccb5 wxWidgets-docs-html-2.9.4.zip
+ 0adcc19fd4eca50eba3abb0b46eb83c055146bdb wxWidgets-2.9.4.7z
+ 5a34ddf19d37c741f74652ee847df9568a8b81e1 wxWidgets-2.9.4.tar.bz2
+ 4697b6e45a20c9e05d888458d658f89ada8dd5c9 wxWidgets-2.9.4.zip
+ 37fc96b3194ad47a574ba8013264104cdf4c942c wxWidgets-docs-html-2.9.4.tar.bz2
+ bbf4bdf1c0746fe0b634ed55e2657d327db12033 wxWidgets-docs-html-2.9.4.zip
diff -ur wxWidgets-2.9.4/docs/tech/tn0022.txt wxPython-src-2.9.4.0/docs/tech/tn0022.txt
--- wxWidgets-2.9.4/docs/tech/tn0022.txt 2012-10-25 20:29:28.467364246 +0200
+++ wxPython-src-2.9.4.0/docs/tech/tn0022.txt 2012-10-25 20:29:59.443247346 +0200
@@ -11,6 +11,8 @@
Update the date in the manual (docs/doxygen/mainpages/manual.h).
+Update the release announcement post in docs/publicity/announce.txt.
+
Creating release files
----------------------
@@ -85,7 +87,7 @@
Announcement
------------
-Post announcement at least to wx-announce@googlegroups.com.
+Post docs/publicity/announce.txt at least to wx-announce@googlegroups.com.
TODO: where else to announce it?
