diff --git a/hardware/firewire/libffado/actions.py b/hardware/firewire/libffado/actions.py index fadb78da5a..7165df9910 100644 --- a/hardware/firewire/libffado/actions.py +++ b/hardware/firewire/libffado/actions.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools diff --git a/hardware/firewire/libffado/pspec.xml b/hardware/firewire/libffado/pspec.xml index 6ec501356f..ce02447abb 100644 --- a/hardware/firewire/libffado/pspec.xml +++ b/hardware/firewire/libffado/pspec.xml @@ -1,5 +1,5 @@ - + libffado @@ -32,13 +32,13 @@ jack-audio-connection-kit-devel - flags.patch - - + libffado-2.4.0-crossbar-router-fix.patch + libffado-2.4.2-python38.patch --> @@ -100,7 +100,7 @@ /usr/bin/ffado-mixer* /usr/share/applications - /usr/share/metainfo/ffado-mixer.appdata.xml + /usr/share/metainfo/ffado-mixer.appdata.xml /usr/share/pixmaps @@ -109,6 +109,13 @@ + + 2021-10-22 + 2.4.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-11-19 2.4.4 @@ -116,7 +123,7 @@ Mustafa Cinasal muscnsl@gmail.com - + 2020-01-22 2.4.2 Version bump. diff --git a/multimedia/converter/soundconverter/pspec.xml b/multimedia/converter/soundconverter/pspec.xml index 9754db8e86..00735a649c 100644 --- a/multimedia/converter/soundconverter/pspec.xml +++ b/multimedia/converter/soundconverter/pspec.xml @@ -15,8 +15,8 @@ A simple sound converter application for the GNOME environment. It reads anything the GStreamer library can read, and writes WAV, FLAC, MP3, and Ogg Vorbis files. - - https://launchpad.net/soundconverter/trunk/4.0.1/+download/soundconverter-4.0.1.tar.gz + + https://launchpad.net/soundconverter/trunk/4.0.2/+download/soundconverter-4.0.2.tar.gz intltool @@ -54,6 +54,13 @@ + + 2021-10-23 + 4.0.2 + Version bump. + fury + uglyside@yandex.ru + 2021-05-18 4.0.1 diff --git a/network/library/serf/actions.py b/network/library/serf/actions.py index 6fbde04b4a..f7e380a548 100644 --- a/network/library/serf/actions.py +++ b/network/library/serf/actions.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import pisitools from pisi.actionsapi import scons diff --git a/network/library/serf/files/scons_py3.patch b/network/library/serf/files/scons_py3.patch new file mode 100644 index 0000000000..144f5e39ea --- /dev/null +++ b/network/library/serf/files/scons_py3.patch @@ -0,0 +1,24 @@ +--- serf-1.3.9/SConstruct.orig 2019-07-26 17:49:30.910189251 +0000 ++++ serf-1.3.9/SConstruct 2019-07-26 17:49:54.073821735 +0000 +@@ -163,9 +163,9 @@ + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +183,7 @@ + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print ('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU']) diff --git a/network/library/serf/pspec.xml b/network/library/serf/pspec.xml index 2a8e300dd8..2c7c1ad314 100644 --- a/network/library/serf/pspec.xml +++ b/network/library/serf/pspec.xml @@ -1,9 +1,9 @@ - + serf - https://code.google.com/p/serf/ + https://serf.apache.org/ Osman Erkan osman.erkan@pisilinux.org @@ -22,6 +22,9 @@ apr-util-devel scons + + scons_py3.patch + @@ -54,6 +57,13 @@ + + 2021-10-22 + 1.3.9 + Rebuild + İdris Kalp + idriskalp@gmail.com + 2020-02-26 1.3.9 diff --git a/network/library/serf/translations.xml b/network/library/serf/translations.xml index d1ec00cb1d..a2bdee9e91 100644 --- a/network/library/serf/translations.xml +++ b/network/library/serf/translations.xml @@ -10,4 +10,4 @@ serf-devel serf için geliştirme dosyaları - \ No newline at end of file + diff --git a/network/misc/florb/pspec.xml b/network/misc/florb/pspec.xml index 48cc933178..5c45cc7639 100644 --- a/network/misc/florb/pspec.xml +++ b/network/misc/florb/pspec.xml @@ -45,7 +45,10 @@ fltk curl gpsd + boost libgcc + libX11 + libXpm tinyxml2 @@ -60,6 +63,13 @@ + + 2021-10-22 + 1.1 + Rebuild. + fury + uglyside@yandex.ru + 2020-12-19 1.1 diff --git a/science/gis/gpsd/actions.py b/science/gis/gpsd/actions.py index 5150cabc22..458aebdf30 100644 --- a/science/gis/gpsd/actions.py +++ b/science/gis/gpsd/actions.py @@ -4,10 +4,7 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get +from pisi.actionsapi import shelltools, get shelltools.export("PYTHONDONTWRITEBYTECODE", "1") i = "/usr/bin/env python3 $(which scons)" @@ -24,7 +21,3 @@ def install(): # fix shebang shelltools.system("find %s/usr/bin -type f -exec sed -i 's|env\ python$|env python3|g' {} \;" % get.installDIR()) - # Install UDEV files -# pisitools.insinto("/lib/udev/rules.d", "gpsd.rules", "99-gpsd.rules") -# pisitools.dobin("gpsd.hotplug", "/lib/udev") - diff --git a/science/gis/gpsd/files/pylibdir_no_prefix_replace.patch b/science/gis/gpsd/files/pylibdir_path.patch similarity index 55% rename from science/gis/gpsd/files/pylibdir_no_prefix_replace.patch rename to science/gis/gpsd/files/pylibdir_path.patch index 5783e91549..d7a1c9fb16 100644 --- a/science/gis/gpsd/files/pylibdir_no_prefix_replace.patch +++ b/science/gis/gpsd/files/pylibdir_path.patch @@ -1,13 +1,13 @@ ---- a/SConstruct 2020-08-04 18:40:06.000000000 +0000 -+++ b/SConstruct 2020-12-12 18:29:38.378386573 +0000 -@@ -1460,8 +1460,8 @@ +--- a/SConscript 2021-09-22 00:53:44.000000000 +0300 ++++ b/SConscript 2021-09-25 06:56:40.449906438 +0300 +@@ -1492,8 +1492,8 @@ # follow FHS, put in /usr/local/libXX, not /usr/libXX # may be lib, lib32 or lib64 python_libdir = polystr(python_libdir) - python_libdir = python_libdir.replace("/usr/lib", - "/usr/local/lib") -+# python_libdir = python_libdir.replace("/usr/lib", -+# "/usr/local/lib") ++ # python_libdir = python_libdir.replace("/usr/lib", ++ # "/usr/local/lib") python_module_dir = str(python_libdir) + os.sep # Many systems can have a problem with the Python path - announce("Ensure your PYTHONPATH includes %s" % python_module_dir) + if 'PYTHONPATH' in os.environ: diff --git a/science/gis/gpsd/files/use_os_environ.patch b/science/gis/gpsd/files/use_os_environ.patch new file mode 100644 index 0000000000..e9d0a49b2c --- /dev/null +++ b/science/gis/gpsd/files/use_os_environ.patch @@ -0,0 +1,11 @@ +--- a/SConscript 2021-09-22 00:53:44.000000000 +0300 ++++ b/SConscript 2021-09-25 06:55:30.514907375 +0300 +@@ -464,7 +464,7 @@ + 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. + ) + +-envs = {} ++envs = os.environ + for var in import_env: + if var in os.environ: + envs[var] = os.environ[var] diff --git a/science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch b/science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch deleted file mode 100644 index 6fc35d8f96..0000000000 --- a/science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/SConstruct 2020-08-04 18:40:06.000000000 +0000 -+++ b/SConstruct 2020-12-27 05:47:40.748197656 +0000 -@@ -516,6 +516,7 @@ - 'CWRAPPERS_CONFIG_DIR', # pkgsrc - # Variables used in testing - 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. -+ 'PYTHONDONTWRITEBYTECODE', - ) - - envs = {} diff --git a/science/gis/gpsd/pspec.xml b/science/gis/gpsd/pspec.xml index c5a377ea9d..fa752f995a 100644 --- a/science/gis/gpsd/pspec.xml +++ b/science/gis/gpsd/pspec.xml @@ -16,8 +16,8 @@ gpsd is a service daemon that monitor one or more GPSes attached to a host computer through serial or USB ports, making all data of the sensors available to be queried on TCP port 2947 of the host computer. - - http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.21.tar.xz + + http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-3.23.1.tar.xz scons @@ -32,8 +32,8 @@ python3-pyserial - pylibdir_no_prefix_replace.patch - use_pythondontwritebytecode_environment_variable.patch + pylibdir_path.patch + use_os_environ.patch @@ -124,6 +124,13 @@ + + 2021-10-22 + 3.23.1 + Version bump. + fury + uglyside@yandex.ru + 2020-12-27 3.21