From 2f29546edc4d1c34f97e5e045a607dedb986e461 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 30 Jul 2022 10:56:05 +0300 Subject: [PATCH 1/7] wxPython python2. --- .../language/python/wxPython/actions.py | 19 +++---- .../language/python/wxPython/pspec.xml | 56 ++++++++----------- 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/programming/language/python/wxPython/actions.py b/programming/language/python/wxPython/actions.py index b434445752..dfa9a7ed40 100644 --- a/programming/language/python/wxPython/actions.py +++ b/programming/language/python/wxPython/actions.py @@ -1,23 +1,22 @@ +#!/usr/bin/python # -*- 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 -from pisi.actionsapi import autotools from pisi.actionsapi import pythonmodules +from pisi.actionsapi import shelltools +from pisi.actionsapi import pisitools from pisi.actionsapi import get -options="WXPORT=gtk3 UNICODE=1 WX_CONFIG=/usr/bin/wx-config-gtk3" +shelltools.export("JOBS", get.makeJOBS().replace("-j5", "5")) +options="WXPORT=gtk3 WX_CONFIG=/usr/bin/wx-config-gtk3" def build(): - shelltools.cd("wxPython") pythonmodules.compile(options) def install(): - shelltools.cd("wxPython") pythonmodules.install(options) - - pisitools.dohtml("docs/*") - pisitools.dodoc("docs/*.txt") + # install only python libraries + pisitools.removeDir("/usr/bin") + pisitools.removeDir("/usr/share") diff --git a/programming/language/python/wxPython/pspec.xml b/programming/language/python/wxPython/pspec.xml index 94877928ce..3b6f90ccc2 100644 --- a/programming/language/python/wxPython/pspec.xml +++ b/programming/language/python/wxPython/pspec.xml @@ -1,9 +1,9 @@ - + wxPython - http://www.wxpython.org/ + https://www.wxpython.org/ PisiLinux Community admin@pisilinux.org @@ -12,24 +12,26 @@ library Python bindings for wxGTK wxPython is a GUI toolkit for the Python programming language. It allows Python programmers to create programs with a robust, highly functional graphical user interface, simply and easily. It is implemented as a Python extension module (native code) that wraps the popular wxWindows cross platform GUI library, which is written in C++. - mirrors://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 + + https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-4.1.1.tar.gz + wxGTK3 - wxGTK-devel - - mesa-devel - mesa-glu-devel - libjpeg-turbo-devel - tiff-devel - pango-devel - gdk-pixbuf - gst-plugins-base-devel - gstreamer-devel gtk3-devel + tiff-devel + mesa-devel + wxGTK-devel + pango-devel libSM-devel - libXinerama-devel - libXxf86vm-devel python-devel + mesa-glu-devel + gstreamer-devel + gdk-pixbuf-devel + libXxf86vm-devel + libXinerama-devel + python-setuptools + libjpeg-turbo-devel + gst-plugins-base-devel @@ -39,34 +41,22 @@ bzip2 python wxGTK3 - wxGTK-common - /usr/bin + /usr/lib /usr/share/doc - - wxPython-devel - Development files for wxPython - - wxPython - - - /usr/include - - - - 2022-08-01 - 3.0.2.0 - Rebuild - Pisi Linux Admins - admin@pisilinux.org + 2022-07-29 + 4.1.1 + Version bump. + fury + uglyside@yandex.ru 2020-01-31 From 7cae73bbf27ed765d8ab0fdd06b580c004348f2c Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 30 Jul 2022 10:57:31 +0300 Subject: [PATCH 2/7] wxPython rebuild python3. --- .../language/python3/wxPython3/actions.py | 19 ++++++ .../language/python3/wxPython3/pspec.xml | 62 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 programming/language/python3/wxPython3/actions.py create mode 100644 programming/language/python3/wxPython3/pspec.xml diff --git a/programming/language/python3/wxPython3/actions.py b/programming/language/python3/wxPython3/actions.py new file mode 100644 index 0000000000..503122907e --- /dev/null +++ b/programming/language/python3/wxPython3/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# 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 pythonmodules +from pisi.actionsapi import shelltools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +shelltools.export("JOBS", get.makeJOBS().replace("-j5", "5")) +options="WXPORT=gtk3 WX_CONFIG=/usr/bin/wx-config-gtk3" + +def build(): + pythonmodules.compile(pyVer = '3', parameters = options) + +def install(): + pythonmodules.install(pyVer = '3', parameters = options) diff --git a/programming/language/python3/wxPython3/pspec.xml b/programming/language/python3/wxPython3/pspec.xml new file mode 100644 index 0000000000..6df1e3a551 --- /dev/null +++ b/programming/language/python3/wxPython3/pspec.xml @@ -0,0 +1,62 @@ + + + + + wxPython3 + https://www.wxpython.org/ + + fury + uglyside@yandex.ru + + wxWinLL-3 + library + Python bindings for wxGTK + wxPython is a GUI toolkit for the Python programming language. It allows Python programmers to create programs with a robust, highly functional graphical user interface, simply and easily. It is implemented as a Python extension module (native code) that wraps the popular wxWindows cross platform GUI library, which is written in C++. + + https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-4.1.1.tar.gz + + + wxGTK3 + gtk3-devel + tiff-devel + mesa-devel + wxGTK-devel + pango-devel + libSM-devel + python3-devel + mesa-glu-devel + gstreamer-devel + gdk-pixbuf-devel + libXxf86vm-devel + libXinerama-devel + python3-setuptools + libjpeg-turbo-devel + gst-plugins-base-devel + + + + + wxPython3 + + bzip2 + python3 + wxGTK3 + wxGTK-common + + + /usr/bin + /usr/lib + /usr/share/doc + + + + + + 2022-07-29 + 4.1.1 + Rebuild python3. + fury + uglyside@yandex.ru + + + From cef721fb3b6e85165aa9a9630ac4fbc37599f20a Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 30 Jul 2022 11:09:10 +0300 Subject: [PATCH 3/7] xscreensaver. --- x11/misc/xscreensaver/pspec.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/x11/misc/xscreensaver/pspec.xml b/x11/misc/xscreensaver/pspec.xml index ff7d9eb13c..a2bdce71fe 100644 --- a/x11/misc/xscreensaver/pspec.xml +++ b/x11/misc/xscreensaver/pspec.xml @@ -12,8 +12,8 @@ x11.misc Screensaver collection for X11 systems. XScreenSaver is the standard screen saver collection shipped on most Linux and Unix systems running the X11 Window System. I released the first version in 1992. I ported it to macOS in 2006, to iOS in 2012, and to Android in 2014. On X11 systems, XScreenSaver is two things: it is both a large collection of screen savers; and it is also the framework for blanking and locking the screen. - - https://www.jwz.org/xscreensaver/xscreensaver-6.03.tar.gz + + https://www.jwz.org/xscreensaver/xscreensaver-6.04.tar.gz bc @@ -105,6 +105,13 @@ + + 2022-07-29 + 6.04 + Rebuild. + fury + uglyside@yandex.ru + 2022-04-14 6.03 From 47be4e29c46edc75f97cd041ee331cc0204d76e3 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 30 Jul 2022 11:11:14 +0300 Subject: [PATCH 4/7] mpd. --- multimedia/stream/mpd/pspec.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/multimedia/stream/mpd/pspec.xml b/multimedia/stream/mpd/pspec.xml index 5bd2f6afef..fda3e20a8c 100644 --- a/multimedia/stream/mpd/pspec.xml +++ b/multimedia/stream/mpd/pspec.xml @@ -15,8 +15,8 @@ Music Player Daemon (MPD) is a flexible, powerful, server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol. - - https://musicpd.org/download/mpd/0.23/mpd-0.23.7.tar.xz + + https://musicpd.org/download/mpd/0.23/mpd-0.23.8.tar.xz meson @@ -163,6 +163,13 @@ + + 2022-07-29 + 0.23.8 + Version bump. + fury + uglyside@yandex.ru + 2022-05-14 0.23.7 From bfab82a323d68be064ed5750585e449c92f0ebcf Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 30 Jul 2022 11:14:58 +0300 Subject: [PATCH 5/7] fsarchiver --- hardware/disk/fsarchiver/actions.py | 14 ++++++-------- hardware/disk/fsarchiver/pspec.xml | 30 +++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/hardware/disk/fsarchiver/actions.py b/hardware/disk/fsarchiver/actions.py index da342358bd..7528591a28 100644 --- a/hardware/disk/fsarchiver/actions.py +++ b/hardware/disk/fsarchiver/actions.py @@ -2,19 +2,17 @@ # -*- 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 get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools +from pisi.actionsapi import pisitools, autotools, get def setup(): - autotools.configure("--disable-lz4 \ - --disable-zstd") - + autotools.configure() + def build(): autotools.make() def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README", "THANKS") + + pisitools.dodoc("ChangeLog", "THANKS") diff --git a/hardware/disk/fsarchiver/pspec.xml b/hardware/disk/fsarchiver/pspec.xml index a33c103097..748a89dd35 100644 --- a/hardware/disk/fsarchiver/pspec.xml +++ b/hardware/disk/fsarchiver/pspec.xml @@ -1,26 +1,31 @@ - + fsarchiver - http://www.fsarchiver.org/ + https://www.fsarchiver.org/ marcin bojara marcin@pisilinux.org GPLv2 app:console + hardware.disk Safe and flexible file-system backup/deployment tool. FSArchiver is a system tool that allows you to save the contents of a file-system to a compressed archive file. - https://github.com/fdupoux/fsarchiver/releases/download/0.8.5/fsarchiver-0.8.5.tar.gz + + https://github.com/fdupoux/fsarchiver/releases/download/0.8.6/fsarchiver-0.8.6.tar.gz + - lzo-devel - xz-devel - zlib-devel bzip2 + xz-devel + lzo-devel + lz4-devel + attr-devel + zlib-devel + zstd-devel e2fsprogs-devel libgcrypt-devel - attr-devel libutil-linux-devel @@ -28,9 +33,11 @@ fsarchiver - lzo xz + lzo + lz4 zlib + zstd bzip2 e2fsprogs libgcrypt @@ -44,6 +51,13 @@ + + 2022-07-30 + 0.8.6 + Version bump. + fury + uglyside@yandex.ru + 2020-02-01 0.8.5 From 7973aefbc0b5b168d1d3a153034474efcba60e36 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 30 Jul 2022 11:17:57 +0300 Subject: [PATCH 6/7] indicator-sound-switcher --- multimedia/misc/indicator-sound-switcher/actions.py | 4 ++-- multimedia/misc/indicator-sound-switcher/pspec.xml | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/multimedia/misc/indicator-sound-switcher/actions.py b/multimedia/misc/indicator-sound-switcher/actions.py index a94fd3e0b6..0a53129d52 100644 --- a/multimedia/misc/indicator-sound-switcher/actions.py +++ b/multimedia/misc/indicator-sound-switcher/actions.py @@ -10,8 +10,8 @@ def setup(): pass def build(): - pass + pythonmodules.compile(pyVer = '3') def install(): - pythonmodules.install(pyVer = '3') + pythonmodules.install(parameters = '--no-compile --optimize=1', pyVer = '3') diff --git a/multimedia/misc/indicator-sound-switcher/pspec.xml b/multimedia/misc/indicator-sound-switcher/pspec.xml index 037fe3e3e1..6a64d6f06b 100644 --- a/multimedia/misc/indicator-sound-switcher/pspec.xml +++ b/multimedia/misc/indicator-sound-switcher/pspec.xml @@ -13,8 +13,8 @@ multimedia.misc Sound input/output selector indicator for Linux. It shows an icon in the indicator area or the system tray (whatever is available in your desktop environment). The icon's menu allows you to switch the current sound input and output (i.e. source ports and sink ports in PulseAudio's terms, respectively) with just two clicks. - - https://github.com/yktoo/indicator-sound-switcher/archive/refs/tags/v2.3.8.tar.gz + + https://github.com/yktoo/indicator-sound-switcher/archive/refs/tags/v2.3.9.tar.gz python3-setuptools @@ -41,6 +41,13 @@ + + 2022-07-09 + 2.3.9 + Version bump. + fury + uglyside@yandex.ru + 2022-05-28 2.3.8 From 16aba8a103866ecb88a143ee0f03f39b8af88591 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Sat, 30 Jul 2022 11:34:54 +0300 Subject: [PATCH 7/7] coolreader rebuild. --- office/misc/coolreader-qt/actions.py | 10 ++++------ office/misc/coolreader-qt/pspec.xml | 7 +++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/office/misc/coolreader-qt/actions.py b/office/misc/coolreader-qt/actions.py index 757935a205..41d7997718 100644 --- a/office/misc/coolreader-qt/actions.py +++ b/office/misc/coolreader-qt/actions.py @@ -4,16 +4,14 @@ # 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 cmaketools -from pisi.actionsapi import get +from pisi.actionsapi import shelltools, cmaketools, pisitools, get j = '-DCMAKE_BUILD_TYPE=Release -DGUI=QT5 -L ' def setup(): - shelltools.makedirs("_build") - shelltools.cd("_build") - cmaketools.configure(j, sourceDir = '..') + pisitools.dosed("crengine/include/cr3version.h", "58", "59") + pisitools.dosed("crengine/include/cr3version.h", "06-13", "08-31") + cmaketools.configure("-B_build %s" % j) def build(): shelltools.cd("_build") diff --git a/office/misc/coolreader-qt/pspec.xml b/office/misc/coolreader-qt/pspec.xml index c27257f117..8ef7120501 100644 --- a/office/misc/coolreader-qt/pspec.xml +++ b/office/misc/coolreader-qt/pspec.xml @@ -58,6 +58,13 @@ + + 2022-07-30 + 3.2.59 + Rebuild + fury + uglyside@yandex.ru + 2021-12-21 3.2.59