Mailinglist Archive: opensuse-commit (926 mails)
| < Previous | Next > |
commit gnome-python-desktop for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 08 Dec 2009 10:39:19 +0100
- Message-id: <20091208093919.C589C20233@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package gnome-python-desktop for
openSUSE:Factory
checked in at Tue Dec 8 10:39:19 CET 2009.
--------
--- gnome-python-desktop/gnome-python-desktop.changes 2009-09-24
14:13:39.000000000 +0200
+++
/mounts/work_src_done/STABLE/gnome-python-desktop/gnome-python-desktop.changes
2009-12-05 10:10:08.000000000 +0100
@@ -1,0 +2,13 @@
+Sat Dec 5 10:09:14 CET 2009 - vuntz@xxxxxxxxxxxx
+
+- Add gnome-python-desktop-brasero-api.patch to fix build with
+ latest brasero.
+
+-------------------------------------------------------------------
+Thu Dec 3 00:49:29 CET 2009 - vuntz@xxxxxxxxxxxx
+
+- Add gnome-python-desktop-evince-api.patch to compile with latest
+ evince.
+- Fix self-obsoletion of evolution-python.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gnome-python-desktop-brasero-api.patch
gnome-python-desktop-evince-api.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-python-desktop.spec ++++++
--- /var/tmp/diff_new_pack.MejKpB/_old 2009-12-08 10:37:48.000000000 +0100
+++ /var/tmp/diff_new_pack.MejKpB/_new 2009-12-08 10:37:48.000000000 +0100
@@ -39,14 +39,18 @@
BuildRequires: totem-pl-parser-devel
BuildRequires: update-desktop-files
Version: 2.28.0
-Release: 1
-Obsoletes: evolution-python <= 0.4
+Release: 2
Provides: evolution-python = 0.4
+Obsoletes: evolution-python < 0.4
Url: http://www.realistanew.com/projects/gnome-python-desktop
Group: System/GUI/GNOME
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Summary: Python modules for GNOME
Source: %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gnome-python-desktop-evince-api.patch bgo603659
vuntz@xxxxxxxxxxxx -- Adapt for evince soname bump
+Patch0: gnome-python-desktop-evince-api.patch
+# PATCH-FIX-UPSTREAM gnome-python-desktop-brasero-api.patch vuntz@xxxxxxxxxxxx
-- Taken from git
+Patch1: gnome-python-desktop-brasero-api.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{py_requires}
@@ -70,23 +74,8 @@
- metacity
-
-
-Authors:
---------
- Beno�t Dejean <TazForEver@xxxxxxxx>
- Gustavo Carneiro <gjc@xxxxxxxxxxxxx>
- James Henstridge <james@xxxxxxxxxx>
- Johan Dahlin <jdahlin@xxxxxxxxx>
- John Palmieri <johnp@xxxxxxxxxxxxxxx>
- Matt Wilson <msw@xxxxxxxxxx>
- I�igo Serna <inigoserna@xxxxxxxxxxxxxx>
- St�phan Kochen <stephan@xxxxxxxxx>
- Tiago Cogumbreiro <cogumbreiro@xxxxxxxxxxxx>
- Raphael Slinckx <raphael@xxxxxxxxxxx>
-
%package doc
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Group: System/GUI/GNOME
Summary: Python modules for GNOME
Requires: %{name} = %{version}
@@ -111,27 +100,15 @@
- metacity
-
-
-Authors:
---------
- Beno�t Dejean <TazForEver@xxxxxxxx>
- Gustavo Carneiro <gjc@xxxxxxxxxxxxx>
- James Henstridge <james@xxxxxxxxxx>
- Johan Dahlin <jdahlin@xxxxxxxxx>
- John Palmieri <johnp@xxxxxxxxxxxxxxx>
- Matt Wilson <msw@xxxxxxxxxx>
- I�igo Serna <inigoserna@xxxxxxxxxxxxxx>
- St�phan Kochen <stephan@xxxxxxxxx>
- Tiago Cogumbreiro <cogumbreiro@xxxxxxxxxxxx>
- Raphael Slinckx <raphael@xxxxxxxxxxx>
-
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
+autoreconf -f
%configure \
- --libexecdir=%{_prefix}/lib/%{name} \
+ --libexecdir=%{_libexecdir}/%{name} \
--enable-metacity
make %{?jobs:-j%jobs}
++++++ gnome-python-desktop-brasero-api.patch ++++++
From efc5f3049f4a1a82176cbf17754434db6cf16d40 Mon Sep 17 00:00:00 2001From: Frédéric Péters <fpeters@xxxxx>
Date: Sat, 28 Nov 2009 15:44:46 +0000
Subject: Do not expose BraseroTrackDataType any longer
https://bugzilla.gnome.org/show_bug.cgi?id=603231
---
diff --git a/braseroburn/brasero_burn.defs b/braseroburn/brasero_burn.defs
index 966c37c..205c172 100644
--- a/braseroburn/brasero_burn.defs
+++ b/braseroburn/brasero_burn.defs
@@ -337,19 +337,6 @@
)
)
-(define-enum TrackDataType
- (in-module "Brasero")
- (c-name "BraseroTrackDataType")
- (values
- '("none" "BRASERO_TRACK_TYPE_NONE")
- '("stream" "BRASERO_TRACK_TYPE_STREAM")
- '("data" "BRASERO_TRACK_TYPE_DATA")
- '("image" "BRASERO_TRACK_TYPE_IMAGE")
- '("disc" "BRASERO_TRACK_TYPE_DISC")
- )
-)
-
-
;; From brasero-blank-dialog.h
(define-function brasero_blank_dialog_get_type
@@ -1487,15 +1474,6 @@
)
)
-(define-method get_track_type
- (of-object "BraseroTrack")
- (c-name "brasero_track_get_track_type")
- (return-type "BraseroTrackDataType")
- (parameters
- '("BraseroTrackType*" "type")
- )
-)
-
(define-method get_status
(of-object "BraseroTrack")
(c-name "brasero_track_get_status")
--
cgit v0.8.2
++++++ gnome-python-desktop-evince-api.patch ++++++
Index: gnome-python-desktop-2.28.0/configure.ac
===================================================================
--- gnome-python-desktop-2.28.0.orig/configure.ac
+++ gnome-python-desktop-2.28.0/configure.ac
@@ -434,7 +434,7 @@ AM_CONDITIONAL(BUILD_EVOLUTION_ECAL, $bu
dnl should we build the evince module
AC_ARG_BINDING([evince],[YES])
if $build_evince; then
- PKG_CHECK_MODULES(EVINCE, [evince-document-2.25 evince-view-2.25],
+ PKG_CHECK_MODULES(EVINCE, [evince-document-2.29 evince-view-2.29],
build_evince=true,
build_evince=false)
if test -n "$export_dynamic"; then
Index: gnome-python-desktop-2.28.0/evince/evince.defs
===================================================================
--- gnome-python-desktop-2.28.0.orig/evince/evince.defs
+++ gnome-python-desktop-2.28.0/evince/evince.defs
@@ -39,12 +39,12 @@
(return-type "GtkWidget*")
)
-(define-method set_document
+(define-method set_model
(of-object "EvView")
- (c-name "ev_view_set_document")
+ (c-name "ev_view_set_model")
(return-type "none")
(parameters
- '("EvDocument*" "document")
+ '("EvDocumentModel*" "model")
)
)
@@ -182,7 +182,6 @@
(return-type "none")
(parameters
'("double" "factor")
- '("gboolean" "relative")
)
)
@@ -192,27 +191,6 @@
(return-type "double")
)
-(define-method set_screen_dpi
- (of-object "EvView")
- (c-name "ev_view_set_screen_dpi")
- (return-type "none")
- (parameters
- '("double" "dpi")
- )
-)
-
-(define-method set_zoom_for_size
- (of-object "EvView")
- (c-name "ev_view_set_zoom_for_size")
- (return-type "none")
- (parameters
- '("int" "width")
- '("int" "height")
- '("int" "vsb_width")
- '("int" "hsb_height")
- )
-)
-
(define-method rotate_left
(of-object "EvView")
(c-name "ev_view_rotate_left")
@@ -488,36 +466,203 @@
(return-type "GtkTreeModel*")
)
-;; From ev-page-cache.h
-;; XXX missing lots of methods on PageCache
+;; From ev-document-model.h
+;; XXX missing lots of methods on DocumentModel
-(define-object PageCache
+(define-object DocumentModel
(in-module "Ev")
- (c-name "EvPageCache")
+ (c-name "EvDocumentModel")
(parent "GObject")
- (gtype-id "EV_TYPE_PAGE_CACHE")
+ (gtype-id "EV_TYPE_DOCUMENT_MODEL")
)
-(define-method get_current_page
- (of-object "EvPageCache")
- (c-name "ev_page_cache_get_current_page")
- (return-type "int")
+(define-function document_model_new
+ (c-name "ev_document_model_new")
+ (is-constructor-of "EvDocumentModel")
+ (return-type "EvDocumentModel*")
)
-(define-method set_current_page
- (of-object "EvPageCache")
- (c-name "ev_page_cache_set_current_page")
+(define-function document_model_new_with_document
+ (c-name "ev_document_model_new_with_document")
+ (is-constructor-of "EvDocumentModel")
+ (return-type "EvDocumentModel*")
+ (parameters
+ '("EvDocument*" "document")
+ )
+)
+
+(define-method set_document
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_document")
(return-type "none")
(parameters
- '("int" "page")
+ '("EvDocument*" "document")
)
)
-;; XXX we stick this inside EvDocument??
-(define-method get_page_cache
- (of-object "EvDocument")
- (c-name "ev_page_cache_get")
- (return-type "EvPageCache*")
+(define-method get_document
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_document")
+ (return-type "EvDocument*")
+)
+
+(define-method set_page
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_page")
+ (return-type "none")
+ (parameters
+ '("gint" "page")
+ )
+)
+
+(define-method set_page_by_label
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_page_by_label")
+ (return-type "none")
+ (parameters
+ '("const-char*" "page_label")
+ )
+)
+
+(define-method get_page
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_page")
+ (return-type "gint")
+)
+
+(define-method set_scale
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_scale")
+ (return-type "none")
+ (parameters
+ '("gdouble" "scale")
+ )
+)
+
+(define-method get_scale
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_scale")
+ (return-type "gdouble")
+)
+
+(define-method set_max_scale
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_max_scale")
+ (return-type "none")
+ (parameters
+ '("gdouble" "max_scale")
+ )
+)
+
+(define-method get_max_scale
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_max_scale")
+ (return-type "gdouble")
+)
+
+(define-method set_min_scale
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_min_scale")
+ (return-type "none")
+ (parameters
+ '("gdouble" "min_scale")
+ )
+)
+
+(define-method get_min_scale
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_min_scale")
+ (return-type "gdouble")
+)
+
+(define-method set_sizing_mode
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_sizing_mode")
+ (return-type "none")
+ (parameters
+ '("EvSizingMode" "mode")
+ )
+)
+
+(define-method get_sizing_mode
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_sizing_mode")
+ (return-type "EvSizingMode")
+)
+
+(define-method set_rotation
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_rotation")
+ (return-type "none")
+ (parameters
+ '("gint" "rotation")
+ )
+)
+
+(define-method get_rotation
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_rotation")
+ (return-type "gint")
+)
+
+(define-method set_inverted_colors
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_inverted_colors")
+ (return-type "none")
+ (parameters
+ '("gboolean" "inverted_colors")
+ )
+)
+
+(define-method get_inverted_colors
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_inverted_colors")
+ (return-type "gboolean")
+)
+
+(define-method set_continuous
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_continuous")
+ (return-type "none")
+ (parameters
+ '("gboolean" "continuous")
+ )
+)
+
+(define-method get_continuous
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_continuous")
+ (return-type "gboolean")
+)
+
+(define-method set_dual_page
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_dual_page")
+ (return-type "none")
+ (parameters
+ '("gboolean" "dual_page")
+ )
+)
+
+(define-method get_dual_page
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_dual_page")
+ (return-type "gboolean")
+)
+
+(define-method set_fullscreen
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_set_fullscreen")
+ (return-type "none")
+ (parameters
+ '("gboolean" "fullscreen")
+ )
+)
+
+(define-method get_fullscreen
+ (of-object "EvDocumentModel")
+ (c-name "ev_document_model_get_fullscreen")
+ (return-type "gboolean")
)
;; From ev-document-info.c
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |