Packman Build Service PMBS

ncmpc.changes Changed

ncmpc.spec Changed

@@ -14,18 +14,25 @@
 
 
 Name:           ncmpc
-Version:        0.27
+Version:        0.30
 Release:        1
 Summary:        Curses Client for the Music Player Daemon
 License:        GPL-2.0+
 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
+BuildRequires:  gcc7-c++
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(glib-2.0) >= 2.30
 BuildRequires:  pkgconfig(libmpdclient) >= 2.9
+BuildRequires:  python-Sphinx
+BuildRequires:  meson
+BuildRequires:  ninja
 
 %description
 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
@@ -35,27 +42,49 @@
 %lang_package
 %prep
 %setup -q
+%patch1
+%patch2
+%patch3
+
+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
+
+CXX=g++-7 \
+meson configure \
+    -Dcurses=ncursesw \
+    -Dmouse=true \
+    -Dcolors=ncursesw \
+    -Dmultibyte=true \
+    -Dlocale=true \
+    -Dnls=true \
+    -Dlirc=false \
+    -Dtcp=true \
+    -Ddocumentation=false
+
+CXX=g++-7 \
+meson \
+    --prefix '%{_prefix}' \
+    --buildtype debug \
+    . \
+    output
 
 %build
-%configure \
-    --docdir="%{_docdir}/%{name}" \
-    --enable-colors \
-    --disable-lirc \
-    --enable-help-screen \
-    --enable-mouse \
-    --enable-artist-screen \
-    --enable-search-screen \
-    --enable-song-screen \
-    --enable-key-screen \
-    --disable-lyrics-screen \
-    --enable-outputs-screen \
-    --enable-chat-screen \
-    --disable-werror
-
-%__make %{?_smp_mflags} V=1
+CXX=g++-7 \
+ninja -C output %{?_smp_mflags} -v
 
 %install
-%makeinstall
+DESTDIR='%{buildroot}' ninja -C output install -v
+
+%__rm -rf '%{buildroot}%{_datadir}/doc'
 
 %find_lang %{name}
 
@@ -71,12 +100,12 @@
 
 %files
 %defattr(-,root,root)
+%doc AUTHORS COPYING NEWS README.rst
+%doc doc/*.sample doc/ncmpc.lirc
 %{_bindir}/ncmpc
 %dir %{_sysconfdir}/%{name}
 %config %{_sysconfdir}/%{name}/keys
 %config %{_sysconfdir}/%{name}/config
-%dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/*
 %doc %{_mandir}/man1/ncmpc.1*
 
 %changelog

ncmpc-c++11.patch Added

@@ -0,0 +1,42 @@
+--- 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 Added

ncmpc-fix_meson_gcc_config.patch Added

ncmpc-0.27.tar.xz -> ncmpc-0.30.tar.xz Changed

Changes of Revision 8