← Back to branch summary

~ubuntu-branches/ubuntu/precise/flac/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/04_stack_smasher.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Joshua Kwan
  • Date: 2007-05-29 22:56:36 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070529225636-ljeff8xxip09qaap
Tags: 1.1.4-1
http://bugs.debian.org/405167
http://bugs.debian.org/411311
* New upstream release. closes: #405167, #411311
  - libOggFLAC and libOggFLAC++ have been merged into libFLAC, so
    remove their corresponding packages.
  - Because of the API changes required to effect the above, there has
    been yet another soname bump. libflac7 -> libflac8 and
    libflac++5 -> libflac++6. Emails have been dispatched to the
    maintainers of dependent packages.
* Some notes on patches that were removed:
  - 02_stdin_stdout, 06_manpage_mention_utf8_convert: merged upstream
  - 08_manpage_warnings: Upstream has changed the manpage so it defintely
    can't fit in in 80 cols, so just forget about it. We'll live.
  - 05_eof_warnings_are_errors: Upstream decided to add a -w option to
    flac to treat all warnings as errors. I am going to defer to that
    for now, but if people think it's stupid let me know and I'll port
    the patch forward.
  - 04_stack_smasher: was a backport from 1.1.3, so it's obsolete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_stack_smasher.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 04_stack_smasher.dpatch by Jan Luebbe <jluebbe@lasnet.de>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad flac-1.1.2~/src/plugin_xmms/configure.c flac-1.1.2/src/plugin_xmms/configure.c
9
 
--- flac-1.1.2~/src/plugin_xmms/configure.c     2007-01-10 01:25:44.000000000 +0100
10
 
+++ flac-1.1.2/src/plugin_xmms/configure.c      2007-01-10 01:27:19.000000000 +0100
11
 
@@ -1,5 +1,5 @@
12
 
 /* libxmms-flac - XMMS FLAC input plugin
13
 
- * Copyright (C) 2002,2003,2004,2005  Daisuke Shimamura
14
 
+ * Copyright (C) 2002,2003,2004,2005,2006  Daisuke Shimamura
15
 
  *
16
 
  * Based on mpg123 plugin
17
 
  *          and prefs.c - 2000/05/06
18
 
@@ -21,6 +21,10 @@
19
 
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
20
 
  */
21
 
 
22
 
+#if HAVE_CONFIG_H
23
 
+#  include <config.h>
24
 
+#endif
25
 
+
26
 
 #include <stdlib.h>
27
 
 #include <string.h>
28
 
 #include <glib.h>
29
 
@@ -55,13 +59,13 @@
30
 
                100 /* KB */, /* http_buffer_size */
31
 
                50, /* http_prebuffer */
32
 
                FALSE, /* use_proxy */
33
 
-               "", /* proxy_host */
34
 
+               NULL, /* proxy_host */
35
 
                0, /* proxy_port */
36
 
                FALSE, /* proxy_use_auth */
37
 
-               "", /* proxy_user */
38
 
-               "", /* proxy_pass */
39
 
+               NULL, /* proxy_user */
40
 
+               NULL, /* proxy_pass */
41
 
                FALSE, /* save_http_stream */
42
 
-               "", /* save_http_path */
43
 
+               NULL, /* save_http_path */
44
 
                FALSE, /* cast_title_streaming */
45
 
                FALSE /* use_udp_channel */
46
 
        },
47
 
@@ -159,7 +163,8 @@
48
 
        flac_cfg.stream.http_prebuffer = (gint) GTK_ADJUSTMENT(streaming_pre_adj)->value;
49
 
 
50
 
        flac_cfg.stream.use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
51
 
-       g_free(flac_cfg.stream.proxy_host);
52
 
+       if(flac_cfg.stream.proxy_host)
53
 
+               g_free(flac_cfg.stream.proxy_host);
54
 
        flac_cfg.stream.proxy_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_host_entry)));
55
 
        flac_cfg.stream.proxy_port = atoi(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_port_entry)));
56
 
 
57
 
@@ -380,7 +385,7 @@
58
 
        GtkWidget *streaming_size_box, *streaming_size_label, *streaming_size_spin;
59
 
        GtkWidget *streaming_pre_box, *streaming_pre_label, *streaming_pre_spin;
60
 
        GtkWidget *streaming_proxy_frame, *streaming_proxy_vbox;
61
 
-       GtkWidget *streaming_proxy_port_label,  *streaming_proxy_host_label;
62
 
+       GtkWidget *streaming_proxy_port_label, *streaming_proxy_host_label;
63
 
        GtkWidget *streaming_save_frame, *streaming_save_vbox;
64
 
        GtkWidget *streaming_save_label, *streaming_save_browse;
65
 
 #ifdef FLAC_ICECAST
66
 
@@ -666,7 +671,7 @@
67
 
        gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_label, FALSE, FALSE, 0);
68
 
 
69
 
        streaming_proxy_host_entry = gtk_entry_new();
70
 
-       gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host);
71
 
+       gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host? flac_cfg.stream.proxy_host : "");
72
 
        gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_entry, TRUE, TRUE, 0);
73
 
 
74
 
        streaming_proxy_port_label = gtk_label_new(_("Port:"));
75
 
@@ -731,7 +736,7 @@
76
 
        gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
77
 
 
78
 
        streaming_save_entry = gtk_entry_new();
79
 
-       gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path);
80
 
+       gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path? flac_cfg.stream.save_http_path : "");
81
 
        gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
82
 
 
83
 
        streaming_save_browse = gtk_button_new_with_label(_("Browse"));