[svn] r5875 - in trunk/rpms: . alpine grepmail pygtk2
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Sep 30 04:57:03 CEST 2007
Author: dag
Date: 2007-09-30 04:57:02 +0200 (Sun, 30 Sep 2007)
New Revision: 5875
Added:
trunk/rpms/pygtk2/
trunk/rpms/pygtk2/pygtk-nodisplay-exception.patch
trunk/rpms/pygtk2/pygtk.spec
trunk/rpms/pygtk2/pygtk2-2.10.1-treeview.patch
Modified:
trunk/rpms/alpine/alpine.spec
trunk/rpms/grepmail/grepmail.spec
Log:
Updates
Modified: trunk/rpms/alpine/alpine.spec
===================================================================
--- trunk/rpms/alpine/alpine.spec 2007-09-30 00:02:15 UTC (rev 5874)
+++ trunk/rpms/alpine/alpine.spec 2007-09-30 02:57:02 UTC (rev 5875)
@@ -3,8 +3,8 @@
Summary: Alternative Pine mail user agent implementation
Name: alpine
-Version: 0.999
-Release: 2
+Version: 0.9999
+Release: 1
License: Apache License
Group: Applications/Internet
URL: http://www.washington.edu/alpine/
@@ -12,6 +12,7 @@
Source: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: inews, aspell, openldap-devel, openssl-devel, krb5-devel
### RPM bug causes package to conflict with itself
#Conflicts: pine
#Obsoletes: pine <= 4.64
@@ -80,6 +81,9 @@
%{_sbindir}/mlock
%changelog
+* Sun Sep 30 2007 Dag Wieers <dag at wieers.com> - 0.9999-1
+- Updated to release 0.9999.
+
* Mon Aug 27 2007 Dag Wieers <dag at wieers.com> - 0.999-2
- Removed Conflicts: pine as RPM bug causes package to conflict with itself. (Bart Schaefer)
Modified: trunk/rpms/grepmail/grepmail.spec
===================================================================
--- trunk/rpms/grepmail/grepmail.spec 2007-09-30 00:02:15 UTC (rev 5874)
+++ trunk/rpms/grepmail/grepmail.spec 2007-09-30 02:57:02 UTC (rev 5875)
@@ -4,8 +4,8 @@
Summary: Search for emails in a mailbox using regular expressions
Name: grepmail
-Version: 5.3032
-Release: 1.2
+Version: 5.3033
+Release: 1
License: GPL
Group: Applications/System
URL: http://grepmail.sourceforge.net/
@@ -41,8 +41,8 @@
%{_bindir}/grepmail
%changelog
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 5.3032-1.2
-- Rebuild for Fedora Core 5.
+* Sun Sep 30 2007 Dag Wieers <dag at wieers.com> - 5.3033-1
+- Updated to release 5.3033.
* Fri Aug 05 2005 Dag Wieers <dag at wieers.com> - 5.3032-1
- Updated to release 5.3032.
Added: trunk/rpms/pygtk2/pygtk-nodisplay-exception.patch
===================================================================
--- trunk/rpms/pygtk2/pygtk-nodisplay-exception.patch (rev 0)
+++ trunk/rpms/pygtk2/pygtk-nodisplay-exception.patch 2007-09-30 02:57:02 UTC (rev 5875)
@@ -0,0 +1,29 @@
+--- pygtk-2.10.1/gtk/__init__.py.display 2006-10-02 14:02:47.000000000 -0400
++++ pygtk-2.10.1/gtk/__init__.py 2006-10-02 14:03:16.000000000 -0400
+@@ -59,19 +59,14 @@
+ def _init():
+ import sys
+
+- try:
+- sys_path = sys.path[:]
++ sys_path = sys.path[:]
+
+- try:
+- _gtk.init_check()
+- except RuntimeError, e:
+- import warnings
+- warnings.warn(str(e), _gtk.Warning)
+- finally:
+- # init_check calls PySys_SetArgv which calls sys.path.insert(0, ''),
+- # which causes problems for pychecker, restore it if modified.
+- if sys.path != sys_path:
+- sys.path = sys_path
++ _gtk.init_check()
++
++ # init_check calls PySys_SetArgv which calls sys.path.insert(0, ''),
++ # which causes problems for pychecker, restore it if modified.
++ if sys.path != sys_path:
++ sys.path = sys_path
+
+ # install the default log handlers
+ _gtk.add_log_handlers()
Added: trunk/rpms/pygtk2/pygtk.spec
===================================================================
--- trunk/rpms/pygtk2/pygtk.spec (rev 0)
+++ trunk/rpms/pygtk2/pygtk.spec 2007-09-30 02:57:02 UTC (rev 5875)
@@ -0,0 +1,439 @@
+# $Id$
+# Authority: dag
+
+# Tag: test
+# DistExclusive: el5
+
+%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+
+Summary: Python bindings for the GTK+ widget set.
+Name: pygtk2
+Version: 2.10.1
+Release: 8.1
+License: LGPL
+Group: Development/Languages
+URL: http://www.pygtk.org/
+
+Source: http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.10/pygtk-%{version}.tar.bz2
+Patch0: pygtk-nodisplay-exception.patch
+Patch1: pygtk2-2.10.1-treeview.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: automake >= 1.6.3-5
+BuildRequires: docbook-style-xsl
+BuildRequires: glib2-devel >= 2.8.0
+BuildRequires: gtk2-devel >= 2.9.4
+BuildRequires: libglade2-devel >= 2.5.0
+BuildRequires: libtool
+BuildRequires: libxslt
+BuildRequires: pango-devel >= 1.10.0
+BuildRequires: pycairo-devel >= 0.5.0
+BuildRequires: pygobject2-devel >= 2.12.0
+BuildRequires: python-numeric
+BuildRequires: python2-devel >= 2.3
+
+Requires: gtk2 >= 2.9.4
+Requires: pycairo
+Requires: pygobject2
+Requires: python-numeric
+Requires: python2 >= 2.3
+
+%description
+PyGTK is an extension module for python that gives you access to the 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 the benefits of python.
+
+%package codegen
+Summary: The code generation program for PyGTK
+Group: Development/Languages
+
+%description codegen
+This package contains the C code generation program for PyGTK.
+
+%package libglade
+Summary: A wrapper for the libglade library for use with PyGTK
+Group: Development/Languages
+Requires: pygtk2 = %{version}
+
+%description libglade
+This module contains a wrapper for the libglade library. Libglade allows
+a program to construct its user interface from an XML description, which
+allows the programmer to keep the UI and program logic separate.
+
+%package devel
+Summary: files needed to build wrappers for GTK+ addon libraries
+Group: Development/Languages
+Requires: pygtk2 = %{version}
+Requires: pygtk2-codegen = %{version}-%{release}
+Requires: pygobject2-devel
+Requires: pycairo-devel
+
+%description devel
+This package contains files required to build wrappers for GTK+ addon
+libraries so that they interoperate with pygtk.
+
+%prep
+%setup -n pygtk-%{version}
+%patch0 -p1
+%patch1 -p1
+
+%build
+%configure --enable-thread --enable-numpy
+export tagname="CC"
+%{__make} LIBTOOL="/usr/bin/libtool"
+
+%install
+%{__rm} -rf "%{buildroot}"
+export tagname="CC"
+%{__make} install DESTDIR="%{buildroot}" LIBTOOL="/usr/bin/libtool"
+find %{buildroot} -name '*.la' -or -name '*.a' | xargs %{__rm} -f
+
+%clean
+%{__rm} -rf "%{buildroot}"
+
+%files
+%defattr(0644, root, root, 0755)
+%doc AUTHORS ChangeLog MAPPING NEWS README examples/
+%dir %{python_sitearch}/gtk-2.0
+%dir %{python_sitearch}/gtk-2.0/gtk
+%{python_sitearch}/gtk-2.0/gtk/*.py*
+%{_bindir}/pygtk-demo
+%dir %{_libdir}/pygtk
+%dir %{_libdir}/pygtk/2.0
+%{_libdir}/pygtk/2.0/*
+
+%defattr(755, root, root, 755)
+%{python_sitearch}/gtk-2.0/atk.so
+%{python_sitearch}/gtk-2.0/pango.so
+%{python_sitearch}/gtk-2.0/gtk/_gtk.so
+%{python_sitearch}/gtk-2.0/gtkunixprint.so
+%{python_sitearch}/gtk-2.0/pangocairo.so
+
+%files libglade
+%defattr(755, root, root, 755)
+%{python_sitearch}/gtk-2.0/gtk/glade.so
+
+%files codegen
+%defattr(755, root, root, 755)
+%{_prefix}/bin/pygtk-codegen-2.0
+%defattr(644, root, root, 755)
+%{_prefix}/share/pygtk/2.0/codegen
+
+%files devel
+%defattr(644, root, root, 755)
+%dir %{_prefix}/include/pygtk-2.0
+%dir %{_prefix}/include/pygtk-2.0/pygtk
+%{_prefix}/include/pygtk-2.0/pygtk/*.h
+%{_libdir}/pkgconfig/pygtk-2.0.pc
+%dir %{_prefix}/share/pygtk
+%dir %{_prefix}/share/pygtk/2.0
+%dir %{_prefix}/share/pygtk/2.0/defs
+%{_prefix}/share/pygtk/2.0/defs/*.defs
+%{_prefix}/share/pygtk/2.0/defs/pangocairo.override
+%{_datadir}/gtk-doc/html/pygtk
+
+%changelog
+* Sun Sep 30 2007 Dag Wieers <dag at wieers.com> - 2.10.1-8.1
+- Added patch to fix problem in treeview. (bug #237077)
+
+* Thu Oct 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-8.el5
+- Require pygtk2-codegen = %{version}-%{release} in devel.
+
+* Thu Oct 26 2006 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-7.el5
+- Add subpackage pygtk2-codegen (bug #212287).
+
+* Tue Oct 24 2006 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-6.el5
+- Oops, try using python_sitearch instead of python_sitelib.
+
+* Tue Oct 24 2006 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-5.el5
+- Spec file cleanups to match Fedora.
+- Define a python_sitelib macro for files under site_packages (bug #211806).
+
+* Mon Oct 2 2006 Jeremy Katz <katzj at redhat.com> - 2.10.1-4
+- go back to raising an exception when importing gtk fails (#208608)
+
+* Tue Sep 5 2006 Ray Strode <rstrode at redhat.com> - 2.10.1-3.fc6
+- drop crazy reload hack patch, since it's been fixed by jdahlin
+ upstream in a better way.
+
+* Tue Sep 5 2006 Ray Strode <rstrode at redhat.com> - 2.10.1-2.fc6
+- drop some old patches
+
+* Tue Sep 5 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.1-1.fc6
+- Update to 2.10.1
+
+* Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.6-2.fc6
+- Include docs
+
+* Sun Aug 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.6-1.fc6
+- Update to 2.9.6
+
+* Fri Jul 28 2006 Alexander Larsson <alexl at redhat.com> - 2.9.3-3
+- Make sure reloading the gtk module works
+- Fixes system-config-display (#199629)
+
+* Wed Jul 19 2006 Chris Lumens <clumens at redhat.com> 2.9.3-2
+- Revert to previous behavior of raising an error if $DISPLAY cannot be
+ opened.
+
+* Wed Jul 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.3-1
+- Update to 2.9.3
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.9.2-1.1
+- rebuild
+
+* Thu Jun 22 2006 Jeremy Katz <katzj at redhat.com> - 2.9.2-1
+- update to 2.9.2
+- fix for gtk+ 2.9.4 API changes
+
+* Thu Jun 15 2006 Ray Strode <rstrode at redhat.com> - 2.9.1-3
+- Use full include path for defs parser
+
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-2
+- Fix missing BuildRequries
+
+* Wed Jun 14 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.1-1
+- Update to 2.9.1
+
+* Fri May 26 2006 Jeremy Katz <katzj at redhat.com> - 2.9.0-3
+- BR should be pygobject2-devel, need to actually require pygobject2 at runtime
+
+* Thu May 25 2006 John (J5) Palmieri <johnp at redhat.com> - 2.9.0-2
+- Add BR for pygobject2
+- Take out files now packaged in pygobject2 from the files list
+
+* Wed May 10 2006 Matthias Clasem <mclasen at redhat.com> - 2.9.0-1
+- Update to 2.9.0
+
+* Thu Apr 20 2006 John (J5) Palmieri <johnp at redhat.com> - 2.8.6-1
+- Update to upstream 2.8.6
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Sun Jan 15 2006 Christopher Aillon <caillon at redhat.com> - 2.8.4-1
+- Bump to upstream 2.8.4
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Wed Oct 26 2005 John (J5) Palmieri <johnp at redhat.com> - 2.8.2-2
+- Add the pycairo dependency since pycairo is now built in rawhide
+
+* Mon Oct 24 2005 Christopher Aillon <caillon at redhat.com> - 2.8.2-1
+- Bump to upstream 2.8.2
+
+* Thu Sep 08 2005 John (J5) Palmieri <johnp at redhat.com> - 2.8.0-1
+- Bump to upstream 2.8.0
+
+* Tue Aug 23 2005 John (J5) Palmieri <johnp at redhat.com> - 2.7.3-3
+- Add a BuildRequires on python-numeric so that Numeric
+ python support is added
+- Add a Requires on python-numeric as well
+
+* Tue Aug 18 2005 John (J5) Palmieri <johnp at redhat.com> - 2.7.3-2
+- Bump and rebuild for cairo ABI changes
+
+* Wed Aug 10 2005 <jrb at redhat.com> - 2.7.3-1
+- Update to 2.7.3
+
+* Wed Aug 10 2005 <jrb at redhat.com> - 2.7.2-1
+- Update to 2.7.2
+
+* Wed Jul 27 2005 Mark McLoughlin <markmc at redhat.com> 2.7.1-1
+- Update to 2.7.1
+
+* Mon Jul 18 2005 John (J5) Palmieri <johnp at redhat.com> - 2.7.0-1
+- Update to upstream 2.7.0
+
+* Wed Jul 6 2005 John (J5) Palmieri <johnp at redhat.com> - 2.6.2-1
+- update to upstream 2.6.2
+- remove gcc4 patch as it is in updated tarball
+
+* Mon Mar 7 2005 Jeremy Katz <katzj at redhat.com> - 2.6.0-2
+- fix build with gcc4
+- add pygtk-demo
+
+* Mon Mar 7 2005 Jeremy Katz <katzj at redhat.com> - 2.6.0-1
+- 2.6.0
+
+* Thu Feb 10 2005 Mark McLoughlin <markmc at redhat.com> - 2.5.3-3
+- Avoid assertion errors in signal handling patch
+
+* Wed Feb 9 2005 Mark McLoughlin <markmc at redhat.com> - 2.5.3-2
+- Backport fix for gnome #154779 - python signal handlers weren't
+ getting executed while gobject.MainLoop was running
+
+* Tue Jan 25 2005 Jeremy Katz <katzj at redhat.com> - 2.5.3-1
+- 2.5.3
+
+* Thu Jan 20 2005 <jrb at redhat.com> - 2.5.1-1
+- New version
+
+* Fri Nov 26 2004 Florian La Roche <laroche at redhat.com>
+- add a %%clean target
+
+* Sun Nov 7 2004 Jeremy Katz <katzj at redhat.com> - 2.4.1-1
+- update to 2.4.1
+
+* Mon Oct 4 2004 GNOME <jrb at redhat.com> - 2.4.0-1
+- new version
+
+* Tue Aug 10 2004 Jonathan Blandford <jrb at redhat.com> 2.3.96-2
+- cleaner lib64 patch
+
+* Tue Aug 10 2004 Jonathan Blandford <jrb at redhat.com> 2.3.96-1
+- move pythondir into /usr/lib64/
+
+* Mon Aug 9 2004 Jonathan Blandford <jrb at redhat.com> 2.3.96-1
+- new version
+
+* Tue Aug 3 2004 Jeremy Katz <katzj at redhat.com> - 2.3.95-1
+- update to 2.3.95
+
+* Thu Jun 17 2004 Jeremy Katz <katzj at redhat.com> - 2.3.92-1
+- update to 2.3.92
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu Mar 11 2004 Jeremy Katz <katzj at redhat.com> - 2.2.0-1
+- 2.2.0
+
+* Wed Mar 10 2004 Jeremy Katz <katzj at redhat.com> 2.2.0-0.rc1
+- 2.2.0 RC1
+
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue Feb 17 2004 Jeremy Katz <katzj at redhat.com> - 2.0.0-5
+- GtkTextSearchFlags is flags, not enum (#114910)
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu Feb 12 2004 Jeremy Katz <katzj at redhat.com> - 2.0.0-3
+- own %%{_libdir}/python?.?/site-packages/gtk-2.0/gtk dir (#113048)
+
+* Thu Nov 6 2003 Jeremy Katz <katzj at redhat.com> 2.0.0-2
+- rebuild for python 2.3
+
+* Thu Sep 4 2003 Jeremy Katz <katzj at redhat.com> 2.0.0-1
+- 2.0.0
+
+* Thu Aug 14 2003 Elliot Lee <sopwith at redhat.com> 1.99.17-1
+- Update to latest version
+- Module filenames changed from foomodule.so to foo.so
+
+* Thu Aug 7 2003 Elliot Lee <sopwith at redhat.com> 1.99.16-10
+- Fix libtool
+
+* Fri Jul 18 2003 Jeremy Katz <katzj at redhat.com> 1.99.16-8
+- part of the fixnew patch wasn't applied upstream, apply it (#99400)
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Tue May 27 2003 Jonathan Blandford <jrb at redhat.com> 1.99.16-5
+- Update compat patch to include gtk_text_buffer_set_text
+
+* Tue May 27 2003 Matt Wilson <msw at redhat.com> 1.99.16-4
+- don't require the deprecated length parameter
+
+* Fri May 23 2003 Matt Wilson <msw at redhat.com> 1.99.16-3
+- add compatibility for deprecated length field in GtkTextBuffer
+ insert methods (#91519)
+
+* Thu May 22 2003 Matt Wilson <msw at redhat.com> 1.99.16-2
+- apply atom_intern patch again (#91349)
+
+* Tue May 20 2003 Matt Wilson <msw at redhat.com> 1.99.16-1
+- added a compatibility function for gtk.gdk.gc_new() so we won't have
+ to fix all our code quite yet
+
+* Mon May 19 2003 Matt Wilson <msw at redhat.com> 1.99.16-1
+- enable threads (#83539, #87872)
+
+* Fri Apr 11 2003 Jonathan Blandford <jrb at redhat.com> 1.99.16-1
+- new version
+
+* Thu Mar 13 2003 Jeremy Katz <katzj at redhat.com> 1.99.14-7
+- and again
+
+* Thu Mar 13 2003 Jeremy Katz <katzj at redhat.com> 1.99.14-6
+- rebuild in new environment
+
+* Wed Mar 5 2003 Thomas Woerner <twoerner at redhat.com> 1.99.14-5
+- fixed new functions for ListStore, TreeStrore and ProgressBar
+
+* Thu Feb 6 2003 Mihai Ibanescu <misa at redhat.com> 1.99.14-4
+- rebuild to use the UCS4-enabled python
+
+* Tue Jan 28 2003 Jeremy Katz <katzj at redhat.com> 1.99.14-3
+- rerun auto* to use new python.m4 and work properly with multilib python
+- libdir-ize
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Fri Dec 27 2002 Jeremy Katz <katzj at redhat.com> 1.99.14-1
+- bump version to 1.99.14
+- add patch to up the ref on gtkInvisible instantiation (#80283)
+
+* Thu Dec 12 2002 Jonathan Blandford <jrb at redhat.com>
+- bump version to 1.99.13
+- backport gdk.Pixbuf.save
+
+* Thu Oct 31 2002 Matt Wilson <msw at redhat.com>
+- rebuild for multilib
+- use %%configure
+
+* Fri Aug 30 2002 Matt Wilson <msw at redhat.com>
+- fix pixbuf leaks (#72137)
+- five more pixbuf leaks plugged
+
+* Wed Aug 28 2002 Jonathan Blandford <jrb at redhat.com>
+- remover Packager tag
+
+* Tue Aug 27 2002 Jonathan Blandford <jrb at redhat.com>
+- add binding for gdk_atom_intern
+
+* Mon Jul 29 2002 Matt Wilson <msw at redhat.com>
+- 0.99.12
+
+* Wed Jul 17 2002 Matt Wilson <msw at redhat.com>
+- new version from CVS
+
+* Thu Jun 27 2002 Tim Waugh <twaugh at redhat.com>
+- Fix bug #65770.
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Jun 17 2002 Matt Wilson <msw at redhat.com>
+- new version from CVS
+
+* Sun May 26 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed May 22 2002 Jeremy Katz <katzj at redhat.com>
+- 1.99.10
+
+* Wed Feb 27 2002 Matt Wilson <msw at redhat.com>
+- 1.99.8
+
+* Mon Jan 28 2002 Matt Wilson <msw at redhat.com>
+- added atkmodule.so to file list
+
+* Thu Oct 18 2001 Matt Wilson <msw at redhat.com>
+- fix devel filelist to match new header location
+
+* Mon Oct 15 2001 Matt Wilson <msw at redhat.com>
+- get the headers from their new version-specific location
+
+* Thu Oct 11 2001 Matt Wilson <msw at redhat.com>
+- fixed typo in devel filelist
+- added macro that tests to see if we have libglade2, make the
+ filelist a condition of that
+- changed name to 'pygtk2' to avoid name conflict with pygtk
+
Property changes on: trunk/rpms/pygtk2/pygtk.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Added: trunk/rpms/pygtk2/pygtk2-2.10.1-treeview.patch
===================================================================
--- trunk/rpms/pygtk2/pygtk2-2.10.1-treeview.patch (rev 0)
+++ trunk/rpms/pygtk2/pygtk2-2.10.1-treeview.patch 2007-09-30 02:57:02 UTC (rev 5875)
@@ -0,0 +1,109 @@
+diff -ru pygtk-2.10.1/gtk/gtkobject-support.c pygtk-2.10.2/gtk/gtkobject-support.c
+--- pygtk-2.10.1/gtk/gtkobject-support.c 2006-07-05 15:12:16.000000000 +0200
++++ pygtk-2.10.2/gtk/gtkobject-support.c 2006-09-16 16:08:12.000000000 +0200
+@@ -120,3 +120,19 @@
+ return list;
+ }
+
++void
++pygtk_boxed_unref_shared(PyObject *boxed)
++{
++ PyGBoxed *pyboxed;
++ g_return_if_fail(boxed != NULL && PyObject_TypeCheck(boxed, &PyGBoxed_Type));
++ pyboxed = (PyGBoxed *) boxed;
++ if (pyboxed->ob_refcnt != 1) {
++ if (!pyboxed->free_on_dealloc) {
++ pyboxed->boxed = g_boxed_copy(pyboxed->gtype,
++ pyboxed->boxed);
++ pyboxed->free_on_dealloc = TRUE;
++ }
++ }
++ Py_DECREF(boxed);
++}
++
+diff -ru pygtk-2.10.1/gtk/gtk.override pygtk-2.10.2/gtk/gtk.override
+--- pygtk-2.10.1/gtk/gtk.override 2006-08-04 22:28:11.000000000 +0200
++++ pygtk-2.10.2/gtk/gtk.override 2006-09-16 13:57:48.000000000 +0200
+@@ -6891,8 +6891,9 @@
+ buffer, &format, &length);
+
+ if (ret) {
++ PyObject *py_ret;
+ name = gdk_atom_name(format);
+- PyObject *py_ret = Py_BuildValue("(s#s)", ret, length, name);
++ py_ret = Py_BuildValue("(s#s)", ret, length, name);
+ g_free(ret);
+ g_free(name);
+ return py_ret;
+diff -ru pygtk-2.10.1/gtk/gtktreeview.override pygtk-2.10.2/gtk/gtktreeview.override
+--- pygtk-2.10.1/gtk/gtktreeview.override 2006-07-19 22:29:19.000000000 +0200
++++ pygtk-2.10.2/gtk/gtktreeview.override 2006-09-16 16:17:07.000000000 +0200
+@@ -579,6 +579,7 @@
+ }
+ %%
+ override gtk_tree_selection_selected_foreach
++
+ static void
+ pygtk_tree_selection_foreach_marshal(GtkTreeModel *model,
+ GtkTreePath *path,
+@@ -597,17 +598,17 @@
+ py_path = pygtk_tree_path_to_pyobject(path);
+ py_iter = pyg_boxed_new(GTK_TYPE_TREE_ITER, iter, FALSE, FALSE);
+ if (cunote->data)
+- retobj = PyEval_CallFunction(cunote->func, "(NNNO)",
++ retobj = PyEval_CallFunction(cunote->func, "(NNOO)",
+ py_model, py_path, py_iter,
+ cunote->data);
+ else
+- retobj = PyEval_CallFunction(cunote->func, "(NNN)",
++ retobj = PyEval_CallFunction(cunote->func, "(NNO)",
+ py_model, py_path, py_iter);
+
+ if (retobj == NULL) {
+ PyErr_Print();
+ }
+-
++ pygtk_boxed_unref_shared(py_iter);
+ Py_XDECREF(retobj);
+
+ pyg_gil_state_release(state);
+@@ -1124,13 +1125,14 @@
+ py_iter2 = pyg_boxed_new(GTK_TYPE_TREE_ITER, iter2, FALSE, FALSE);
+
+ if (cunote->data) {
+- retobj = PyEval_CallFunction(cunote->func, "(NNNO)", py_model,
++ retobj = PyEval_CallFunction(cunote->func, "(OONO)", py_model,
+ py_iter1, py_iter2, cunote->data);
+ } else {
+- retobj = PyEval_CallFunction(cunote->func, "(NNN)", py_model,
++ retobj = PyEval_CallFunction(cunote->func, "(OON)", py_model,
+ py_iter1, py_iter2);
+ }
+-
++ pygtk_boxed_unref_shared(py_iter1);
++ pygtk_boxed_unref_shared(py_iter2);
+ if (retobj)
+ ret = PyInt_AsLong(retobj);
+ if (PyErr_Occurred()) {
+diff -ru pygtk-2.10.1/gtk/pygtkcellrenderer.c pygtk-2.10.2/gtk/pygtkcellrenderer.c
+--- pygtk-2.10.1/gtk/pygtkcellrenderer.c 2005-01-09 18:35:02.000000000 +0100
++++ pygtk-2.10.2/gtk/pygtkcellrenderer.c 2006-09-16 16:17:07.000000000 +0200
+@@ -250,7 +250,7 @@
+ Py_DECREF(py_ret);
+
+ out:
+- Py_DECREF(py_event);
++ pygtk_boxed_unref_shared(py_event);
+ Py_DECREF(py_widget);
+ Py_DECREF(py_background_area);
+ Py_DECREF(py_cell_area);
+diff -ru pygtk-2.10.1/gtk/pygtk-private.h pygtk-2.10.2/gtk/pygtk-private.h
+--- pygtk-2.10.1/gtk/pygtk-private.h 2006-07-05 15:12:17.000000000 +0200
++++ pygtk-2.10.2/gtk/pygtk-private.h 2006-09-16 16:11:01.000000000 +0200
+@@ -70,4 +70,6 @@
+ #define PYGDK_TYPE_REGION (pygdk_region_get_type ())
+ #endif /* GDK_TYPE_REGION */
+
++void pygtk_boxed_unref_shared(PyObject *boxed);
++
+ #endif
More information about the svn-commits
mailing list