From c18d92a549019ddc6c61b6e7e74e9e4c70e9f15e Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sat, 12 Mar 2011 15:19:09 +0000 Subject: [PATCH] Update to 2.91.91.1 --- .gitignore | 1 + cheese-bugreport.sh | 4 -- cheese-countdown-crasher.patch | 70 ---------------------------------- cheese-effects-i18n.patch | 35 ----------------- cheese.spec | 12 +++--- no-webcam.patch | 14 ------- sources | 2 +- 7 files changed, 9 insertions(+), 129 deletions(-) delete mode 100644 cheese-bugreport.sh delete mode 100644 cheese-countdown-crasher.patch delete mode 100644 cheese-effects-i18n.patch delete mode 100644 no-webcam.patch diff --git a/.gitignore b/.gitignore index 22984c4..cfadf72 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ cheese-2.31.1.tar.bz2 /cheese-2.32.0.tar.bz2 /cheese-2.91.3.tar.bz2 /cheese-2.91.4.tar.bz2 +/cheese-2.91.91.1.tar.bz2 diff --git a/cheese-bugreport.sh b/cheese-bugreport.sh deleted file mode 100644 index b7e12a6..0000000 --- a/cheese-bugreport.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo "Cheese log:" -cat $HOME/.gnome2/cheese/log diff --git a/cheese-countdown-crasher.patch b/cheese-countdown-crasher.patch deleted file mode 100644 index a36a52b..0000000 --- a/cheese-countdown-crasher.patch +++ /dev/null @@ -1,70 +0,0 @@ -From beee2792720f5a55820b9ce8df94d985c6d139d0 Mon Sep 17 00:00:00 2001 -From: Filippo Argiolas -Date: Wed, 24 Mar 2010 08:52:13 +0100 -Subject: [PATCH] countdown: move rsvg_init and rsvg_term into main - -Initialize rsvg at startup and clean it up at exit. -rsvg_term is particularly subtle as it calls xmlCleanupParser() -triggering nasty crashes (e.g. with PulseAudio) with multithread -applications. -See http://0pointer.de/blog/projects/beware-of-rsvg-term.html for more -info. -Rsvg loading seems to work even without these functions so I'm not sure -it's worth to keep them. - -https://bugzilla.gnome.org/show_bug.cgi?id=592100 ---- - libcheese/cheese-countdown.c | 3 --- - src/cheese.c | 10 ++++++++++ - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/libcheese/cheese-countdown.c b/libcheese/cheese-countdown.c -index b2782e2..d849594 100644 ---- a/libcheese/cheese-countdown.c -+++ b/libcheese/cheese-countdown.c -@@ -504,8 +504,6 @@ create_surface_from_svg (GtkWidget *widget, gchar *pcFilename) - - CheeseCountdownPrivate *priv = CHEESE_COUNTDOWN_GET_PRIVATE (widget); - -- rsvg_init (); -- - /* load svg-file from disk */ - pSvgHandle = rsvg_handle_new_from_file (pcFilename, &pError); - if (!pSvgHandle) -@@ -546,7 +544,6 @@ create_surface_from_svg (GtkWidget *widget, gchar *pcFilename) - - /* clean up */ - rsvg_handle_free (pSvgHandle); -- rsvg_term (); - cairo_destroy (pContext); - - return pSurface; -diff --git a/src/cheese.c b/src/cheese.c -index 5e1c952..f143ecf 100644 ---- a/src/cheese.c -+++ b/src/cheese.c -@@ -110,6 +110,10 @@ main (int argc, char **argv) - g_thread_init (NULL); - gdk_threads_init (); - -+ /* initialize rsvg */ -+ /* needed to load the camera icon for the countdown widget */ -+ rsvg_init (); -+ - g_set_application_name (_("Cheese")); - - context = g_option_context_new (N_("- Take photos and videos with your webcam, with fun graphical effects")); -@@ -159,5 +163,11 @@ main (int argc, char **argv) - gtk_main (); - gdk_threads_leave (); - -+ /* cleanup rsvg */ -+ /* Note: this function is bad with multithread applications as it -+ * calls xmlCleanupParser() and should be only called right before -+ * exit */ -+ rsvg_term (); -+ - return 0; - } --- -1.6.6.1 \ No newline at end of file diff --git a/cheese-effects-i18n.patch b/cheese-effects-i18n.patch deleted file mode 100644 index 0fe11b4..0000000 --- a/cheese-effects-i18n.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/cheese-effect-chooser.c b/src/cheese-effect-chooser.c -index 8716117..61aeacb 100644 ---- a/src/cheese-effect-chooser.c -+++ b/src/cheese-effect-chooser.c -@@ -178,18 +178,20 @@ cheese_cairo_draw_card (cairo_t *cr, const GstEffect *card, gboolean highlight) - if (card->is_black) - cairo_set_source_rgb (cr, 1, 1, 1); - -- double x, y; -- cairo_select_font_face (cr, "Sans", -- CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); -- -- cairo_set_font_size (cr, 0.09); -+ PangoLayout *layout = pango_cairo_create_layout (cr); - gchar *name = gettext (card->name); -- cairo_text_extents (cr, name, &extents); -- x = 0.5 - (extents.width / 2 + extents.x_bearing); -- y = 0.92 - (extents.height / 2 + extents.y_bearing); -- -+ pango_layout_set_text (layout, name, -1); -+ PangoFontDescription *desc = pango_font_description_from_string ("Sans 0.09"); -+ pango_layout_set_font_description (layout, desc); -+ pango_font_description_free (desc); -+ int width, height; -+ pango_layout_get_size (layout, &width, &height); -+ double x, y; -+ x = 0.5 - ((double)width / PANGO_SCALE) / 2; -+ y = 0.92 - ((double)height / PANGO_SCALE) / 2; - cairo_move_to (cr, x, y); -- cairo_show_text (cr, name); -+ pango_cairo_show_layout (cr, layout); -+ g_object_unref (layout); - - if (highlight) - { diff --git a/cheese.spec b/cheese.spec index 6e9e4b1..448732e 100644 --- a/cheese.spec +++ b/cheese.spec @@ -1,7 +1,7 @@ Name: cheese Epoch: 1 -Version: 2.91.4 -Release: 2%{?dist} +Version: 2.91.91.1 +Release: 1%{?dist} Summary: Application for taking pictures and movies from a webcam Group: Amusements/Graphics @@ -10,10 +10,9 @@ URL: http://projects.gnome.org/cheese/ #VCS: git:git://git.gnome.org/cheese Source0: http://download.gnome.org/sources/cheese/2.91/%{name}-%{version}.tar.bz2 -BuildRequires: gtk2-devel >= 2.19.1 +BuildRequires: gtk3-devel >= 2.19.1 BuildRequires: gstreamer-devel >= 0.10.23 BuildRequires: gstreamer-plugins-base-devel >= 0.10.12 -BuildRequires: gnome-vfs2-devel BuildRequires: cairo-devel >= 1.4.0 BuildRequires: librsvg2-devel >= 2.18.0 BuildRequires: evolution-data-server-devel @@ -28,7 +27,7 @@ BuildRequires: libgudev1-devel BuildRequires: libcanberra-devel BuildRequires: scrollkeeper BuildRequires: clutter-devel -BuildRequires: clutter-gtk010-devel +BuildRequires: clutter-gtk-devel BuildRequires: clutter-gst-devel BuildRequires: libmx-devel BuildRequires: vala-devel @@ -130,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_libdir}/pkgconfig/cheese-gtk.pc %changelog +* Sat Mar 12 2011 Bastien Nocera 2.91.91.1-1 +- Update to 2.91.91.1 + * Tue Feb 08 2011 Fedora Release Engineering - 1:2.91.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/no-webcam.patch b/no-webcam.patch deleted file mode 100644 index ff577a1..0000000 --- a/no-webcam.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up cheese-2.29.92/libcheese/cheese-widget.c.no-webcam cheese-2.29.92/libcheese/cheese-widget.c ---- cheese-2.29.92/libcheese/cheese-widget.c.no-webcam 2010-03-16 13:51:03.281478874 -0400 -+++ cheese-2.29.92/libcheese/cheese-widget.c 2010-03-16 13:51:07.649806018 -0400 -@@ -75,8 +75,8 @@ cheese_widget_load_pixbuf (GtkWidget *w - theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); - - /* FIXME special case "no-webcam" and actually use the icon_name */ -- pixbuf = gtk_icon_theme_load_icon (theme, "error", -- size, 0, error); -+ pixbuf = gtk_icon_theme_load_icon (theme, "dialog-error", -+ size, GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_FORCE_SIZE, error); - return pixbuf; - } - diff --git a/sources b/sources index 34c44af..b1b2b50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24a6c7c7ab8b456d65cdf4e02dd3af5c cheese-2.91.4.tar.bz2 +5f3ee91e563182ca6d571a6e87292b95 cheese-2.91.91.1.tar.bz2