r26047 - in /desktop/experimental/totem/debian: changelog control control.in patches/02_gtk_build_fixes.patch patches/03_more_gtk_build_fixes.patch patches/series totem-common.install
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Dec 19 02:42:58 UTC 2010
Author: pochu
Date: Sun Dec 19 02:42:58 2010
New Revision: 26047
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26047
Log:
- debian/patches/02_gtk_build_fixes.patch,
debian/patches/03_more_gtk_build_fixes.patch:
+ Patches from upstream git, fix build with latest GTK+ 3.
- debian/totem-common.install:
+ Don't install the gconf schemas, they're gone. Install the
gsettings files instead.
Added:
desktop/experimental/totem/debian/patches/02_gtk_build_fixes.patch
desktop/experimental/totem/debian/patches/03_more_gtk_build_fixes.patch
Modified:
desktop/experimental/totem/debian/changelog
desktop/experimental/totem/debian/control
desktop/experimental/totem/debian/control.in
desktop/experimental/totem/debian/patches/series
desktop/experimental/totem/debian/totem-common.install
Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=26047&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog [utf-8] (original)
+++ desktop/experimental/totem/debian/changelog [utf-8] Sun Dec 19 02:42:58 2010
@@ -13,9 +13,15 @@
+ Removed, no longer needed.
- debian/patches/70_bbc_plugin.patch:
+ Disabled, needs porting.
+ - debian/patches/02_gtk_build_fixes.patch,
+ debian/patches/03_more_gtk_build_fixes.patch:
+ + Patches from upstream git, fix build with latest GTK+ 3.
- debian/control.in:
+ Updated build dependencies and dependencies.
+ Removed transitional totem-xine and totem-gstreamer packages.
+ - debian/totem-common.install:
+ + Don't install the gconf schemas, they're gone. Install the
+ gsettings files instead.
* debian/rules,
debian/control.in,
debian/source/format:
Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=26047&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control [utf-8] (original)
+++ desktop/experimental/totem/debian/control [utf-8] Sun Dec 19 02:42:58 2010
@@ -10,14 +10,14 @@
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.51~),
cdbs,
- quilt,
python-support (>= 0.6),
libepc-ui-dev (>= 0.3.0),
libglib2.0-dev (>= 2.25.11),
libatk1.0-dev (>= 1.29.4),
- libgtk3.0-dev (>= 2.90.7),
+ libgtk3.0-dev (>= 2.91.6),
libtotem-plparser-dev (>= 2.29.1),
libsoup2.4-dev,
+ libpeas-dev (>= 0.7.0),
libxml2-dev (>= 2.6.0),
libtracker-client-0.8-dev (>= 0.8.1),
liblircclient-dev (>= 0.6.6),
@@ -31,7 +31,7 @@
gstreamer0.10-plugins-good,
librsvg2-dev (>= 2.16.0-2),
librsvg2-common (>= 2.16.0-2),
- libnautilus-extension-dev (>= 2.22),
+ libnautilus-extension-dev (>= 2.91.4),
libmusicbrainz4-dev (>= 2.1.1-4.1),
gnome-icon-theme (>= 2.15.90),
libdbus-glib-1-dev (>= 0.61),
@@ -41,7 +41,7 @@
dpkg-dev (>= 1.13.19),
shared-mime-info (>= 0.22),
libhal-dev (>= 0.5),
- libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+ libcam-dev [kfreebsd-any],
libxtst-dev,
libxrandr-dev (>= 1.1.1),
libxxf86vm-dev (>= 1.0.1),
@@ -50,7 +50,9 @@
gnome-doc-utils,
libbluetooth-dev [linux-any],
libgalago-dev (>= 0.5.2),
- libgdata-dev (>= 0.6.0)
+ libgdata-dev (>= 0.6.0),
+ gobject-introspection (>= 0.9.12-4~),
+ libgirepository1.0-dev (>= 0.9.12)
Standards-Version: 3.8.4
Homepage: http://www.gnome.org/projects/totem/
Modified: desktop/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=26047&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in [utf-8] (original)
+++ desktop/experimental/totem/debian/control.in [utf-8] Sun Dec 19 02:42:58 2010
@@ -9,9 +9,10 @@
libepc-ui-dev (>= 0.3.0),
libglib2.0-dev (>= 2.25.11),
libatk1.0-dev (>= 1.29.4),
- libgtk3.0-dev (>= 2.90.7),
+ libgtk3.0-dev (>= 2.91.6),
libtotem-plparser-dev (>= 2.29.1),
libsoup2.4-dev,
+ libpeas-dev (>= 0.7.0),
libxml2-dev (>= 2.6.0),
libtracker-client-0.8-dev (>= 0.8.1),
liblircclient-dev (>= 0.6.6),
@@ -25,7 +26,7 @@
gstreamer0.10-plugins-good,
librsvg2-dev (>= 2.16.0-2),
librsvg2-common (>= 2.16.0-2),
- libnautilus-extension-dev (>= 2.22),
+ libnautilus-extension-dev (>= 2.91.4),
libmusicbrainz4-dev (>= 2.1.1-4.1),
gnome-icon-theme (>= 2.15.90),
libdbus-glib-1-dev (>= 0.61),
@@ -35,7 +36,7 @@
dpkg-dev (>= 1.13.19),
shared-mime-info (>= 0.22),
libhal-dev (>= 0.5),
- libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+ libcam-dev [kfreebsd-any],
libxtst-dev,
libxrandr-dev (>= 1.1.1),
libxxf86vm-dev (>= 1.0.1),
@@ -44,7 +45,9 @@
gnome-doc-utils,
libbluetooth-dev [linux-any],
libgalago-dev (>= 0.5.2),
- libgdata-dev (>= 0.6.0)
+ libgdata-dev (>= 0.6.0),
+ gobject-introspection (>= 0.9.12-4~),
+ libgirepository1.0-dev (>= 0.9.12)
Standards-Version: 3.8.4
Homepage: http://www.gnome.org/projects/totem/
Added: desktop/experimental/totem/debian/patches/02_gtk_build_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/02_gtk_build_fixes.patch?rev=26047&op=file
==============================================================================
--- desktop/experimental/totem/debian/patches/02_gtk_build_fixes.patch (added)
+++ desktop/experimental/totem/debian/patches/02_gtk_build_fixes.patch [utf-8] Sun Dec 19 02:42:58 2010
@@ -1,0 +1,88 @@
+From 6041c95a252ef493c4cded16ac6fed0f8fe9ad3c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Fri, 03 Dec 2010 00:19:21 +0000
+Subject: backend: Fix for latest GTK+ 3.x breakage
+
+---
+diff --git a/src/backend/bacon-resize.c b/src/backend/bacon-resize.c
+index d067aac..208dc66 100644
+--- a/src/backend/bacon-resize.c
++++ b/src/backend/bacon-resize.c
+@@ -187,7 +187,7 @@ set_video_widget (BaconResize *resize, GtkWidget *video_widget)
+ goto bail;
+
+ /* We don't use the output here, checking whether XRRGetScreenInfo works */
+- xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)));
++ xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY (display), gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)));
+ if (xr_screen_conf == NULL)
+ goto bail;
+
+@@ -227,7 +227,7 @@ bacon_resize_resize (BaconResize *resize)
+ g_return_if_fail (GTK_IS_WIDGET (resize->priv->video_widget));
+ g_return_if_fail (gtk_widget_get_realized (resize->priv->video_widget));
+
+- xdisplay = GDK_DRAWABLE_XDISPLAY (gtk_widget_get_window (GTK_WIDGET (resize->priv->video_widget)));
++ xdisplay = gdk_x11_display_get_xdisplay (gdk_window_get_display (gtk_widget_get_window (GTK_WIDGET (resize->priv->video_widget))));
+ if (xdisplay == NULL)
+ return;
+
+@@ -254,7 +254,7 @@ bacon_resize_resize (BaconResize *resize)
+ gdk_error_trap_push ();
+
+ /* Find the XRandR mode that corresponds to the real size */
+- resize->priv->xr_screen_conf = XRRGetScreenInfo (xdisplay, GDK_WINDOW_XWINDOW (root));
++ resize->priv->xr_screen_conf = XRRGetScreenInfo (xdisplay, gdk_x11_window_get_xid (root));
+ xr_sizes = XRRConfigSizes (resize->priv->xr_screen_conf, &xr_nsize);
+ resize->priv->xr_original_size = XRRConfigCurrentConfiguration (resize->priv->xr_screen_conf, &(resize->priv->xr_current_rotation));
+ if (gdk_error_trap_pop ()) {
+@@ -275,7 +275,7 @@ bacon_resize_resize (BaconResize *resize)
+ gdk_error_trap_push ();
+ XRRSetScreenConfig (xdisplay,
+ resize->priv->xr_screen_conf,
+- GDK_WINDOW_XWINDOW (root),
++ gdk_x11_window_get_xid (root),
+ (SizeID) i,
+ resize->priv->xr_current_rotation,
+ CurrentTime);
+@@ -308,7 +308,7 @@ bacon_resize_restore (BaconResize *resize)
+ if (resize->priv->xr_screen_conf == NULL)
+ return;
+
+- xdisplay = GDK_DRAWABLE_XDISPLAY (gtk_widget_get_window (GTK_WIDGET (resize->priv->video_widget)));
++ xdisplay = gdk_x11_display_get_xdisplay (gdk_window_get_display (gtk_widget_get_window (GTK_WIDGET (resize->priv->video_widget))));
+ if (xdisplay == NULL)
+ return;
+
+@@ -330,7 +330,7 @@ bacon_resize_restore (BaconResize *resize)
+ gdk_error_trap_push ();
+ XRRSetScreenConfig (xdisplay,
+ resize->priv->xr_screen_conf,
+- GDK_WINDOW_XWINDOW (root),
++ gdk_x11_window_get_xid (root),
+ resize->priv->xr_original_size,
+ resize->priv->xr_current_rotation,
+ CurrentTime);
+diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
+index 17c68c1..d15b3da 100644
+--- a/src/backend/bacon-video-widget-gst-0.10.c
++++ b/src/backend/bacon-video-widget-gst-0.10.c
+@@ -727,7 +727,7 @@ bacon_video_widget_draw (GtkWidget *widget, cairo_t *cr)
+
+ g_mutex_unlock (bvw->priv->lock);
+
+- window = GDK_WINDOW_XWINDOW (bvw->priv->video_window);
++ window = gdk_x11_window_get_xid (bvw->priv->video_window);
+
+ if (xoverlay != NULL && GST_IS_X_OVERLAY (xoverlay))
+ gst_x_overlay_set_xwindow_id (xoverlay, window);
+@@ -6669,7 +6669,7 @@ bvw_element_msg_sync (GstBus *bus, GstMessage *msg, gpointer data)
+ g_return_if_fail (bvw->priv->xoverlay != NULL);
+ g_return_if_fail (bvw->priv->video_window != NULL);
+
+- window = GDK_WINDOW_XWINDOW (bvw->priv->video_window);
++ window = gdk_x11_window_get_xid (bvw->priv->video_window);
+ gst_x_overlay_set_xwindow_id (bvw->priv->xoverlay, window);
+ }
+ }
+--
+cgit v0.8.3.1
Added: desktop/experimental/totem/debian/patches/03_more_gtk_build_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/03_more_gtk_build_fixes.patch?rev=26047&op=file
==============================================================================
--- desktop/experimental/totem/debian/patches/03_more_gtk_build_fixes.patch (added)
+++ desktop/experimental/totem/debian/patches/03_more_gtk_build_fixes.patch [utf-8] Sun Dec 19 02:42:58 2010
@@ -1,0 +1,21 @@
+From 74adcc6e1d350ff6e74d6031e0ae709aca52d3fd Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 06 Dec 2010 13:28:38 +0000
+Subject: brasero: Fixes for latest GTK+ 3.x changes
+
+---
+diff --git a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
+index bae55e0..aa0875b 100644
+--- a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
++++ b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
+@@ -96,7 +96,7 @@ totem_disc_recorder_plugin_start_burning (TotemDiscRecorderPlugin *pi,
+
+ main_window = totem_get_main_window (pi->priv->totem);
+ screen = gtk_widget_get_screen (GTK_WIDGET (main_window));
+- xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (gtk_widget_get_window (GTK_WIDGET (main_window))));
++ xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (main_window)));
+ xid_str = g_strdup_printf ("%d", xid);
+ g_ptr_array_add (array, (gpointer) "-x");
+ g_ptr_array_add (array, xid_str);
+--
+cgit v0.8.3.1
Modified: desktop/experimental/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/series?rev=26047&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/series [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/series [utf-8] Sun Dec 19 02:42:58 2010
@@ -1,2 +1,4 @@
01_fake_keypresses.patch
+02_gtk_build_fixes.patch
+03_more_gtk_build_fixes.patch
#70_bbc_plugin.patch
Modified: desktop/experimental/totem/debian/totem-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/totem-common.install?rev=26047&op=diff
==============================================================================
--- desktop/experimental/totem/debian/totem-common.install [utf-8] (original)
+++ desktop/experimental/totem/debian/totem-common.install [utf-8] Sun Dec 19 02:42:58 2010
@@ -6,4 +6,5 @@
debian/tmp/usr/share/omf
debian/tmp/usr/share/gtk-doc
debian/tmp/usr/share/totem
-debian/tmp/etc/gconf
+debian/tmp/usr/share/GConf
+debian/tmp/usr/share/glib-2.0
More information about the pkg-gnome-commits
mailing list