[packages/xmms2] - up to 0.2DrAlban - adde sid-update, sid plugin appeared now
qboosh
qboosh at pld-linux.org
Wed May 10 19:49:06 CEST 2023
commit 1270936ff9048e49ff0b64aa3e6897f3e16f320f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed May 10 19:51:27 2023 +0200
- up to 0.2DrAlban
- adde sid-update, sid plugin appeared now
xmms2-format.patch | 10 +++---
xmms2-python3.patch | 90 ++++++++++++++++++++++++++++++--------------------
xmms2-ruby.patch | 15 +++++++--
xmms2-sid-update.patch | 17 ++++++++++
xmms2-sqlite.patch | 20 -----------
xmms2-tabs.patch | 28 ++++++++--------
xmms2.spec | 31 +++++++++++------
7 files changed, 122 insertions(+), 89 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index 622d181..72a925f 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -8,21 +8,20 @@
Summary: Client/server based media player system
Summary(pl.UTF-8): System odtwarzania multimediów oparty na architekturze klient/serwer
-%define _dr 2.2
Name: xmms2
-Version: 0.1
-Release: 0.DR%{_dr}.0.3
+Version: 0.2DrAlban
+Release: 0.1
License: LGPL v2.1
Group: Applications/Sound
-Source0: http://downloads.sourceforge.net/xmms2/%{name}-%{version}DR%{_dr}.tar.gz
-# Source0-md5: e1f8c5a0ed5be0913eae12eb464e7e3b
+Source0: http://downloads.sourceforge.net/xmms2/%{name}-%{version}.tar.bz2
+# Source0-md5: 172368d5d03d3f309641f82aef7490f5
Patch0: %{name}-tabs.patch
Patch1: %{name}-python3.patch
Patch2: %{name}-link.patch
Patch3: %{name}-modplug.patch
Patch4: %{name}-format.patch
Patch5: %{name}-ruby.patch
-Patch6: %{name}-sqlite.patch
+Patch6: %{name}-sid-update.patch
URL: http://xmms2.xmms.se/
BuildRequires: SDL-devel
BuildRequires: SDL_ttf-devel
@@ -35,6 +34,7 @@ BuildRequires: gnome-vfs2-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libmad-devel
BuildRequires: libmodplug-devel
+BuildRequires: libsidplay2-devel
BuildRequires: libsmbclient-devel
BuildRequires: libvorbis-devel
BuildRequires: pkgconfig
@@ -46,6 +46,7 @@ BuildRequires: python3 >= 1:3.2
BuildRequires: rpmbuild(macros) >= 1.277
%{?with_ruby:BuildRequires: ruby-modules >= 1:1.8}
BuildRequires: scons >= 4
+BuildRequires: sed >= 4.0
#BuildRequires: speex-devel
BuildRequires: sqlite3-devel >= 3.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -340,7 +341,7 @@ Ten pakiet zawiera biblioteki programistyczne i pliki nagłówkowe dla
xmms2.
%prep
-%setup -q -n %{name}-%{version}DR%{_dr}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -349,11 +350,18 @@ xmms2.
%patch5 -p1
%patch6 -p1
+%{__sed} -i xmms2.pc.in \
+ -e '/^libdir/ s,/lib$,/%{_lib},'
+%{__sed} -i SConstruct \
+ -e '/%PKGLIBDIR%/ s,/lib/,/%{_lib}/,'
%{__sed} -i xmmsenv.py \
-e '/os\.path\.join(self\.install_prefix.*"lib/s@"lib@"%{_lib}@'
%{__sed} -i src/clients/lib/python/Library \
-e 's/get_python_lib()/get_python_lib("false")/'
+# avoid invalid version in .pc files
+%{__sed} -i -e '/^XMMS_VERSION/ s/ \(Dr[^ ]*\) (git commit: %s%s)/\1/; s/ % .*//;' SConstruct
+
iconv -f iso-8859-1 -t utf8 doc/xmms2.1 -o doc/xmms2.1.utf8
%{__mv} doc/xmms2.1.utf8 doc/xmms2.1
@@ -381,6 +389,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README TODO
+%attr(755,root,root) %{_bindir}/xmms2-launcher
%attr(755,root,root) %{_bindir}/xmms2d
%attr(755,root,root) %{_libdir}/libxmmsclient.so.0
%dir %{_libdir}/%{name}
@@ -389,8 +398,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/libxmms_file.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_html.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_m3u.so
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_null.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_pls.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_replaygain.so
+# TODO: separate
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_faad.so
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_musepack.so
%{_datadir}/%{name}
%{_mandir}/man8/xmms2d.8*
@@ -398,6 +411,7 @@ rm -rf $RPM_BUILD_ROOT
%files client-cli
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xmms2
+%attr(755,root,root) %{_bindir}/xmms2-et
%attr(755,root,root) %{_bindir}/xmms2-mlib-updater
%{_mandir}/man1/xmms2.1*
@@ -462,12 +476,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_modplug.so
-%if 0
-# disabled up to DR2.1
%files input-sid
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_sid.so
-%endif
%if 0
# disabled in DR2.1
diff --git a/xmms2-format.patch b/xmms2-format.patch
index a1511cf..5e593c2 100644
--- a/xmms2-format.patch
+++ b/xmms2-format.patch
@@ -1,9 +1,9 @@
---- xmms2-0.1DR2.1/src/xmms/main.c.orig 2005-08-18 20:26:23.000000000 +0200
-+++ xmms2-0.1DR2.1/src/xmms/main.c 2023-05-06 22:09:11.418652966 +0200
-@@ -323,7 +323,7 @@ Options:\n\
- -p <foo> Search for plugins in directory 'foo'\n\
+--- xmms2-0.2DrAlban/src/xmms/main.c.orig 2023-05-09 21:49:50.690734257 +0200
++++ xmms2-0.2DrAlban/src/xmms/main.c 2023-05-09 21:50:24.180552827 +0200
+@@ -383,7 +383,7 @@ Options:\n\
-h|--help Print this help\n\
- -c|--conf=<file> Specify alternate configuration file\n";
+ -c|--conf=<file> Specify alternate configuration file\n\
+ -s|--status-fd=fd Specify a filedescriptor to write to when started\n";
- printf(usageText);
+ fputs(usageText, stdout);
}
diff --git a/xmms2-python3.patch b/xmms2-python3.patch
index 682fad2..d421be9 100644
--- a/xmms2-python3.patch
+++ b/xmms2-python3.patch
@@ -1,14 +1,14 @@
---- xmms2-0.1DR2.1/SConstruct.orig 2023-05-06 16:09:29.235573684 +0200
-+++ xmms2-0.1DR2.1/SConstruct 2023-05-06 16:18:35.752612948 +0200
+--- xmms2-0.2DrAlban/SConstruct.orig 2023-05-09 21:45:41.648750100 +0200
++++ xmms2-0.2DrAlban/SConstruct 2023-05-09 21:47:00.734988320 +0200
@@ -5,7 +5,6 @@ import sys
import SCons
import re
import string
-import new
+ import gittools
from marshal import dump
- try:
-@@ -21,7 +20,7 @@ EnsurePythonVersion(2, 1)
+@@ -24,7 +23,7 @@ EnsurePythonVersion(2, 1)
SConsignFile()
def SimpleListOption(key, help, default=[]):
@@ -17,7 +17,7 @@
if sys.platform == 'win32':
-@@ -40,7 +39,7 @@ else:
+@@ -43,7 +42,7 @@ else:
else:
default_cpppath = []
@@ -26,7 +26,7 @@
opts.Add('CC', 'C compiler to use')
opts.Add('CXX', 'C++ compiler to use')
opts.Add('LD', 'Linker to use')
-@@ -54,9 +53,9 @@ opts.Add('MANDIR', 'manual directory', '
+@@ -57,9 +56,9 @@ opts.Add('MANDIR', 'manual directory', '
opts.Add('RUBYARCHDIR', 'Path to install Ruby bindings')
opts.Add('INSTALLDIR', 'install dir')
opts.Add('PKGCONFIGDIR', 'Where should we put our .pc files?', '$PREFIX/lib/pkgconfig')
@@ -38,7 +38,7 @@
# base CCPATH
base_env = xmmsenv.XMMSEnvironment(options=opts)
-@@ -74,24 +73,24 @@ def do_subst_in_file(targetfile, sourcef
+@@ -77,24 +76,24 @@ def do_subst_in_file(targetfile, sourcef
then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
"""
try:
@@ -69,7 +69,7 @@
d = dict(env['SUBST_DICT']) # copy it
for (k,v) in d.items():
if callable(v):
-@@ -99,7 +98,7 @@ def subst_in_file(target, source, env):
+@@ -102,7 +101,7 @@ def subst_in_file(target, source, env):
elif SCons.Util.is_String(v):
d[k]=env.subst(v)
else:
@@ -78,7 +78,7 @@
for (t,s) in zip(target, source):
return do_subst_in_file(str(t), str(s), d)
-@@ -128,7 +128,8 @@ python_executable = sys.executable
+@@ -132,7 +131,8 @@ python_executable = sys.executable
b = Builder(action = python_executable + ' src/xmms/generate-converter.py > src/xmms/converter.c')
base_env.Depends('#src/xmms/converter.c', 'src/xmms/generate-converter.py')
base_env.Depends('#src/xmms/sample.c', 'src/xmms/converter.c')
@@ -88,7 +88,7 @@
subst_dict = {"%VERSION%":XMMS_VERSION, "%PLATFORM%":"XMMS_OS_" + base_env.platform.upper(),
"%PKGLIBDIR%":base_env["PREFIX"]+"/lib/xmms2",
-@@ -146,7 +145,7 @@ base_env.handle_targets("Program")
+@@ -150,7 +150,7 @@ base_env.handle_targets("Program")
try:
dump(base_env.config_cache, open("config.cache", "wb+"))
except IOError:
@@ -97,7 +97,7 @@
#### INSTALL HEADERS!
-@@ -181,13 +180,13 @@ for p in pc_files:
+@@ -197,13 +197,13 @@ for p in pc_files:
base_env.Install("$PKGCONFIGDIR", p["name"]+".pc")
@@ -116,8 +116,8 @@
base_env.add_shared("dismantled-the_swarm_clip.ogg")
base_env.Alias('install', base_env.install_targets)
---- xmms2-0.1DR2.1/xmmsenv.py.orig 2023-05-06 17:20:47.209064583 +0200
-+++ xmms2-0.1DR2.1/xmmsenv.py 2023-05-06 17:24:10.881294529 +0200
+--- xmms2-0.2DrAlban/xmmsenv.py.orig 2023-05-09 21:47:27.101512147 +0200
++++ xmms2-0.2DrAlban/xmmsenv.py 2023-05-09 21:49:27.594192715 +0200
@@ -5,15 +5,12 @@ import shutil
import gzip
from marshal import load
@@ -134,7 +134,7 @@
def installFunc(dest, source, env):
"""Copy file, setting sane permissions"""
-@@ -35,7 +35,7 @@ class Target:
+@@ -38,7 +35,7 @@ class Target:
self.globs['platform'] = env.platform
self.globs['ConfigError'] = ConfigError
@@ -169,7 +169,16 @@
self.installdir = os.path.normpath(self["INSTALLDIR"] + '/')
else:
self.installdir = ""
-@@ -135,7 +132,7 @@ class XMMSEnvironment(Environment):
+@@ -124,7 +121,7 @@ class XMMSEnvironment(Environment):
+ self.platform = sys.platform
+
+ def gzipper(target, source, env):
+- gzip.GzipFile(target[0].path, 'wb',9).write(file(source[0].path).read())
++ gzip.GzipFile(target[0].path, 'wb',9).write(open(source[0].path, "rb").read())
+ self['BUILDERS']['GZipper'] = SCons.Builder.Builder(action=SCons.Action.Action(gzipper))
+
+ if self.platform == 'darwin':
+@@ -140,7 +137,7 @@ class XMMSEnvironment(Environment):
self.install_targets.append(target)
def tryaction(self, cmd):
@@ -178,7 +187,7 @@
return self.config_cache[cmd]
r = False
-@@ -156,7 +153,7 @@ class XMMSEnvironment(Environment):
+@@ -161,7 +158,7 @@ class XMMSEnvironment(Environment):
return r
def run(self, cmd):
@@ -187,7 +196,7 @@
return self.config_cache[cmd]
try:
-@@ -178,7 +175,7 @@ class XMMSEnvironment(Environment):
+@@ -183,7 +180,7 @@ class XMMSEnvironment(Environment):
def configcmd(self, cmd, fail=False):
@@ -196,7 +205,7 @@
ret = self.config_cache[cmd]
else:
ret = os.popen(cmd).read()
-@@ -186,7 +183,7 @@ class XMMSEnvironment(Environment):
+@@ -191,7 +188,7 @@ class XMMSEnvironment(Environment):
if ret == '':
if fail:
@@ -205,7 +214,7 @@
sys.exit(-1)
raise ConfigError("Command '%s' failed" % cmd)
ret = ret.strip()
-@@ -195,18 +192,18 @@ class XMMSEnvironment(Environment):
+@@ -200,18 +197,18 @@ class XMMSEnvironment(Environment):
def checkheader(self, header, fail=False):
key = ("HEADER", header)
@@ -227,7 +236,7 @@
#libtool_flags = None
self.config_cache[key] = ""
-@@ -229,7 +226,7 @@ class XMMSEnvironment(Environment):
+@@ -234,7 +231,7 @@ class XMMSEnvironment(Environment):
if not self.config_cache[key]:
if fail:
@@ -236,16 +245,7 @@
sys.exit(1)
raise ConfigError("Symbol '%s' in library '%s' not found" % (func, lib))
-@@ -345,7 +345,7 @@ class XMMSEnvironment(Environment):
- self.Install(os.path.join(self.includepath,target), source)
-
- def add_manpage(self, section, source):
-- gzip.GzipFile(source+".gz", 'wb',9).write(file(source).read())
-+ gzip.GzipFile(source+".gz", 'wb',9).write(open(source, "rb").read())
- self.Install(os.path.join(self.manpath, "man"+str(section)), source+'.gz')
-
- def options_changed(self, options, exclude=[]):
-@@ -354,7 +354,7 @@ class XMMSEnvironment(Environment):
+@@ -365,14 +362,14 @@ class XMMSEnvironment(Environment):
if options.files:
for filename in options.files:
if os.path.exists(filename):
@@ -254,8 +254,6 @@
else:
return False
-@@ -363,8 +360,8 @@ class XMMSEnvironment(Environment):
-
for option in options.options:
if option.key in exclude: continue
- if options.args.has_key(option.key):
@@ -265,7 +263,7 @@
if options.args[option.key] != cached[option.key]:
# differnt value
return True
-@@ -391,7 +391,7 @@ class XMMSEnvironment(Environment):
+@@ -402,7 +399,7 @@ class XMMSEnvironment(Environment):
This will open the libtool file and read the lines
that we need.
"""
@@ -274,7 +272,7 @@
line = f.readline()
ret = {}
while line:
-@@ -408,7 +408,7 @@ class XMMSEnvironment(Environment):
+@@ -419,12 +416,12 @@ class XMMSEnvironment(Environment):
targets = [cls(a[1], self) for a in self.potential_targets if a[0].startswith(targettype)]
for t in targets:
@@ -283,8 +281,6 @@
env.dir = t.dir
try:
-@@ -417,6 +414,6 @@ class XMMSEnvironment(Environment):
- try:
t.config(env)
t.add(env)
- except ConfigError, m:
@@ -389,3 +385,25 @@
env.Prepend(LIBPATH=["src/lib/xmmsipc"])
env.Prepend(LIBPATH=["src/lib/xmmssocket"])
env.Append(LIBS=['xmmsipc'])
+--- xmms2-0.2DrAlban/gittools.py.orig 2005-12-18 17:35:27.000000000 +0100
++++ xmms2-0.2DrAlban/gittools.py 2023-05-09 22:02:59.466461092 +0200
+@@ -1,8 +1,8 @@
+ import os
+-import sha
++import hashlib
+
+ def gitsha(path):
+- h = sha.sha()
++ h = hashlib.sha1()
+ data = file(path).read()
+ h.update("blob %d\0" % len(data))
+ h.update(data)
+@@ -13,7 +13,7 @@ def git_info():
+ if os.getuid() == os.stat(".git/index").st_uid:
+ os.system('git-update-cache --refresh >/dev/null')
+ else:
+- print "NOT updating git cache, local changes might not be detected"
++ print("NOT updating git cache, local changes might not be detected")
+ changed = bool(os.popen('git-diff-cache -r HEAD').read())
+ return commithash, changed
+
diff --git a/xmms2-ruby.patch b/xmms2-ruby.patch
index 2509192..b3f81cc 100644
--- a/xmms2-ruby.patch
+++ b/xmms2-ruby.patch
@@ -88,9 +88,18 @@
env.librarypath = os.popen(cmd).read().strip()
env.pkgconfig("glib-2.0")
---- xmms2-0.1DR2.1/src/clients/lib/ruby/rb_xmmsclient.c.orig 2023-05-07 21:46:21.478005611 +0200
-+++ xmms2-0.1DR2.1/src/clients/lib/ruby/rb_xmmsclient.c 2023-05-07 21:46:25.607983236 +0200
-@@ -523,7 +523,7 @@ static VALUE c_playlist_add (VALUE self,
+--- xmms2-0.2DrAlban/src/clients/lib/ruby/rb_xmmsclient.c.orig 2005-12-18 17:35:27.000000000 +0100
++++ xmms2-0.2DrAlban/src/clients/lib/ruby/rb_xmmsclient.c 2023-05-09 22:35:33.975872606 +0200
+@@ -511,7 +511,7 @@ static VALUE c_playlist_add (VALUE self,
+
+ if (!NIL_P (rb_check_string_type (arg)))
+ is_str = true;
+- else if (rb_obj_is_kind_of (arg, rb_cFixnum))
++ else if (rb_obj_is_kind_of (arg, rb_cInteger))
+ is_str = false;
+ else {
+ rb_raise (eXmmsClientError, "unsupported argument");
+@@ -538,7 +538,7 @@ static VALUE c_playlist_insert (VALUE se
if (!NIL_P (rb_check_string_type (arg)))
is_str = true;
diff --git a/xmms2-sid-update.patch b/xmms2-sid-update.patch
new file mode 100644
index 0000000..9fa3157
--- /dev/null
+++ b/xmms2-sid-update.patch
@@ -0,0 +1,17 @@
+--- xmms2-0.2DrAlban/src/plugins/sid/sid.c.orig 2005-12-18 17:35:27.000000000 +0100
++++ xmms2-0.2DrAlban/src/plugins/sid/sid.c 2023-05-10 17:17:13.484532781 +0200
+@@ -192,10 +192,12 @@ xmms_sid_get_media_info (xmms_decoder_t
+
+ err = sidplay_wrapper_songinfo (data->wrapper, artist, title);
+ if (err > 0) {
+- xmms_medialib_entry_property_set_str (entry,
++ xmms_medialib_session_t *session = xmms_medialib_begin ();
++ xmms_medialib_entry_property_set_str (session, entry,
+ XMMS_MEDIALIB_ENTRY_PROPERTY_TITLE, title);
+- xmms_medialib_entry_property_set_str (entry,
++ xmms_medialib_entry_property_set_str (session, entry,
+ XMMS_MEDIALIB_ENTRY_PROPERTY_ARTIST, artist);
++ xmms_medialib_end (session);
+ xmms_medialib_entry_send_update (entry);
+ }
+ }
diff --git a/xmms2-sqlite.patch b/xmms2-sqlite.patch
deleted file mode 100644
index 6eb5164..0000000
--- a/xmms2-sqlite.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xmms2-0.1DR2.2/src/xmms/Program.orig 2023-05-08 21:47:48.436132214 +0200
-+++ xmms2-0.1DR2.2/src/xmms/Program 2023-05-08 22:21:59.581686871 +0200
-@@ -33,17 +33,6 @@ def config(env):
- env.pkgconfig("gmodule-2.0", fail=True)
- env.pkgconfig("gthread-2.0", fail=True)
- env.pkgconfig("sqlite3", fail=True)
-- print "checking for sqlite version < 3.2.4...",
-- e = env.conf.TryRun("#include <sqlite3.h>\n int main() { if (SQLITE_VERSION_NUMBER > 3002004) { return 1; } else { return 0; } }", ".c")
-- if e[0] == 1:
-- print "ok!"
-- else:
-- print "no!"
-- print "*"*78
-- print "There is a KNOWN error with this version of SQLite and XMMS2."
-- print "PLEASE downgrade SQLite or UPGRADE XMMS2 to latest devel branch"
-- print "*"*78
-- raise RuntimeError("Abort!")
-
- if env.platform != 'win32':
- env.checklib("m", "sin", fail=True)
diff --git a/xmms2-tabs.patch b/xmms2-tabs.patch
index 6dff483..ee512db 100644
--- a/xmms2-tabs.patch
+++ b/xmms2-tabs.patch
@@ -1,6 +1,6 @@
---- xmms2-0.1DR2.1/SConstruct.orig 2005-08-18 20:26:23.000000000 +0200
-+++ xmms2-0.1DR2.1/SConstruct 2023-05-06 14:46:41.612485598 +0200
-@@ -69,8 +69,8 @@ base_env.Append(CPPPATH=["#src/include"]
+--- xmms2-0.2DrAlban/SConstruct.orig 2005-12-18 17:35:27.000000000 +0100
++++ xmms2-0.2DrAlban/SConstruct 2023-05-09 21:43:50.776017416 +0200
+@@ -72,8 +72,8 @@ base_env.Append(CPPPATH=["#src/include"]
Help(opts.GenerateHelpText(base_env))
def do_subst_in_file(targetfile, sourcefile, dict):
@@ -11,20 +11,22 @@
then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
"""
try:
-@@ -132,9 +132,9 @@ base_env.Depends('#src/xmms/sample.c', '
+@@ -135,10 +135,10 @@ base_env.Depends('#src/xmms/sample.c', '
base_env.SourceCode('src/xmms/converter.c', b)
subst_dict = {"%VERSION%":XMMS_VERSION, "%PLATFORM%":"XMMS_OS_" + base_env.platform.upper(),
- "%PKGLIBDIR%":base_env["PREFIX"]+"/lib/xmms2",
+- "%BINDIR%":base_env["PREFIX"]+"/bin",
- "%SHAREDDIR%":base_env.sharepath,
- "%PREFIX%":base_env.install_prefix}
+ "%PKGLIBDIR%":base_env["PREFIX"]+"/lib/xmms2",
++ "%BINDIR%":base_env["PREFIX"]+"/bin",
+ "%SHAREDDIR%":base_env.sharepath,
+ "%PREFIX%":base_env.install_prefix}
config = base_env.SubstInFile("src/include/xmms/xmms_defs.h", "src/include/xmms/xmms_defs.h.in", SUBST_DICT=subst_dict)
-@@ -156,7 +156,7 @@ def scan_headers(name):
+@@ -160,7 +160,7 @@ def scan_headers(name):
newf = dir+"/"+d
if os.path.isfile(newf) and newf.endswith('.h'):
base_env.add_header(name, newf)
@@ -33,7 +35,7 @@
scan_headers("xmmsc")
scan_headers("xmms")
scan_headers("xmmsclient")
-@@ -169,9 +169,9 @@ base_env.add_manpage(8, 'doc/xmms2d.8')
+@@ -185,9 +185,9 @@ base_env.add_manpage(8, 'doc/xmms2d.8')
#### Generate pc files.
pc_files = [{"name": "xmms2-plugin", "lib":""},
@@ -46,18 +48,14 @@
for p in pc_files:
d = subst_dict.copy()
---- xmms2-0.1DR2.1/xmmsenv.py.orig 2005-08-18 20:26:23.000000000 +0200
-+++ xmms2-0.1DR2.1/xmmsenv.py 2023-05-06 15:04:57.296549768 +0200
-@@ -347,9 +347,9 @@ class XMMSEnvironment(Environment):
+--- xmms2-0.2DrAlban/xmmsenv.py.orig 2023-05-09 21:16:22.821611818 +0200
++++ xmms2-0.2DrAlban/xmmsenv.py 2023-05-09 21:45:23.205516682 +0200
+@@ -352,7 +352,7 @@ class XMMSEnvironment(Environment):
def add_header(self, target, source):
self.Install(os.path.join(self.includepath,target), source)
- def add_manpage(self, section, source):
-- gzip.GzipFile(source+".gz", 'wb',9).write(file(source).read())
-- self.Install(os.path.join(self.manpath, "man"+str(section)), source+'.gz')
+ def add_manpage(self, section, source):
-+ gzip.GzipFile(source+".gz", 'wb',9).write(file(source).read())
-+ self.Install(os.path.join(self.manpath, "man"+str(section)), source+'.gz')
+ self.GZipper(source + '.gz', source)
+ self.Install(os.path.join(self.manpath, "man"+str(section)), source+'.gz')
- def options_changed(self, options, exclude=[]):
- """NOTE: This method does not catch changed defaults."""
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmms2.git/commitdiff/1270936ff9048e49ff0b64aa3e6897f3e16f320f
More information about the pld-cvs-commit
mailing list