Request 4295 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 4295 (accepted)

No description set

Created by Aloysius over 7 years ago
In state accepted
Package maintainer: mantarimay

Submit ncmpc

Submit package home:Aloysius:branches:Multimedia / ncmpc to package Multimedia / ncmpc

ncmpc.changes Changed

@@ -1,4 +1,34 @@
 -------------------------------------------------------------------
+Thu Oct 11 07:38:47 UTC 2018 - aloisio@gmx.com
+
+- Update to version 0.32
+  * fix crash bug on queue page
+  * fix crash bug on lyrics page
+  * fix off-by-one buffer overflow bug
+  * fix manpage installation directory
+  * fix build breakages with some ncurses builds
+  * work around GCC 4.9 build failure
+  * remove doxygen support
+  * new dependency: Boost
+  * remove dependency on GLib
+  version 0.31
+  * fix "No such song" in search screen
+  * fix progressbar when colors are disabled
+  * enable colors by default
+  * allow configuring per-style background colors
+  * keep current song in xterm title when MPD is paused
+  * load configuration from $XDG_CONFIG_HOME/ncmpc/config
+  * always show the screen list at the top
+  * fix memory leak
+  * require MPD 0.19
+
+- Refreshed ncmpc-fix_meson_docdir.patch
+
+- Dropped ncmpc-fix_meson_gcc_config.patch and ncmpc-c++11.patch
+
+- Spec cleanup
+
+-------------------------------------------------------------------
 Sun Apr 15 17:27:33 UTC 2018 - pascal.bleser@opensuse.org
 
 - change build to use meson+ninja+sphinx

ncmpc.spec Changed

@@ -1,4 +1,7 @@
-# vim: set sw=4 ts=4 et:
+#
+# spec file for package ncmpc
+#
+# Copyright (c) 2018 Packman team: http://packman.links2linux.org/
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -14,24 +17,18 @@
 
 
 Name:           ncmpc
-Version:        0.30
-Release:        1
+Version:        0.32
+Release:        0
 Summary:        Curses Client for the Music Player Daemon
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
-Source:         http://www.musicpd.org/download/ncmpc/0/ncmpc-%{version}.tar.xz
-Patch1:         ncmpc-fix_meson_gcc_config.patch
-Patch2:         ncmpc-c++11.patch
-Patch3:         ncmpc-fix_meson_docdir.patch
 URL:            http://mpd.wikia.com/wiki/Client:Ncmpc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-%if %{suse_version} > 1500
-BuildRequires:  gcc-c++
-%else
-BuildRequires:  gcc7-c++
-%endif
+Source:         https://www.musicpd.org/download/ncmpc/0/ncmpc-%{version}.tar.xz
+Patch3:         ncmpc-fix_meson_docdir.patch
+BuildRequires:  gcc-c++ >= 7
+BuildRequires:  libboost_iostreams-devel >= 1.62
 BuildRequires:  ncurses-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0) >= 2.30
 BuildRequires:  pkgconfig(libmpdclient) >= 2.9
 BuildRequires:  python-Sphinx
@@ -39,73 +36,39 @@
 BuildRequires:  ninja
 
 %description
-ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
-a MPD running on a machine on the local network, and controls this with an 
+ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to
+a MPD running on a machine on the local network, and controls this with an
 interface inspired by cplay.
 
 %lang_package
 %prep
 %setup -q
-%patch1
-%patch2
 %patch3
 
 %build
-export PKG_CONFIG_PATH="$PWD/pc:$PKG_CONFIG_PATH"
-mkdir pc
-cat<<EOF > pc/ncursesw.pc
-prefix=/usr
-libdir=%{_libdir}
-
-Version: `rpm -q --qf='%{VERSION}' ncurses-devel`
-Name: ncursesw
-Description: ncursesw
-Libs: -L\${libdir} -lncursesw
-EOF
-test -n "$(type -p g++)"   && CXX=$_
-test -n "$(type -p g++-7)" && CXX=$_
-
-CXX="${CXX}" \
-meson \
-    --prefix '%{_prefix}' \
-    --buildtype debug \
-    -Dcurses=ncursesw \
-    -Dmouse=true \
-    -Dcolors=ncursesw \
-    -Dmultibyte=true \
-    -Dlocale=true \
-    -Dnls=true \
-    -Dlirc=false \
-    -Dtcp=true \
-    -Ddocumentation=false \
-    . \
-    output
-
-CXX="${CXX}" \
-ninja -C output %{?_smp_mflags} -v
+%meson \
+       -Dhtml_manual=false
+%meson_build
 
 %install
-DESTDIR='%{buildroot}' ninja -C output install -v
-
-%__rm -rf '%{buildroot}%{_datadir}/doc'
+%meson_install
 
 %find_lang %{name}
 
 # install config.sample and keys.sample in /etc/ncmpc
-%__install -D -m 644 doc/keys.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/keys
-%__install -D -m 644 doc/config.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config
+install -D -m 644 doc/keys.sample %{buildroot}%{_sysconfdir}/%{name}/keys
+install -D -m 644 doc/config.sample %{buildroot}%{_sysconfdir}/%{name}/config
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README.rst
+%license COPYING
+%doc AUTHORS NEWS README.rst
 %doc doc/*.sample doc/ncmpc.lirc
 %{_bindir}/ncmpc
 %dir %{_sysconfdir}/%{name}
 %config %{_sysconfdir}/%{name}/keys
 %config %{_sysconfdir}/%{name}/config
-%doc %{_mandir}/man1/ncmpc.1*
+%doc %{_mandir}/man1/ncmpc.1%{ext_man}
 
 %changelog

ncmpc-c++11.patch Deleted

@@ -1,42 +0,0 @@
---- src/BasicMarquee.cxx.orig	2018-04-15 19:07:11.477337687 +0200
-+++ src/BasicMarquee.cxx	2018-04-15 19:07:17.257355182 +0200
-@@ -76,5 +76,5 @@
- 	g_free(text);
- 	text = nullptr;
- 
--	g_free(std::exchange(text_utf8, nullptr));
-+	g_free(std::__exchange(text_utf8, nullptr));
- }
---- src/hscroll.cxx.orig	2018-04-15 19:07:28.293388583 +0200
-+++ src/hscroll.cxx	2018-04-15 19:07:33.585404598 +0200
-@@ -61,7 +61,7 @@
- 	basic.Clear();
- 
- 	if (source_id != 0)
--		g_source_remove(std::exchange(source_id, 0));
-+		g_source_remove(std::__exchange(source_id, 0));
- }
- 
- void
---- src/Page.hxx.orig	2018-04-15 19:07:38.285418822 +0200
-+++ src/Page.hxx	2018-04-15 19:07:42.657432051 +0200
-@@ -70,7 +70,7 @@
- 	}
- 
- 	void Update(struct mpdclient &c) {
--		Update(c, std::exchange(pending_events, 0));
-+		Update(c, std::__exchange(pending_events, 0));
- 	}
- 
- protected:
---- src/filelist.hxx.orig	2018-04-15 19:06:49.833272166 +0200
-+++ src/filelist.hxx	2018-04-15 19:07:01.865308591 +0200
-@@ -38,7 +38,7 @@
- 
- 	FileListEntry(FileListEntry &&src)
- 		:flags(src.flags),
--		 entity(std::exchange(src.entity, nullptr)) {}
-+		 entity(std::__exchange(src.entity, nullptr)) {}
- 
- 	FileListEntry &operator=(FileListEntry &&src) {
- 		using std::swap;

ncmpc-fix_meson_docdir.patch Changed

@@ -1,11 +1,29 @@
---- meson.build.orig	2018-04-15 19:10:48.613989140 +0200
-+++ meson.build	2018-04-15 19:10:59.522020430 +0200
-@@ -380,7 +380,7 @@
+Index: meson.build
+===================================================================
+--- meson.build.orig
++++ meson.build
+@@ -384,8 +384,8 @@ ncmpc = executable('ncmpc',
  
  configure_file(output: 'config.h', configuration: conf)
  
 -docdir = join_paths(get_option('datadir'), 'doc', meson.project_name())
+-install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst',
 +docdir = join_paths(get_option('datadir'), 'doc', 'packages', meson.project_name())
- install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst',
++install_data('AUTHORS', 'NEWS', 'README.rst',
    'doc/config.sample',
    'doc/keys.sample',
+   'doc/ncmpc.lirc',
+Index: doc/meson.build
+===================================================================
+--- doc/meson.build.orig
++++ doc/meson.build
+@@ -20,7 +20,8 @@ if sphinx.found()
+       command: sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1',
+       build_by_default: true,
+       install: true,
+-      install_dir: get_option('mandir'),
++      install_dir: get_option('datadir'),
+     )
+   endif
+ endif
++