Hello community,

here is the log from the commit of package wxWidgets-2_9 for openSUSE:Factory 
checked in at 2012-11-13 17:52:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wxWidgets-2_9 (Old)
 and      /work/SRC/openSUSE:Factory/.wxWidgets-2_9.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wxWidgets-2_9", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null   2012-10-22 00:44:18.403455820 +0200
+++ /work/SRC/openSUSE:Factory/.wxWidgets-2_9.new/wxWidgets-2_9-ansi.changes    
2012-11-13 17:52:27.000000000 +0100
@@ -0,0 +1,780 @@
+-------------------------------------------------------------------
+Thu Oct 25 20:35:35 CEST 2012 - [email protected]
+
+- Provide wxWidgets-3_0*-devel for future compatibility.
+- Add "API version" in %description.
+- Backported fixes from 2.8 branch.
+- Included post-release fixes from wxpython.
+
+-------------------------------------------------------------------
+Thu Sep 20 08:42:17 UTC 2012 - [email protected]
+
+- add explicit buildrequire on pkgconfig(glu)
+
+-------------------------------------------------------------------
+Mon Jul 23 16:18:10 CEST 2012 - [email protected]
+
+- Fixed wx-config symlink (bnc#772528).
+
+-------------------------------------------------------------------
+Thu Jul 19 17:21:47 CEST 2012 - [email protected]
+
+- Update to version 2.9.4.
+
+-------------------------------------------------------------------
+Fri Apr 27 18:37:40 CEST 2012 - [email protected]
+
+- Backported fixes of the dependency generator from 2.8 branch
+  (bnc#757124, bnc#759287#c3).
+
+-------------------------------------------------------------------
+Thu Apr 19 17:08:50 CEST 2012 - [email protected]
+
+- Added support for Fedora compatible 24c variants (bnc#660438).
+- Change name of compat-lib-config virtual provide to not clash
+  with package name, fix requires/provides generator (bnc#757124).
+
+-------------------------------------------------------------------
+Mon Apr  2 16:21:37 CEST 2012 - [email protected]
+
+- Update to version 2.9.3.
+
+-------------------------------------------------------------------
+Wed Dec 21 13:55:09 UTC 2011 - [email protected]
+
+- own aclocal directory, there is no other reason to buildrequire
+  automake
+
+-------------------------------------------------------------------
+Mon Oct 17 09:11:21 UTC 2011 - [email protected]
+
+- fix whitespace of spec file
+
+-------------------------------------------------------------------
+Wed Aug  3 17:33:36 CEST 2011 - [email protected]
+
+- Updated to version 2.9.2.
+
+-------------------------------------------------------------------
+Tue Jul 26 08:01:48 UTC 2011 - [email protected]
+
+- Recommend instead of require lang package.
+
+-------------------------------------------------------------------
+Tue May 17 20:24:51 CEST 2011 - [email protected]
+
+- Create synthetic .la files to work-around libtool failures when
+  linking third level libraries or binaries (bnc#690952).
+
+-------------------------------------------------------------------
+Fri Apr  8 14:27:33 CEST 2011 - [email protected]
+
+- Do not use bash coproc on system with bash-3.
+
+-------------------------------------------------------------------
+Tue Mar 29 19:35:10 CEST 2011 - [email protected]
+
+- Fixed find-wx-requires to check directories instead of library
+  name. Provide find-wx-provides. (bnc#681409)
+
+-------------------------------------------------------------------
+Thu Dec 23 19:29:12 CET 2010 - [email protected]
+
+- Updated to version 2.9.1.
+- Rename package to wxWidgets to follow upstream base name.
+- Split wxPython documentation to a separate package.
+- Build Unicode/ANSI, standard/debug and STL/wx container versions
+  separately.
+- Spec file completely rewritten.
+
+-------------------------------------------------------------------
+Sun Aug 15 00:15:52 UTC 2010 - [email protected]
+
+-  Updated to version 2.8.11.0
+   Adds Python 2.7 builds, PySlices, new pubsub implementation, 
+   lots of updates to AGW, and lots of bugs fixed.
+-  Removed wxGTK-GSocket-clash.patch and wxGTK-editra-ebmlib.patch
+   as already fixed.
+
+-------------------------------------------------------------------
+Tue Jun 15 16:15:11 CEST 2010 - [email protected]
+
+- Added --enable-graphics_ctx to fix Editra (bnc#580060).
+- Added ebmlib file required by Editra (bnc#580060,
+  patch from Salix).
+
+-------------------------------------------------------------------
+Mon Feb 22 14:58:36 UTC 2010 - [email protected]
+
+- build with PIC 
+
+-------------------------------------------------------------------
+Thu Jan 28 17:17:47 CET 2010 - [email protected]
+
+- Enabled media libraries (bnc#565039).
+
+-------------------------------------------------------------------
+Fri Sep 25 17:53:00 CEST 2009 - [email protected]
+
+- Disabled STL (bnc#530027). See also
+  http://lists.opensuse.org/opensuse-factory/2009-09/msg00386.html
+- Removed obsolete RPATH.
+- The GSocket symbol clash fix replaced by the upstream one.
+
+-------------------------------------------------------------------
+Thu Sep 17 18:33:20 CEST 2009 - [email protected]
+
+- fixed pth file to point to platlib
+
+-------------------------------------------------------------------
+Sat Sep  5 11:52:46 CEST 2009 - [email protected]
+
+- Fixed for the latest python package.
+
+-------------------------------------------------------------------
+Fri Aug  7 16:51:39 CEST 2009 - [email protected]
+
+- Updated to version 2.8.10.1:
+  * Incompatible change in wxTreeCtrl behaviour!
+  * Added several functions forward compatible with wxWidgets 3.0.
+  * Add wxBU_EXACTFIT support to wxToggleButton XRC handler.
+  * wxHashMap::insert() doesn't update the value if it didn't
+    insert the element any more.
+  * Correct bug in wxTimeSpan::Format() for negative spans.
+  * Correct several bugs in wxList using end() iterators.
+  * Translation updates.
+  * Fix wxURL::GetInputStream() for URLs with special characters in
+    credentials.
+  * Fix wxURI::GetUser() for URIs without password.
+  * Correct wxDateTime DST computation for 2006 and later.
+  * wxRTC: fixed a problem with HTML list generation.
+  * wxRTC: no longer deletes a character when content is selected
+   before pressing Delete.
+  * wxRTC: fixed inability to select no superscript and no
+   subscript in formatting dialog.
+  * wxRTC: fixed centering and right-justification when combined
+    with left indentation.
+  * wxRTC: fixed lack of right margin when centering or
+    right-justifying.
+  * wxRTC: fixed wrong descent when wrapping lines with different
+    font sizes.
+  * wxRTC: fixed wrapping problem for long lines.
+  * wxRTC: all buffer margins now respected.
+  * wxRTC: Added wxRE_CENTRE_CARET to centre the caret line
+    vertically.
+  * Fixed wxHTML's pagebreaks computation in tables.
+  * Fixed wxHtmlWindow::SelectionToText() to correctly insert
+    newlines after single-cell paragraphs.
+  * Fixed wxHTML's line breaks handling in <pre> blocks.
+  * wxHTML: don't include extra whitespace in table cells.
+  * Implemented wxWindow::DragAcceptFiles() on all platforms.
+  * Added wxAUI_MGR_LIVE_RESIZE flag to wxAuiManager.
+  * Use bitmap mask in wxSplashScreen.
+  * Translate "(c)" and "(C)" to the real copyright sign in
+    wxAboutBox.
+  * Fix painting of highlight border for merged cells in wxGrid.
+  * Fix handling of long lines in wxGridCellAutoWrapStringRenderer.
+  * Return false from wxSingleInstanceChecker::IsAnotherRunning()
+    if an error occurred while opening or reading the lock file.
+  * Fixed printing to use fonts sizes adjustment consistent with
+    wxMSW.
+  * Make colours used by list, tree and status bar controls more
+    consistent with the system theme settings.
+  * Worked around bug in GTK+ < 2.14 where enabling some controls
+    such as wxButton didn't re-enable sensitivity until the mouse
+    was moved.
+
+-------------------------------------------------------------------
+Thu Jun 18 19:16:27 CEST 2009 - [email protected]
+
+- Worked-around GSocket name conflict with GIO.
+
+-------------------------------------------------------------------
+Tue Feb 17 17:29:57 CET 2009 - [email protected]
+
+- build require libexpat-devel so we dont use the bundled one 
+
+-------------------------------------------------------------------
++++ 583 more lines (skipped)
++++ between /dev/null
++++ and 
/work/SRC/openSUSE:Factory/.wxWidgets-2_9.new/wxWidgets-2_9-ansi.changes
New Changes file:

wxWidgets-2_9-wxcontainer.changes: same change
New Changes file:

wxWidgets-2_9-wxcontainer24c.changes: same change
New Changes file:

wxWidgets-2_9.changes: same change

New:
----
  README.SUSE
  pre_checkin.sh
  rpmlintrc
  virtual-package.README
  wxGTK-enable-wxrc.patch
  wxWidgets-2.9.4.tar.bz2
  wxWidgets-2_9-ansi.changes
  wxWidgets-2_9-ansi.spec
  wxWidgets-2_9-config-force-rpath.patch
  wxWidgets-2_9-wxcontainer.changes
  wxWidgets-2_9-wxcontainer.spec
  wxWidgets-2_9-wxcontainer24c.changes
  wxWidgets-2_9-wxcontainer24c.spec
  wxWidgets-2_9.changes
  wxWidgets-2_9.spec
  wxWidgets-find-wx-provides
  wxWidgets-find-wx-provides-bash3.patch
  wxWidgets-find-wx-requires
  wxWidgets-to-wxpython-2.9.4.0.patch
  wxpython-mkdiff.sh

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wxWidgets-2_9-ansi.spec ++++++
++++ 1119 lines (skipped)

wxWidgets-2_9-wxcontainer.spec: same change
wxWidgets-2_9-wxcontainer24c.spec: same change
wxWidgets-2_9.spec: same change
++++++ README.SUSE ++++++
wxWidgets in SUSE
=================

There are many possible wxWidgets variants that can be built from single
source spec file.

The STL + Unicode is the most modern variant of wxWidgets. But there are
still applications that don't compile correctly with this model, so
wxWidgets provide way to compile these applications against deprecated
versions of libraries (wx container and ANSI).

Additionally, some compatibility flags also change ABI, so applications
compiled against library with compatibility support enabled must be used
with libraries with compatibility support enabled, not depending whether
they use compatibility calls or not.

Because STL, wx container and compatibility variant versions have the
same soname but they are binary incompatible, variant libraries are
installed to dedicated directories. Applications then need to use RPATH
during the compile time (wx-config does this automatically) or
LD_LIBRARY_PATH in runtime (applications compiled against third party
wxWidgets packages need proper variant of -compat-lib-config package and
packages need also
-compat-lib packages).

To make dependencies correct, please use %wx_requires in the the
preamble of your spec file:

%define _use_internal_dependency_generator 0
%define __find_requires %wx_requires

These lines must be placed below any BuildRoot preamble line.

If you compile wxWidgets variant-specific libraries or wxWidgets
modules, you also need to use:

%define __find_provides %wx_provides

If you don't do it, rpm would not be able to identify library variant
package your package is linked with.

There may be more than one version of wxWidgets. Some of them may be
discriminated by the minor version number appended to the name with "."
replaced with "_".


Here is the wxWidgets variant list:


default = stl:  API compatible with modern applications, ABI compatible with 
wxGTK in openSUSE == 11.1

wxcontainer:    API compatible with older applications, ABI compatible with 
wxGTK in openSUSE <= 11.3 except 11.1

wxcontainer24c: API compatible with modern applications since since version 
2.4, ABI compatible with Fedora

ansi:           API compatible with historical applications without Unicode 
support

no extension: STL + Unicode (recommended)
============  -------------
devel package name:    wxWidgets-devel / wxWidgets[-{mi_nor}]-devel
libdir:                wx-{minor}-stl
library package names: lib...u...-stl
library names:         lib...u....so.*

This API is compatible with modern applications.


wxcontainer: Old wx containers + Unicode (deprecated)
===========  ---------------------------
wxWidgets originally used dedicated wx containers class. Now it allows
to be compiled with standard STL classes.  However some applications
were not written in respect to this compile time option and won't
compile. This is reason why we still may need wx containers
compatibility version. This version also contains wxWidgets-2.6.x
compatibility support.
devel package name:    wxWidgets[-{mi_nor}]-wxcontainer-devel
libdir:                wx-{minor}-wxcontainer
library package names: lib...u...-wxcontainer
library names:         lib...u....so.*

This API is compatible with older applications.


wxcontainer24c: Old wx containers + Unicode + 2.4 compatibility (deprecated)
==============  -----------------------------------------------
This is a variant above using wx containers, which has 2.4 compatibility
enabled. Use with and only with applications that were linked against
libraries with 2.4 compatibility enabled (e. g. Fedora packages).
devel package name:    wxWidgets[-{mi_nor}]-wxcontainer24c-devel
libdir:                wx-{minor}-wxcontainer24c
library package names: lib...u...-wxcontainer24c
library names:         lib...u....so.*

This API is compatible with old applications since since version 2.4.


ansi: Old wx containers + ANSI (strongly deprecated)
====  ------------------------
wxWidgets allows to be compiled in unicode mode. This is needed for some
controls to work correctly with unicode locales. However some
applications were not written in respect to this compile time option and
won't compile due to incorrect wxString manipulation. This is reason why
we still may need ANSI version. ANSI version uses wx containers, as STL
was introduced much later than Unicode.
devel package name:    wxWidgets[-{mi_nor}]-ansi-devel
libdir:                wx-{minor}-wxcontainer
library package names: lib......-wxcontainer
library names:         lib.......so.*

This API is compatible with historical applications expecting 8-bit
characters.


Each variant can enable or disable debugging. Debug versions of
libraries contain lots of asserts that help in debugging of poorly
written applications.

Please pick correct devel version if you want to compile your
application with the deprecated variant of wxWidgets.

Passing parameter --unicode=[yes|no] to wx-config to select wanted
wxWidgets variant may work as well, as long as all needed shared
libraries are installed. Note that you cannot mix packages using
different libdir.
++++++ pre_checkin.sh ++++++
#!/bin/bash

CANONICAL_NAME=wxWidgets-2_9
VARIANTS=("" -wxcontainer -ansi -wxcontainer24c)

for VAR in "${VARIANTS[@]}" ; do
        NAME=$CANONICAL_NAME$VAR
        if test $NAME = $CANONICAL_NAME ; then
                continue
        fi
        if test $CANONICAL_NAME.spec -ot $NAME.spec ; then
                echo "$CANONICAL_NAME.spec is older than $NAME.spec. Please 
merge changes manually and call pre-checkin.sh again."
                exit 1
        fi
        if test $CANONICAL_NAME.changes -ot $NAME.changes ; then
                echo "$CANONICAL_NAME.changes is older than $NAME.changes. 
Please merge changes manually and call pre-checkin.sh again."
                exit 1
        fi
        sed "s/^Name: *$CANONICAL_NAME$/&$VAR/" <$CANONICAL_NAME.spec 
>$NAME.spec
        cp -a $CANONICAL_NAME.changes $NAME.changes
done
touch $CANONICAL_NAME.spec $CANONICAL_NAME.changes

osc service localrun format_spec_file
++++++ rpmlintrc ++++++
# Project name just starts with lowercase.
addFilter("summary-not-capitalized")
# We know what we are doing. %{wxlibdir}/wx can be owned by more package 
instances at once.
addFilter("shlib-policy-nonversioned-dir")
# There is no such package.
addFilter("no-dependency-on")
# Package splits to many library packages, we just need to obsolete old one.
addFilter("obsolete-not-provided")
# Yes, there are macros in comments.
addFilter("macro-in-comment")
++++++ virtual-package.README ++++++
This package is deliberately empty. It only provides RPM symbols and
requires another package to fulfill dependencies of third party
packages.
++++++ wxGTK-enable-wxrc.patch ++++++
Index: wxPython-src-2.9.1.1/configure.in
===================================================================
--- configure.in
+++ configure.in
@@ -8401,7 +8401,7 @@ for subdir in $SUBDIRS; do
                 done
             elif test ${subdir} = "utils"; then
                 makefiles=""
-                for util in ifacecheck ; do
+                for util in ifacecheck wxrc ; do
                     if test -d $srcdir/utils/$util ; then
                         makefiles="utils/$util/src/Makefile.in \
                                    $makefiles"
Index: wxPython-src-2.9.1.1/Makefile.in
===================================================================
--- Makefile.in
+++ Makefile.in
@@ -4,6 +4,15 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

+wxrc:
+       (cd wxrc && $(MAKE) all)
+
+install_wxrc:
+       (cd wxrc && $(MAKE) install)
+
+install-strip_wxrc:
+       (cd wxrc && $(MAKE) install-strip)
+

 @MAKE_SET@

++++++ wxWidgets-2_9-config-force-rpath.patch ++++++
Index: wx-config.in
===================================================================
--- wx-config.in.orig
+++ wx-config.in
@@ -146,7 +146,7 @@ wxconfig_input_options="prefix exec_pref
 wxconfig_yesno_options="universal unicode debug static"
 
 # Boolean options that do something or not.
-wxconfig_flag_options="$wxconfig_yesno_options selected_config no_rpath 
inplace"
+wxconfig_flag_options="$wxconfig_yesno_options selected_config inplace"
 
 
 
@@ -1275,7 +1275,7 @@ if [ -n "$output_option_libs" ]; then
        fi
     fi
 
-    is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
+    [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
 
     echo $_ldflags "@WXCONFIG_LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@"
 
++++++ wxWidgets-find-wx-provides ++++++
#! /bin/bash
# convert libwxfoo()() to libwxfoo(variant)()() for libraries inside wx libdir

shopt -s extglob

# redirect 3 to stdout (3 does not change in coprocesses)
exec 3>&1
# Coprocess for files outside wx libdir
coproc COPROC_NOT_WX ( /usr/lib/rpm/find-provides >&3 )
# HACK: Return stderr to place.

while read ; do
        case "$REPLY" in
        */usr/lib*/wx-*-* )
                VARIANT=${REPLY#*/usr/lib*/wx-*-}
                VARIANT=${VARIANT%%/*}
                case "$VARIANT" in
                +([A-Za-z0-9_]) )
                        # Assign a coprocess that corresponds to the variant.
                        eval "COPROC_YES_WX=(\"\${COPROC_YES_WX_$VARIANT[@]}\")"
                        # Coprocess for files inside particular wx libdir
                        if test -z "$COPROC_YES_WX" ; then
                                # HACK: Closing stderr seems to be the only way
                                # to silence warning "execute_coproc: coproc
                                # [$PID:TRA] still exists"
                                exec 4>&2-
                                eval "coproc COPROC_YES_WX_$VARIANT ( 
/usr/lib/rpm/find-provides |\
                                        sed 's/^\([^)]*\)(/\1($VARIANT)(/' >&3 
)"
                                exec 2>&4
                                eval 
"COPROC_YES_WX=(\"\${COPROC_YES_WX_$VARIANT[@]}\")"
                        fi
                        echo "$REPLY" >&${COPROC_YES_WX[1]}
                        ;;
                # invalid variant string
                * )
                        echo "find-wx-provides: ERROR: invalid format of wx 
variant directory name" >&2
                        echo "$REPLY" >&${COPROC_NOT_WX[1]}
                        ;;
                esac
                ;;
        * )
                echo "$REPLY" >&${COPROC_NOT_WX[1]}
                ;;
        esac
done

# close input of coprocesses (terminate them)
for COPROC_YES_WX in "${!COPROC_YES_WX_@}" ; do
        case $COPROC_YES_WX in
        # foo_PID variables are created by coproc builtin
        *_PID ) ;;
        * )
                eval eval exec \${$COPROC_YES_WX\[1\]}\\\>\\\&-
        ;;
        esac
done
eval exec ${COPROC_NOT_WX[1]}\>\&-

# wait for coprocesses to finish
wait
++++++ wxWidgets-find-wx-provides-bash3.patch ++++++
--- find-wx-provides    2011-03-28 18:27:14.000000000 +0200
+++ find-wx-provides    2011-04-08 14:23:22.718604689 +0200
@@ -3,12 +3,6 @@
 
 shopt -s extglob
 
-# redirect 3 to stdout (3 does not change in coprocesses)
-exec 3>&1
-# Coprocess for files outside wx libdir
-coproc COPROC_NOT_WX ( /usr/lib/rpm/find-provides >&3 )
-# HACK: Return stderr to place.
-
 while read ; do
        case "$REPLY" in
        */usr/lib*/wx-*-* )
@@ -16,45 +10,18 @@
                VARIANT=${VARIANT%%/*}
                case "$VARIANT" in
                +([A-Za-z0-9_]) )
-                       # Assign a coprocess that corresponds to the variant.
-                       eval "COPROC_YES_WX=(\"\${COPROC_YES_WX_$VARIANT[@]}\")"
-                       # Coprocess for files inside particular wx libdir
-                       if test -z "$COPROC_YES_WX" ; then
-                               # HACK: Closing stderr seems to be the only way
-                               # to silence warning "execute_coproc: coproc
-                               # [$PID:TRA] still exists"
-                               exec 4>&2-
-                               eval "coproc COPROC_YES_WX_$VARIANT ( 
/usr/lib/rpm/find-provides |\
-                                       sed 's/^\([^)]*\)(/\1($VARIANT)(/' >&3 
)"
-                               exec 2>&4
-                               eval 
"COPROC_YES_WX=(\"\${COPROC_YES_WX_$VARIANT[@]}\")"
-                       fi
-                       echo "$REPLY" >&${COPROC_YES_WX[1]}
+                       echo "$REPLY" | /usr/lib/rpm/find-provides |\
+                                       sed "s/^\([^)]*\)(/\1($VARIANT)(/"
                        ;;
                # invalid variant string
                * )
                        echo "find-wx-provides: ERROR: invalid format of wx 
variant directory name" >&2
-                       echo "$REPLY" >&${COPROC_NOT_WX[1]}
+                       echo "$REPLY" | /usr/lib/rpm/find-provides
                        ;;
                esac
                ;;
        * )
-               echo "$REPLY" >&${COPROC_NOT_WX[1]}
+               echo "$REPLY" | /usr/lib/rpm/find-provides
                ;;
        esac
 done
-
-# close input of coprocesses (terminate them)
-for COPROC_YES_WX in "${!COPROC_YES_WX_@}" ; do
-       case $COPROC_YES_WX in
-       # foo_PID variables are created by coproc builtin
-       *_PID ) ;;
-       * )
-               eval eval exec \${$COPROC_YES_WX\[1\]}\\\>\\\&-
-       ;;
-       esac
-done
-eval exec ${COPROC_NOT_WX[1]}\>\&-
-
-# wait for coprocesses to finish
-wait
++++++ wxWidgets-find-wx-requires ++++++
#! /bin/bash
# convert libwxfoo()() to libwxfoo(variant)()() for libraries inside wx libdir
#
# Notes:
# - We do not use ldd, it fails to detect uninstalled libraries in the sysroot.

# - The script is not able to recognize exact variant of wx libraries.
#   It expects, that it corresponds with just-installed devel packages.

shopt -s nullglob
RPM_BUILD_ROOT=$1

/usr/lib/rpm/find-requires |\
        while read ; do
                case "$REPLY" in
                 *'('*')' | *'('*')('*')' )
                        SONAME=${REPLY%%(*}
                        NOT_WX=true
                        for DIR in /usr/lib*/wx-*-* /usr/lib*/wx-*-*/wx/* 
"$RPM_BUILD_ROOT"/usr/lib*/wx-*-* "$RPM_BUILD_ROOT"/usr/lib*/wx-*-*/wx/* ; do
                                if test -f "$DIR/$SONAME" ; then
                                        VARIANT=${DIR#*/usr/lib*/wx-*-}
                                        VARIANT=${VARIANT%%/*}
                                        echo "$SONAME($VARIANT)${REPLY#$SONAME}"
                                        NOT_WX=false
                                        break
                                fi
                        done
                        if $NOT_WX ; then
                                echo "$REPLY"
                        fi
                        ;;
                * )
                        echo "$REPLY"
                        ;;
                esac
        done
++++++ wxWidgets-to-wxpython-2.9.4.0.patch ++++++
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 [email protected].
+Post docs/publicity/announce.txt at least to [email protected].
 
 TODO: where else to announce it?
 
++++++ wxpython-mkdiff.sh ++++++
#!/bin/sh

# This script helps to find important differences between
# wxWidgets/wxGTK and wxWidgets instance embedded in wxPython-src.

VER=2.9.4
PYREL=0
find wxWidgets-${VER} wxPython-src-${VER}.${PYREL} -type f | while read ; do tr 
-d '\r' <"$REPLY" >"$REPLY".new ; mv "$REPLY".new "$REPLY" ; done
find wxWidgets-${VER} wxPython-src-${VER}.${PYREL} -type f -exec sed -i 
/RCS-ID:/d {} \;
find wxWidgets-${VER} wxPython-src-${VER}.${PYREL} -type f -exec sed -i /\$Id/d 
{} \;
find wxWidgets-${VER} wxPython-src-${VER}.${PYREL} -name '*.wat' -exec rm {} \;
LANG=C diff -ur wxWidgets-${VER} wxPython-src-${VER}.${PYREL} | grep -v ^Only 
>wxWidgets-to-wxpython-${VER}.${PYREL}.patch
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to