Hello community, here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2012-08-07 21:52:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gvfs (Old) and /work/SRC/openSUSE:Factory/.gvfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gvfs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2012-08-07 08:07:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes 2012-08-07 21:52:14.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 6 19:30:09 UTC 2012 - [email protected] + +- Add gvfs-cdda.patch: Fix build with libcdio_paranoia 0.83 + (bnc#774636). +- Re-enable cdda backend by setting with_cdda %define to 1 +- Replace libcdio-devel BuildRequires with + pkgconfig(libdio_paranoia), which is what configure checks for. + +------------------------------------------------------------------- New: ---- gvfs-cdda.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.YNvuJw/_old 2012-08-07 21:52:15.000000000 +0200 +++ /var/tmp/diff_new_pack.YNvuJw/_new 2012-08-07 21:52:15.000000000 +0200 @@ -17,7 +17,7 @@ %define with_udisks2 1 -%define with_cdda 0 +%define with_cdda 1 Name: gvfs Version: 1.12.3 @@ -32,6 +32,8 @@ Patch5: gvfs-nvvfs.patch # PATCH-FEATURE-OPENSUSE gvfs-nds.patch [email protected] -- Provides NDS browsing for nautilus Patch6: gvfs-nds.patch +# PATCH-FIX-UPSTREAM gvfs-cdda.patch bgo#678257 [email protected] -- Fix build with libcdio 0.83, where the CDText API changed. +Patch7: gvfs-cdda.patch BuildRequires: bluez-devel BuildRequires: dbus-1-glib-devel BuildRequires: fuse-devel @@ -40,7 +42,7 @@ BuildRequires: libarchive-devel BuildRequires: libavahi-glib-devel %if %{with_cdda} -BuildRequires: libcdio-devel +BuildRequires: pkgconfig(libcdio_paranoia) >= 0.78.2 %endif BuildRequires: libexpat-devel BuildRequires: libgcrypt-devel @@ -129,6 +131,7 @@ translation-update-upstream %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build autoreconf -f ++++++ gvfs-cdda.patch ++++++ diff --git a/daemon/gvfsbackendcdda.c b/daemon/gvfsbackendcdda.c index 6f009c7..5abbbf1 100644 --- a/daemon/gvfsbackendcdda.c +++ b/daemon/gvfsbackendcdda.c @@ -169,11 +169,11 @@ fetch_metadata (GVfsBackendCdda *cdda_backend) if (!cdio) return; - cdtext = cdio_get_cdtext(cdio, 0); + cdtext = cdio_get_cdtext(cdio); if (cdtext) { - cdda_backend->album_title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext)); - cdda_backend->album_artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext)); - cdda_backend->genre = g_strdup (cdtext_get (CDTEXT_GENRE, cdtext)); + cdda_backend->album_title = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_TITLE, 0)); + cdda_backend->album_artist = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_PERFORMER, 0)); + cdda_backend->genre = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_GENRE, 0)); } cdtrack = cdio_get_first_track_num(cdio); @@ -182,10 +182,10 @@ fetch_metadata (GVfsBackendCdda *cdda_backend) for ( ; cdtrack < last_cdtrack; cdtrack++ ) { GVfsBackendCddaTrack *track; track = g_new0 (GVfsBackendCddaTrack, 1); - cdtext = cdio_get_cdtext(cdio, cdtrack); + cdtext = cdio_get_cdtext(cdio); if (cdtext) { - track->title = g_strdup (cdtext_get (CDTEXT_TITLE, cdtext)); - track->artist = g_strdup (cdtext_get (CDTEXT_PERFORMER, cdtext)); + track->title = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_TITLE, cdtrack)); + track->artist = g_strdup (cdtext_get (cdtext, CDTEXT_FIELD_PERFORMER, cdtrack)); } track->duration = cdio_get_track_sec_count (cdio, cdtrack) / CDIO_CD_FRAMES_PER_SEC; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
