Hello community, here is the log from the commit of package wxGTK checked in at Thu Mar 1 21:03:46 CET 2007. -------- --- wxGTK/wxGTK.changes 2006-12-11 15:37:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/wxGTK/wxGTK.changes 2007-03-01 13:59:03.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 1 13:57:40 CET 2007 - pth@suse.de + +- Update to 2.8.1.1. Changes are too numerous to list, see + changes.txt for a full list. +- fix use of uninitialised variables wxPython_int.h +- Correct spelling in README.unicode + +------------------------------------------------------------------- @@ -63,2 +71,2 @@ -- fixed problem in makefiles.in and configure.in. In many cases - the variable top_builddir was not separated by slash. This caused +- fixed a problem in makefiles.in and configure.in. In many cases + the variable top_builddir was not separated by a slash. This caused @@ -113 +121 @@ -- Force re-create old lex code in doslex.c. +- Force re-creating the old lex code in doslex.c. Old: ---- wxGTK-2.6.2.1-overflow.patch wxGTK-2.6.3.3-slash-typo.patch wxPython-src-2.6.3.3-applet-replaced-clean.tar.bz2 New: ---- wxGTK-2.8.1.1-uninitilised_vars.patch wxPython-src-2.8.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxGTK.spec ++++++ --- /var/tmp/diff_new_pack.E29013/_old 2007-03-01 20:58:15.000000000 +0100 +++ /var/tmp/diff_new_pack.E29013/_new 2007-03-01 20:58:15.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package wxGTK (Version 2.6.3.3) +# spec file for package wxGTK (Version 2.8.1.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,18 +11,20 @@ # norootforbuild Name: wxGTK +%define srcname wxPython-src +%define wx_version 2.8 BuildRequires: SDL-devel cppunit-devel esound-devel gcc-c++ gtk2-devel libgnomeprintui-devel libmspack-devel libtiff-devel python-devel python-xml unixODBC-devel License: GNU General Public License (GPL) Group: System/Libraries Autoreqprov: on -Version: 2.6.3.3 -Release: 32 -%define srcname wxPython-src +Version: 2.8.1.1 +Release: 1 Summary: C++ Framework for Cross-Platform Development # http://www.wxpython.org/ # contrib/samples/applet replaces by one from wxWidgets-2.7.0-1.tar.bz2 # to prevent unauthorized distribution of monitors.c (#203607) -Source0: %{srcname}-%{version}-applet-replaced-clean.tar.bz2 +#Source0: %{srcname}-%{version}-applet-replaced-clean.tar.bz2 +Source0: %{srcname}-%{version}.tar.bz2 Source1: README.unicode URL: http://www.wxwidgets.org/ Provides: wxgtk @@ -30,10 +32,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch3: wxGTK-expat.patch Patch5: wxGTK-2.5.3.1-wx-config.patch -Patch6: wxGTK-2.6.2.1-overflow.patch -Patch7: wxGTK-2.6.3.3-slash-typo.patch Patch8: wxGTK-2.6.3.3-decl.patch Patch9: wxGTK-enable-wxrc.patch +Patch10: wxGTK-2.8.1.1-uninitilised_vars.patch # compile with debug stuff (adds lots of asserts, which can help finding # problems in applications) %define usedebug 0 @@ -134,11 +135,9 @@ cp %{S:1} . # patching: %patch3 -%patch5 -%patch6 -%patch7 %patch8 %patch9 +%patch10 # build directories: mkdir build-normal mkdir build-unicode @@ -146,9 +145,12 @@ %build %{suse_update_config -f} autoconf -export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" -export CPPFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" +#export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" +#export CXXFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" +#export CPPFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +export CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +export CPPFLAGS="$RPM_OPT_FLAGS -fPIC" # non-unicode version: pushd build-normal #ln -s version-script .version-script @@ -232,19 +234,20 @@ pushd wxPython # build and install it python setup.py \ - WX_CONFIG="$RPM_BUILD_ROOT%{_prefix}/bin/wx-config --unicode --prefix=$RPM_BUILD_ROOT%{_prefix}" \ + WX_CONFIG="%{buildroot}%{_prefix}/lib64/wx/config/gtk2-unicode-release-2.8 --prefix=%{buildroot}%{_prefix}" \ WXPORT=gtk2 \ UNICODE=1 \ build \ install \ --prefix=%{_prefix} \ - --root=$RPM_BUILD_ROOT \ + --root=%{buildroot} \ --record-rpm=INSTALLED_FILES # LIBS=" -L$RPM_BUILD_ROOT/%{_libdir}" \ #XXX: -sed -i 's/^WX_CONFIG.*/WX_CONFIG="wx-config --unicode"/' $RPM_BUILD_ROOT/%{py_sitedir}/wx-*/wx/build/build_options.py -for x in $RPM_BUILD_ROOT/%{py_sitedir}/wx-*/wx/build/build_options.py ; do - f=`echo $x | sed "s=$RPM_BUILD_ROOT=="` +#sed -i 's/^WX_CONFIG.*/WX_CONFIG="wx-config --unicode"/' $RPM_BUILD_ROOT/%{py_sitedir}/wx-*/wx/build/build_options.py +sed -i 's$%{buildroot}$$g' $RPM_BUILD_ROOT/%{py_sitedir}/wx-*/wx/build/build_options.py +for x in %{buildroot}%{py_sitedir}/wx-*/wx/build/build_options.py ; do + f=$(echo $x | sed 's=%{buildroot}==') python -c "import py_compile; py_compile.compile('$x', None, '$f', True);" done popd @@ -260,8 +263,8 @@ grep '%{mask}[-_]' FILELIST > FILELIST.normal grep -v '%{mask}[-_]' FILELIST > FILELIST.compat (cd $RPM_BUILD_ROOT; ls ./%{_libdir}/libwx_*.so.*) | grep _gl- | sed 's/^\.//' > FILELIST.gl -(cd $RPM_BUILD_ROOT; find ./%{_includedir}/wx-2.6/wx -type f -maxdepth 1) | grep -v /wxPython | sed 's/^\.//' > FILELIST.devel -(cd $RPM_BUILD_ROOT; find ./%{_includedir}/wx-2.6/wx -type d -mindepth 1 -maxdepth 1) | grep -v /wxPython | sed 's/^\.//' >> FILELIST.devel +(cd $RPM_BUILD_ROOT; find ./%{_includedir}/wx-%{wx_version}/wx -type f -maxdepth 1) | grep -v /wxPython | sed 's/^\.//' > FILELIST.devel +(cd $RPM_BUILD_ROOT; find ./%{_includedir}/wx-%{wx_version}/wx -type d -mindepth 1 -maxdepth 1) | grep -v /wxPython | sed 's/^\.//' >> FILELIST.devel (cd $RPM_BUILD_ROOT; find ./%{_bindir} -type f -mindepth 1 -maxdepth 1) | grep -v -e '\(-config\|wxrc\)' | sed 's/^\.//' > FILELIST.python %post @@ -291,13 +294,13 @@ %files devel -f FILELIST.devel %defattr (755, root, root, 755) %{_bindir}/wxrc -%{_bindir}/wxrc-2.6 +%{_bindir}/wxrc-%{wx_version} %{_bindir}/*-config* %{_libdir}/wx/config %defattr (644, root, root, 755) %doc docs/tech -%dir %{_includedir}/wx-2.6 -%dir %{_includedir}/wx-2.6/wx +%dir %{_includedir}/wx-%{wx_version} +%dir %{_includedir}/wx-%{wx_version}/wx %{_libdir}/wx/include %{_libdir}/lib*.so %{_datadir}/aclocal/wxwin.m4 @@ -310,11 +313,16 @@ %defattr(-, root, root) %doc wxPython/docs/*.txt wxPython/docs/*.html wxPython/docs/screenshots wxPython/licence %{_bindir}/pywxrc -%dir %{_includedir}/wx-2.6/wx -%{_includedir}/wx-2.6/wx/wxPython +%dir %{_includedir}/wx-%{wx_version}/wx +%{_includedir}/wx-%{wx_version}/wx/wxPython %{py_sitedir}/* -%changelog -n wxGTK +%changelog +* Thu Mar 01 2007 - pth@suse.de +- Update to 2.8.1.1. Changes are too numerous to list, see + changes.txt for a full list. +- fix use of uninitialised variables wxPython_int.h +- Correct spelling in README.unicode * Mon Dec 11 2006 - sbrabec@suse.cz - Source code cleanup (#226403). * Tue Sep 05 2006 - sbrabec@suse.cz @@ -366,8 +374,8 @@ - Fixed slash typo patch. - Do not delete no more generated doslex.c. * Mon Jul 17 2006 - mkudlvasr@suse.cz -- fixed problem in makefiles.in and configure.in. In many cases - the variable top_builddir was not separated by slash. This caused +- fixed a problem in makefiles.in and configure.in. In many cases + the variable top_builddir was not separated by a slash. This caused many 'file not found' errors. * Fri Apr 07 2006 - mmarek@suse.cz - fix array subscript out of range in src/common/db.cpp @@ -389,7 +397,7 @@ * Mon Jan 16 2006 - sbrabec@suse.cz - Updated to version 2.6.2.1. * Mon Sep 19 2005 - sbrabec@suse.cz -- Force re-create old lex code in doslex.c. +- Force re-creating the old lex code in doslex.c. * Fri Aug 19 2005 - sbrabec@suse.cz - Removed references to no more provided PangoRenderX calls. * Mon Aug 01 2005 - sbrabec@suse.cz ++++++ README.unicode ++++++ --- wxGTK/README.unicode 2006-01-19 16:29:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/wxGTK/README.unicode 2007-02-28 14:47:22.000000000 +0100 @@ -1,15 +1,15 @@ wxWidgets and unicode ===================== -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. -This is reason why this package contains both unicode and non unicode versions -of library. +wxWidgets can 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 thus won't compile. This +is the reason why this package contains both unicode and non unicode +versions of the library. -If you want to compile application using wxWidgets, it will by default use -unicode version, in case it doesn't compile (you get errors about wrong -conversion to wxString and simmilar), you can pass parameter --unicode=[yes|no] -to wx-config to select wanted wxGTK version. +If you want to compile an application using wxWidgets, it will by default +use the unicode version, in case it doesn't compile (you get errors about +wrong conversion to wxString and simmilar), you can pass the parameter +--unicode=[yes|no] to wx-config to select the wanted wxGTK version. -Non-unicode libraries are shipped in separate package - wxGTK-compat +Non-unicode libraries are shipped in a separate package - wxGTK-compat ++++++ wxGTK-2.8.1.1-uninitilised_vars.patch ++++++ --- wxPython/include/wx/wxPython/wxPython_int.h +++ wxPython/include/wx/wxPython/wxPython_int.h @@ -2608,7 +2608,7 @@ wxFont rv; \ bool found; \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxFont* ptr; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)", a)); \ @@ -2634,7 +2634,7 @@ wxColour rv; \ bool found; \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxColour* ptr; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)", a)); \ ++++++ wxGTK-enable-wxrc.patch ++++++ --- /var/tmp/diff_new_pack.E29013/_old 2007-03-01 20:58:15.000000000 +0100 +++ /var/tmp/diff_new_pack.E29013/_new 2007-03-01 20:58:15.000000000 +0100 @@ -1,6 +1,6 @@ --- configure.in +++ configure.in -@@ -7376,7 +7376,7 @@ +@@ -8091,7 +8091,7 @@ makefiles="samples/Makefile.in samples/console/Makefile.in" elif test ${subdir} = "utils"; then makefiles="" @@ -15,20 +15,20 @@ ### Targets: ### --all: configtool emulator helpview tex2rtf helpgen -+all: configtool emulator helpview tex2rtf helpgen wxrc +-all: emulator helpview tex2rtf helpgen ++all: emulator helpview tex2rtf helpgen wxrc -install: all install_tex2rtf install_helpgen +install: all install_tex2rtf install_helpgen install_wxrc - uninstall: + uninstall: uninstall_tex2rtf uninstall_helpgen -install-strip: install install-strip_tex2rtf install-strip_helpgen +install-strip: install install-strip_tex2rtf install-strip_helpgen install-strip_wxrc clean: rm -rf ./.deps ./.pch -@@ -36,6 +36,7 @@ +@@ -35,6 +35,7 @@ (cd helpview/src && $(MAKE) clean) (cd tex2rtf/src && $(MAKE) clean) (cd HelpGen && $(MAKE) clean) @@ -36,7 +36,7 @@ distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@@ -67,8 +68,17 @@ +@@ -73,8 +74,17 @@ install-strip_helpgen: (cd HelpGen && $(MAKE) install-strip) @@ -53,5 +53,5 @@ # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d --.PHONY: all install uninstall clean distclean configtool emulator helpview tex2rtf install_tex2rtf install-strip_tex2rtf helpgen install_helpgen install-strip_helpgen -+.PHONY: all install uninstall clean distclean configtool emulator helpview tex2rtf install_tex2rtf install-strip_tex2rtf helpgen install_helpgen install-strip_helpgen wxrc install_wxrc install-strip_wxrc +-.PHONY: all install uninstall clean distclean emulator helpview tex2rtf install_tex2rtf uninstall_tex2rtf install-strip_tex2rtf helpgen install_helpgen uninstall_helpgen install-strip_helpgen ++.PHONY: all install uninstall clean distclean emulator helpview tex2rtf install_tex2rtf uninstall_tex2rtf install-strip_tex2rtf helpgen install_helpgen uninstall_helpgen install-strip_helpgen wxrc install_wxrc install-strip_wxrc ++++++ wxGTK-expat.patch ++++++ --- /var/tmp/diff_new_pack.E29013/_old 2007-03-01 20:58:15.000000000 +0100 +++ /var/tmp/diff_new_pack.E29013/_new 2007-03-01 20:58:15.000000000 +0100 @@ -3,7 +3,7 @@ ================================================================================ --- configure.in +++ configure.in -@@ -2415,10 +2415,10 @@ +@@ -2923,10 +2923,10 @@ wxUSE_EXPAT=sys fi fi ++++++ wxPython-src-2.6.3.3-applet-replaced-clean.tar.bz2 -> wxPython-src-2.8.1.1.tar.bz2 ++++++ wxGTK/wxPython-src-2.6.3.3-applet-replaced-clean.tar.bz2 /mounts/work_src_done/STABLE/wxGTK/wxPython-src-2.8.1.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org