commit f98becac97ca34594c73e75a3f7e9488cd0527dd
Author: Jakub Bogusz <[email protected]>
Date: Wed May 10 21:29:37 2023 +0200
- up to 0.2DrBombay
xmms2-format.patch | 11 -----------
xmms2-python3.patch | 53 ++++++++++++++++++++++++++++++++---------------------
xmms2.spec | 6 ++----
3 files changed, 34 insertions(+), 36 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index 86a7b2e..9b6a8b9 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -9,17 +9,16 @@
Summary: Client/server based media player system
Summary(pl.UTF-8): System odtwarzania multimediów oparty na architekturze
klient/serwer
Name: xmms2
-Version: 0.2DrAlban
+Version: 0.2DrBombay
Release: 0.1
License: LGPL v2.1
Group: Applications/Sound
Source0:
http://downloads.sourceforge.net/xmms2/%{name}-%{version}.tar.bz2
-# Source0-md5: 172368d5d03d3f309641f82aef7490f5
+# Source0-md5: 2477865f4e609f58e00d4ab27d8c4fbf
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}-sid-update.patch
URL: http://xmms2.xmms.se/
@@ -373,7 +372,6 @@ xmms2.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
diff --git a/xmms2-format.patch b/xmms2-format.patch
deleted file mode 100644
index 5e593c2..0000000
--- a/xmms2-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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\
- -s|--status-fd=fd Specify a filedescriptor to write to when started\n";
-- printf(usageText);
-+ fputs(usageText, stdout);
- }
-
- /* @endif */
diff --git a/xmms2-python3.patch b/xmms2-python3.patch
index d421be9..af52d6d 100644
--- a/xmms2-python3.patch
+++ b/xmms2-python3.patch
@@ -1,5 +1,5 @@
---- 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
+--- xmms2-0.2DrBombay/SConstruct.orig 2023-05-10 20:46:53.629794051 +0200
++++ xmms2-0.2DrBombay/SConstruct 2023-05-10 20:54:00.570814446 +0200
@@ -5,7 +5,6 @@ import sys
import SCons
import re
@@ -114,10 +114,10 @@
-print ", ".join(foo)
+print(", ".join(foo))
- base_env.add_shared("dismantled-the_swarm_clip.ogg")
+ base_env.add_shared("mind.in.a.box-lament_snipplet.ogg")
base_env.Alias('install', base_env.install_targets)
---- 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
+--- xmms2-0.2DrBombay/xmmsenv.py.orig 2023-05-10 20:54:22.264030257 +0200
++++ xmms2-0.2DrBombay/xmmsenv.py 2023-05-10 20:58:35.045994153 +0200
@@ -5,15 +5,12 @@ import shutil
import gzip
from marshal import load
@@ -214,10 +214,10 @@
sys.exit(-1)
raise ConfigError("Command '%s' failed" % cmd)
ret = ret.strip()
-@@ -200,18 +197,18 @@ class XMMSEnvironment(Environment):
+@@ -205,18 +202,18 @@ class XMMSEnvironment(Environment):
+ else:
+ key = ("HEADER", header)
- def checkheader(self, header, fail=False):
- key = ("HEADER", header)
- if not self.config_cache.has_key(key):
+ if key not in self.config_cache:
self.config_cache[key] = self.conf.CheckCHeader(header)
@@ -236,7 +236,7 @@
#libtool_flags = None
self.config_cache[key] = ""
-@@ -234,7 +231,7 @@ class XMMSEnvironment(Environment):
+@@ -239,7 +236,7 @@ class XMMSEnvironment(Environment):
if not self.config_cache[key]:
if fail:
@@ -245,7 +245,7 @@
sys.exit(1)
raise ConfigError("Symbol '%s' in library '%s' not
found" % (func, lib))
-@@ -365,14 +362,14 @@ class XMMSEnvironment(Environment):
+@@ -370,14 +367,14 @@ class XMMSEnvironment(Environment):
if options.files:
for filename in options.files:
if os.path.exists(filename):
@@ -263,7 +263,7 @@
if options.args[option.key] !=
cached[option.key]:
# differnt value
return True
-@@ -402,7 +399,7 @@ class XMMSEnvironment(Environment):
+@@ -407,7 +404,7 @@ class XMMSEnvironment(Environment):
This will open the libtool file and read the lines
that we need.
"""
@@ -272,7 +272,7 @@
line = f.readline()
ret = {}
while line:
-@@ -419,12 +416,12 @@ class XMMSEnvironment(Environment):
+@@ -424,12 +421,12 @@ class XMMSEnvironment(Environment):
targets = [cls(a[1], self) for a in self.potential_targets if
a[0].startswith(targettype)]
for t in targets:
@@ -287,8 +287,8 @@
+ except ConfigError as m:
self.conf.logstream.write("xmmsscons: File %s
reported error '%s' and was disabled.\n" % (t.target, m))
continue
---- xmms2-0.1DR2.1/src/clients/lib/ruby/Library.orig 2005-08-18
20:26:23.000000000 +0200
-+++ xmms2-0.1DR2.1/src/clients/lib/ruby/Library 2023-05-07
20:13:51.721404557 +0200
+--- xmms2-0.2DrBombay/src/clients/lib/ruby/Library.orig 2023-05-10
21:16:11.150272745 +0200
++++ xmms2-0.2DrBombay/src/clients/lib/ruby/Library 2023-05-10
21:17:02.769993097 +0200
@@ -7,14 +7,14 @@ static=False
def config(env):
if env.tryaction ("ruby --version") :
@@ -385,25 +385,36 @@
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 @@
+--- xmms2-0.2DrBombay/gittools.py.orig 2006-01-13 12:54:27.000000000 +0100
++++ xmms2-0.2DrBombay/gittools.py 2023-05-10 21:02:19.834776368 +0200
+@@ -1,24 +1,24 @@
import os
-import sha
+import hashlib
def gitsha(path):
- h = sha.sha()
+- data = file(path).read()
+ h = hashlib.sha1()
- data = file(path).read()
++ data = open(path).read()
h.update("blob %d\0" % len(data))
h.update(data)
-@@ -13,7 +13,7 @@ def git_info():
+ return h.hexdigest()
+
+ def git_info():
+- commithash = file('.git/HEAD').read().strip()
++ commithash = open('.git/HEAD').read().strip()
if os.getuid() == os.stat(".git/index").st_uid:
- os.system('git-update-cache --refresh >/dev/null')
+ os.system('git-update-index --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())
+ changed = bool(os.popen('git-diff-index -r HEAD').read())
return commithash, changed
+ def snapshot_info():
+- info = file('commithash').read().split('\n')
++ info = open('commithash').read().split('\n')
+
+ commithash = info[0]
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmms2.git/commitdiff/f98becac97ca34594c73e75a3f7e9488cd0527dd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
