gentoo resync : 14.07.2018

4 files changed, 84 insertions, 0 deletions

diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch
new file mode 100644
index 000000000000..4a683d2c84ec
--- /dev/null
+++ b/app-cdr/graveman/files/desktop-entry.patch
@@ -0,0 +1,17 @@
+diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in
+--- graveman-0.3.12-5.orig/desktop/graveman.desktop.in	2005-05-24 00:07:08.000000000 +0300
++++ graveman-0.3.12-5/desktop/graveman.desktop.in	2008-05-10 06:33:32.000000000 +0300
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Graveman
+ Name[cs]=Graveman
+ Name[de]=Graveman
+@@ -48,5 +47,5 @@
+ Exec=graveman
+ Terminal=false
+ Type=Application
+-Icon=graveman48.png
+-Categories=Application;Utility;
++Icon=graveman48
++Categories=Utility;
diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch
new file mode 100644
index 000000000000..0b0f66656aa3
--- /dev/null
+++ b/app-cdr/graveman/files/joliet-long.patch
@@ -0,0 +1,18 @@
+--- a/src/mkisofs.c.old	2005-05-28 02:37:14.000000000 +0200
++++ b/src/mkisofs.c	2005-07-11 02:10:44.000000000 +0200
+@@ -91,13 +91,13 @@
+       }
+     }
+ 
+-    Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == TRUE ? "-r" : "", Ljoliet ? "-J" : "", Lisolevel,
++    Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == TRUE ? "-r" : "", Ljoliet ? "-J -joliet-long" : "", Lisolevel,
+         Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lmediainfo && Ldevchar ? "-M " : "",
+         Lmediainfo && Ldevchar ? Ldevchar : "");
+     g_free(Lmediainfo);
+     g_free(Lisolevel);
+   } else {  /* data dvd */
+-    Lextra = g_strdup("-r -J");
++    Lextra = g_strdup("-r -J -joliet-long");
+   }
+ 
+   /* charsets a utiliser pour la creation de l'image iso */
diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch
new file mode 100644
index 000000000000..5970656a3c55
--- /dev/null
+++ b/app-cdr/graveman/files/rename.patch
@@ -0,0 +1,11 @@
+--- a/src/callbacks.c.old	2006-05-23 17:42:48.642913000 +0200
++++ b/src/callbacks.c	2006-05-23 17:42:52.553201500 +0200
+@@ -268,7 +268,7 @@
+ 
+   gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1);
+ 
+-  Ltitle = g_strdup_printf(Ltitle, _("Enter the new name for %s"), Lname);
++  Ltitle = g_strdup_printf(_("Enter the new name for %s"), Lname);
+  
+   Lboite = gtk_dialog_new_with_buttons(Ltitle, NULL, GTK_DIALOG_MODAL,
+         GTK_STOCK_OK,GTK_RESPONSE_OK, GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL, NULL);
diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch
new file mode 100644
index 000000000000..570bc8406177
--- /dev/null
+++ b/app-cdr/graveman/files/sox.patch
@@ -0,0 +1,38 @@
+diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c
+--- a/src/sox.c	2005-05-28 02:37:14.000000000 +0200
++++ b/src/sox.c	2007-01-27 18:22:11.000000000 +0100
+@@ -37,7 +37,7 @@
+ gboolean check_sox()
+ {
+   gchar *Lsox = conf_get_string("sox");
+-  gchar *Lcommandline, *Lerr = NULL;
++  gchar *Lcommandline, *Lerr = NULL, *Lstdout = NULL;
+   gboolean Lstatus;
+   gint Lexit = 0;
+ 
+@@ -47,12 +47,22 @@
+   if (!Lsox || !*Lsox) return FALSE;
+ 
+   Lcommandline = g_strdup_printf("%s -help", conf_get_string("sox"));
+-  Lstatus = g_spawn_command_line_sync(Lcommandline, NULL, &Lerr, &Lexit, NULL);
++  Lstatus = g_spawn_command_line_sync(Lcommandline, &Lstdout, &Lerr, &Lexit, NULL);
+   g_free(Lcommandline);
+ 
+-  GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
+-  GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  /* sox 12.17 outputs -help to stderr */ 
++  if (Lerr && strstr(Lerr, "12.17")) {
++	GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  }
++
++  /* sox 12.18 outputs -help to stdout */
++  else {
++	GsupportMp3 = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_OGG))));
++  }
+   
++  g_free(Lstdout);
+   g_free(Lerr);
+ 
+   return Lstatus;