public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-cdr/xfburn/files: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
@ 2011-11-24 23:08 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-11-24 23:08 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/11/24 23:08:22

  Added:               
                        xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
  Log:
  Use Debian patchset to port from obsolete thunar-vfs layer to libgio-2.0.
  
  (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.1&content-type=text/plain

Index: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
===================================================================
--- xfburn/xfburn-data-composition.c
+++ xfburn/xfburn-data-composition.c
@@ -1852,26 +1852,29 @@
           g_error ("Failed adding %s as a node to the image: code %X!", src, r);
       }
 
-      basename = g_path_get_basename (src);
+      /* Check names only for items not manually created (#613563) */
+      if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) {
+        basename = g_path_get_basename (src);
+
+        /* check if the file has been renamed */
+        if (strcmp (basename, name) != 0) {
+          /* rename the iso_node */
+          r = iso_node_set_name (node, name);
+
+          if (r == 0) {
+            /* The first string is the renamed name, the second one the original name */
+            xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
+
+            g_free (basename);
+            g_free (name);
+            g_free (src);
 
-      /* check if the file has been renamed */
-      if (strcmp (basename, name) != 0) {
-        /* rename the iso_node */
-        r = iso_node_set_name (node, name);
-
-        if (r == 0) {
-          /* The first string is the renamed name, the second one the original name */
-	  xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
-
-          g_free (basename);
-          g_free (name);
-          g_free (src);
-
-          continue;
+            continue;
+          }
         }
+        g_free (basename);
       }
 
-      g_free (basename);
       g_free (name);
       g_free (src);
 






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-cdr/xfburn/files: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
@ 2012-03-10  9:59 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-03-10  9:59 UTC (permalink / raw
  To: gentoo-commits

ssuominen    12/03/10 09:59:48

  Modified:            
                        xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
  Log:
  upstream link to bug
  
  (Portage version: 2.2.0_alpha90/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.2                  app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?r1=1.1&r2=1.2

Index: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfburn-0.4.3-empty_directory_segmentation_fault-2.patch	24 Nov 2011 23:08:22 -0000	1.1
+++ xfburn-0.4.3-empty_directory_segmentation_fault-2.patch	10 Mar 2012 09:59:47 -0000	1.2
@@ -1,3 +1,5 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6805
+
 --- xfburn/xfburn-data-composition.c
 +++ xfburn/xfburn-data-composition.c
 @@ -1852,26 +1852,29 @@






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-cdr/xfburn/files: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
@ 2012-03-10 10:04 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-03-10 10:04 UTC (permalink / raw
  To: gentoo-commits

ssuominen    12/03/10 10:04:35

  Modified:            
                        xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
  Log:
  downstream link to bug to be complete
  
  (Portage version: 2.2.0_alpha90/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.3                  app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?r1=1.2&r2=1.3

Index: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfburn-0.4.3-empty_directory_segmentation_fault-2.patch	10 Mar 2012 09:59:47 -0000	1.2
+++ xfburn-0.4.3-empty_directory_segmentation_fault-2.patch	10 Mar 2012 10:04:35 -0000	1.3
@@ -1,3 +1,4 @@
+http://bugs.gentoo.org/331135
 http://bugzilla.xfce.org/show_bug.cgi?id=6805
 
 --- xfburn/xfburn-data-composition.c






^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-cdr/xfburn/files: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
@ 2012-09-29 11:35 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-09-29 11:35 UTC (permalink / raw
  To: gentoo-commits

ssuominen    12/09/29 11:35:53

  Modified:            
                        xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
  Log:
  Add clear comment on not forwarding this hack to next snapshot
  
  (Portage version: 2.2.0_alpha128/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.4                  app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch?r1=1.3&r2=1.4

Index: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfburn-0.4.3-empty_directory_segmentation_fault-2.patch	10 Mar 2012 10:04:35 -0000	1.3
+++ xfburn-0.4.3-empty_directory_segmentation_fault-2.patch	29 Sep 2012 11:35:53 -0000	1.4
@@ -1,3 +1,5 @@
+This patch is OBSOLETE and fixed differently in git already. DO NOT CARRY THIS AROUND ANYMORE.
+
 http://bugs.gentoo.org/331135
 http://bugzilla.xfce.org/show_bug.cgi?id=6805
 





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-cdr/xfburn/files: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
@ 2012-11-28 12:36 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-11-28 12:36 UTC (permalink / raw
  To: gentoo-commits

ssuominen    12/11/28 12:36:56

  Removed:             
                        xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
  Log:
  old
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-11-28 12:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-10  9:59 [gentoo-commits] gentoo-x86 commit in app-cdr/xfburn/files: xfburn-0.4.3-empty_directory_segmentation_fault-2.patch Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2012-11-28 12:36 Samuli Suominen (ssuominen)
2012-09-29 11:35 Samuli Suominen (ssuominen)
2012-03-10 10:04 Samuli Suominen (ssuominen)
2011-11-24 23:08 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox