diff -Nru mpdscribble-0.22+git20110824.10b4fcd/debian/changelog mpdscribble-0.22+git20120104.9828c71/debian/changelog --- mpdscribble-0.22+git20110824.10b4fcd/debian/changelog 2012-01-05 10:04:53.000000000 +0000 +++ mpdscribble-0.22+git20120104.9828c71/debian/changelog 2012-01-05 10:04:54.000000000 +0000 @@ -1,5 +1,5 @@ -mpdscribble (0.22+git20110824.10b4fcd-0ubuntu1~ripps1~maverick) maverick; urgency=low +mpdscribble (0.22+git20120104.9828c71-0ubuntu1~ripps1~maverick) maverick; urgency=low * Daily Release Build - -- Taylor LeMasurier-Wren Wed, 24 Aug 2011 21:38:28 -0500 + -- Taylor LeMasurier-Wren Thu, 05 Jan 2012 03:22:13 -0600 diff -Nru mpdscribble-0.22+git20110824.10b4fcd/debian/control mpdscribble-0.22+git20120104.9828c71/debian/control --- mpdscribble-0.22+git20110824.10b4fcd/debian/control 2012-01-05 10:04:53.000000000 +0000 +++ mpdscribble-0.22+git20120104.9828c71/debian/control 2012-01-05 10:04:54.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Michal Čihař Build-Depends: debhelper (>= 7.0.50), - libmpdclient-dev (>= 2.5+git20110711.e39d1df-0ubuntu1~ripps1~maverick), + libmpdclient-dev (>= 2.6+git20120104.940b1d0-0ubuntu1~ripps1~maverick), cdbs, autotools-dev, automake, diff -Nru mpdscribble-0.22+git20110824.10b4fcd/Makefile.am mpdscribble-0.22+git20120104.9828c71/Makefile.am --- mpdscribble-0.22+git20110824.10b4fcd/Makefile.am 2011-07-06 02:54:29.000000000 +0000 +++ mpdscribble-0.22+git20120104.9828c71/Makefile.am 2012-01-05 09:23:24.000000000 +0000 @@ -20,6 +20,7 @@ endif src_mpdscribble_SOURCES = \ + src/gcc.h \ src/mpdscribble.c \ src/compat.h \ src/daemon.c src/daemon.h \ diff -Nru mpdscribble-0.22+git20110824.10b4fcd/src/file.c mpdscribble-0.22+git20120104.9828c71/src/file.c --- mpdscribble-0.22+git20110824.10b4fcd/src/file.c 2010-12-28 01:46:14.000000000 +0000 +++ mpdscribble-0.22+git20120104.9828c71/src/file.c 2012-01-05 09:23:24.000000000 +0000 @@ -83,7 +83,7 @@ file_config.loc = file_home; return file; } else { - free(file); + g_free(file); if (!file_exists(FILE_CONF)) return NULL; diff -Nru mpdscribble-0.22+git20110824.10b4fcd/src/gcc.h mpdscribble-0.22+git20120104.9828c71/src/gcc.h --- mpdscribble-0.22+git20110824.10b4fcd/src/gcc.h 1970-01-01 00:00:00.000000000 +0000 +++ mpdscribble-0.22+git20120104.9828c71/src/gcc.h 2012-01-05 09:23:24.000000000 +0000 @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2003-2011 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_GCC_H +#define MPD_GCC_H + +#define GCC_CHECK_VERSION(major, minor) \ + (defined(__GNUC__) && \ + (__GNUC__ > (major) || \ + (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))) + +#endif /* MPD_GCC_H */ diff -Nru mpdscribble-0.22+git20110824.10b4fcd/src/http_client_soup.c mpdscribble-0.22+git20120104.9828c71/src/http_client_soup.c --- mpdscribble-0.22+git20110824.10b4fcd/src/http_client_soup.c 2011-08-25 02:42:16.000000000 +0000 +++ mpdscribble-0.22+git20120104.9828c71/src/http_client_soup.c 2012-01-05 09:23:24.000000000 +0000 @@ -21,6 +21,7 @@ #include "http_client.h" #include "file.h" #include "config.h" +#include "gcc.h" #include #include @@ -160,7 +161,18 @@ struct http_request *request; if (post_data) { +#if GCC_CHECK_VERSION(4,5) +#pragma GCC diagnostic push + /* the libsoup macro SOUP_METHOD_POST discards the + "const" attribute of the g_intern_static_string() + return value; don't make the gcc warning fatal: */ +#pragma GCC diagnostic ignored "-Wcast-qual" +#endif msg = soup_message_new(SOUP_METHOD_POST, url); +#if GCC_CHECK_VERSION(4,5) +#pragma GCC diagnostic pop +#endif + #ifdef HAVE_SOUP_24 soup_message_set_request (msg, "application/x-www-form-urlencoded", @@ -172,7 +184,17 @@ strlen(post_data)); #endif } else { +#if GCC_CHECK_VERSION(4,5) +#pragma GCC diagnostic push + /* the libsoup macro SOUP_METHOD_POST discards the + "const" attribute of the g_intern_static_string() + return value; don't make the gcc warning fatal: */ +#pragma GCC diagnostic ignored "-Wcast-qual" +#endif msg = soup_message_new(SOUP_METHOD_GET, url); +#if GCC_CHECK_VERSION(4,5) +#pragma GCC diagnostic pop +#endif } soup_message_set_flags(msg, SOUP_MESSAGE_NO_REDIRECT);