[pitivi/f13/master] Fix rhbz #596612
Hicham HAOUARI
hicham at fedoraproject.org
Sun Dec 12 15:26:03 UTC 2010
commit 4b636faab391600794bcb70b0e0ecebeecbfb4ce
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Sun Dec 12 15:25:46 2010 +0000
Fix rhbz #596612
.gitignore | 1 +
0001-backport-canvas-fixes-to-0.13.5.patch | 253 ----------------------------
pitivi-0.13.4-fix-crrestore.patch | 46 +++++
pitivi-0.13.4-no-svg-sizeddir.patch | 77 +++++++++
pitivi.spec | 191 +++++++++++++++-------
sources | 2 +-
6 files changed, 257 insertions(+), 313 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 447d729..d7e7cbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pitivi-0.13.5.tar.bz2
+/pitivi-0.13.4.tar.bz2
diff --git a/pitivi-0.13.4-fix-crrestore.patch b/pitivi-0.13.4-fix-crrestore.patch
new file mode 100644
index 0000000..25ba531
--- /dev/null
+++ b/pitivi-0.13.4-fix-crrestore.patch
@@ -0,0 +1,46 @@
+From a9795568f5a0adca5a4277bf51868a5a30ff99dd Mon Sep 17 00:00:00 2001
+From: Brandon Lewis <brandon_lewis at alum.berkeley.edu>
+Date: Tue, 06 Apr 2010 17:59:58 +0000
+Subject: pitivi/ui/curve.py: use save/restore instead of reset_clip in simple_paint
+
+closes bug 612501, as we avoid calling the improperly-wrapped
+cr.restore() method
+---
+diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
+index 68b7b6b..17ddcab 100644
+--- a/pitivi/ui/curve.py
++++ b/pitivi/ui/curve.py
+@@ -214,7 +214,7 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
+ self.keyframes[kf] = pos
+
+ def do_simple_paint(self, cr, bounds):
+-
++ cr.save()
+ cr.identity_matrix()
+ if self.interpolator:
+
+@@ -258,17 +258,21 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
+ bounds = intersect(self.bounds, bounds)
+ width = bounds.x2 - bounds.x1
+ height = bounds.y2 - bounds.y1
+- cr.reset_clip()
++ # cr.reset_clip()
++ cr.restore()
+ cr.rectangle(bounds.x1, bounds.y1, width, height)
+ cr.clip()
+
+ # draw the value label
+ roundedrec(cr, x - KW_LABEL_HPAD2, y - KW_LABEL_VPAD2,
+ w + KW_LABEL_HPAD, h + KW_LABEL_VPAD, r=10)
++ cr.set_source_rgb(1, 1, 1)
+ cr.fill()
+ cr.set_source_rgb(1, 0, 0)
+ cr.move_to(x, y + h)
+ cr.show_text(text)
++ else:
++ cr.restore()
+
+ def make_curve(self, cr):
+ if not self.interpolator:
+--
+cgit v0.8.3.1
diff --git a/pitivi-0.13.4-no-svg-sizeddir.patch b/pitivi-0.13.4-no-svg-sizeddir.patch
new file mode 100644
index 0000000..cfc6cbc
--- /dev/null
+++ b/pitivi-0.13.4-no-svg-sizeddir.patch
@@ -0,0 +1,77 @@
+From ba02f578050f3adfa25dc21d89d90a8d5f0566a9 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Mon, 15 Mar 2010 14:35:31 +0000
+Subject: Don't install svg files into NxN icon dirs
+
+The svg file is installed correctly into scalable/ already and png files
+are put into the other dirs.
+
+The svg files are the source images, so we keep and dist them, we just
+don't install them.
+---
+diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
+index 086c08a..c4995a3 100644
+--- a/icons/16x16/Makefile.am
++++ b/icons/16x16/Makefile.am
+@@ -5,8 +5,8 @@ context = actions
+ iconsdir = $(themedir)/$(size)/apps
+
+ icons_DATA = \
+- pitivi.png \
+- pitivi.svg
++ pitivi.png
+
+ EXTRA_DIST = \
+- $(icons_DATA)
++ $(icons_DATA) \
++ pitivi.svg
+diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
+index 0c52079..651bcd4 100644
+--- a/icons/22x22/Makefile.am
++++ b/icons/22x22/Makefile.am
+@@ -5,8 +5,8 @@ context = actions
+ iconsdir = $(themedir)/$(size)/apps
+
+ icons_DATA = \
+- pitivi.png \
+- pitivi.svg
++ pitivi.png
+
+ EXTRA_DIST = \
+- $(icons_DATA)
++ $(icons_DATA) \
++ pitivi.svg
+diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
+index 7cdaca7..01bae57 100644
+--- a/icons/32x32/Makefile.am
++++ b/icons/32x32/Makefile.am
+@@ -5,8 +5,8 @@ context = actions
+ iconsdir = $(themedir)/$(size)/apps
+
+ icons_DATA = \
+- pitivi.png \
+- pitivi.svg
++ pitivi.png
+
+ EXTRA_DIST = \
+- $(icons_DATA)
++ $(icons_DATA) \
++ pitivi.svg
+diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
+index c99ae5e..ba77dc8 100644
+--- a/icons/48x48/Makefile.am
++++ b/icons/48x48/Makefile.am
+@@ -5,8 +5,8 @@ context = actions
+ iconsdir = $(themedir)/$(size)/apps
+
+ icons_DATA = \
+- pitivi.png \
+- pitivi.svg
++ pitivi.png
+
+ EXTRA_DIST = \
+- $(icons_DATA)
++ $(icons_DATA) \
++ pitivi.svg
+--
+cgit v0.8.3.1
diff --git a/pitivi.spec b/pitivi.spec
index 8b461db..2da0984 100644
--- a/pitivi.spec
+++ b/pitivi.spec
@@ -1,38 +1,46 @@
-%global major 0.13
-%global minor 5
-
-Name: pitivi
-Version: %{major}.%{minor}
-Release: 3%{?dist}
-Summary: Non-linear video editor
-Group: Applications/Multimedia
-License: LGPLv2+
-URL: http://www.pitivi.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: intltool
-BuildRequires: python
-BuildRequires: desktop-file-utils
-BuildRequires: pygobject2
-BuildRequires: gstreamer-python
-BuildRequires: gnonlin
-BuildRequires: gstreamer-plugins-good
-Requires: gnonlin
-Requires: gstreamer-plugins-good
-Requires: gstreamer-python
-Requires: pygtk2
-Requires: pygoocanvas
-Requires: python-zope-interface
-Requires: python-setuptools
-Requires: hicolor-icon-theme
-BuildArch: noarch
-
-#Patch0: fix crash when zooming with the slider
-# https://bugzilla.redhat.com/show_bug.cgi?id=654119
-Patch0: https://bugs.launchpad.net/ubuntu/+source/pygoocanvas/+bug/640630/+attachment/1671260/+files/0001-backport-canvas-fixes-to-0.13.5.patch
-#Patch1: Add man page
-# https://bugzilla.gnome.org/show_bug.cgi?id=636787
-Patch1: 0001-Add-man-page.patch
+%define major 0.13
+%define minor 4
+Name: pitivi
+Version: %{major}.%{minor}
+Release: 3%{?dist}
+Summary: Non-linear video editor
+
+Group: Applications/Multimedia
+License: LGPLv2+
+URL: http://www.pitivi.org/
+
+Source0: http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+Requires: gnonlin >= 0.10.15
+Requires: gstreamer-python >= 0.10.16
+Requires: gstreamer >= 0.10.24
+Requires: gstreamer-plugins-base >= 0.10.24
+Requires: pygtk2 >= 2.14.0
+Requires: python-zope-interface
+Requires: pygoocanvas
+Requires: python-setuptools
+
+BuildRequires: desktop-file-utils
+BuildRequires: intltool => 0.35.0
+BuildRequires: python-setuptools
+BuildRequires: pygobject2
+BuildRequires: gstreamer-python
+BuildRequires: gnonlin
+BuildRequires: gstreamer-plugins-good
+
+#Patch0: Add man page
+# https://bugzilla.gnome.org/show_bug.cgi?id=636787
+Patch0: 0001-Add-man-page.patch
+#Patch1: Don't install svg files into NxN icon dirs
+# http://git.gnome.org/browse/pitivi/commit/?id=ba02f578050f3adfa25dc21d89d90a8d5f0566a9
+Patch1: %{name}-%{version}-no-svg-sizeddir.patch
+#Patch2: avoid calling the improperly-wrapped cr.restore() method
+# https://bugzilla.gnome.org/show_bug.cgi?id=612501
+# https://bugzilla.redhat.com/process_bug.cgi
+Patch2: %{name}-%{version}-fix-crrestore.patch
%description
Pitivi is an application using the GStreamer multimedia framework to
@@ -42,19 +50,19 @@ At this level of development it can be compared to a classic video editing
program.
%prep
-%setup -q
+%setup0 -q -n %{name}-%{version}
for f in `find . -name \*.py`
do
- sed -e '/^#!/,1d' < $f > $f.tmp && mv $f.tmp $f
+ %{__sed} -e '/^#!/,1d' < $f > $f.tmp && mv $f.tmp $f
done
-
-%patch0 -p1 -b .fix-zoom-crash
-%patch1 -p1 -b .add-man-page
+%patch0 -p1 -b .add-man-page
+%patch1 -p1 -b .no-svg-sizeddir
+%patch2 -p1 -b .fix-crrestore
# Since DISPLAY is unset, don't import Pitivi in tests/test_binary_search.py and don't run tests/test_basic.py
# Don't run tests/test_still_image.py either as it fails : https://bugzilla.gnome.org/show_bug.cgi?id=636807
sed -i '/from pitivi.application import Pitivi/d' tests/test_binary_search.py
-sed -i "s|'test_integration'|'test_integration' ,'test_basic', 'test_still_image'|g" tests/runtests.py
+sed -i "s|'test_integration'|'test_integration' ,'test_basic'|g" tests/runtests.py
autoreconf -if -I common/m4
%build
@@ -63,12 +71,13 @@ autoreconf -if -I common/m4
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
-desktop-file-install --delete-original \
- --dir %{buildroot}%{_datadir}/applications \
- --add-category AudioVideoEditing \
- pitivi.desktop
+rm %{buildroot}%{_datadir}/applications/pitivi.desktop
+desktop-file-install \
+ --dir %{buildroot}%{_datadir}/applications \
+ --add-category AudioVideoEditing \
+ pitivi.desktop
%find_lang %{name}
@@ -105,23 +114,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/%{name}.1.gz
%changelog
-* Wed Dec 08 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.13.5-3
-- Add buildroot tag
-- Clean buildroot in %%install section
-- Add patch from lp #640630 to fix rhbz #654119
+* Sun Dec 12 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.13.4-3
- Add man page
+- Backport patch to not install svg icons into NxN dirs, instead of
+ removing them manually in %%install
+- Add scriptlet to update icon cache (rhbz #625580)
- Add %%check section
- Add pygobject2, gstreamer-python, gnonlin and gstreamer-plugins-good
to BR so that we can run %%check
-
-* Tue Dec 07 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.13.5-2
-- Add scriptlet to update icon cache (rhbz #625580)
-
-* Wed Sep 22 2010 Chen Lei <supercyper at 163.com> - 0.13.5-1
-- Update to 0.13.5
-
-* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.13.4-3
-- recompiling .py files against Python 2.7 (rhbz#623347)
+- Backport commit a9795568f5a0adca5a4277bf51868a5a30ff99dd to fix
+ https://bugzilla.gnome.org/show_bug.cgi?id=612501
+ https://bugzilla.redhat.com/show_bug.cgi?id=596612
* Mon Mar 15 2010 Benjamin Otte <otte at redhat.com> - 0.13.4-2
- Make sure Pitivi has an icon in the menu.
@@ -279,3 +282,73 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Mon May 28 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.2.2-2
- BR perl(XML::Parser)
+
+* Mon May 28 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.2.2-1
+- Update to 0.10.2.2
+
+* Wed Jan 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.2-2
+- Don't forget to add new patch to CVS
+
+* Wed Jan 31 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.2-1
+- Update to 0.10.2
+- Drop sync patch
+- Add find_lang to pick up localizations
+- Temporarily re-run auto* tools until PyGTK detection is fixed.
+- See http://bugzilla.gnome.org/show_bug.cgi?id=402995
+
+* Thu Dec 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.1-7
+- Fix stupid mistake
+
+* Thu Dec 14 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.1-6
+- Launch pitivi with --sync option (BZ#219604)
+- Fix buildroot macro usage
+- Remove X-Fedora category from menu entry
+- Remove duplicate menu entry (BZ#219603)
+
+* Wed Dec 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.1-5
+- Add requirement on gstreamer-python
+
+* Tue Dec 12 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.1-4
+- Taking ownership.
+- Add dist tag
+- Simplify files section
+- Move library files to /usr/share
+- Remove shebangs from library files
+- Drop zero length README file
+
+* Thu Sep 07 2006 W. Michael Petullo <mike[at]flyn.org> - 0.10.1-3
+- Rebuild for FC6.
+
+* Wed Sep 06 2006 W. Michael Petullo <mike[at]flyn.org> - 0.10.1-2
+- Remove %%ghost from .pyo files: new Fedora policy.
+
+* Sat Jun 03 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.1-1
+- update to 0.10.1
+
+* Sun May 07 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0-3
+- BuildRequires: pygtk2-libglade
+
+* Sun May 07 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0-2
+- BuildRequires: gnonlin because plugins are required a build time
+
+* Wed Apr 26 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0-1
+- update to 0.10.0
+- remove BuildRequires: gnonlin-devel
+
+* Wed Feb 08 2006 W. Michael Petullo <mike[@]flyn.org> 0.9.9.2-3
+- add BuildRequires
+- add %%{_libdir}/pitivi/python/pitivi/ui/*.glade
+
+* Tue Feb 07 2006 W. Michael Petullo <mike[@]flyn.org> 0.9.9.2-2
+- remove several %%defines.
+- avoid %%makeinstall.
+- BuildRequire: gnonlin-devel and Require: gnonlin.
+- use desktop-file-install.
+- BuildArch: noarch.
+- %%ghost *.pyo.
+
+* Mon Jan 23 2006 W. Michael Petullo <mike[@]flyn.org>
+- 0.9.9.2: updated to new version and gstreamer-0.10.
+
+* Mon Dec 20 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.1.1-0.fdr.1: initial package
diff --git a/sources b/sources
index b5c8b3f..7a84bad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2471dbff3a63777dc89870e44da203e1 pitivi-0.13.5.tar.bz2
+1c960ce49947412299aceed6eec54ebc pitivi-0.13.4.tar.bz2
More information about the scm-commits
mailing list