Overview

Request 4295 (accepted)

No description set
Submit package home:Aloysius:branches:Multimedia / ncmpc to package Multimedia / ncmpc

ncmpc.changes Changed
x
 
1
@@ -1,4 +1,34 @@
2
 -------------------------------------------------------------------
3
+Thu Oct 11 07:38:47 UTC 2018 - aloisio@gmx.com
4
+
5
+- Update to version 0.32
6
+  * fix crash bug on queue page
7
+  * fix crash bug on lyrics page
8
+  * fix off-by-one buffer overflow bug
9
+  * fix manpage installation directory
10
+  * fix build breakages with some ncurses builds
11
+  * work around GCC 4.9 build failure
12
+  * remove doxygen support
13
+  * new dependency: Boost
14
+  * remove dependency on GLib
15
+  version 0.31
16
+  * fix "No such song" in search screen
17
+  * fix progressbar when colors are disabled
18
+  * enable colors by default
19
+  * allow configuring per-style background colors
20
+  * keep current song in xterm title when MPD is paused
21
+  * load configuration from $XDG_CONFIG_HOME/ncmpc/config
22
+  * always show the screen list at the top
23
+  * fix memory leak
24
+  * require MPD 0.19
25
+
26
+- Refreshed ncmpc-fix_meson_docdir.patch
27
+
28
+- Dropped ncmpc-fix_meson_gcc_config.patch and ncmpc-c++11.patch
29
+
30
+- Spec cleanup
31
+
32
+-------------------------------------------------------------------
33
 Sun Apr 15 17:27:33 UTC 2018 - pascal.bleser@opensuse.org
34
 
35
 - change build to use meson+ninja+sphinx
36
ncmpc.spec Changed
128
 
1
@@ -1,4 +1,7 @@
2
-# vim: set sw=4 ts=4 et:
3
+#
4
+# spec file for package ncmpc
5
+#
6
+# Copyright (c) 2018 Packman team: http://packman.links2linux.org/
7
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
8
 #
9
 # All modifications and additions to the file contributed by third parties
10
@@ -14,24 +17,18 @@
11
 
12
 
13
 Name:           ncmpc
14
-Version:        0.30
15
-Release:        1
16
+Version:        0.32
17
+Release:        0
18
 Summary:        Curses Client for the Music Player Daemon
19
-License:        GPL-2.0+
20
+License:        GPL-2.0-or-later
21
 Group:          Productivity/Multimedia/Sound/Players
22
-Source:         http://www.musicpd.org/download/ncmpc/0/ncmpc-%{version}.tar.xz
23
-Patch1:         ncmpc-fix_meson_gcc_config.patch
24
-Patch2:         ncmpc-c++11.patch
25
-Patch3:         ncmpc-fix_meson_docdir.patch
26
 URL:            http://mpd.wikia.com/wiki/Client:Ncmpc
27
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
28
-%if %{suse_version} > 1500
29
-BuildRequires:  gcc-c++
30
-%else
31
-BuildRequires:  gcc7-c++
32
-%endif
33
+Source:         https://www.musicpd.org/download/ncmpc/0/ncmpc-%{version}.tar.xz
34
+Patch3:         ncmpc-fix_meson_docdir.patch
35
+BuildRequires:  gcc-c++ >= 7
36
+BuildRequires:  libboost_iostreams-devel >= 1.62
37
 BuildRequires:  ncurses-devel
38
-BuildRequires:  pkg-config
39
+BuildRequires:  pkgconfig
40
 BuildRequires:  pkgconfig(glib-2.0) >= 2.30
41
 BuildRequires:  pkgconfig(libmpdclient) >= 2.9
42
 BuildRequires:  python-Sphinx
43
@@ -39,73 +36,39 @@
44
 BuildRequires:  ninja
45
 
46
 %description
47
-ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 
48
-a MPD running on a machine on the local network, and controls this with an 
49
+ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to
50
+a MPD running on a machine on the local network, and controls this with an
51
 interface inspired by cplay.
52
 
53
 %lang_package
54
 %prep
55
 %setup -q
56
-%patch1
57
-%patch2
58
 %patch3
59
 
60
 %build
61
-export PKG_CONFIG_PATH="$PWD/pc:$PKG_CONFIG_PATH"
62
-mkdir pc
63
-cat<<EOF > pc/ncursesw.pc
64
-prefix=/usr
65
-libdir=%{_libdir}
66
-
67
-Version: `rpm -q --qf='%{VERSION}' ncurses-devel`
68
-Name: ncursesw
69
-Description: ncursesw
70
-Libs: -L\${libdir} -lncursesw
71
-EOF
72
-test -n "$(type -p g++)"   && CXX=$_
73
-test -n "$(type -p g++-7)" && CXX=$_
74
-
75
-CXX="${CXX}" \
76
-meson \
77
-    --prefix '%{_prefix}' \
78
-    --buildtype debug \
79
-    -Dcurses=ncursesw \
80
-    -Dmouse=true \
81
-    -Dcolors=ncursesw \
82
-    -Dmultibyte=true \
83
-    -Dlocale=true \
84
-    -Dnls=true \
85
-    -Dlirc=false \
86
-    -Dtcp=true \
87
-    -Ddocumentation=false \
88
-    . \
89
-    output
90
-
91
-CXX="${CXX}" \
92
-ninja -C output %{?_smp_mflags} -v
93
+%meson \
94
+       -Dhtml_manual=false
95
+%meson_build
96
 
97
 %install
98
-DESTDIR='%{buildroot}' ninja -C output install -v
99
-
100
-%__rm -rf '%{buildroot}%{_datadir}/doc'
101
+%meson_install
102
 
103
 %find_lang %{name}
104
 
105
 # install config.sample and keys.sample in /etc/ncmpc
106
-%__install -D -m 644 doc/keys.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/keys
107
-%__install -D -m 644 doc/config.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config
108
+install -D -m 644 doc/keys.sample %{buildroot}%{_sysconfdir}/%{name}/keys
109
+install -D -m 644 doc/config.sample %{buildroot}%{_sysconfdir}/%{name}/config
110
 
111
 %files lang -f %{name}.lang
112
-%defattr(-,root,root)
113
 
114
 %files
115
-%defattr(-,root,root)
116
-%doc AUTHORS COPYING NEWS README.rst
117
+%license COPYING
118
+%doc AUTHORS NEWS README.rst
119
 %doc doc/*.sample doc/ncmpc.lirc
120
 %{_bindir}/ncmpc
121
 %dir %{_sysconfdir}/%{name}
122
 %config %{_sysconfdir}/%{name}/keys
123
 %config %{_sysconfdir}/%{name}/config
124
-%doc %{_mandir}/man1/ncmpc.1*
125
+%doc %{_mandir}/man1/ncmpc.1%{ext_man}
126
 
127
 %changelog
128
ncmpc-c++11.patch Deleted
44
 
1
@@ -1,42 +0,0 @@
2
---- src/BasicMarquee.cxx.orig  2018-04-15 19:07:11.477337687 +0200
3
-+++ src/BasicMarquee.cxx   2018-04-15 19:07:17.257355182 +0200
4
-@@ -76,5 +76,5 @@
5
-   g_free(text);
6
-   text = nullptr;
7
- 
8
--  g_free(std::exchange(text_utf8, nullptr));
9
-+  g_free(std::__exchange(text_utf8, nullptr));
10
- }
11
---- src/hscroll.cxx.orig   2018-04-15 19:07:28.293388583 +0200
12
-+++ src/hscroll.cxx    2018-04-15 19:07:33.585404598 +0200
13
-@@ -61,7 +61,7 @@
14
-   basic.Clear();
15
- 
16
-   if (source_id != 0)
17
--      g_source_remove(std::exchange(source_id, 0));
18
-+      g_source_remove(std::__exchange(source_id, 0));
19
- }
20
- 
21
- void
22
---- src/Page.hxx.orig  2018-04-15 19:07:38.285418822 +0200
23
-+++ src/Page.hxx   2018-04-15 19:07:42.657432051 +0200
24
-@@ -70,7 +70,7 @@
25
-   }
26
- 
27
-   void Update(struct mpdclient &c) {
28
--      Update(c, std::exchange(pending_events, 0));
29
-+      Update(c, std::__exchange(pending_events, 0));
30
-   }
31
- 
32
- protected:
33
---- src/filelist.hxx.orig  2018-04-15 19:06:49.833272166 +0200
34
-+++ src/filelist.hxx   2018-04-15 19:07:01.865308591 +0200
35
-@@ -38,7 +38,7 @@
36
- 
37
-   FileListEntry(FileListEntry &&src)
38
-       :flags(src.flags),
39
--       entity(std::exchange(src.entity, nullptr)) {}
40
-+       entity(std::__exchange(src.entity, nullptr)) {}
41
- 
42
-   FileListEntry &operator=(FileListEntry &&src) {
43
-       using std::swap;
44
ncmpc-fix_meson_docdir.patch Changed
35
 
1
@@ -1,11 +1,29 @@
2
---- meson.build.orig   2018-04-15 19:10:48.613989140 +0200
3
-+++ meson.build    2018-04-15 19:10:59.522020430 +0200
4
-@@ -380,7 +380,7 @@
5
+Index: meson.build
6
+===================================================================
7
+--- meson.build.orig
8
++++ meson.build
9
+@@ -384,8 +384,8 @@ ncmpc = executable('ncmpc',
10
  
11
  configure_file(output: 'config.h', configuration: conf)
12
  
13
 -docdir = join_paths(get_option('datadir'), 'doc', meson.project_name())
14
+-install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst',
15
 +docdir = join_paths(get_option('datadir'), 'doc', 'packages', meson.project_name())
16
- install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst',
17
++install_data('AUTHORS', 'NEWS', 'README.rst',
18
    'doc/config.sample',
19
    'doc/keys.sample',
20
+   'doc/ncmpc.lirc',
21
+Index: doc/meson.build
22
+===================================================================
23
+--- doc/meson.build.orig
24
++++ doc/meson.build
25
+@@ -20,7 +20,8 @@ if sphinx.found()
26
+       command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
27
+       build_by_default: true,
28
+       install: true,
29
+-      install_dir: get_option('mandir'),
30
++      install_dir: get_option('datadir'),
31
+     )
32
+   endif
33
+ endif
34
++
35
ncmpc-fix_meson_gcc_config.patch Deleted
13
 
1
@@ -1,11 +0,0 @@
2
---- meson.build.orig   2018-04-15 18:36:58.559796835 +0200
3
-+++ meson.build    2018-04-15 18:37:04.971816648 +0200
4
-@@ -1,7 +1,7 @@
5
- project('ncmpc', 'cpp',
6
-   version: '0.30',
7
-   default_options: [
8
--    'cpp_std=c++14'
9
-+    'cpp_std=c++11'
10
-   ],
11
-   license: 'GPLv2+',
12
- )
13
ncmpc-0.30.tar.xz -> ncmpc-0.32.tar.xz Changed
Refresh
Refresh

Luigi Baldoni

Aloysius wrote over 6 years ago

Sorry, what is it that fails to build?


Olaf Hering

olh wrote over 6 years ago

It is all red, while the variant in Multimedia is all green.


Aloysius wrote over 6 years ago

The updated version requires a newer boost, would you be comfortable with linking it for 42.3 and SLE12?

Request History
Luigi Baldoni's avatar

Aloysius created request almost 7 years ago


Olaf Hering's avatar

olh declined request over 6 years ago

fails to build with this change


Luigi Baldoni's avatar

Aloysius reopened request over 6 years ago

Can't see the failure, could you please be more specific?


Olaf Hering's avatar

olh accepted request over 6 years ago