From 69549aeee5ef4004c877174ab18380abe9dee78a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 5 Sep 2017 13:32:46 +0200
Subject: audio-recorder: 1.9.4 -> 1.9.7

---
 pkgs/applications/audio/audio-recorder/default.nix |  6 +--
 .../audio/audio-recorder/icon-names.diff           | 51 ----------------------
 2 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/applications/audio/audio-recorder/icon-names.diff

(limited to 'pkgs')

diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index c482e44e7aa..ac13371dd93 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -8,18 +8,16 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "audio-recorder-${version}";
-  version = "1.9.4";
+  version = "1.9.7";
 
   src = fetchurl {
     name = "${name}-zesty.tar.gz";
     url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ezesty.tar.gz";
-    sha256 = "062bad38cz4fqzv418wza0x8sa4m5mqr3xsisrr1qgkqj9hg1f6x";
+    sha256 = "163c0vs5qj72y62731yp6sl6s0indh2szhjg02mxigv9b68dx89c";
   };
 
   nativeBuildInputs = [ pkgconfig intltool autoconf wrapGAppsHook ];
 
-  patches = [ ./icon-names.diff ];
-
   buildInputs = with gst_all_1; [
     glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf)
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
diff --git a/pkgs/applications/audio/audio-recorder/icon-names.diff b/pkgs/applications/audio/audio-recorder/icon-names.diff
deleted file mode 100644
index 28f21799166..00000000000
--- a/pkgs/applications/audio/audio-recorder/icon-names.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru audio-recorder/src/main.c audio-recorder.new/src/main.c
---- audio-recorder/src/main.c	2017-01-03 20:27:36.000000000 +0100
-+++ audio-recorder.new/src/main.c	2017-01-30 20:19:44.019255096 +0100
-@@ -1099,7 +1099,7 @@
-     gtk_container_add(GTK_CONTAINER(frame2), g_win.timer_text);
- 
-     // Timer [Save] button
--    g_win.timer_save_button = gtk_button_new_from_icon_name("gtk-save", GTK_ICON_SIZE_BUTTON);
-+    g_win.timer_save_button = gtk_button_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON);
-     // Hide it
-     gtk_widget_hide(g_win.timer_save_button);
-     g_signal_connect(g_win.timer_save_button, "clicked", G_CALLBACK(win_timer_save_text_cb), NULL);
-@@ -1129,7 +1129,7 @@
-     // The [Info] button
-     GtkWidget *button0 = gtk_button_new();
-     gtk_widget_show(button0);
--    GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
-+    GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
-     gtk_widget_show(image);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
-     gtk_button_set_image(GTK_BUTTON(button0), image);
-@@ -1220,7 +1220,7 @@
-     // Add [Reload] button
-     button0 = gtk_button_new();
-     gtk_widget_show(button0);
--    image = gtk_image_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_BUTTON);
-+    image = gtk_image_new_from_icon_name("view-refresh", GTK_ICON_SIZE_BUTTON);
-     gtk_widget_show(image);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
- 
-@@ -1297,7 +1297,7 @@
-     gtk_widget_show(hbox4);
-     gtk_box_pack_start(GTK_BOX(vbox0), hbox4, FALSE, TRUE, 0);
- 
--    button0 = gtk_button_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON);
-+    button0 = gtk_button_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
-     gtk_widget_show(button0);
-     gtk_box_pack_end(GTK_BOX(hbox4), button0, FALSE, FALSE, 0);
-diff -ru audio-recorder/src/settings.c audio-recorder.new/src/settings.c
---- audio-recorder/src/settings.c	2017-01-02 10:47:27.000000000 +0100
-+++ audio-recorder.new/src/settings.c	2017-01-30 20:23:04.621314105 +0100
-@@ -659,7 +659,7 @@
-     gtk_entry_set_invisible_char(GTK_ENTRY(file_name_pattern), 9679);
- 
-     button0 = gtk_button_new();
--    GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
-+    GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
-     gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
-     gtk_button_set_image(GTK_BUTTON(button0), image);
-     g_signal_connect(button0, "clicked", G_CALLBACK(win_settings_show_filename_help), NULL);
-- 
cgit 1.4.1