Compare commits
No commits in common. "8aad41571aff5ab1014284333dae172bda48c984" and "31c230ad8bf74833389fca24e92f61c97ab8db8a" have entirely different histories.
8aad41571a
...
31c230ad8b
@ -1,53 +0,0 @@
|
|||||||
From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
|
||||||
Date: Mon, 11 Jul 2022 00:56:28 +0200
|
|
||||||
Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python
|
|
||||||
|
|
||||||
The 'U' mode bit is removed in python 3.11. It has been
|
|
||||||
deprecated for a long time. The 'U' mode bit has no effect
|
|
||||||
so this change doesn't change any behavior.
|
|
||||||
|
|
||||||
See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
|
|
||||||
---
|
|
||||||
waflib/ConfigSet.py | 2 +-
|
|
||||||
waflib/Context.py | 4 ++--
|
|
||||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py
|
|
||||||
index b300bb56..84736c9c 100644
|
|
||||||
--- a/waflib/ConfigSet.py
|
|
||||||
+++ b/waflib/ConfigSet.py
|
|
||||||
@@ -312,7 +312,7 @@ class ConfigSet(object):
|
|
||||||
:type filename: string
|
|
||||||
"""
|
|
||||||
tbl = self.table
|
|
||||||
- code = Utils.readf(filename, m='rU')
|
|
||||||
+ code = Utils.readf(filename, m='r')
|
|
||||||
for m in re_imp.finditer(code):
|
|
||||||
g = m.group
|
|
||||||
tbl[g(2)] = eval(g(3))
|
|
||||||
diff --git a/waflib/Context.py b/waflib/Context.py
|
|
||||||
index 9fee3fa1..761b521f 100644
|
|
||||||
--- a/waflib/Context.py
|
|
||||||
+++ b/waflib/Context.py
|
|
||||||
@@ -266,7 +266,7 @@ class Context(ctx):
|
|
||||||
cache[node] = True
|
|
||||||
self.pre_recurse(node)
|
|
||||||
try:
|
|
||||||
- function_code = node.read('rU', encoding)
|
|
||||||
+ function_code = node.read('r', encoding)
|
|
||||||
exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
|
|
||||||
finally:
|
|
||||||
self.post_recurse(node)
|
|
||||||
@@ -662,7 +662,7 @@ def load_module(path, encoding=None):
|
|
||||||
|
|
||||||
module = imp.new_module(WSCRIPT_FILE)
|
|
||||||
try:
|
|
||||||
- code = Utils.readf(path, m='rU', encoding=encoding)
|
|
||||||
+ code = Utils.readf(path, m='r', encoding=encoding)
|
|
||||||
except EnvironmentError:
|
|
||||||
raise Errors.WafError('Could not read the file %r' % path)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff --git a/doxyfile.in b/doxyfile.in
|
|
||||||
index f92e264a..2335adab 100644
|
|
||||||
--- a/doxyfile.in
|
|
||||||
+++ b/doxyfile.in
|
|
||||||
@@ -792,7 +792,7 @@ HTML_HEADER =
|
|
||||||
# each generated HTML page. If it is left blank doxygen will generate a
|
|
||||||
# standard footer.
|
|
||||||
|
|
||||||
-HTML_FOOTER = @SRCDIR@/no_date_footer.html
|
|
||||||
+HTML_FOOTER =
|
|
||||||
|
|
||||||
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
|
|
||||||
# style sheet that is used by each HTML page. It can be used to
|
|
||||||
@ -1,17 +1,13 @@
|
|||||||
%global groupname jackuser
|
|
||||||
|
|
||||||
Name: jack-audio-connection-kit
|
Name: jack-audio-connection-kit
|
||||||
Version: 1.9.14
|
Version: 1.9.12
|
||||||
Release: 4
|
Release: 9
|
||||||
Summary: A professional sound server
|
Summary: A professional sound server
|
||||||
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and GPL-3.0+
|
License: GPLv2 and GPLv2+ and LGPLv2+
|
||||||
URL: http://github.com/jackaudio/jack2
|
URL: http://www.jackaudio.org
|
||||||
Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
|
Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
|
||||||
Patch0: %{name}-doxygen.patch
|
|
||||||
Patch1: Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch
|
|
||||||
|
|
||||||
BuildRequires: alsa-lib-devel dbus-devel doxygen expat-devel gcc-c++ libffado-devel libsamplerate-devel libdb-devel < 6.0.20
|
BuildRequires: alsa-lib-devel dbus-devel doxygen expat-devel gcc-c++ libffado-devel libsamplerate-devel
|
||||||
BuildRequires: libsndfile-devel ncurses-devel opus-devel pkgconfig python3 readline-devel
|
BuildRequires: libsndfile-devel ncurses-devel opus-devel pkgconfig python2 readline-devel
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires: pam
|
Requires: pam
|
||||||
Provides: jack-audio-connection-kit-dbus = %{version}-%{release}
|
Provides: jack-audio-connection-kit-dbus = %{version}-%{release}
|
||||||
@ -39,12 +35,12 @@ The package contains the libraries and headers necessary for the Jack Audio Conn
|
|||||||
export CPPFLAGS="$RPM_OPT_FLAGS"
|
export CPPFLAGS="$RPM_OPT_FLAGS"
|
||||||
export LDFLAGS="$RPM_LD_FLAGS"
|
export LDFLAGS="$RPM_LD_FLAGS"
|
||||||
export PREFIX=%{_prefix}
|
export PREFIX=%{_prefix}
|
||||||
python3 ./waf configure %{?_smp_mflags} --mandir=%{_mandir}/man1 --libdir=%{_libdir} --doxygen --dbus --db \
|
./waf configure %{?_smp_mflags} --mandir=%{_mandir}/man1 --libdir=%{_libdir} --doxygen --dbus \
|
||||||
--classic --firewire --alsa --clients 256 --ports-per-application=2048
|
--classic --firewire --alsa --clients 256 --ports-per-application=2048
|
||||||
python3 ./waf build %{?_smp_mflags} -v
|
./waf build %{?_smp_mflags} -v
|
||||||
|
|
||||||
%install
|
%install
|
||||||
python3 ./waf --destdir=$RPM_BUILD_ROOT install
|
./waf --destdir=$RPM_BUILD_ROOT install
|
||||||
|
|
||||||
mv $RPM_BUILD_ROOT%{_datadir}/jack-audio-connection-kit/reference .
|
mv $RPM_BUILD_ROOT%{_datadir}/jack-audio-connection-kit/reference .
|
||||||
|
|
||||||
@ -62,7 +58,7 @@ exit 0
|
|||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc ChangeLog.rst
|
%doc ChangeLog
|
||||||
%{_bindir}/jackd
|
%{_bindir}/jackd
|
||||||
%{_bindir}/jackrec
|
%{_bindir}/jackrec
|
||||||
%{_libdir}/jack/
|
%{_libdir}/jack/
|
||||||
@ -85,23 +81,11 @@ exit 0
|
|||||||
%exclude %{_bindir}/jack_control
|
%exclude %{_bindir}/jack_control
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%doc README.rst README_NETJACK2
|
%doc README README_NETJACK2 TODO
|
||||||
%doc reference/html/
|
%doc reference/html/
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%exclude %{_mandir}/man1/jack_impulse_grabber.1*
|
%exclude %{_mandir}/man1/jack_impulse_grabber.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Aug 16 2023 chenchen <chen_aka_jan@163.com> - 1.9.14-4
|
* Fri Feb 25 2020 xuxijian<xuxijian@huawei.com> - 1.9.12-9
|
||||||
- Remove usage of 'U' mode bit for opening files in python 3.11
|
|
||||||
|
|
||||||
* Fri Oct 22 2021 Ge Wang <wangge20@huawei.com> - 1.9.14-3
|
|
||||||
- Fix groupname is not a valid name error
|
|
||||||
|
|
||||||
* Wed Jan 20 2021 Ge Wang <wangge20@huawei.com> - 1.9.14-2
|
|
||||||
- Modify license information.
|
|
||||||
|
|
||||||
* Thu Nov 12 2020 leiju<leiju4@huawei.com> - 1.9.14-1
|
|
||||||
- Update to 1.9.14
|
|
||||||
|
|
||||||
* Mon Feb 24 2020 xuxijian<xuxijian@huawei.com> - 1.9.12-9
|
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: github
|
|
||||||
src_repo: jackaudio/jack2
|
|
||||||
tag_prefix: "^v"
|
|
||||||
separator: "."
|
|
||||||
BIN
jack2-1.9.12.tar.gz
Normal file
BIN
jack2-1.9.12.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user