klavaro: 3.13 -> 3.14

patches removed since they where upstreamed

3 files changed, 2 insertions, 221 deletions

diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 79585e74a0954..b99969bf6a814 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "klavaro";
-  version = "3.13";
+  version = "3.14";
 
   src = fetchurl {
     url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2";
-    sha256 = "0z6c3lqikk50mkz3ipm93l48qj7b98lxyip8y6ndg9y9k0z0n878";
+    hash = "sha256-hxh+SdMBxRDmlkCYzbYSEmvwMNKodf15nq3K0+rlbas=";
   };
 
   nativeBuildInputs = [ intltool makeWrapper pkg-config ];
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     substituteInPlace src/tutor.c --replace '"espeak ' '"${espeak}/bin/espeak '
   '';
 
-  patches = [ ./icons.patch ./trans_lang_get_similar.patch ];
-
   postInstall = ''
     wrapProgram $out/bin/klavaro \
       --prefix LD_LIBRARY_PATH : $out/lib
diff --git a/pkgs/games/klavaro/icons.patch b/pkgs/games/klavaro/icons.patch
deleted file mode 100644
index 1717fdf44e687..0000000000000
--- a/pkgs/games/klavaro/icons.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- a/data/klavaro.glade	(revision 137)
-+++ b/data/klavaro.glade	(working copy)
-@@ -311,7 +311,7 @@
-                       <object class="GtkImage" id="image24">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-delete</property>
-+                        <property name="icon-name">edit-delete</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
-@@ -708,7 +708,7 @@
-                     <property name="can-default">True</property>
-                     <property name="has-default">True</property>
-                     <property name="tooltip-text" translatable="yes">Drag and drop text here to practice with it.</property>
--                    <property name="secondary-icon-name">gtk-clear</property>
-+                    <property name="secondary-icon-name">edit-clear</property>
-                     <property name="secondary-icon-tooltip-text" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property>
-                     <property name="secondary-icon-tooltip-markup" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property>
-                     <signal name="activate" handler="on_entry_mesg_activate" after="yes" swapped="no"/>
-@@ -1232,7 +1232,7 @@
-                       <object class="GtkImage" id="image27">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-delete</property>
-+                        <property name="icon-name">edit-delete</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
-@@ -1352,7 +1352,7 @@
-                       <object class="GtkImage" id="image23">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-open</property>
-+                        <property name="icon-name">document-open</property>
-                       </object>
-                       <packing>
-                         <property name="expand">True</property>
-@@ -1510,7 +1510,7 @@
-                       <object class="GtkImage" id="image11">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-open</property>
-+                        <property name="icon-name">document-open</property>
-                         <property name="icon_size">2</property>
-                       </object>
-                       <packing>
-@@ -1557,7 +1557,7 @@
-                       <object class="GtkImage" id="image6">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-paste</property>
-+                        <property name="icon-name">edit-paste</property>
-                         <property name="icon_size">2</property>
-                       </object>
-                       <packing>
-@@ -1604,7 +1604,7 @@
-                       <object class="GtkImage" id="image19">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-delete</property>
-+                        <property name="icon-name">edit-delete</property>
-                         <property name="icon_size">2</property>
-                       </object>
-                       <packing>
-@@ -2051,7 +2051,7 @@
-                       <object class="GtkImage" id="image14">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-delete</property>
-+                        <property name="icon-name">edit-delete</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
-@@ -2343,7 +2343,7 @@
-                   <object class="GtkImage" id="image3">
-                     <property name="visible">True</property>
-                     <property name="can-focus">False</property>
--                    <property name="icon-name">gtk-media-rewind</property>
-+                    <property name="icon-name">media-seek-backward</property>
-                     <property name="icon_size">1</property>
-                   </object>
-                 </child>
-@@ -2418,7 +2418,7 @@
-                       <object class="GtkImage" id="image20">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-go-back</property>
-+                        <property name="icon-name">go-previous</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
-@@ -2469,7 +2469,7 @@
-                       <object class="GtkImage" id="image18">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-go-forward</property>
-+                        <property name="icon-name">go-next</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
-@@ -2577,7 +2577,7 @@
-                       <object class="GtkImage" id="image13">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-save</property>
-+                        <property name="icon-name">document-save</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
-@@ -2825,7 +2825,7 @@
-                       <object class="GtkImage" id="image_basic">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-strikethrough</property>
-+                        <property name="icon-name">format-text-strikethrough</property>
-                         <property name="icon_size">6</property>
-                       </object>
-                       <packing>
-@@ -2901,7 +2901,7 @@
-                       <object class="GtkImage" id="image_adapt">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-bold</property>
-+                        <property name="icon-name">format-text-bold</property>
-                         <property name="icon_size">6</property>
-                       </object>
-                       <packing>
-@@ -3630,7 +3630,7 @@
-                       <object class="GtkImage" id="image_top10_publish">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-goto-top</property>
-+                        <property name="icon-name">go-top</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
-@@ -3678,7 +3678,7 @@
-                       <object class="GtkImage" id="image_top10_update">
-                         <property name="visible">True</property>
-                         <property name="can-focus">False</property>
--                        <property name="icon-name">gtk-goto-bottom</property>
-+                        <property name="icon-name">go-bottom</property>
-                       </object>
-                       <packing>
-                         <property name="expand">False</property>
diff --git a/pkgs/games/klavaro/trans_lang_get_similar.patch b/pkgs/games/klavaro/trans_lang_get_similar.patch
deleted file mode 100644
index 3b6644c5f7f7d..0000000000000
--- a/pkgs/games/klavaro/trans_lang_get_similar.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/src/translation.c	(revision 137)
-+++ b/src/translation.c	(working copy)
-@@ -257,23 +257,23 @@
-  * Private auxiliar function
-  */
- static gboolean
--trans_lang_get_similar (gchar * test)
-+trans_lang_get_similar (gchar ** test)
- {
- 	gint i;
- 	gchar aux_code_2[3];
- 
- 	/* Prefer C over en_GB for English variants other than en_GB. (Debian patch 02) */
--	if (g_str_has_prefix (test, "en"))
-+	if (g_str_has_prefix (*test, "en"))
- 	{
--		g_free (test);
--		test = g_strdup ("C");
-+		g_free (*test);
-+		*test = g_strdup ("C");
- 		return (TRUE);
- 	}
- 
--	if (g_str_equal (test, "C"))
-+	if (g_str_equal (*test, "C"))
- 		return TRUE;
- 
--	strncpy (aux_code_2, test, 2);
-+	strncpy (aux_code_2, *test, 2);
- 	aux_code_2[2] = '\0';
- 
- 	for (i = 0; i < lang_num; i++)
-@@ -280,15 +280,15 @@
- 	{
- 		if (strstr (lang[i].code, aux_code_2))
- 		{
--			g_free (test);
--			test = g_strdup (lang[i].code);
-+			g_free (*test);
-+			*test = g_strdup (lang[i].code);
- 			break;
- 		}
- 	}
--	if (i == lang_num && g_str_has_prefix (test, "en"))
-+	if (i == lang_num && g_str_has_prefix (*test, "en"))
- 	{
--		g_free (test);
--		test = g_strdup ("C");
-+		g_free (*test);
-+		*test = g_strdup ("C");
- 		return (TRUE);
- 	}
- 	return (i == lang_num ? FALSE : TRUE);
-@@ -356,7 +356,7 @@
- 					lang_ok = (i == 0 ? TRUE : FALSE);
- 					break;
- 				}
--				lang_ok = trans_lang_get_similar (tmp_code);
-+				lang_ok = trans_lang_get_similar (&tmp_code);
- 				if (lang_ok == TRUE)
- 					break;
- 				g_free (tmp_code);
-@@ -368,7 +368,7 @@
- 		tmp_code = g_win32_getlocale ();
- 		lang_ok = trans_lang_is_available (tmp_code);
- 		if (lang_ok == FALSE)
--			lang_ok = trans_lang_get_similar (tmp_code);
-+			lang_ok = trans_lang_get_similar (&tmp_code);
- #endif
- 	}
- 	if (tmp_code == NULL)