Date: Wednesday, July 19, 2017 @ 12:48:14 Author: eworm Revision: 300825
archrelease: copy trunk to testing-i686, testing-x86_64 Added: libmpd/repos/testing-i686/ libmpd/repos/testing-i686/0001-fix-return-value.patch (from rev 300824, libmpd/trunk/0001-fix-return-value.patch) libmpd/repos/testing-i686/0002-include-config.h.patch (from rev 300824, libmpd/trunk/0002-include-config.h.patch) libmpd/repos/testing-i686/0003-fix-comparison.patch (from rev 300824, libmpd/trunk/0003-fix-comparison.patch) libmpd/repos/testing-i686/PKGBUILD (from rev 300824, libmpd/trunk/PKGBUILD) libmpd/repos/testing-x86_64/ libmpd/repos/testing-x86_64/0001-fix-return-value.patch (from rev 300824, libmpd/trunk/0001-fix-return-value.patch) libmpd/repos/testing-x86_64/0002-include-config.h.patch (from rev 300824, libmpd/trunk/0002-include-config.h.patch) libmpd/repos/testing-x86_64/0003-fix-comparison.patch (from rev 300824, libmpd/trunk/0003-fix-comparison.patch) libmpd/repos/testing-x86_64/PKGBUILD (from rev 300824, libmpd/trunk/PKGBUILD) --------------------------------------------+ testing-i686/0001-fix-return-value.patch | 21 ++++++++++++++ testing-i686/0002-include-config.h.patch | 20 ++++++++++++++ testing-i686/0003-fix-comparison.patch | 21 ++++++++++++++ testing-i686/PKGBUILD | 38 +++++++++++++++++++++++++++ testing-x86_64/0001-fix-return-value.patch | 21 ++++++++++++++ testing-x86_64/0002-include-config.h.patch | 20 ++++++++++++++ testing-x86_64/0003-fix-comparison.patch | 21 ++++++++++++++ testing-x86_64/PKGBUILD | 38 +++++++++++++++++++++++++++ 8 files changed, 200 insertions(+) Copied: libmpd/repos/testing-i686/0001-fix-return-value.patch (from rev 300824, libmpd/trunk/0001-fix-return-value.patch) =================================================================== --- testing-i686/0001-fix-return-value.patch (rev 0) +++ testing-i686/0001-fix-return-value.patch 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,21 @@ +From 91001f43970e3faa0a97ccc3fced03b86be47d27 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Wed, 19 Jul 2017 14:22:48 +0200 +Subject: [PATCH 1/3] fix return makes integer from pointer without a cast +--- + src/libmpd-playlist.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libmpd-playlist.c b/src/libmpd-playlist.c +index c3c30ec..64c64ea 100644 +--- a/src/libmpd-playlist.c ++++ b/src/libmpd-playlist.c +@@ -780,7 +780,7 @@ int mpd_playlist_load(MpdObj *mi, const char *path) + if(mpd_lock_conn(mi)) + { + debug_printf(DEBUG_ERROR,"lock failed\n"); +- return NULL; ++ return MPD_LOCK_FAILED; + } + mpd_sendLoadCommand(mi->connection,path); + mpd_finishCommand(mi->connection); Copied: libmpd/repos/testing-i686/0002-include-config.h.patch (from rev 300824, libmpd/trunk/0002-include-config.h.patch) =================================================================== --- testing-i686/0002-include-config.h.patch (rev 0) +++ testing-i686/0002-include-config.h.patch 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,20 @@ +From fba7e03c4466f54424a196f646f865909ceb5fc2 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Wed, 19 Jul 2017 14:38:43 +0200 +Subject: [PATCH 2/3] include config.h +--- + src/libmpd-strfsong.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libmpd-strfsong.c b/src/libmpd-strfsong.c +index 7d47bed..76fa3ff 100644 +--- a/src/libmpd-strfsong.c ++++ b/src/libmpd-strfsong.c +@@ -28,6 +28,7 @@ + #include <unistd.h> + #include <string.h> + #include <glib.h> ++#include <config.h> + #include "libmpd.h" + #include "libmpd-internal.h" + Copied: libmpd/repos/testing-i686/0003-fix-comparison.patch (from rev 300824, libmpd/trunk/0003-fix-comparison.patch) =================================================================== --- testing-i686/0003-fix-comparison.patch (rev 0) +++ testing-i686/0003-fix-comparison.patch 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,21 @@ +From f33d4946c9349909d6ddc816d3c7eb81dd342b57 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Wed, 19 Jul 2017 14:40:00 +0200 +Subject: [PATCH 3/3] fix comparison between pointer and zero character constant +--- + src/libmpd-database.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libmpd-database.c b/src/libmpd-database.c +index 2480d5e..edafc0a 100644 +--- a/src/libmpd-database.c ++++ b/src/libmpd-database.c +@@ -961,7 +961,7 @@ MpdData * mpd_database_get_directory_recursive(MpdObj *mi, const char *path) + debug_printf(DEBUG_WARNING,"not connected\n"); + return NULL; + } +- if(path == '\0' || path[0] == '\0') ++ if(path == NULL || path[0] == '\0') + { + debug_printf(DEBUG_ERROR, "argumant invalid\n"); + return NULL; Copied: libmpd/repos/testing-i686/PKGBUILD (from rev 300824, libmpd/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: tobias <tob...@archlinux.org> + +pkgname=libmpd +pkgver=11.8.17 +pkgrel=3 +pkgdesc="Signal based wrapper around libmpdclient" +arch=('i686' 'x86_64') +url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" +license=('GPL') +depends=('glib2') +source=("http://download.sarine.nl/Programs/gmpc/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" + '0001-fix-return-value.patch' + '0002-include-config.h.patch' + '0003-fix-comparison.patch') +sha256sums=('fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83' + 'd8f93df567479bca89df17ebbe5db103ce36da01d5574d24184679659b731b97' + '8f87b7cf45bd57d2d7c7c59f66b60b6c49bebff910dcf0716b82d18905c0846b' + 'f36b2a5bd9e0794a2945b840ac15ad72253874ede4d655282b978598b7a94662') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 < "${srcdir}"/0001-fix-return-value.patch + patch -Np1 < "${srcdir}"/0002-include-config.h.patch + patch -Np1 < "${srcdir}"/0003-fix-comparison.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} Copied: libmpd/repos/testing-x86_64/0001-fix-return-value.patch (from rev 300824, libmpd/trunk/0001-fix-return-value.patch) =================================================================== --- testing-x86_64/0001-fix-return-value.patch (rev 0) +++ testing-x86_64/0001-fix-return-value.patch 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,21 @@ +From 91001f43970e3faa0a97ccc3fced03b86be47d27 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Wed, 19 Jul 2017 14:22:48 +0200 +Subject: [PATCH 1/3] fix return makes integer from pointer without a cast +--- + src/libmpd-playlist.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libmpd-playlist.c b/src/libmpd-playlist.c +index c3c30ec..64c64ea 100644 +--- a/src/libmpd-playlist.c ++++ b/src/libmpd-playlist.c +@@ -780,7 +780,7 @@ int mpd_playlist_load(MpdObj *mi, const char *path) + if(mpd_lock_conn(mi)) + { + debug_printf(DEBUG_ERROR,"lock failed\n"); +- return NULL; ++ return MPD_LOCK_FAILED; + } + mpd_sendLoadCommand(mi->connection,path); + mpd_finishCommand(mi->connection); Copied: libmpd/repos/testing-x86_64/0002-include-config.h.patch (from rev 300824, libmpd/trunk/0002-include-config.h.patch) =================================================================== --- testing-x86_64/0002-include-config.h.patch (rev 0) +++ testing-x86_64/0002-include-config.h.patch 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,20 @@ +From fba7e03c4466f54424a196f646f865909ceb5fc2 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Wed, 19 Jul 2017 14:38:43 +0200 +Subject: [PATCH 2/3] include config.h +--- + src/libmpd-strfsong.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libmpd-strfsong.c b/src/libmpd-strfsong.c +index 7d47bed..76fa3ff 100644 +--- a/src/libmpd-strfsong.c ++++ b/src/libmpd-strfsong.c +@@ -28,6 +28,7 @@ + #include <unistd.h> + #include <string.h> + #include <glib.h> ++#include <config.h> + #include "libmpd.h" + #include "libmpd-internal.h" + Copied: libmpd/repos/testing-x86_64/0003-fix-comparison.patch (from rev 300824, libmpd/trunk/0003-fix-comparison.patch) =================================================================== --- testing-x86_64/0003-fix-comparison.patch (rev 0) +++ testing-x86_64/0003-fix-comparison.patch 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,21 @@ +From f33d4946c9349909d6ddc816d3c7eb81dd342b57 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Wed, 19 Jul 2017 14:40:00 +0200 +Subject: [PATCH 3/3] fix comparison between pointer and zero character constant +--- + src/libmpd-database.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libmpd-database.c b/src/libmpd-database.c +index 2480d5e..edafc0a 100644 +--- a/src/libmpd-database.c ++++ b/src/libmpd-database.c +@@ -961,7 +961,7 @@ MpdData * mpd_database_get_directory_recursive(MpdObj *mi, const char *path) + debug_printf(DEBUG_WARNING,"not connected\n"); + return NULL; + } +- if(path == '\0' || path[0] == '\0') ++ if(path == NULL || path[0] == '\0') + { + debug_printf(DEBUG_ERROR, "argumant invalid\n"); + return NULL; Copied: libmpd/repos/testing-x86_64/PKGBUILD (from rev 300824, libmpd/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-07-19 12:48:14 UTC (rev 300825) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: tobias <tob...@archlinux.org> + +pkgname=libmpd +pkgver=11.8.17 +pkgrel=3 +pkgdesc="Signal based wrapper around libmpdclient" +arch=('i686' 'x86_64') +url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" +license=('GPL') +depends=('glib2') +source=("http://download.sarine.nl/Programs/gmpc/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" + '0001-fix-return-value.patch' + '0002-include-config.h.patch' + '0003-fix-comparison.patch') +sha256sums=('fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83' + 'd8f93df567479bca89df17ebbe5db103ce36da01d5574d24184679659b731b97' + '8f87b7cf45bd57d2d7c7c59f66b60b6c49bebff910dcf0716b82d18905c0846b' + 'f36b2a5bd9e0794a2945b840ac15ad72253874ede4d655282b978598b7a94662') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 < "${srcdir}"/0001-fix-return-value.patch + patch -Np1 < "${srcdir}"/0002-include-config.h.patch + patch -Np1 < "${srcdir}"/0003-fix-comparison.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +}