Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9821 from 4fury-c3440d8/no

Browse Source 
gpsd update and rebuild a few apps with new scons.
This commit is contained in:
Kamil ATLI
2021-10-23 12:16:23 +03:00
committed by GitHub
parent dca9295a8e fa9ebaafcc
commit 58e9ad2353
13 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/firewire/libffado/actions.py
+1 -1
View File
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Licensed under the GNU General Public License, version 3. # 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 pisitools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
hardware/firewire/libffado/pspec.xml
+14 -7
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM 'http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd'> <!DOCTYPE PISI SYSTEM 'https://pisilinux.org/projeler/pisi/pisi-spec.dtd'>
<PISI> <PISI>
<Source> <Source>
<Name>libffado</Name> <Name>libffado</Name>
@@ -32,13 +32,13 @@
<Dependency>jack-audio-connection-kit-devel</Dependency> <Dependency>jack-audio-connection-kit-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">flags.patch</Patch> <!-- <Patch level="1">flags.patch</Patch>
<!-- <Patch level="1">libffado-2.4.0-rme-bigendian-fix.patch</Patch> <Patch level="1">libffado-2.4.0-rme-bigendian-fix.patch</Patch>
<Patch level="1">libffado-2.4.0-pyqt5-dbus-detection.patch</Patch> <Patch level="1">libffado-2.4.0-pyqt5-dbus-detection.patch</Patch>
<Patch level="1">libffado-2.4.0-py3-pyqt5-fixes.patch</Patch> <Patch level="1">libffado-2.4.0-py3-pyqt5-fixes.patch</Patch>
<Patch level="1">libffado-2.4.0-additional-py3-fixes.patch</Patch> <Patch level="1">libffado-2.4.0-additional-py3-fixes.patch</Patch>
<Patch level="1">libffado-2.4.0-crossbar-router-fix.patch</Patch>--> <Patch level="1">libffado-2.4.0-crossbar-router-fix.patch</Patch>
<!-- <Patch level="1">libffado-2.4.2-python38.patch</Patch> --> <Patch level="1">libffado-2.4.2-python38.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -100,7 +100,7 @@
<Files> <Files>
<Path fileType="executable">/usr/bin/ffado-mixer*</Path> <Path fileType="executable">/usr/bin/ffado-mixer*</Path>
<Path fileType="data">/usr/share/applications</Path> <Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/metainfo/ffado-mixer.appdata.xml</Path> <Path fileType="data">/usr/share/metainfo/ffado-mixer.appdata.xml</Path>
<Path fileType="data">/usr/share/pixmaps</Path> <Path fileType="data">/usr/share/pixmaps</Path>
</Files> </Files>
<AdditionalFiles> <AdditionalFiles>
@@ -109,6 +109,13 @@
</Package> </Package>
<History> <History>
<Update release="8">
<Date>2021-10-22</Date>
<Version>2.4.4</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7"> <Update release="7">
<Date>2020-11-19</Date> <Date>2020-11-19</Date>
<Version>2.4.4</Version> <Version>2.4.4</Version>
@@ -116,7 +123,7 @@
<Name>Mustafa Cinasal</Name> <Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email> <Email>muscnsl@gmail.com</Email>
</Update> </Update>
<Update release="6"> <Update release="6">
<Date>2020-01-22</Date> <Date>2020-01-22</Date>
<Version>2.4.2</Version> <Version>2.4.2</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
multimedia/converter/soundconverter/pspec.xml
+9 -2
View File
@@ -15,8 +15,8 @@
<Description> <Description>
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. 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.
</Description> </Description>
<Archive sha1sum="e35d0e357dfa4016569b3f7a7fcfba24664e7ab5" type="targz"> <Archive sha1sum="d28190a4aab7b6ff7d637900e870e778fa8a0523" type="targz">
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
</Archive> </Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>intltool</Dependency> <Dependency>intltool</Dependency>
@@ -54,6 +54,13 @@
</Package> </Package>
<History> <History>
<Update release="3">
<Date>2021-10-23</Date>
<Version>4.0.2</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="2"> <Update release="2">
<Date>2021-05-18</Date> <Date>2021-05-18</Date>
<Version>4.0.1</Version> <Version>4.0.1</Version>
network/library/serf/actions.py
+1 -1
View File
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Licensed under the GNU General Public License, version 3. # 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 pisitools
from pisi.actionsapi import scons from pisi.actionsapi import scons
network/library/serf/files/scons_py3.patch
+24
View File
@@ -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'])
network/library/serf/pspec.xml
+12 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>serf</Name> <Name>serf</Name>
<Homepage>https://code.google.com/p/serf/</Homepage> <Homepage>https://serf.apache.org/</Homepage>
<Packager> <Packager>
<Name>Osman Erkan</Name> <Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email> <Email>osman.erkan@pisilinux.org</Email>
@@ -22,6 +22,9 @@
<Dependency>apr-util-devel</Dependency> <Dependency>apr-util-devel</Dependency>
<Dependency>scons</Dependency> <Dependency>scons</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches>
<Patch>scons_py3.patch</Patch>
</Patches>
</Source> </Source>
<Package> <Package>
@@ -54,6 +57,13 @@
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2021-10-22</Date>
<Version>1.3.9</Version>
<Comment>Rebuild</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2020-02-26</Date> <Date>2020-02-26</Date>
<Version>1.3.9</Version> <Version>1.3.9</Version>
network/library/serf/translations.xml
+1 -1
View File
@@ -10,4 +10,4 @@
<Name>serf-devel</Name> <Name>serf-devel</Name>
<Summary xml:lang="tr">serf için geliştirme dosyaları</Summary> <Summary xml:lang="tr">serf için geliştirme dosyaları</Summary>
</Package> </Package>
</PISI> </PISI>
network/misc/florb/pspec.xml
+10
View File
@@ -45,7 +45,10 @@
<Dependency>fltk</Dependency> <Dependency>fltk</Dependency>
<Dependency>curl</Dependency> <Dependency>curl</Dependency>
<Dependency>gpsd</Dependency> <Dependency>gpsd</Dependency>
<Dependency>boost</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libXpm</Dependency>
<Dependency>tinyxml2</Dependency> <Dependency>tinyxml2</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -60,6 +63,13 @@
</Package> </Package>
<History> <History>
<Update release="2">
<Date>2021-10-22</Date>
<Version>1.1</Version>
<Comment>Rebuild.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="1"> <Update release="1">
<Date>2020-12-19</Date> <Date>2020-12-19</Date>
<Version>1.1</Version> <Version>1.1</Version>
science/gis/gpsd/actions.py
+1 -8
View File
@@ -4,10 +4,7 @@
# Licensed under the GNU General Public License, version 3. # Licensed under the GNU General Public License, version 3.
# See the file https://www.gnu.org/licenses/gpl-3.0.txt # See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools, get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
shelltools.export("PYTHONDONTWRITEBYTECODE", "1") shelltools.export("PYTHONDONTWRITEBYTECODE", "1")
i = "/usr/bin/env python3 $(which scons)" i = "/usr/bin/env python3 $(which scons)"
@@ -24,7 +21,3 @@ def install():
# fix shebang # fix shebang
shelltools.system("find %s/usr/bin -type f -exec sed -i 's|env\ python$|env python3|g' {} \;" % get.installDIR()) 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")
science/gis/gpsd/files/pylibdir_no_prefix_replace.patch → science/gis/gpsd/files/pylibdir_path.patch
+6 -6
View File
@@ -1,13 +1,13 @@
--- a/SConstruct 2020-08-04 18:40:06.000000000 +0000 --- a/SConscript 2021-09-22 00:53:44.000000000 +0300
+++ b/SConstruct 2020-12-12 18:29:38.378386573 +0000 +++ b/SConscript 2021-09-25 06:56:40.449906438 +0300
@@ -1460,8 +1460,8 @@ @@ -1492,8 +1492,8 @@
# follow FHS, put in /usr/local/libXX, not /usr/libXX # follow FHS, put in /usr/local/libXX, not /usr/libXX
# may be lib, lib32 or lib64 # may be lib, lib32 or lib64
python_libdir = polystr(python_libdir) python_libdir = polystr(python_libdir)
- python_libdir = python_libdir.replace("/usr/lib", - python_libdir = python_libdir.replace("/usr/lib",
- "/usr/local/lib") - "/usr/local/lib")
+# python_libdir = python_libdir.replace("/usr/lib", + # python_libdir = python_libdir.replace("/usr/lib",
+# "/usr/local/lib") + # "/usr/local/lib")
python_module_dir = str(python_libdir) + os.sep python_module_dir = str(python_libdir) + os.sep
# Many systems can have a problem with the Python path # Many systems can have a problem with the Python path
announce("Ensure your PYTHONPATH includes %s" % python_module_dir) if 'PYTHONPATH' in os.environ:
science/gis/gpsd/files/use_os_environ.patch
+11
View File
@@ -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]
science/gis/gpsd/files/use_pythondontwritebytecode_environment_variable.patch
-10
View File
@@ -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 = {}
science/gis/gpsd/pspec.xml
+11 -4
View File
@@ -16,8 +16,8 @@
<Description> <Description>
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. 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.
</Description> </Description>
<Archive sha1sum="6d5d232b2a6580390268d27fe67b527df224a646" type="tarxz"> <Archive sha1sum="2ca76a2fbb5a14b3913b5fb0df50f494356f2e8d" type="tarxz">
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
</Archive> </Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>scons</Dependency> <Dependency>scons</Dependency>
@@ -32,8 +32,8 @@
<Dependency>python3-pyserial</Dependency> <Dependency>python3-pyserial</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">pylibdir_no_prefix_replace.patch</Patch> <Patch level="1">pylibdir_path.patch</Patch>
<Patch level="1">use_pythondontwritebytecode_environment_variable.patch</Patch> <Patch level="1">use_os_environ.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -124,6 +124,13 @@
</Package> </Package>
<History> <History>
<Update release="2">
<Date>2021-10-22</Date>
<Version>3.23.1</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="1"> <Update release="1">
<Date>2020-12-27</Date> <Date>2020-12-27</Date>
<Version>3.21</Version> <Version>3.21</Version>