[gdesklets/f16: 1/4] add patch addressing memory leak

Luya Tshimbalanga luya at fedoraproject.org
Sun Apr 8 04:35:13 UTC 2012


commit 4ff04a718d79b0e0bb6033fa0372942d05f078a7
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sat Apr 7 21:23:33 2012 -0700

    add patch addressing memory leak

 gdesklets-0.36.3-2.fc16.src.rpm |  Bin 0 -> 3757675 bytes
 gdesklets-desktop.patch         |   28 ++++
 gdesklets.spec                  |    5 +-
 gdesklets.spec~                 |  258 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 289 insertions(+), 2 deletions(-)
---
diff --git a/gdesklets-0.36.3-2.fc16.src.rpm b/gdesklets-0.36.3-2.fc16.src.rpm
new file mode 100644
index 0000000..57c5f05
Binary files /dev/null and b/gdesklets-0.36.3-2.fc16.src.rpm differ
diff --git a/gdesklets-desktop.patch b/gdesklets-desktop.patch
new file mode 100644
index 0000000..1879ea8
--- /dev/null
+++ b/gdesklets-desktop.patch
@@ -0,0 +1,28 @@
+diff -ru rpmbuild/BUILD/gdesklets-0.36.3-orig/data/gdesklets.desktop.in rpmbuild/BUILD/gdesklets-0.36.3/data/gdesklets.desktop.in
+--- rpmbuild/BUILD/gdesklets-0.36.3-orig/data/gdesklets.desktop.in	2010-06-07 00:41:57.000000000 -0700
++++ rpmbuild/BUILD/gdesklets-0.36.3/data/gdesklets.desktop.in	2012-03-20 19:59:38.838192035 -0700
+@@ -3,7 +3,7 @@
+ Type=Application
+ Encoding=UTF-8
+ Version=1.0
+-MimeType=application/x-gdesklets-display
++MimeType=application/x-gdesklets-display;
+ Categories=Utility;
+ X-GNOME-Autostart-enabled=true
+ Exec=gdesklets start
+diff -ru rpmbuild/BUILD/gdesklets-0.36.3-orig/utils/render.c rpmbuild/BUILD/gdesklets-0.36.3/utils/render.c
+--- rpmbuild/BUILD/gdesklets-0.36.3-orig/utils/render.c	2010-05-24 03:56:05.000000000 -0700
++++ rpmbuild/BUILD/gdesklets-0.36.3/utils/render.c	2012-03-06 11:09:11.818001473 -0800
+@@ -89,8 +89,12 @@
+   /* set image */
+   gtk_image_set_from_pixbuf (image, scaled);
+ 
++// this condition is causing a memory leak since rev. 142
++/*
+   if (srcwidth != width || srcheight != height)
++*/
+     g_object_unref (scaled);
++
+ }
+ 
+ 
diff --git a/gdesklets.spec b/gdesklets.spec
index b3bcaba..9093f4d 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -44,10 +44,11 @@ make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor=fedora  \
 	--dir %{buildroot}%{_datadir}/applications \
-	--add-category X-Fedora \
 	--add-category Application \
 	--add-category Utility \
-	data/%{name}.desktop
+	%{buildroot}/%{_datadir}/%{name}.desktop
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 mkdir -p  %{buildroot}{%{_bindir},%{_datadir}/%{name}/data/,%{_datadir}/%{name}/Displays/,%{_datadir}/%{name}/Controls/}
 
diff --git a/gdesklets.spec~ b/gdesklets.spec~
new file mode 100644
index 0000000..b3bcaba
--- /dev/null
+++ b/gdesklets.spec~
@@ -0,0 +1,258 @@
+#%define alphatag beta
+
+Name:		gdesklets
+Version:	0.36.3
+Release:	2%{?dist}
+Summary:	Architecture for desktop applets
+
+Group:		User Interface/Desktops
+License:	GPL+
+
+URL:		http://%{name}.de/
+Source0:	http://%{name}.de/files/%{name}-%{version}.tar.bz2
+Patch0:		transition.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
+BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
+BuildRequires:  libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
+BuildRequires:  libgnome-devel > 2.6.0, desktop-file-utils, libcap-devel
+Requires:	gnome-python2-gconf >= 2.6.0
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
+
+
+%description
+'gDesklets' provides an advanced architecture for desktop applets -
+tiny displays that sit on your desktop such as status meters, icon
+bars, weather sensors, news tickers.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .transition
+
+%build
+%configure \
+ --disable-schemas-install
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+%find_lang %{name}
+
+desktop-file-install --vendor=fedora  \
+	--dir %{buildroot}%{_datadir}/applications \
+	--add-category X-Fedora \
+	--add-category Application \
+	--add-category Utility \
+	data/%{name}.desktop
+
+mkdir -p  %{buildroot}{%{_bindir},%{_datadir}/%{name}/data/,%{_datadir}/%{name}/Displays/,%{_datadir}/%{name}/Controls/}
+
+rm -rf %{buildroot}%{_datadir}/mime/application
+rm -rf %{buildroot}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses,mime.cache}
+rm -f %{buildroot}%{_datadir}/applications/{%{name}.desktop,mimeinfo.cache}
+rm -f %{buildroot}%{_datadir}/mime/{globs2,generic-icons,icons,treemagic,types}
+
+
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+
+%clean
+rm -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{_bindir}/%{name}
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/mime/packages/%{name}.xml.in
+%{_datadir}/icons/gnome/48x48/mimetypes/*.png
+#%{_datadir}/pixmaps/%{name}.png
+%{_sysconfdir}/xdg/autostart/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop.in
+%{_datadir}/%{name}/
+%{_libdir}/%{name}/
+%{_mandir}/man1/*
+
+
+%changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jan 27 2011 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.3-1
+- New upstream version
+- Fixes spec
+
+* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.36.2-3
+- recompiling .py files against Python 2.7 (rhbz#623304)
+
+* Wed Mar 03 2010 Luya Tshimbalanga <luya at fedoraproject.org> 0.36.2-2
+- Changed summary sentence (rhbz#588330)
+
+* Wed Mar 03 2010 Luya Tshimbalanga <luya at fedoraproject.org> 0.36.2-1.1
+- New upstream version
+- Dropped patch related to python 2.6 compatibility
+
+* Thu Oct 29 2009 Luya Tshimbalanga <luya at fedoraproject.org> 0.36.1-7
+- Add patch to address compatibility with python 2.6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.36.1-4
+- Rebuild for Python 2.6
+
+* Thu Nov 20 2008 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.1-3
+- Updated from upstream
+- (#472263) Removed autogenerated-mime data for integrating check
+  courtesy of Christian Krause (chkr at plauener.de) 
+
+* Fri Oct 03 2008 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.36-2
+- Cleaned up spec
+- Minor fixes
+
+* Fri Feb 22 2008 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.36-1
+- Update from upstream
+- Added libcap-devel for dependancy
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.36-0.4.beta
+- Autorebuild for GCC 4.3
+
+* Fri Nov 23 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.36.0-3.beta
+- Changed url adress
+- Added patch for dialog
+
+* Thu Nov 15 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.36.0-1.beta
+- New beta release
+- Removed patch
+
+* Tue Aug 21 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.4-9
+- Renamed GPL to GPL+ following the new Fedora tagging license schema
+
+* Sun Jul 15 2007 Tyler Owen <tyler.l.owen at gmail.com> - 0.35.4-8
+- Added directory for Displays
+- Added directory for Controls
+
+* Thu Jun 07 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.4-7.1
+- Dropped Applet name category
+- Replaced Accesories name category by Applet
+- Added patch to remove old Xorg 6.8 notification for transition.py
+- Removed no-longer needed python-abi
+
+* Tue May 15 2007 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.4-5
+- Rebuild with Koji
+
+* Thu Dec 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.35.4-4
+- Rebuild for new Python
+
+* Tue Nov 07 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.4-3
+- Added gnome-python2-devel for buildrequires (rawhide)
+
+* Tue Nov 07 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.4-2
+- Removed gnome-python for buildrequires
+
+* Tue Nov 07 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.4-1
+- Removed patch no longer needed
+- Updated to 0.35.4
+
+* Thu Aug 31 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-14
+- Add patch related to pyorbit due to upstream bug
+
+* Wed Aug 30 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-13.2
+- pyorbit for FC-4 is 2.0.1 (-_-)
+
+* Wed Aug 30 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-13
+- Fixed a silly typo
+- Added intltool for BuildRequires
+
+* Sun Aug 27 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-10
+- Removed unecessary comment
+
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
+- Remove conditional sign for pyorbit-devel
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Ajusted pyorbit requirement for ppc64
+
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
+- Rebuild for Fedora Extras 5
+
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
+- Updated to 0.35.3
+- Removed thumbmail
+- Removed patch, no longer needed
+
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-26.fc5
+- Minor rebuilt
+
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
+- Rebuilt against libgtop2-devel
+- Changed url of the provider
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-24.fc5
+- Added libXdmcp-devel on BuildRequires
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-23.fc5
+- Added libXau-devel on BuildRequires
+
+* Wed Dec 14 2005 Luya Tshimbalanga
+ <luya_tfz at thefinalzone.com> - 0.35.2-22
+- Added desktop-file-utils for build requirement
+- Clean up
+
+* Tue Dec 6 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-21
+- Removed unnecessary comment  
+- More clean up
+
+* Tue Dec 6 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-20
+- Clean up 
+- Fixed the right path for symbolic link
+
+* Sat Dec 3 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-19
+- Added disable-schemas-install on configure
+- Trying to symlink using nrpms method based on FC3 version
+
+* Tue Nov 29 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-18
+- Added patch against NullObject.py (thanks jwb)
+
+* Tue Nov 29 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-17
+- Reorganized names and fixed install
+
+* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-12
+- Removed pygtk2
+
+* Mon Nov 21 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-11
+- Added distribution version
+- Clarified the note about GConf instead of gconf
+
+* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-10
+- Added libgnomeui-devel to test some sensors
+
+* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-9
+- Cleaned up and removed unnecesary buildrequires
+
+* Fri Nov 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-8
+- Fixed error on mime.cache
+
+* Wed Nov 16 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-5
+- Added desktop-file-utils command for post and postun
+
+* Wed Nov 16 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-4
+- Fixed mistakes (thanks Alex Lancaster (alexl at users.sourceforge.net))
+
+* Sat Nov 12 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-3
+- Enhanced codes to be FedoraGuide compliant (thanks to Brian Pepple (bdpepple at ameritech.net))
+
+* Sat Nov 12 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-1
+- Initial Fedora Extras package


More information about the scm-commits mailing list