Hello community, here is the log from the commit of package brasero checked in at Mon Nov 17 16:45:00 CET 2008. -------- --- GNOME/brasero/brasero.changes 2008-09-15 16:30:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/brasero/brasero.changes 2008-11-12 19:05:39.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Nov 12 18:03:28 UTC 2008 - lmedinas@gmail.com + +- Bump to Brasero 0.8.3 + * Bug fix release. + * Add brasero-remove-oldtooltips.patch to remove + brasero-gtk-deprecated.patch. + * Add patch brasero-fix-discspace.patch, contains + important fixes for bgo #557561 #556449. + * Important bugs fixed. + * GUI revised. + * Enable new nautilus extension (depends of nautilus). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- brasero-0.8.2.tar.bz2 brasero-gtk-deprecated.patch New: ---- brasero-0.8.3.tar.bz2 brasero-fix-discspace.patch brasero-remove-oldtooltips.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brasero.spec ++++++ --- /var/tmp/diff_new_pack.ZW7816/_old 2008-11-17 16:42:47.000000000 +0100 +++ /var/tmp/diff_new_pack.ZW7816/_new 2008-11-17 16:42:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package brasero (Version 0.8.2) +# spec file for package brasero (Version 0.8.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,19 +19,19 @@ Name: brasero -Version: 0.8.2 +Version: 0.8.3 Release: 1 License: GPL v2 or later Group: Productivity/Multimedia/CD/Record Summary: CD/DVD burning application for GNOME Url: http://gnome.org/projects/brasero Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE brasero-gtk-deprecated.patch -- Brasero depends on deprecated GTK+ code, so remove -DGTK_DISABLE_DEPRECATED from the build -Patch0: brasero-gtk-deprecated.patch +Patch0: brasero-remove-oldtooltips.patch +Patch1: brasero-fix-discspace.patch AutoReqProv: on PreReq: filesystem gconf2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gnome-doc-utils-devel gstreamer010-devel gstreamer010-plugins-base-devel libbeagle-devel libgnomeui-devel perl-XML-Parser totem-pl-parser-devel update-desktop-files +BuildRequires: eel-devel gnome-doc-utils-devel gstreamer010-devel gstreamer010-plugins-base-devel libbeagle-devel libgnomeui-devel nautilus-devel perl-XML-Parser totem-pl-parser-devel update-desktop-files BuildRequires: gtk-doc intltool Requires: gstreamer010 gstreamer010-plugins-base gstreamer010-plugins-base-oil gstreamer010-plugins-good Requires: %{name}-lang = %{version} @@ -76,7 +76,8 @@ %lang_package %prep %setup -q -%patch0 +%patch0 -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing" @@ -88,12 +89,14 @@ --disable-scrollkeeper \ --enable-search \ --enable-playlist \ + --enable-nautilus \ --disable-schemas-install make %{?jobs:-j%jobs} %install %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/brasero/plugins/*.*a +rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.*a %suse_update_desktop_file -N "Brasero" -r %{name} GNOME GTK AudioVideo DiscBurning %find_lang %{name} %find_gconf_schemas @@ -145,6 +148,7 @@ %{_datadir}/icons/hicolor/*/apps/brasero.* %{_datadir}/mime/packages/brasero.xml %doc %{_mandir}/man?/*.* +%{_libdir}/nautilus/extensions-2.0/*.so %files doc %defattr(-,root,root) @@ -153,6 +157,16 @@ %files lang -f %{name}.lang %changelog +* Wed Nov 12 2008 lmedinas@gmail.com +- Bump to Brasero 0.8.3 + * Bug fix release. + * Add brasero-remove-oldtooltips.patch to remove + brasero-gtk-deprecated.patch. + * Add patch brasero-fix-discspace.patch, contains + important fixes for bgo #557561 #556449. + * Important bugs fixed. + * GUI revised. + * Enable new nautilus extension (depends of nautilus). * Mon Sep 15 2008 abockover@suse.de - Updated to Brasero 0.8.2 * Bug-fix-only release ++++++ brasero-0.8.2.tar.bz2 -> brasero-0.8.3.tar.bz2 ++++++ ++++ 203646 lines of diff (skipped) ++++++ brasero-fix-discspace.patch ++++++ --- trunk/src/burn-medium.c 2008/10/30 14:31:57 1446 +++ trunk/src/burn-medium.c 2008/11/10 15:04:37 1510 @@ -1498,6 +1498,46 @@ } static BraseroBurnResult +brasero_medium_track_set_leadout_CDR_blank (BraseroMedium *self, + BraseroDeviceHandle *handle, + BraseroMediumTrack *leadout, + BraseroScsiErrCode *code) +{ + BraseroScsiAtipData *atip = NULL; + BraseroMediumPrivate *priv; + BraseroScsiResult result; + int size = 0; + + priv = BRASERO_MEDIUM_PRIVATE (self); + + BRASERO_BURN_LOG ("Using fallback method for blank CDR to retrieve NWA and leadout information"); + + /* NWA is easy for blank CDRs, it's 0. So far, so good... */ + priv->next_wr_add = 0; + + result = brasero_mmc1_read_atip (handle, &atip, &size, code); + if (result != BRASERO_SCSI_OK) { + BRASERO_BURN_LOG ("READ ATIP failed"); + return BRASERO_BURN_ERR; + } + + leadout->blocks_num = atip->desc->leadout_mn * 60 * 75 + + atip->desc->leadout_sec * 75 + + atip->desc->leadout_frame; + + /* of course it starts at 0 since it's empty */ + leadout->start = 0; + + BRASERO_BURN_LOG ("Leadout (through READ ATIP): start = %llu size = %llu", + leadout->start, + leadout->blocks_num); + + g_free (atip); + + return BRASERO_BURN_OK; +} + +static BraseroBurnResult brasero_medium_track_set_leadout (BraseroMedium *self, BraseroDeviceHandle *handle, BraseroMediumTrack *leadout, @@ -1531,8 +1571,25 @@ if (result == BRASERO_SCSI_OK) { wrt_page = (BraseroScsiWritePage *) &data->page; - BRASERO_BURN_LOG ("Former write mode %d", wrt_page->write_type); + BRASERO_BURN_LOG ("Former write type %d", wrt_page->write_type); + BRASERO_BURN_LOG ("Former track mode %d", wrt_page->track_mode); + BRASERO_BURN_LOG ("Former data block type %d", wrt_page->data_block_type); + + /* "reset some stuff to be on the safe side" (words and ideas + * taken from k3b:)). */ + wrt_page->ps = 0; + wrt_page->BUFE = 0; + wrt_page->multisession = 0; + wrt_page->testwrite = 0; + wrt_page->LS_V = 0; + wrt_page->copy = 0; + wrt_page->FP = 0; + wrt_page->session_format = 0; + BRASERO_SET_16 (wrt_page->pause_len, 150); + wrt_page->write_type = BRASERO_SCSI_WRITE_TAO; + wrt_page->track_mode = 4; /* should be 5 for DVD-R(W) */ + wrt_page->data_block_type = 8; result = brasero_spc1_mode_select (handle, data, size, code); g_free (data); @@ -1540,6 +1597,13 @@ if (result != BRASERO_SCSI_OK) { BRASERO_BURN_LOG ("MODE SELECT failed"); + /* This only for CD-R */ + if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_CDR|BRASERO_MEDIUM_BLANK)) + return brasero_medium_track_set_leadout_CDR_blank (self, + handle, + leadout, + code); + /* This isn't necessarily a problem! we better try */ // return BRASERO_BURN_ERR; } @@ -1547,6 +1611,13 @@ else { BRASERO_BURN_LOG ("MODE SENSE failed"); + /* This only for CD-R */ + if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_CDR|BRASERO_MEDIUM_BLANK)) + return brasero_medium_track_set_leadout_CDR_blank (self, + handle, + leadout, + code); + /* This isn't necessarily a problem we better! try the rest */ // return BRASERO_BURN_ERR; } @@ -1580,6 +1651,13 @@ code); if (result != BRASERO_SCSI_OK) { + /* This only for CD-R */ + if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_CDR|BRASERO_MEDIUM_BLANK)) + return brasero_medium_track_set_leadout_CDR_blank (self, + handle, + leadout, + code); + BRASERO_BURN_LOG ("READ TRACK INFO failed"); return BRASERO_BURN_ERR; } --- trunk/src/scsi-write-page.h 2008/09/03 13:41:19 1240 +++ trunk/src/scsi-write-page.h 2008/11/10 15:04:37 1510 @@ -51,7 +51,7 @@ uchar FP :1; uchar multisession :2; - uchar book_type :4; + uchar data_block_type :4; uchar reserved2 :4; uchar link_size; @@ -102,7 +102,7 @@ uchar track_mode :4; uchar reserved2 :4; - uchar book_type :4; + uchar data_block_type :4; uchar link_size; ++++++ brasero-remove-oldtooltips.patch ++++++ --- trunk/nautilus/nautilus-burn-bar.c 2008/11/05 12:58:21 1472 +++ trunk/nautilus/nautilus-burn-bar.c 2008/11/11 19:55:06 1517 @@ -35,7 +35,6 @@ struct NautilusBurnBarPrivate { - GtkTooltips *tooltips; GtkWidget *button; }; @@ -130,10 +129,6 @@ bar->priv = NAUTILUS_BURN_BAR_GET_PRIVATE (bar); - bar->priv->tooltips = gtk_tooltips_new (); - g_object_ref (bar->priv->tooltips); - gtk_object_sink (GTK_OBJECT (bar->priv->tooltips)); - hbox = GTK_WIDGET (bar); label = gtk_label_new (_("CD/DVD Creator Folder")); @@ -148,10 +143,8 @@ G_CALLBACK (button_clicked_cb), bar); - gtk_tooltips_set_tip (GTK_TOOLTIPS (bar->priv->tooltips), - bar->priv->button, - _("Write contents to a CD or DVD disc"), - NULL); + gtk_widget_set_tooltip_text (bar->priv->button, _("Write contents to a CD or DVD disc")); + } static void @@ -166,10 +159,6 @@ g_return_if_fail (bar->priv != NULL); - if (bar->priv->tooltips != NULL) { - g_object_unref (bar->priv->tooltips); - } - G_OBJECT_CLASS (nautilus_burn_bar_parent_class)->finalize (object); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org