Hello community, here is the log from the commit of package totem for openSUSE:Factory checked in at Mon Jul 11 12:19:58 CEST 2011.
-------- --- GNOME/totem/totem.changes 2011-05-27 17:34:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/totem/totem.changes 2011-07-07 09:23:33.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Jul 7 08:26:29 CEST 2011 - [email protected] + +- Add totem-libgdata-0.9.patch: fix build against libgdata 0.9.x, + taken from git. Add call to gnome-autogen.sh to have it taken + into account. +- Add totem-gdk-multibackend.patch: fix detection of gdk backend to + support GTK+ built with multiple backends, taken from git. +- Stop building the tracker plugin to fix build: + + it got removed upstream in git, so it will be gone in the next + version anyway; and the current version requires tracker 0.10 + while we moved to 0.11. + + remove pkgconfig(tracker-client-0.10) BuildRequires (or + pkgconfig(tracker-client-0.8) on old versions). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- totem-gdk-multibackend.patch totem-libgdata-0.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.ooFw0Z/_old 2011-07-11 12:19:36.000000000 +0200 +++ /var/tmp/diff_new_pack.ooFw0Z/_new 2011-07-11 12:19:36.000000000 +0200 @@ -24,12 +24,17 @@ License: GPLv2+ ; LGPLv2.1+ Group: Productivity/Multimedia/Video/Players Version: 3.1.0 -Release: 1 +Release: 2 Url: http://www.gnome.org/projects/totem/ Summary: Movie Player for the GNOME Desktop Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM totem-libgdata-0.9.patch [email protected] -- Taken from git, build against libgdata 0.9 +Patch0: totem-libgdata-0.9.patch +# PATCH-FIX-UPSTREAM totem-gdk-multibackend.patch [email protected] -- Taken from git, fix gdk backend detection +Patch1: totem-gdk-multibackend.patch BuildRequires: fdupes BuildRequires: gcc-c++ +# Needed for patch0 and patch1 BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: gstreamer-0_10-plugins-good @@ -64,11 +69,6 @@ BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(totem-plparser) -%if 0%{?suse_version} <= 1130 -BuildRequires: pkgconfig(tracker-client-0.8) -%else -BuildRequires: pkgconfig(tracker-client-0.10) -%endif BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zeitgeist-1.0) @@ -196,8 +196,11 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 +%patch1 -p1 %build +NOCONFIGURE=1 gnome-autogen.sh export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins %configure\ --disable-static\ @@ -302,7 +305,6 @@ %{_libdir}/totem/plugins/screensaver/ %{_libdir}/totem/plugins/screenshot/ %{_libdir}/totem/plugins/skipto/ -%{_libdir}/totem/plugins/tracker/ %{_libdir}/totem/plugins/youtube/ %{_datadir}/GConf/gsettings/jamendo.convert %{_datadir}/GConf/gsettings/opensubtitles.convert ++++++ totem-gdk-multibackend.patch ++++++ >From 870b8a95cdfcbc45cd9c02b9f141ad50a074f798 Mon Sep 17 00:00:00 2001 From: Vincent Untz <[email protected]> Date: Wed, 06 Jul 2011 08:27:39 +0000 Subject: build: Fix detection of GDK backend in case of multiple backends The GDK backend detection routine only worked in the case where GTK+ is built for one and only one backend. https://bugzilla.gnome.org/show_bug.cgi?id=654070 --- diff --git a/configure.in b/configure.in index 33d923f..3b4ea4d 100644 --- a/configure.in +++ b/configure.in @@ -238,52 +238,57 @@ dnl ************************* dnl X11 related functionality dnl ************************* have_x11=no -if test x$(pkg-config --variable=targets gtk+-3.0) = xx11; then - AC_PATH_X +gdk_targets=$(pkg-config --variable=targets gtk+-3.0) +for gdk_target in $gdk_targets; do + if test x$gdk_target = xx11; then + AC_PATH_X - have_x11=yes + have_x11=yes - if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then - X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"` - fi - if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then - X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"` - fi - CFLAGS="$X_INCLUDES $CFLAGS" - LIBS="$X_LIBRARIES $LIBS" - - XTEST_LIBS="" - enable_xtest=no - AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, - XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES" - enable_xtest=yes - AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]), - , - $X_LIBRARIES) - AC_SUBST(XTEST_LIBS) - - X_LIBS="" - - dnl Explicitely link against libX11 to avoid problems with crappy linkers - X_LIBS="$X_LIBRARIES -lX11" - AC_SUBST(X_LIBS) - - dnl Multimedia keys - have_xfree=no - AC_COMPILE_IFELSE([ - #include <X11/XF86keysym.h> - int main(int argc,char **argv) { - return 0; - } - ], - have_xfree=yes - ) - AC_MSG_CHECKING(for X11 XFree86 headers) - AC_MSG_RESULT([$have_xfree]) - if test x"$have_xfree" = "xyes" ; then - AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h]) + if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then + X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"` + fi + if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then + X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"` + fi + CFLAGS="$X_INCLUDES $CFLAGS" + LIBS="$X_LIBRARIES $LIBS" + + XTEST_LIBS="" + enable_xtest=no + AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, + XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES" + enable_xtest=yes + AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]), + , + $X_LIBRARIES) + AC_SUBST(XTEST_LIBS) + + X_LIBS="" + + dnl Explicitely link against libX11 to avoid problems with crappy linkers + X_LIBS="$X_LIBRARIES -lX11" + AC_SUBST(X_LIBS) + + dnl Multimedia keys + have_xfree=no + AC_COMPILE_IFELSE([ + #include <X11/XF86keysym.h> + int main(int argc,char **argv) { + return 0; + } + ], + have_xfree=yes + ) + AC_MSG_CHECKING(for X11 XFree86 headers) + AC_MSG_RESULT([$have_xfree]) + if test x"$have_xfree" = "xyes" ; then + AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h]) + fi + + break fi -fi +done dnl ================================================================ dnl Plugins support -- cgit v0.9 ++++++ totem-libgdata-0.9.patch ++++++ >From 05ba9e12ddcfb12bc2af695726e24712a2767ea0 Mon Sep 17 00:00:00 2001 From: Philip Withnall <[email protected]> Date: Mon, 20 Jun 2011 17:23:30 +0000 Subject: youtube: Add optional support for compiling against libgdata 0.9.x This migrates Totem to the API changes in libgdata 0.9.0 and (unreleased) 0.9.1 if they're available. --- diff --git a/configure.in b/configure.in index 178976d..ec81d4a 100644 --- a/configure.in +++ b/configure.in @@ -481,6 +481,13 @@ for plugin in ${used_plugins}; do AC_DEFINE([HAVE_LIBGDATA_0_7],[1],[Define if libgdata >= 0.7.0 is available]) fi + # For the API breaks in libgdata 0.9. Remove this once we depend on libgdata >= 0.9.1 + PKG_CHECK_MODULES(LIBGDATA_0_9, libgdata >= 0.9.1, + [HAVE_LIBGDATA_0_9=yes], [HAVE_LIBGDATA_0_9=no]) + if test "${HAVE_LIBGDATA_0_9}" = "yes" ; then + AC_DEFINE([HAVE_LIBGDATA_0_9],[1],[Define if libgdata >= 0.9.1 is available]) + fi + PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, [HAVE_LIBSOUP=yes], [HAVE_LIBSOUP=no]) if test "${HAVE_LIBSOUP}" != "yes" ; then diff --git a/src/plugins/youtube/totem-youtube.c b/src/plugins/youtube/totem-youtube.c index 710ce75..bc19a2a 100644 --- a/src/plugins/youtube/totem-youtube.c +++ b/src/plugins/youtube/totem-youtube.c @@ -591,6 +591,17 @@ execute_query (TotemYouTubePlugin *self, guint tree_view, gboolean clear_tree_vi if (clear_tree_view == TRUE) gtk_list_store_clear (self->priv->list_store[tree_view]); +#ifdef HAVE_LIBGDATA_0_9 + if (tree_view == SEARCH_TREE_VIEW) { + gdata_youtube_service_query_videos_async (self->priv->service, self->priv->query[tree_view], data->query_cancellable, + (GDataQueryProgressCallback) query_progress_cb, data, NULL, + (GAsyncReadyCallback) query_finished_cb, data); + } else { + gdata_youtube_service_query_related_async (self->priv->service, self->priv->playing_video, self->priv->query[tree_view], + data->query_cancellable, (GDataQueryProgressCallback) query_progress_cb, data, NULL, + (GAsyncReadyCallback) query_finished_cb, data); + } +#else if (tree_view == SEARCH_TREE_VIEW) { gdata_youtube_service_query_videos_async (self->priv->service, self->priv->query[tree_view], data->query_cancellable, (GDataQueryProgressCallback) query_progress_cb, data, @@ -600,6 +611,7 @@ execute_query (TotemYouTubePlugin *self, guint tree_view, gboolean clear_tree_vi data->query_cancellable, (GDataQueryProgressCallback) query_progress_cb, data, (GAsyncReadyCallback) query_finished_cb, data); } +#endif /* !HAVE_LIBGDATA_0_9 */ } void @@ -634,7 +646,11 @@ search_button_clicked_cb (GtkButton *button, TotemYouTubePlugin *self) g_assert (priv->regex != NULL); /* Set up the GData service (needed for the tree views' queries) */ +#ifdef HAVE_LIBGDATA_0_9 + priv->service = gdata_youtube_service_new (DEVELOPER_KEY, NULL); +#else priv->service = gdata_youtube_service_new (DEVELOPER_KEY, CLIENT_ID); +#endif /* !HAVE_LIBGDATA_0_9 */ /* Set up network timeouts, if they're supported by our version of libgdata. * This will return from queries with %GDATA_SERVICE_ERROR_NETWORK_ERROR if network operations take longer than 30 seconds. */ -- cgit v0.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
