Hello community,

here is the log from the commit of package cheese for openSUSE:Factory
checked in at Sun Oct 16 12:42:04 CEST 2011.



--------
--- openSUSE:Factory/cheese/cheese.changes      2011-10-04 16:54:55.000000000 
+0200
+++ /mounts/work_src_done/STABLE/cheese/cheese.changes  2011-10-16 
09:41:55.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Oct  4 15:30:54 UTC 2011 - zai...@opensuse.org
+
+- Add cheese-prefer-darkGTK+-theme.patch: prefer dark GTK+ theme
+  (bgo#660628).
+- Add cheese-common.vapi source: this file is missing from the
+  tarball, and is needed to rebuild vala files.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  cheese-common.vapi
  cheese-prefer-darkGTK+-theme.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cheese.spec ++++++
--- /var/tmp/diff_new_pack.rcNpeQ/_old  2011-10-16 12:42:00.000000000 +0200
+++ /var/tmp/diff_new_pack.rcNpeQ/_new  2011-10-16 12:42:00.000000000 +0200
@@ -27,6 +27,10 @@
 Url:            http://www.gnome.org/projects/cheese
 Group:          Productivity/Graphics/Other
 Source0:        
http://download.gnome.org/sources/cheese/3.2/%{name}-%{version}.tar.bz2
+# Needed for patch0, missing from tarball -- Cheese will not build due to vala 
without it. Taken from git.
+Source1:        cheese-common.vapi
+# PATCH-FIX-UPSTREAM cheese-prefer-darkGTK+-theme.patch bgo#660628 
zai...@opensuse.org -- Prefer dark GTK+ theme
+Patch0:         cheese-prefer-darkGTK+-theme.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
@@ -120,6 +124,11 @@
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
+# Will fail when we can remove our local copy of the vapi file
+test ! -f src/vapi/cheese-common.vapi
+# Needed for build due to patch0 - cheese-prefer-darkGTK+-theme.patch
+cp -p %{S:1} src/vapi/cheese-common.vapi
 
 %build
 %configure \

++++++ cheese-common.vapi ++++++
/* cheese-common.vapi generated by vapigen, do not modify. */

[CCode (cprefix = "Cheese", lower_case_cprefix = "cheese_")]
namespace Cheese
{
  [CCode (cheader_filename = "cheese-effect.h")]
  public class Effect : GLib.Object
  {
    [CCode (has_construct_function = false)]
    public Effect ();
    [NoAccessorMethod]
    public string name {owned get; set;}
    [NoAccessorMethod]
    public string pipeline_desc {owned get; set;}
    [NoAccessorMethod]
    public Gst.Element control_valve {get; set;}

    public void enable_preview();
    public void disable_preview();
    public bool is_preview_connected();

    public static Cheese.Effect load_from_file (string fname);
    public static GLib.List<Cheese.Effect> load_effects ();
  }

  [CCode (cheader_filename = "cheese-camera.h")]
  public class Camera : GLib.Object
  {
    [CCode (has_construct_function = false)]
    public Camera (Clutter.Texture video_texture, string camera_device_name, 
int x_resolution, int y_resolution);
    public bool                        get_balance_property_range (string 
property, double min, double max, double def);
    public unowned GLib.PtrArray       get_camera_devices ();
    public unowned Cheese.VideoFormat  get_current_video_format ();
    public int                         get_num_camera_devices ();
    public unowned Cheese.CameraDevice get_selected_device ();
    public unowned GLib.List           get_video_formats ();
    public bool                        has_camera ();
    public void                        play ();
    public void                        set_balance_property (string property, 
double value);
    public void                        set_device_by_dev_file (string file);
    public void                        set_device_by_dev_udi (string udi);
    public void                        set_effect (Cheese.Effect effect);
    public void                        toggle_effects_pipeline (bool active);
    public void                        connect_effect_texture (Cheese.Effect 
effect, Clutter.Texture texture);
    public void                        set_video_format (Cheese.VideoFormat 
format);
    public void                        setup (string udi) throws GLib.Error;
    public void                        start_video_recording (string filename);
    public void                        stop ();
    public void                        stop_video_recording ();
    public bool                        switch_camera_device ();
    public bool                        take_photo (string filename);
    public bool                        take_photo_pixbuf ();
    [NoAccessorMethod]
    public string device_name {owned get; set;}
    [NoAccessorMethod]
    public Cheese.VideoFormat format {owned get; set;}
    [NoAccessorMethod]
    public void *video_texture {get; set;}
    public virtual signal void photo_saved ();
    public virtual signal void photo_taken (Gdk.Pixbuf pixbuf);
    public virtual signal void video_saved ();
    public virtual signal void state_flags_changed (Gst.State new_state);
  }
  [CCode (cheader_filename = "cheese-camera-device.h")]
  public class CameraDevice : GLib.Object, GLib.Initable
  {
    [CCode (has_construct_function = false)]
    public CameraDevice (string device_id, string device_file, string 
product_name, int api_version) throws GLib.Error;
    public unowned Cheese.VideoFormat get_best_format ();
    public unowned Gst.Caps           get_caps_for_format (Cheese.VideoFormat 
format);
    public unowned string             get_device_file ();
    public unowned GLib.List          get_format_list ();
    public unowned string             get_id ();
    public unowned string             get_name ();
    public unowned string             get_src ();
    [NoAccessorMethod]
    public int api {get; construct;}
    public string device_file {get; construct;}
    [NoAccessorMethod]
    public string device_id {owned get; construct;}
    public string name {get; construct;}
  }

  [CCode (cheader_filename = "cheese-camera-device-monitor.h")]
  public class CameraDeviceMonitor : GLib.Object
  {
    [CCode (has_construct_function = false)]
    public CameraDeviceMonitor ();
    public void                coldplug ();
    public virtual signal void added (string id, string device_file, string 
product_name, int api_version);
    public virtual signal void removed (string id);
  }


  [CCode (cheader_filename = "cheese-fileutil.h")]
  public class FileUtil  : GLib.Object
  {
    [CCode (cname = "cheese_fileutil_new", has_construct_function = false)]
    public FileUtil ();
    [CCode (cname = "cheese_fileutil_get_new_media_filename")]
    public unowned string get_new_media_filename (Cheese.MediaMode mode);
    [CCode (cname = "cheese_fileutil_get_path_before_224")]
    public unowned string get_path_before_224 ();
    [CCode (cname = "cheese_fileutil_get_photo_path")]
    public unowned string get_photo_path ();
    [CCode (cname = "cheese_fileutil_get_video_path")]
    public unowned string get_video_path ();
    [CCode (cname = "cheese_fileutil_reset_burst")]
    public void reset_burst ();
  }

  [CCode (cheader_filename = "cheese-flash.h")]
  public class Flash : GLib.Object
  {
    [CCode (has_construct_function = false)]
    public Flash (Gtk.Widget parent);
    public void fire ();
  }

  [Compact]
  [CCode (type_id = "CHEESE_TYPE_VIDEO_FORMAT", cheader_filename = 
"cheese-camera-device.h")]
  public class VideoFormat
  {
    public int height;
    public int width;
  }
  [CCode (cprefix = "CHEESE_CAMERA_EFFECT_", has_type_id = false, 
cheader_filename = "cheese-camera.h")]
  public enum CameraEffect
  {
    NO_EFFECT,
    MAUVE,
    NOIR_BLANC,
    SATURATION,
    HULK,
    VERTICAL_FLIP,
    HORIZONTAL_FLIP,
    SHAGADELIC,
    VERTIGO,
    EDGE,
    DICE,
    WARP
  }
  [CCode (cprefix = "CHEESE_MEDIA_MODE_", has_type_id = false, cheader_filename 
= "cheese-fileutil.h")]
  public enum MediaMode
  {
    PHOTO,
    VIDEO,
    BURST
  }
  [CCode (cprefix = "CHEESE_WIDGET_STATE_", cheader_filename = 
"cheese-fileutil.h")]
  public enum WidgetState
  {
    NONE,
    READY,
    ERROR
  }
  [CCode (cheader_filename = "cheese-fileutil.h")]
  public const string PHOTO_NAME_SUFFIX;
  [CCode (cheader_filename = "cheese-fileutil.h")]
  public const string VIDEO_NAME_SUFFIX;
}

++++++ cheese-prefer-darkGTK+-theme.patch ++++++
>From e01861e0fffcba31de49c8266f49ea6861e26441 Mon Sep 17 00:00:00 2001
From: David King <amigad...@amigadave.com>
Date: Tue, 4 Oct 2011 10:49:54 +0200
Subject: [PATCH] Prefer a dark GTK+ theme, bug 660628

---
 src/cheese-main.vala |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/cheese-main.vala b/src/cheese-main.vala
index cf9bb42..0d1cd53 100644
--- a/src/cheese-main.vala
+++ b/src/cheese-main.vala
@@ -52,6 +52,11 @@ public class Cheese.Main : Gtk.Application
       main_window.present ();
     else
     {
+      // Prefer a dark GTK+ theme, bug 660628.
+      var gtk_settings = Gtk.Settings.get_default ();
+      if (gtk_settings != null)
+        gtk_settings.gtk_application_prefer_dark_theme = true;
+
       main_window = new Cheese.MainWindow ();
 
       Environment.set_application_name (_("Cheese"));
-- 
1.7.3.4
continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to