From 7160a3200156d5c3cc7d916f51624d28d0a8003d Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 26 Aug 2015 17:08:27 +0200 Subject: linphone: 3.8.1 -> 3.8.5 --- .../instant-messengers/linphone/default.nix | 4 +-- .../linphone/fix-deprecated.patch | 35 ---------------------- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index f9bd941b2f663..3310aace40eaf 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "linphone-3.8.1"; + name = "linphone-3.8.5"; src = fetchurl { url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz"; - sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd"; + sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax"; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch deleted file mode 100644 index 8978e6e665253..0000000000000 --- a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gtk/main.c b/gtk/main.c -index 7079bc8..f076127 100644 ---- a/gtk/main.c -+++ b/gtk/main.c -@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){ - GdkPixbuf *pbuf; - const char *app_name="Linphone"; - -- g_thread_init(NULL); -+ g_type_init(); - gdk_threads_init(); - - progpath = strdup(argv[0]); -diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c -index 1c54fca..45c9091 100644 ---- a/gtk/setupwizard.c -+++ b/gtk/setupwizard.c -@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) { - linphone_account_creator_set_username(creator, gtk_entry_get_text(username)); - - if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) { -- g_thread_create(check_username_availability, (void*)w, FALSE, NULL); -+ g_thread_new (NULL, check_username_availability, (void*)w); - } - else { - if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) { -@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){ - ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png")); - notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png")); - -- g_thread_init (NULL); -+ g_type_init (); - gdk_threads_init (); - - GtkWidget *p1=create_intro(); -- cgit 1.4.1