Merge pull request #16907 from mrSi-Si/various-2

Various updates
This commit is contained in:
Kamil ATLI
2025-06-24 13:37:04 +03:00
committed by GitHub
10 changed files with 143 additions and 147 deletions
@@ -13,4 +13,4 @@ def build():
def install(): def install():
pythonmodules.install(pyVer = "3") pythonmodules.install(pyVer = "3")
pisitools.dodoc("ChangeLog", "COPYING", "README*") pisitools.dodoc("AUTHORS", "COPYING", "PKG-INFO", "TRANSLATORS")
@@ -1,22 +0,0 @@
From c47d47ab7f66a1973b1314ef531de2fb444c2fe6 Mon Sep 17 00:00:00 2001
From: Ilias Stamatis <ilstam@mailbox.org>
Date: Wed, 22 Dec 2021 14:43:22 +0000
Subject: [PATCH] QProgressBar.setValue() expects an int, not a float
---
ffmulticonverter/progress.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmulticonverter/progress.py b/ffmulticonverter/progress.py
index 5d14efc..e196ef4 100755
--- a/ffmulticonverter/progress.py
+++ b/ffmulticonverter/progress.py
@@ -304,7 +304,7 @@ def convert_video(self, from_file, to_file, command):
time = utils.duration_in_seconds(time)
now_sec = int(float(time))
try:
- self.nowQPBar.setValue(100 * now_sec / total)
+ self.nowQPBar.setValue(int(100 * now_sec / total))
except (UnboundLocalError, ZeroDivisionError):
pass
self.update_text_edit_signal.emit(myline)
+16 -10
View File
@@ -3,7 +3,7 @@
<PISI> <PISI>
<Source> <Source>
<Name>ffmulticonverter</Name> <Name>ffmulticonverter</Name>
<Homepage>https://github.com/Ilias95/FF-Multi-Converter</Homepage> <Homepage>https://github.com/l-koehler/FF-converter</Homepage>
<Packager> <Packager>
<Name>Kamil Atlı</Name> <Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email> <Email>suvari@pisilinux.org</Email>
@@ -11,17 +11,18 @@
<License>GPLv3</License> <License>GPLv3</License>
<Icon>ffmulticonverter</Icon> <Icon>ffmulticonverter</Icon>
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>A multi converter.</Summary> <Summary>GUI File Format Converter.</Summary>
<Description>FF Multi Converter is a simple graphical application that enables you to convert audio, video, image and document files between all popular formats, using and combining other programs. It uses ffmpeg for audio/video files, unoconv for document files (which uses the OpenOffice's UNO bindings) and PIL library for image file conversions.</Description> <Description>A simple graphical application which enables you to convert between all popular formats, by utilizing and combining other programs.</Description>
<Archive sha1sum="bae21490cc0cb7c38fccc8b1a4e77dc0c1f31a32" type="targz">mirrors://sourceforge/ffmulticonv/ffmulticonverter-1.8.0.tar.gz</Archive> <Archive sha1sum="005cfc782d2d8221014d1bfabf01e35f1cf616a5" type="targz">https://github.com/l-koehler/FF-converter/releases/download/v2.4.6/ffconverter-2.4.6.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>ffmpeg-devel</Dependency> <Dependency>ffmpeg-devel</Dependency>
<Dependency>gettext-devel</Dependency> <Dependency>gettext-devel</Dependency>
<Dependency>python3-devel</Dependency> <Dependency>python3-devel</Dependency>
<Dependency>python3-qt5-devel</Dependency> <Dependency>python3-qt5-devel</Dependency>
<Dependency>python3-setuptools</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">QProgressBar_value_replaced_to_int.patch</Patch> <!-- <Patch level="1"></Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -30,21 +31,26 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>ffmpeg</Dependency> <Dependency>ffmpeg</Dependency>
<Dependency>unoconv</Dependency> <Dependency>unoconv</Dependency>
<Dependency>pandoc-bin</Dependency>
<Dependency>python3-qt5</Dependency> <Dependency>python3-qt5</Dependency>
<Dependency>imagemagick</Dependency> <Dependency>imagemagick</Dependency>
<Dependency>squashfs-tools</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share/pixmaps</Path> <Path fileType="data">/usr/share</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/ffmulticonverter</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2025-06-21</Date>
<Version>2.4.6</Version>
<Comment>New maintained upstream.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="4"> <Update release="4">
<Date>2023-11-03</Date> <Date>2023-11-03</Date>
<Version>1.8.0</Version> <Version>1.8.0</Version>
+9 -14
View File
@@ -1,28 +1,23 @@
#!/usr/bin/env python #!/usr/bin/python
# -*- 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 cmaketools from pisi.actionsapi import cmaketools
from pisi.actionsapi import mesontools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup(): def setup():
shelltools.system("mkdir build")
shelltools.cd("build")
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DCMARK_STATIC=OFF \ -DCMARK_STATIC=OFF \
-DCMAKE_INSTALL_LIBDIR=lib", sourceDir = '..') -DCMAKE_INSTALL_LIBDIR=lib \
-Bbuild -G Ninja")
def build(): def build():
shelltools.cd("build") mesontools.build()
cmaketools.make()
def install(): def install():
shelltools.cd("build") mesontools.install()
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("COPYING")
shelltools.cd("..")
pisitools.dodoc("COPYING", "README*")
+15 -12
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>cmark</Name> <Name>cmark</Name>
<Homepage>https://github.com/jgm/cmark</Homepage> <Homepage>https://github.com/commonmark/cmark</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
@@ -12,23 +12,19 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>CommonMark parsing and rendering library and program in C</Summary> <Summary>CommonMark parsing and rendering library and program in C</Summary>
<Description>CommonMark parsing and rendering library and program in C</Description> <Description>CommonMark parsing and rendering library and program in C</Description>
<Archive sha1sum="ae87665962390dabca20e461bac7523c8580e097" type="targz">https://github.com/commonmark/cmark/archive/0.30.3.tar.gz</Archive> <Archive sha1sum="041faa22f1772e79784875eb18039480c2e33139" type="targz">https://github.com/commonmark/cmark/archive/refs/tags/0.31.1.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>python3-devel</Dependency> <Dependency>python3-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<!--
<Patches> <Patches>
<Patch>cmark.patch</Patch> <!-- <Patch level="1"></Patch> -->
<Patch level="1">cmark.patch</Patch>
</Patches> </Patches>
-->
</Source> </Source>
<Package> <Package>
<Name>cmark</Name> <Name>cmark</Name>
<RuntimeDependencies>
</RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
@@ -36,7 +32,7 @@
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
<Package> <Package>
<Name>cmark-devel</Name> <Name>cmark-devel</Name>
<Summary>Development files for cmark</Summary> <Summary>Development files for cmark</Summary>
@@ -46,11 +42,18 @@
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path> <Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path> <Path fileType="data">/usr/lib/pkgconfig</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2025-06-21</Date>
<Version>0.31.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4"> <Update release="4">
<Date>2023-11-03</Date> <Date>2023-11-03</Date>
<Version>0.30.3</Version> <Version>0.30.3</Version>
+2 -5
View File
@@ -6,12 +6,9 @@
from pisi.actionsapi import pythonmodules from pisi.actionsapi import pythonmodules
def setup():
pass
def build(): def build():
pythonmodules.compile(pyVer = "3") pythonmodules.compile(pyVer = "3")
def install(): def install():
pythonmodules.install(pyVer = "3") pythonmodules.install(pyVer = "3")
+62 -56
View File
@@ -1,69 +1,75 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
<Source> <Source>
<Name>zim</Name> <Name>zim</Name>
<Homepage>https://zim-wiki.org/</Homepage> <Homepage>https://zim-wiki.org/</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>GPL-2</License> <License>GPLv2</License>
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<PartOf>office</PartOf> <PartOf>office</PartOf>
<Summary>A Desktop Wiki.</Summary> <Summary>A Desktop Wiki.</Summary>
<Description>Zim is a graphical text editor used to maintain a collection of wiki pages. Each page can contain links to other pages, simple formatting and images. Pages are stored in a folder structure, like in an outliner, and can have attachments. Creating a new page is as easy as linking to a nonexistent page. All data is stored in plain text files with wiki formatting. Various plugins provide additional functionality, like a task list manager, an equation editor, a tray icon, and support for version control.</Description> <Description>Zim is a graphical text editor used to maintain a collection of wiki pages.</Description>
<Archive sha1sum="b628872834b486d320e62d72ffd5a38657b4708d" type="targz">https://zim-wiki.org/downloads/zim-0.75.2.tar.gz</Archive> <Archive sha1sum="c9a7313717ecd427d008f24d2beb5417572a7a8c" type="targz">https://zim-wiki.org/downloads/zim-0.76.3.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>xdg-utils</Dependency> <Dependency>xdg-utils</Dependency>
<Dependency>gtk3-devel</Dependency> <Dependency>gtk3-devel</Dependency>
<Dependency>python3-xdg</Dependency> <Dependency>python3-xdg</Dependency>
<Dependency>python3-devel</Dependency> <Dependency>python3-devel</Dependency>
<Dependency>python3-pygobject3-devel</Dependency> <Dependency>python3-pygobject3-devel</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
<Name>zim</Name> <Name>zim</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>gtk3</Dependency> <Dependency>gtk3</Dependency>
<Dependency>python3</Dependency> <Dependency>python3</Dependency>
<Dependency>xdg-utils</Dependency> <Dependency>xdg-utils</Dependency>
<Dependency>python3-xdg</Dependency> <Dependency>python3-xdg</Dependency>
<Dependency>python3-pygobject3</Dependency> <Dependency>python3-pygobject3</Dependency>
<Dependency>gobject-introspection</Dependency> <Dependency>gobject-introspection</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path> <Path fileType="data">/usr/share</Path>
<Path fileType="data">/usr/share/zim</Path> <Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="localedata">/usr/share/locale</Path> <Path fileType="man">/usr/share/man/man1</Path>
<Path fileType="man">/usr/share/man/man1</Path> </Files>
</Files> </Package>
</Package>
<History> <History>
<Update release="3"> <Update release="4">
<Date>2025-06-21</Date>
<Version>0.76.3</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3">
<Date>2023-11-04</Date> <Date>2023-11-04</Date>
<Version>0.75.2</Version> <Version>0.75.2</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name> <Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email> <Email>muscnsl@gmail.com</Email>
</Update> </Update>
<Update release="2"> <Update release="2">
<Date>2022-11-14</Date> <Date>2022-11-14</Date>
<Version>0.75.1</Version> <Version>0.75.1</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
<Update release="1"> <Update release="1">
<Date>2021-12-14</Date> <Date>2021-12-14</Date>
<Version>0.74.3</Version> <Version>0.74.3</Version>
<Comment>First build.</Comment> <Comment>First build.</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>FastCGI Developer's Kit.</Summary> <Summary>FastCGI Developer's Kit.</Summary>
<Description>FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs.</Description> <Description>FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs.</Description>
<Archive sha1sum="85533305786c4c74f51089465be27070d2de58db" type="targz">https://github.com/FastCGI-Archives/fcgi2/archive/2.4.5/fcgi2-2.4.5.tar.gz</Archive> <Archive sha1sum="3433b4e51bb6cc6a244bfe3844b60f55a2b78531" type="targz">https://github.com/FastCGI-Archives/fcgi2/archive/2.4.6/fcgi2-2.4.6.tar.gz</Archive>
<Patches> <Patches>
<!-- <Patch level="1"></Patch> --> <!-- <Patch level="1"></Patch> -->
</Patches> </Patches>
@@ -40,6 +40,13 @@
</Package> </Package>
<History> <History>
<Update release="3">
<Date>2025-06-21</Date>
<Version>2.4.6</Version>
<Comment>Release bump.</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="2"> <Update release="2">
<Date>2025-04-19</Date> <Date>2025-04-19</Date>
<Version>2.4.5</Version> <Version>2.4.5</Version>
+8 -13
View File
@@ -1,24 +1,19 @@
#!/usr/bin/python #!/usr/bin/python
# -*- 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/copyleft/gpl.txt # See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import cmaketools from pisi.actionsapi import cmaketools, pisitools, get
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
#WorkDir = "pugixml-1.8/scripts" def setup():
def setup():
cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \ cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=ON") -DBUILD_SHARED_LIBS=ON")
def build(): def build():
cmaketools.make() cmaketools.make()
def install(): def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
# pisitools.dodoc("AUTHORS", "BUGS", "ChangeLog", "COPYING", "README") pisitools.dodoc("LICENSE.md")
+22 -13
View File
@@ -1,22 +1,22 @@
<?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>pugixml</Name> <Name>pugixml</Name>
<Homepage>http://pugixml.org</Homepage> <Homepage>https://pugixml.org/</Homepage>
<Packager> <Packager>
<Name>Stefan Gronewold</Name> <Name>PisiLinux Community</Name>
<Email>groni@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>MIT</License> <License>MIT</License>
<Summary>Light-weight, simple and fast XML parser for C++ with XPath support</Summary> <Summary>Light-weight, simple and fast XML parser for C++ with XPath support</Summary>
<Description>Light-weight, simple and fast XML parser for C++ with XPath support</Description> <Description>Light-weight, simple and fast XML parser for C++ with XPath support</Description>
<Archive sha1sum="906f1038f0687ce6466687eaa9b457af3c7e3382" type="targz">https://github.com/zeux/pugixml/releases/download/v1.15/pugixml-1.15.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
</BuildDependencies> </BuildDependencies>
<Archive sha1sum="c82dd9589ff56c978ecdb5c8ce55989697b08618" type="targz">https://github.com/zeux/pugixml/archive/v1.11.4.tar.gz</Archive>
</Source> </Source>
<Package> <Package>
<Name>pugixml</Name> <Name>pugixml</Name>
<RuntimeDependencies> <RuntimeDependencies>
@@ -24,22 +24,31 @@
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
</Files> </Files>
</Package> </Package>
<Package> <Package>
<Name>pugixml-devel</Name> <Name>pugixml-devel</Name>
<Summary>Development header for pugixml</Summary> <Summary>Development header for pugixml</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">pugixml</Dependency> <Dependency release="current">pugixml</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path> <Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2025-06-21</Date>
<Version>1.15</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2021-03-10</Date> <Date>2021-03-10</Date>
<Version>1.11.4</Version> <Version>1.11.4</Version>