diff --git a/pygtk-2.14.1-numpy.patch b/pygtk-2.14.1-numpy.patch deleted file mode 100644 index bbb89c0..0000000 --- a/pygtk-2.14.1-numpy.patch +++ /dev/null @@ -1,112 +0,0 @@ -Index: gtk/gdk.override -=================================================================== ---- gtk/gdk.override (révision 3082) -+++ gtk/gdk.override (copie de travail) -@@ -44,7 +44,7 @@ - #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object)) - - #ifdef HAVE_NUMPY --# include -+# include - static int have_numpy(void); - #endif - -Index: configure.ac -=================================================================== ---- configure.ac (révision 3082) -+++ configure.ac (copie de travail) -@@ -350,18 +350,27 @@ - esac - - --dnl checks to see if Numeric Python is installed. -+dnl checks to see if numpy is installed. - AC_ARG_ENABLE(numpy, - AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),, - enable_numpy=yes) - - if test "x$enable_numpy" != xno; then - save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -- AC_CHECK_HEADER([Numeric/arrayobject.h], -- [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],, -- [#include ]) -- CPPFLAGS="$save_CPPFLAGS" -+ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()" 2> /dev/null` -+ if test "x$numpy_INCLUDES" = "x"; then -+ AC_MSG_WARN([Could not find a valid numpy installation, disabling.]) -+ enable_numpy=no -+ else -+ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES" -+ AC_CHECK_HEADER([numpy/arrayobject.h], -+ [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])], -+ [enable_numpy=no], -+ [#include ]) -+ if test "x$enable_numpy" != "xno"; then -+ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES" -+ fi -+ fi - fi - - -@@ -402,11 +411,11 @@ - $have_gtk && echo gtk with $gtk_version API - $have_libglade && echo gtk.glade - $have_gtkunixprint && echo gtk.unixprint --echo - - if test ! $have_atk || ! $have_pango || \ - ! $have_gtk || ! $have_libglade || \ - ! $have_pangocairo || ! $have_gtkunixprint; then -+ echo - echo "The following modules will NOT be built:" - echo - $have_atk || echo atk -@@ -416,3 +425,7 @@ - $have_libglade || echo gtk.glade - $have_gtkunixprint || echo gtk.unixprint - fi -+ -+echo -+echo "Numpy support: $enable_numpy" -+echo -Index: setup.py -=================================================================== ---- setup.py (révision 3082) -+++ setup.py (copie de travail) -@@ -228,16 +228,16 @@ - data_files.append((DEFS_DIR, ('pangocairo.defs',))) - GLOBAL_MACROS.append(('HAVE_PYCAIRO',1)) - if gtk.can_build(): -- if '--disable-numeric' in sys.argv: -- sys.argv.remove('--disable-numeric') -+ if '--disable-numpy' in sys.argv: -+ sys.argv.remove('--disable-numpy') - else: - try: -- import Numeric -- Numeric # pyflakes -+ import numpy -+ numpy # pyflakes - GLOBAL_MACROS.append(('HAVE_NUMPY', 1)) - except ImportError: -- print ('* Numeric module could not be found, ' -- 'will build without Numeric support.') -+ print ('* numpy module could not be found, ' -+ 'will build without numpy support.') - ext_modules.append(gtk) - data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',))) - data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs', -Index: README -=================================================================== ---- README (révision 3082) -+++ README (copie de travail) -@@ -54,7 +54,7 @@ - GTK+ 2.14.0 or higher for 2.14 API - * libglade 2.5.0 or higher (optional) - * pycairo 1.0.2 or higher (optional) -- * Numeric (optional) -+ * numpy (optional) - - This release is supporting the following GTK+ releases: - diff --git a/pygtk-2.14.1.tar.bz2 b/pygtk-2.14.1.tar.bz2 deleted file mode 100644 index 5bc36d1..0000000 --- a/pygtk-2.14.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:733a5e2e1ca2ca6cf9dae0de9c035d3a428c6ec52774977f60d0618a1a27591a -size 2210535 diff --git a/pygtk-2.16.0.tar.bz2 b/pygtk-2.16.0.tar.bz2 new file mode 100644 index 0000000..8447c73 --- /dev/null +++ b/pygtk-2.16.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8 +size 2253202 diff --git a/python-gtk.changes b/python-gtk.changes index a009ecf..cd47978 100644 --- a/python-gtk.changes +++ b/python-gtk.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Tue Sep 29 10:36:04 CEST 2009 - vuntz@opensuse.org + +- Update to version 2.16.0: + + Allow to use automake 1.11 + + Remove compiler warnings + + Add gtk.gdk.CURRENT_TIME constant + + Fix gtk.IMContext().set_client_window() + + Some docs fix + + Fixed invocation of FileChooserDialog in print demo + + Some autotools tweaks + + Fix arg parsing format typo for gtk_toggle_button_new + + Update some docs to the new 2.16 API +- Changes from version 2.15.2: + + Rename gtk.Statusbar.remove() to gtk.Statusbar.remove_message + + Allow pango.Context creation (bgo#550855) + + Make gtk.gdk.Pixbuf.add_alpha accept integers, retaining + backward compatibility accepting also chars (bgo#586094) + + Protect window obj from GC in gtk.window_get_toplevels + (bgo#574259) + + Plug huge number of memory leaks in Pango wrappers + + Add gtk.gdk.WINDOWING constant (bgo#555112) + + Wrap gdk_pixbuf_apply_embedded_orientation + + Modernize constructors of seven more types + + Don't free a string we don't own (bgo#585458) + + Some docs tweaking +- Changes from version 2.15.1: + + Add HSV support to gtk.gdk.Color objects + + Add floating-point support to gtk.gdk.Color + + Retire hand-written ChangeLog; autocreate from Git history + + Fix conditional in docs/Makefile.am + + Document that gtk.gdk.GC coordinates are not related to + allocation + + Make pygtk_boxed_unref_shared() also handle Py_None + + Make gtk.MenuItem.set_submenu accept None + + Don't run 'fixxref.py' if documentation is not built + + Apply libtool 2.2 compatibility patch + + Plug reference leak on main signal watch source + + Add extra warning against accidental misuse of tree model + columns + + Wrap gtk.Border attributes and constructor + + Make gtk.gdk.Event.time accept 'long' in assignments + + Wrap gtk.RcStyle attributes +- Changes from version 2.15.0: + + Update pygtk to use numpy instead of Numeric + (bgo#397544) + + Update the address of the FSF (bgo#577154) + + Wrap gtk_builder_add_objects_from_string and + gtk_builder_add_objects_from_file. + + Add GTK+ 2.16 API + + wrap gtk.IconView.convert_widget_to_bin_window_coords + + add gtk.gdk.Window.redirect_to_drawable + + add GtkNumberUpLayout enum + + some method argument fixes + + add gtk.PrintSettings.[get|set]_number_up_layout + + Some demo fixes + + Add various deprecation warnings +- Drop pygtk-2.14.1-numpy.patch: fixed upstream. +- Always BuildRequires/Requires python-numpy, and no longer use + python-numeric on old openSUSE versions. + ------------------------------------------------------------------- Tue Apr 21 18:32:41 CEST 2009 - matejcik@suse.cz diff --git a/python-gtk.spec b/python-gtk.spec index 53cf823..7ebdb78 100644 --- a/python-gtk.spec +++ b/python-gtk.spec @@ -1,5 +1,5 @@ # -# spec file for package python-gtk (Version 2.14.1) +# spec file for package python-gtk (Version 2.16.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,24 +24,18 @@ BuildRequires: fdupes libglade2-devel python-cairo-devel python-devel python-go %if %suse_version > 1020 || 0%{?opensuse_bs} BuildRequires: python-gobject2-doc %endif -%if %suse_version > 1110 BuildRequires: python-numpy Requires: python-numpy -%else -BuildRequires: python-numeric -Requires: python-numeric -%endif # Only for directory ownership: BuildRequires: gtk-doc Url: http://www.pygtk.org/ Summary: Python bindings for the GTK+ widget set -Version: 2.14.1 +Version: 2.16.0 Release: 1 License: LGPL v2.1 or later Group: Development/Libraries/Python Source: %{_name}-%{version}.tar.bz2 Source1: python-gtk-acinclude.m4 -Patch1: pygtk-2.14.1-numpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define lparen ( %define rparen ) @@ -55,12 +49,6 @@ GTK+ widget set. Just about anything you can write in C with GTK+ you can write in python with PyGTK (within reason), but with all of python's benefits. - - -Authors: --------- - James Henstridge - %package devel License: LGPL v2.1 or later Summary: Files needed to build wrappers for GTK+ addon libraries @@ -71,12 +59,6 @@ Requires: %{name} = %{version} python-gobject2-devel python-cairo-devel This package contains files required to build wrappers for GTK+ addon libraries so that they interoperate with pygtk. - - -Authors: --------- - James Henstridge - %package doc License: LGPL v2.1 or later Summary: Python bindings for the GTK+ widget set @@ -89,18 +71,9 @@ GTK+ widget set. Just about anything you can write in C with GTK+ you can write in python with PyGTK (within reason), but with all of python's benefits. - - -Authors: --------- - James Henstridge - %prep %setup -q -n %{_name}-%{version} cat %{S:1} >>acinclude.m4 -%if %suse_version > 1110 -%patch1 -%endif %build autoreconf -f -i @@ -142,295 +115,3 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog -* Tue Apr 21 2009 matejcik@suse.cz -- update to 2.14.1 - * support for new gtk api - * numerous bugfixes -- removed python-numeric dependency in favour of python-numpy -* Sat Jan 10 2009 olh@suse.de -- remove -fno-schedule-insns workaround, gcc is fixed -* Wed Nov 26 2008 vuntz@novell.com -- Add python-gtk-bgo534083-memory-corruption.patch to fix - bnc#449152. Patch taken from upstream (see bgo#534083). -* Tue Oct 28 2008 olh@suse.de -- build with -fno-schedule-insns on ppc64 (bnc#428413) -* Mon Apr 07 2008 matejcik@suse.cz -- update to 2.12.1 - * minor bugfixes - * includes treeview fix, removing the patch -* Tue Dec 11 2007 matejcik@suse.cz -- fixed treeview coordinate methods (#344311, gnome #479012) -* Wed Oct 17 2007 sbrabec@suse.cz -- Fixed name of python-gobject2 in previous change. -* Tue Oct 16 2007 sbrabec@suse.cz -- Fixed autoreconf. -- Use requirement versions defined by upstream. -- Use %%fdupes. -- Fixed scripts executable flag. -* Thu Sep 20 2007 sbrabec@suse.cz -- Updated to version 2.12.0: - * Make pango bindings more pythonic - * Remove X11 specific calls from non-X11 builds - * Allow string parameters to have default empty string ("") - * Make pango.Context non-instantiable - * defsgen.py fixes - * Docs build fixes -* Wed Jul 25 2007 jmatejek@suse.cz -- update to 2.10.6 - * builds correctly with new glib/gtk - * minor bugfixes -* Fri May 25 2007 sbrabec@suse.cz -- Build correctly in the GNOME Build Service. -- Examples moved to devel package. -* Mon May 07 2007 sbrabec@suse.cz -- Reduced BuildRequires. -* Sat May 05 2007 james@usr-local-bin.org -- Updated to 2.10.4: - * Documentation and build fixes - * Return NULL on error in TextBuffer.register_serialize_format - * Do not overwrite sys.argv - * Add status icon example - * Make it possible to remove rows in the gtk.TreeModel.foreach - callback - * Code generator fix for %%define - * Duplicate GdkEvent.string member when setting it - * Make it possible to use automake 1.10 - * distutils build fixes - * Allow None to be passed into gdk.Display - * Undeprecate gtk.container_class_list_child_properties - * Fix memory leak in gtk.Container.child_get -* Tue Dec 19 2006 sbrabec@suse.cz -- Spec file cleanup. -- Splitted python-gtk-doc from python-gtk-devel. -* Sat Oct 21 2006 cthiel@suse.de -- update to version 2.10.3 - * Fix a crasher bug introduced in 2.10.2 - * Make PyGTK work with Python 2.5 and 64-bit -- changes from 2.10.0 to 2.10.2 - * distutils / win32 compilation fixes - * gtk.TreeSelection.selected_foreach bug fix - * Fix compilation older C compilers -- changes from 2.9.6 to 2.10.0 - * Issue a warning when a DISPLAY is not set - * Copy style.css from pygobject docs when installing docs. - * Include the built docs in the tarball -* Wed Aug 16 2006 cthiel@suse.de -- split of -devel package -* Thu Aug 10 2006 cthiel@suse.de -- update to version 2.9.6 - * GtkTreePath can be converted from integers again - * Fix parallel build - * Reduce exception abuse in code generator - * Documentation improvements -- changes in 2.9.5 - * Make it possible to build with GTK+ 2.10 - * Make sure dir(gtk.keysyms) work again - * reloading the gtk module works again -- changes in 2.9.4 - * Include John Finlay's PyGTK reference manual - * Setters and getters for GtkWidget.activate_signal - * GtkToolItemType setter/getter - * Code generator fixes - * Add more gtk+ 2.10 API - * Don't copy treeiters in callbacks - * Provide full information for GtkTreeSelection.set_select_function - * Export less symbols and reduce the size of the libraries - * Allow negative values for GtkTreeModel.set/getitem - * Much improved interface/virtual method support - * Remove evil 100ms timeout timer -- changes in 2.9.3 - * Update to latest gtk+ 2.10 API changes - * Many more new gtk+ 2.10 APIs wrapped - * Wrap gtk_widget_class_find_style_property - * gtk.gdk.CairoContext.rectangle bug fix - * Update defs for atk 1.8 - * Misc. module cleanups - * New pango APIs wrapped - * Fix refcount error in gtk.Clipboard - * Enable GDK X11-specific APIs available also with gtk+ 2.8 - * Lazy loading of the gtk.keysyms module -- changes in 2.9.2 - * Fix a codegen bug that prevent build of other extensions - * Builds with pycairo 1.1.6 - * gtk.TextBuffer rich text copy and serialization - * Correct Print Editor example -- changes in 2.9.1 - * Allow gtk.TreeSortable.set_default_sort_func callback to be None - * Add API to unset the g_log handlers - * Allow the gtk module to be imported without DISPLAY - * Code cleanup and fixes considering Coverity reports - * Add codegen support for const-Object return type - * Add codgen support for unblocking threads around method calls - * Wrap gdk_event_handler_set - * Codegen reverse wrapper bug fix (#340162, Yevgen Muntyan) - * Wrap GdkRegion (John Ehresman) - * Add codegen support for ignore-type statement in override - * Add conditional support for gtk+ 2.10 API, especially printing - * Complete the support for gtk.Container virtual methods - * Fix misc. reference leaks - * Allow None parameter in pangocairo.CairoContext.set_font_options - * Complete the support for gtk.CellRenderer virtual methods - * IconView.set_cursor method params 'cell' and 'start_editing' made - optional - * Wrap a few more gdk_cairo_* methods - * Add a 'selection' field to gdk.OWNER_CHANGE events - * Allow None in gtk.Entry.set_inner_border() - * gtk.Clipboard rich text methods - * Add gtk.MessageDialog.set_image() - * Wrap gtk_link_button_set_uri_hook() - * Allow None in gtk.Widget.input_shape_combine_mask() - * Allow gtk.LinkButton() constructor to optionally receive a label - * Allow None in gtk.Label.set_mnemonic_widget() - * Wrap a bunch of X11 specific gdk methods - * Add gtk.SizeGroup.get_widgets() - * Wrap gtk_style_lookup_color() - * Wrap a bunch of gtk treeview grid lines methods - * Better Drag and drop API support - * Add -I option to codegen (defs search path) -- changes in 2.9.0 - * Remove gobject, pygobject is now a hard dependency - * Set encoding in pango instead of gtk - * Wrap gdk.Screen.get_rgba_colormap/get_rgbma_visual - * Remove private gtk wrappers - * Add a bunch of missing wrappers - * Add inout support in reverse wrappers - * Update h2defs to allow whitespace before parenthesis - * Make it possible to reimplement interfaces - * Allow log_handler to be called when python is not initialized - * Support for const object args - * Export pygtk tree model api - * Allow overrides to be in base classes - * Wrap a pango cairo font options acecssors - * Add GDK_PARENT_RELATIVE relative handling - * Improve pixbuf demo - * Set default markup accel marker to \x00 - * Set 1 as default argument to SpinButton.spin() - * Wrap gdk.Drawable.gdk_draw_indexed_image - * Mark rowreference.free() as deprecated - * Rename name of first keyword argument to pango.LayoutLine.index_to_x - * Run reindent on all python code - * Improve generictreemodel example - * Wrap gdk.Pixbuf.rotate_simple - * Use in argument in gtk.TreeView.cell_get_size -- changes in 2.8.5 - * String list bug fix - * Improved examples - * Proper refcounting in gdk.Window constructor - * Fix a bunch of reference leaks - * __init__.py fixes for pydoc - * gtk.Dialog.new_with_buttons leak -- changes in 2.8.4 - * Re-include gobject wrappers if pygobject is not found - * gtk.IconView should implement GtkCellLayout - * Always install pygtk-2.0.pc -- changes in 2.8.3 - * Split out gobject wrappers into a separate module and - depend on pygobject 2.9.0 - * Bug fixes - * Size group example - * Plug mem leaks - * Build cairo on win32 -* Tue Mar 28 2006 jmatejek@suse.cz -- fixed permissions on pygtk-demo -* Tue Mar 07 2006 gekker@suse.de -- Add python-cairo to Requires to fix issues in packages - that require python-gtk -* Tue Feb 28 2006 sbrabec@suse.cz -- Added missing python-cairo to BuildRequires (#153456). -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Oct 10 2005 jmatejek@suse.cz -- update to 2.8.2 -* Mon Sep 05 2005 aj@suse.de -- Update to 2.8.0. -* Wed Aug 10 2005 sbrabec@suse.cz -- Do not require -devel packages. -* Wed Aug 03 2005 gekker@suse.de -- update to 2.7.1 (adds gtk 2.8 support) -* Tue May 10 2005 mcihar@suse.cz -- update to 2.6.2 -* Thu Apr 14 2005 mcihar@suse.cz -- update to 2.6.1 -* Tue Feb 08 2005 mcihar@suse.cz -- update to 2.5.3 (adds gtk 2.6 support) -- fix permissions -* Wed Dec 01 2004 mcihar@suse.cz -- no need to recompile modules with current automake -* Wed Nov 24 2004 mcihar@suse.cz -- udpdate to 2.4.1 -* Tue Nov 23 2004 ro@suse.de -- fix build for <= 9.0 (only py_ver works everywhere) -* Thu Apr 15 2004 mcihar@suse.cz -- updated to 2.2.0 -- drop gtk 1.2 support -* Mon Feb 23 2004 mcihar@suse.cz -- really fix sed call -* Sat Feb 21 2004 ro@suse.de -- fix typo in specfile -* Fri Feb 20 2004 sbrabec@suse.cz -- Fixed names of GNOME2 packages. -* Fri Feb 20 2004 mcihar@suse.cz -- enable threading in GTK 2 version (bug #34648) -- build GTK 1.2 version with -fno-strict-aliasing -* Mon Nov 03 2003 meissner@suse.de -- requires python-numeric in installed system too. -* Wed Oct 15 2003 mcihar@suse.cz -- record-rpm is really not needed -- don't build as root -* Tue Sep 02 2003 mcihar@suse.cz -- updated to 2.0.0 (final GNOME 2 version, just minor bugfixes) -* Tue Aug 26 2003 mcihar@suse.cz -- force usage of pygtk.py from 1.99.18 and not from 0.6.11 (caused - problems with default sys.path in python 2.3) -* Tue Aug 26 2003 mcihar@suse.cz -- updated to 1.99.18: - - Fix up a duplicate symbol bug in the atk module, that was - causing build problems on MacOS X (hopefully the last such - problem). - - add gtk.glade.set_custom_handler() API, that provides more - info to the custom widget callback. Deprecate - set_custom_widget_callbacks(). - - some other bug fixes. -* Thu Aug 07 2003 mcihar@suse.cz -- updated to 1.99.17: - - Threading support is compiled in by default now. It is - necessary to call gtk.threads_init() in order to make use of - threading though. There have been a number of fixes to the - threading support too. - - Fix up some problems with multiple definitions of global - variables in gobject module, that was causing problems on - Mac OS X. - - Wrappers for many new APIs (John Finlay, Naofumi Yasufuku, - Johan Dahlin and others). - - Improvements to the code generator to give better error - messages. - - Some fixes to property APIs to work correctly on 64 bit - systems, and to handle ATOM type properties. - - Fix copyright headers on source files. -* Wed Aug 06 2003 mcihar@suse.cz -- added workaround for lib64 dirs and pkgconfig -* Tue Aug 05 2003 mcihar@suse.cz -- use distutils when possible -- compile python files with correct paths inside -- fix pkgconfig and codegen files to not contain buildroot -* Mon Jul 14 2003 sbrabec@suse.cz -- GNOME prefix change to /opt/gnome. -* Thu May 29 2003 mcihar@suse.cz -- make executable only files that should be -* Mon May 12 2003 mcihar@suse.cz -- use versioned dependency on python -* Mon May 05 2003 mcihar@suse.cz -- gnome 2 version updated to 1.99.16 -* Wed Mar 12 2003 mcihar@suse.cz -- include both pygtk versions (for Gtk 1.2 and 2.0) making 1.2 - version default, this fixes bug #25148 -* Thu Jan 23 2003 mcihar@suse.cz -- updated to 1.99.14 -* Fri Nov 29 2002 mcihar@suse.cz -- added libxml2{,-devel} to neededforbuild to enable building with glade -* Wed Nov 27 2002 mcihar@suse.cz -- cleaned up specfile -- fixed building for lib64 (this is temporary, should be fixed in autoconf) -* Wed Nov 27 2002 mcihar@suse.cz -- version for GNOME 2 -- fixes #21066 - dangling symlink