Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-05-30 Lin Ma <[email protected]>
authorlin
Sat, 30 May 2009 14:43:04 +0000
changeset 15817 f79178a554a7
parent 15816 1fdd96341078
child 15818 c5b0bb1d5165
2009-05-30 Lin Ma <[email protected]> * SUNWgnome-cd-burner.spec: Bump to 2.26.2 * patches/brasero-02-load-by-gksu.diff: Updated and reordered, fixed crash on debug mode. * patches/brasero-02-src-data.diff: Removed.
ChangeLog file | annotate | diff | comparison | revisions
SUNWgnome-cd-burner.spec file | annotate | diff | comparison | revisions
patches/brasero-02-load-by-gksu.diff file | annotate | diff | comparison | revisions
patches/brasero-02-src-data.diff file | annotate | diff | comparison | revisions
patches/brasero-03-load-by-gksu.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Fri May 29 00:55:04 2009 +0000
+++ b/ChangeLog	Sat May 30 14:43:04 2009 +0000
@@ -1,3 +1,10 @@
+2009-05-30  Lin Ma  <[email protected]>
+
+	* SUNWgnome-cd-burner.spec: Bump to 2.26.2
+	* patches/brasero-02-load-by-gksu.diff: Updated and reordered, fixed crash on debug
+	mode.
+	* patches/brasero-02-src-data.diff: Removed.
+
 2009-05-28 Erwann Chenede - <[email protected]>
 
 	* patches/glib-02-gmodule-always-lazy.diff: removed RTLD_FIRST flag from 
--- a/SUNWgnome-cd-burner.spec	Fri May 29 00:55:04 2009 +0000
+++ b/SUNWgnome-cd-burner.spec	Sat May 30 14:43:04 2009 +0000
@@ -24,9 +24,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # date:2008-09-05 owner:lin type:branding
 Patch1:         brasero-01-manpages.diff
-Patch2:         brasero-02-src-data.diff
-# date:2008-09-05 owner:lin type:branding
-Patch3:         brasero-03-load-by-gksu.diff
+# date:2009-05-27 owner:lin type:branding
+Patch2:         brasero-02-load-by-gksu.diff
 
 %include default-depend.inc
 BuildRequires: SUNWgtk2-devel
@@ -75,7 +74,6 @@
 
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -97,7 +95,6 @@
     --libdir=%{_libdir}		\
     --libexecdir=%{_libexecdir}	\
     --sysconfdir=%{_sysconfdir}	\
-    --disable-gnome2		\
     --disable-inotify		\
     --enable-shared		\
     --disable-static		\
@@ -197,8 +194,10 @@
 %endif
 
 %changelog
-* Tue May 26 2009 - [email protected]
+* Sat Map 30 2009 - [email protected]
 - Bump to 2.26.2
+- removed patches/brasero-02-src-data.diff.
+- Updated and reordered gksu related patch.
 * Tue Apr 22 2009 - [email protected]
 - Updated gksu related patch, and fixed a nit of spec.
 * Tue Apr 21 2009 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/brasero-02-load-by-gksu.diff	Sat May 30 14:43:04 2009 +0000
@@ -0,0 +1,111 @@
+diff --git a/data/brasero-copy-medium.desktop.in.in b/data/brasero-copy-medium.desktop.in.in
+index 458d7d2..6757b4f 100644
+--- a/data/brasero-copy-medium.desktop.in.in
++++ b/data/brasero-copy-medium.desktop.in.in
+@@ -3,7 +3,7 @@ _Name=Disc Copier
+ _GenericName=Disc Copier
+ _Comment=Copy CDs and DVDs
+ Categories=GNOME;GTK;System;
+-Exec=brasero -c %u
++Exec=gksu "brasero -c %u"
+ Icon=brasero
+ MimeType=x-content/audio-cdda;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-content/image-picturecd;
+ StartupNotify=true
+diff --git a/data/brasero-open-image.desktop.in.in b/data/brasero-open-image.desktop.in.in
+index 22f202d..18cf937 100644
+--- a/data/brasero-open-image.desktop.in.in
++++ b/data/brasero-open-image.desktop.in.in
+@@ -3,7 +3,7 @@ _Name=Disc Burner
+ _GenericName=Disc Burner
+ _Comment=Create CDs and DVDs
+ Categories=GNOME;AudioVideo;DiscBurning;
+-Exec=brasero -i %u
++Exec=gksu "brasero -i %u"
+ Icon=brasero
+ MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-cue;application/x-toc;
+ StartupNotify=true
+diff --git a/data/brasero-open-playlist.desktop.in.in b/data/brasero-open-playlist.desktop.in.in
+index 87d5960..579ed8f 100644
+--- a/data/brasero-open-playlist.desktop.in.in
++++ b/data/brasero-open-playlist.desktop.in.in
+@@ -3,7 +3,7 @@ _Name=Disc Burner
+ _GenericName=Disc Burner
+ _Comment=Create CDs and DVDs
+ Categories=GNOME;GTK;System;
+-Exec=brasero -l %u
++Exec=gksu "brasero -l %u"
+ Icon=brasero
+ MimeType=audio/x-scpls;audio/x-ms-asx;audio/x-mp3-playlist;audio/x-mpegurl;
+ StartupNotify=true
+diff --git a/data/brasero-open-project.desktop.in.in b/data/brasero-open-project.desktop.in.in
+index 8133787..bcfe9fa 100644
+--- a/data/brasero-open-project.desktop.in.in
++++ b/data/brasero-open-project.desktop.in.in
+@@ -3,7 +3,7 @@ _Name=Disc Burner
+ _GenericName=Disc Burner
+ _Comment=Create CDs and DVDs
+ Categories=GNOME;GTK;System;
+-Exec=brasero -p %u
++Exec=gksu "brasero -p %u"
+ Icon=brasero
+ MimeType=application/x-brasero;
+ StartupNotify=true
+diff --git a/data/brasero.desktop.in.in b/data/brasero.desktop.in.in
+index 9e5d1df..7076490 100644
+--- a/data/brasero.desktop.in.in
++++ b/data/brasero.desktop.in.in
+@@ -3,7 +3,7 @@ _Name=Brasero Disc Burner
+ _GenericName=Disc Burner
+ _Comment=Create and copy CDs and DVDs
+ Categories=GNOME;AudioVideo;DiscBurning;
+-Exec=brasero %U
++Exec=gksu "brasero %U"
+ Icon=brasero
+ StartupNotify=true
+ Terminal=false
+diff --git a/nautilus/nautilus-burn-extension.c b/nautilus/nautilus-burn-extension.c
+index 9031d84..22a1224 100644
+--- a/nautilus/nautilus-burn-extension.c
++++ b/nautilus/nautilus-burn-extension.c
+@@ -98,6 +98,15 @@ launch_process (GPtrArray *argv, GtkWindow *parent)
+         error = NULL;
+         g_ptr_array_add (argv, NULL);
+         args = (gchar **) g_ptr_array_free (argv, FALSE);
++        {
++                gchar **args_gksu = g_malloc(3*sizeof(gchar *));
++
++                *(args_gksu + 0) = g_build_filename (BINDIR, "gksu", NULL);
++                *(args_gksu + 1) = g_strdup_printf("%s", g_strjoinv(" ", args));
++                *(args_gksu + 2) = NULL;
++                g_strfreev (args);
++                args = args_gksu;
++        }
+         if (!g_spawn_async (NULL,
+                             args, NULL,
+                             0,
+diff --git a/src/burn-plugin.c b/src/burn-plugin.c
+index bc7e662..6d4a72d 100644
+--- a/src/burn-plugin.c
++++ b/src/burn-plugin.c
+@@ -473,7 +473,7 @@ brasero_plugin_get_error (BraseroPlugin *self)
+ 	BraseroPluginPrivate *priv;
+ 
+ 	priv = BRASERO_PLUGIN_PRIVATE (self);
+-	return priv->error;
++	return priv->error ? priv->error : "";
+ }
+ 
+ static BraseroPluginFlags *
+diff --git a/src/plugins/cdrtools/burn-cdrecord.c b/src/plugins/cdrtools/burn-cdrecord.c
+index b19caf6..6841d3c 100644
+--- a/src/plugins/cdrtools/burn-cdrecord.c
++++ b/src/plugins/cdrtools/burn-cdrecord.c
+@@ -1184,7 +1184,7 @@ brasero_cdrecord_export_caps (BraseroPlugin *plugin, gchar **error)
+ 				  BRASERO_MEDIUM_WRITABLE|
+ 				  BRASERO_MEDIUM_REWRITABLE|
+ 				  BRASERO_MEDIUM_BLANK,
+-				  BRASERO_BURN_FLAG_RAW|
++/* 				  BRASERO_BURN_FLAG_RAW| */
+ 				  BRASERO_BURN_FLAG_BURNPROOF|
+ 				  BRASERO_BURN_FLAG_OVERBURN|
+ 				  BRASERO_BURN_FLAG_NOGRACE,
--- a/patches/brasero-02-src-data.diff	Fri May 29 00:55:04 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/cdrtools/burn-cdrecord.c b/src/plugins/cdrtools/burn-cdrecord.c
-index 32b2448..a259127 100644
---- a/src/plugins/cdrtools/burn-cdrecord.c
-+++ b/src/plugins/cdrtools/burn-cdrecord.c
-@@ -1169,7 +1169,7 @@ brasero_cdrecord_export_caps (BraseroPlugin *plugin, gchar **error)
- 				  BRASERO_MEDIUM_WRITABLE|
- 				  BRASERO_MEDIUM_REWRITABLE|
- 				  BRASERO_MEDIUM_BLANK,
--				  BRASERO_BURN_FLAG_RAW|
-+/* 				  BRASERO_BURN_FLAG_RAW| */
- 				  BRASERO_BURN_FLAG_BURNPROOF|
- 				  BRASERO_BURN_FLAG_OVERBURN|
- 				  BRASERO_BURN_FLAG_NOGRACE,
--- a/patches/brasero-03-load-by-gksu.diff	Fri May 29 00:55:04 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-diff --git a/data/brasero-copy-medium.desktop.in.in b/data/brasero-copy-medium.desktop.in.in
-index 458d7d2..6757b4f 100644
---- a/data/brasero-copy-medium.desktop.in.in
-+++ b/data/brasero-copy-medium.desktop.in.in
-@@ -3,7 +3,7 @@ _Name=Disc Copier
- _GenericName=Disc Copier
- _Comment=Copy CDs and DVDs
- Categories=GNOME;GTK;System;
--Exec=brasero -c %u
-+Exec=gksu "brasero -c %u"
- Icon=brasero
- MimeType=x-content/audio-cdda;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-content/image-picturecd;
- StartupNotify=true
-diff --git a/data/brasero-open-image.desktop.in.in b/data/brasero-open-image.desktop.in.in
-index 22f202d..18cf937 100644
---- a/data/brasero-open-image.desktop.in.in
-+++ b/data/brasero-open-image.desktop.in.in
-@@ -3,7 +3,7 @@ _Name=Disc Burner
- _GenericName=Disc Burner
- _Comment=Create CDs and DVDs
- Categories=GNOME;AudioVideo;DiscBurning;
--Exec=brasero -i %u
-+Exec=gksu "brasero -i %u"
- Icon=brasero
- MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-cue;application/x-toc;
- StartupNotify=true
-diff --git a/data/brasero-open-playlist.desktop.in.in b/data/brasero-open-playlist.desktop.in.in
-index 87d5960..579ed8f 100644
---- a/data/brasero-open-playlist.desktop.in.in
-+++ b/data/brasero-open-playlist.desktop.in.in
-@@ -3,7 +3,7 @@ _Name=Disc Burner
- _GenericName=Disc Burner
- _Comment=Create CDs and DVDs
- Categories=GNOME;GTK;System;
--Exec=brasero -l %u
-+Exec=gksu "brasero -l %u"
- Icon=brasero
- MimeType=audio/x-scpls;audio/x-ms-asx;audio/x-mp3-playlist;audio/x-mpegurl;
- StartupNotify=true
-diff --git a/data/brasero-open-project.desktop.in.in b/data/brasero-open-project.desktop.in.in
-index 8133787..bcfe9fa 100644
---- a/data/brasero-open-project.desktop.in.in
-+++ b/data/brasero-open-project.desktop.in.in
-@@ -3,7 +3,7 @@ _Name=Disc Burner
- _GenericName=Disc Burner
- _Comment=Create CDs and DVDs
- Categories=GNOME;GTK;System;
--Exec=brasero -p %u
-+Exec=gksu "brasero -p %u"
- Icon=brasero
- MimeType=application/x-brasero;
- StartupNotify=true
-diff --git a/data/brasero.desktop.in.in b/data/brasero.desktop.in.in
-index 9e5d1df..7076490 100644
---- a/data/brasero.desktop.in.in
-+++ b/data/brasero.desktop.in.in
-@@ -3,7 +3,7 @@ _Name=Brasero Disc Burner
- _GenericName=Disc Burner
- _Comment=Create and copy CDs and DVDs
- Categories=GNOME;AudioVideo;DiscBurning;
--Exec=brasero %U
-+Exec=gksu "brasero %U"
- Icon=brasero
- StartupNotify=true
- Terminal=false
-diff --git a/nautilus/nautilus-burn-extension.c b/nautilus/nautilus-burn-extension.c
-index 9031d84..22a1224 100644
---- a/nautilus/nautilus-burn-extension.c
-+++ b/nautilus/nautilus-burn-extension.c
-@@ -98,6 +98,15 @@ launch_process (GPtrArray *argv, GtkWindow *parent)
-         error = NULL;
-         g_ptr_array_add (argv, NULL);
-         args = (gchar **) g_ptr_array_free (argv, FALSE);
-+        {
-+                gchar **args_gksu = g_malloc(3*sizeof(gchar *));
-+
-+                *(args_gksu + 0) = g_build_filename (BINDIR, "gksu", NULL);
-+                *(args_gksu + 1) = g_strdup_printf("%s", g_strjoinv(" ", args));
-+                *(args_gksu + 2) = NULL;
-+                g_strfreev (args);
-+                args = args_gksu;
-+        }
-         if (!g_spawn_async (NULL,
-                             args, NULL,
-                             0,
sustaining/oi_151a/spec-files