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

Merge pull request #16660 from 4fury-c3440d8/work

Browse Source 
plank dock, dash shell, gaupol subtitle editor: updates.
This commit is contained in:
Rmys
2025-05-16 17:34:59 +03:00
committed by GitHub
parent 68b9eab387 fbaf8f6cce
commit 6321a39ecd
10 changed files with 146 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/editor/gaupol/actions.py
+3 -3
View File
@@ -8,9 +8,9 @@ from pisi.actionsapi import pythonmodules
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
def build(): def build():
pythonmodules.compile(pyVer = "3") pythonmodules.compile(pyVer = "3")
def install(): def install():
pythonmodules.install(pyVer = "3") pythonmodules.install(pyVer = "3")
pisitools.dodoc("AUTHORS.md", "NEWS.md", "README.aeidon.md", "README.md") pisitools.dodoc("AUTHORS.md", "NEWS.md")
multimedia/editor/gaupol/pspec.xml
+72 -70
View File
@@ -1,57 +1,59 @@
<?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>gaupol</Name> <Name>gaupol</Name>
<Homepage>https://otsaloma.io/gaupol/</Homepage> <Homepage>https://otsaloma.io/gaupol/</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-3</License> <License>GPLv3</License>
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<PartOf>multimedia.editor</PartOf> <PartOf>multimedia.editor</PartOf>
<Summary>Editor for text-based subtitle files.</Summary> <Summary>Editor for text-based subtitle files.</Summary>
<Description> <Description>Gaupol supports multiple subtitle file formats and provides means of creating, editing and translating subtitles and timing subtitles to match video.</Description>
Gaupol is an editor for text-based subtitle files. It supports multiple subtitle file formats and provides means of creating, editing and translating subtitles and timing subtitles to match video. <Archive sha1sum="bacba41ebb72261f3d04f63d64728c098c6380a5" type="targz">https://github.com/otsaloma/gaupol/archive/1.15/gaupol-1.15.tar.gz</Archive>
</Description> <BuildDependencies>
<Archive sha1sum="9c668feebacdfc07fa341dace6d6ea8b41174cd8" type="targz">https://github.com/otsaloma/gaupol/archive/refs/tags/1.13.tar.gz</Archive> <Dependency>python3-setuptools</Dependency>
<BuildDependencies> </BuildDependencies>
<Dependency>gtk3-devel</Dependency> </Source>
<Dependency>python3-devel</Dependency>
<Dependency>python3-setuptools</Dependency>
<Dependency>python3-pygobject3-devel</Dependency>
</BuildDependencies>
</Source>
<Package> <Package>
<Name>gaupol</Name> <Name>gaupol</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>gtk3</Dependency> <Dependency>gtk3</Dependency>
<Dependency>gspell</Dependency> <Dependency>gspell</Dependency>
<Dependency>python3</Dependency> <Dependency>python3</Dependency>
<Dependency>iso-codes</Dependency> <Dependency>iso-codes</Dependency>
<Dependency>gst-libav</Dependency> <Dependency>gst-libav</Dependency>
<Dependency>mpv-player</Dependency> <Dependency>mpv-player</Dependency>
<Dependency>python3-cairo</Dependency> <Dependency>python3-cairo</Dependency>
<Dependency>python3-chardet</Dependency> <Dependency>gst-plugins-bad</Dependency>
<Dependency>gst-plugins-bad</Dependency> <Dependency>gst-plugins-base</Dependency>
<Dependency>gst-plugins-base</Dependency> <Dependency>gst-plugins-ugly</Dependency>
<Dependency>gst-plugins-ugly</Dependency> <Dependency>gst-plugins-good</Dependency>
<Dependency>gst-plugins-good</Dependency> <Dependency>python3-pygobject3</Dependency>
<Dependency>python3-pygobject3</Dependency> <Dependency>python3-charset-normalizer</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="localedata">/usr/share/locale</Path> <Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path> <Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2025-05-16</Date>
<Version>1.15</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>1.13</Version> <Version>1.13</Version>
@@ -59,26 +61,26 @@
<Name>Mustafa Cinasal</Name> <Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email> <Email>muscnsl@gmail.com</Email>
</Update> </Update>
<Update release="3"> <Update release="3">
<Date>2023-01-24</Date> <Date>2023-01-24</Date>
<Version>1.12</Version> <Version>1.12</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="2"> <Update release="2">
<Date>2022-05-14</Date> <Date>2022-05-14</Date>
<Version>1.11</Version> <Version>1.11</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-11-04</Date> <Date>2021-11-04</Date>
<Version>1.10.1</Version> <Version>1.10.1</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>
programming/library/libdispatch/actions.py
+19 -14
View File
@@ -6,26 +6,31 @@
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
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 get
j = ''.join([ j = "-DCMAKE_INSTALL_PREFIX=/usr \
' -DCMAKE_INSTALL_PREFIX=/usr', -DCMAKE_BUILD_TYPE=Release \
' -DCMAKE_BUILD_TYPE=Release', -DCMAKE_THREAD_LIBS_INIT='-lpthread' \
' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON', -DCMAKE_HAVE_THREADS_LIBRARY=ON \
' -DBUILD_TESTING=OFF', -DCMAKE_USE_PTHREADS_INIT=ON \
' -Bbuild -G Ninja -L ' -DBUILD_TESTING=OFF -LA \
]) "
def setup(): def setup():
shelltools.export("CC", "clang") shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++") shelltools.export("CXX", "clang++")
cmaketools.configure(j) shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.configure(j, sourceDir = '..')
def build(): def build():
mesontools.build() shelltools.cd("build")
cmaketools.make()
def install(): def install():
mesontools.install() shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("../CONTRIBUTING.md", "../INSTALL.md", "../README.md", "../TESTING.md")
pisitools.dodoc("LICENSE")
programming/library/libdispatch/files/avoid-libkqueue.patch
+11
View File
@@ -0,0 +1,11 @@
--- tests/dispatch_test.c.orig
+++ tests/dispatch_test.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <unistd.h>
-#if __has_include(<sys/event.h>)
+#if __has_include(<sys/event.h>) && !defined(__linux__)
#define HAS_SYS_EVENT_H 1
#include <sys/event.h>
#else
programming/library/libdispatch/files/remove-werror.patch
+10
View File
@@ -0,0 +1,10 @@
--- cmake/modules/DispatchCompilerWarnings.cmake.orig 2020-05-12 13:13:59.619689872 +0300
+++ cmake/modules/DispatchCompilerWarnings.cmake 2020-05-12 13:13:35.216171428 +0300
@@ -2,7 +2,6 @@
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
# TODO: someone needs to provide the msvc equivalent warning flags
else()
- add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
programming/library/libdispatch/pspec.xml
+5 -27
View File
@@ -12,17 +12,15 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>Grand Central Dispatch.</Summary> <Summary>Grand Central Dispatch.</Summary>
<Description>Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware.</Description> <Description>Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware.</Description>
<Archive sha1sum="fd6cda567e682bc46cafe91d07fc34c545f610f6" type="targz"> <Archive sha1sum="f25bc698285cfa84bf24bd8bd5ef9103c4668e0a" type="targz">https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE.tar.gz</Archive>
https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/swift-6.1-RELEASE.tar.gz
</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>llvm-clang</Dependency> <Dependency>llvm-clang</Dependency>
<Dependency>llvm-clang-devel</Dependency> <Dependency>llvm-clang-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch level="1"></Patch> --> <Patch level="0">avoid-libkqueue.patch</Patch>
<Patch level="0">remove-werror.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -33,7 +31,8 @@
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path> <Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
@@ -48,27 +47,6 @@
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2025-05-08</Date>
<Version>6.1</Version>
<Comment>Rebuild.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="4">
<Date>2022-11-25</Date>
<Version>5.5</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="3">
<Date>2021-09-12</Date>
<Version>5.4.2</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="2"> <Update release="2">
<Date>2021-02-24</Date> <Date>2021-02-24</Date>
<Version>5.3</Version> <Version>5.3</Version>
util/dock/plank/actions.py
+1 -1
View File
@@ -10,7 +10,7 @@ i = ''.join([
' --prefix=/usr', ' --prefix=/usr',
' -Denable-apport=false', ' -Denable-apport=false',
' -Denable-dbusmenu=yes', ' -Denable-dbusmenu=yes',
' -Dproduction_release=true', ' -Dproduction-release=true',
' -Denable-docs=false ' ' -Denable-docs=false '
]) ])
util/dock/plank/pspec.xml
+9 -1
View File
@@ -13,7 +13,7 @@
<IsA>app</IsA> <IsA>app</IsA>
<Summary>Plank reloaded. Still stupidly simple.</Summary> <Summary>Plank reloaded. Still stupidly simple.</Summary>
<Description>A simplest dock. Also it is library which can be extended to create other dock programs with more advanced features.</Description> <Description>A simplest dock. Also it is library which can be extended to create other dock programs with more advanced features.</Description>
<Archive sha1sum="bc2e678f481544bc538dcf0e06c923665d3509ca" type="targz">https://github.com/zquestz/plank-reloaded/archive/0.11.118/plank-reloaded-0.11.118.tar.gz</Archive> <Archive sha1sum="790a8734456b7c517b92fea6e7d2c58689724b7d" type="targz">https://github.com/zquestz/plank-reloaded/archive/0.11.127/plank-reloaded-0.11.127.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>meson</Dependency> <Dependency>meson</Dependency>
<Dependency>atk-devel</Dependency> <Dependency>atk-devel</Dependency>
@@ -91,9 +91,17 @@
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2025-05-16</Date>
<Version>0.11.127</Version>
<Comment>Version bump.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2025-04-05</Date> <Date>2025-04-05</Date>
<Version>0.11.118</Version> <Version>0.11.118</Version>
<Comment>Version bump.</Comment>
<Name>Kamil Atlı</Name> <Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email> <Email>suvari@pisilinux.org</Email>
</Update> </Update>
util/shell/dash/actions.py
+3 -2
View File
@@ -2,14 +2,14 @@
# -*- 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 autotools from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import get from pisi.actionsapi import get
def setup(): def setup():
autotools.configure("--prefix=/") autotools.configure("--prefix=/usr")
def build(): def build():
autotools.make() autotools.make()
@@ -17,4 +17,5 @@ def build():
def install(): def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR()) autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dosym("/usr/bin/dash", "/bin/dash")
pisitools.dodoc("COPYING") pisitools.dodoc("COPYING")
util/shell/dash/pspec.xml
+13 -5
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>dash</Name> <Name>dash</Name>
@@ -8,23 +8,31 @@
<Name>PisiLinux Community</Name> <Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admins@pisilinux.org</Email>
</Packager> </Packager>
<License>BSD</License> <License>BSDv3</License>
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Small and fast POSIX-compliant shell</Summary> <Summary>Small and fast POSIX-compliant shell.</Summary>
<Description>DASH is a POSIX-compliant implementation of /bin/sh that aims to be as small as possible.</Description> <Description>DASH is a POSIX-compliant implementation of /bin/sh that aims to be as small as possible.</Description>
<Archive sha1sum="bcfe37148a26bf1a222660cf4b4f6c6b64e4c94c" type="targz">http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz</Archive> <Archive sha1sum="e15444a93853f693774df003f87d9040ab600a5e" type="targz">http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.12.tar.gz</Archive>
</Source> </Source>
<Package> <Package>
<Name>dash</Name> <Name>dash</Name>
<Files> <Files>
<Path fileType="executable">/bin/dash</Path> <Path fileType="executable">/bin</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="man">/usr/share/man</Path> <Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path> <Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2025-05-16</Date>
<Version>0.5.12</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2020-01-25</Date> <Date>2020-01-25</Date>
<Version>0.5.10.2</Version> <Version>0.5.10.2</Version>