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

Merge pull request #18272 from 4fury-c3440d8-2/upwork

Browse Source 
geeqie-v2.7
This commit is contained in:
Rmys
2026-02-28 11:50:04 +03:00
committed by GitHub
parent a4ddf13fd4 4e8a53b494
commit e623c54b8e
8 changed files with 202 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/graphics/fbida/actions.py
+6 -14
View File
@@ -4,24 +4,16 @@
# 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 mesontools from pisi.actionsapi import mesontools
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import get
i = "-Wno-strict-prototypes \ def setup():
-Wno-missing-prototypes \ mesontools.configure()
-Wno-unused-result \
-Wno-format-overflow \
-Wno-format-truncation \
"
def build(): def build():
pisitools.dosed("GNUmakefile", "-Wno-pointer-sign", "-Wno-pointer-sign %s" % i) mesontools.build()
autotools.make("prefix=/usr")
def install(): def install():
autotools.rawInstall("DESTDIR=%s prefix=/usr" % get.installDIR()) mesontools.install()
pisitools.dodoc("COPYING", "README", "TODO")
pisitools.dodoc("COPYING")
multimedia/graphics/fbida/files/gcc10_build_fix.patch
-77
View File
@@ -1,77 +0,0 @@
From 1bb8a8aa29845378903f3c690e17c0867c820da2 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 16 Mar 2020 13:24:12 +0100
Subject: [PATCH] gcc10 build fix
by Adrian Reber <adrian@lisas.de>
---
fbi.c | 1 -
filter.c | 2 --
idaconfig.h | 2 +-
readers.c | 2 ++
viewer.c | 1 -
5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fbi.c b/fbi.c
index 8882302..8fd9d31 100644
--- a/fbi.c
+++ b/fbi.c
@@ -86,7 +86,6 @@ static int img_mem, max_mem_mb;
/* graphics interface */
gfxstate *gfx;
-int debug;
/* framebuffer */
char *fbdev = NULL;
diff --git a/filter.c b/filter.c
index a75f73a..e20ebc2 100644
--- a/filter.c
+++ b/filter.c
@@ -6,8 +6,6 @@
#include "readers.h"
#include "filter.h"
-int debug = 0;
-
/* ----------------------------------------------------------------------- */
static void
diff --git a/idaconfig.h b/idaconfig.h
index 8d616ef..d09a178 100644
--- a/idaconfig.h
+++ b/idaconfig.h
@@ -17,7 +17,7 @@
/* -------------------------------------------------------------------------- */
-char *ida_lists;
+extern char *ida_lists;
void ida_init_config(void);
void ida_read_config(void);
diff --git a/readers.c b/readers.c
index e94bbcb..1516ed9 100644
--- a/readers.c
+++ b/readers.c
@@ -7,6 +7,8 @@
#include "readers.h"
#include "byteorder.h"
+int debug=0;
+
/* ----------------------------------------------------------------------- */
void load_bits_lsb(unsigned char *dst, unsigned char *src, int width,
diff --git a/viewer.c b/viewer.c
index ab4b31c..02ba807 100644
--- a/viewer.c
+++ b/viewer.c
@@ -38,7 +38,6 @@
#define PROCESS_LINES 16
-int debug;
Cursor ptrs[POINTER_COUNT];
/* ----------------------------------------------------------------------- */
multimedia/graphics/fbida/pspec.xml
+92 -86
View File
@@ -1,92 +1,98 @@
<?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>fbida</Name> <Name>fbida</Name>
<Homepage>https://www.kraxel.org/blog/linux/fbida/</Homepage> <Homepage>https://www.kraxel.org/blog/linux/fbida/</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>Pisi Linux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admin@pisilinux.org</Email>
</Packager> </Packager>
<License>GPLv2</License> <License>GPLv2</License>
<IsA>app</IsA> <IsA>app</IsA>
<PartOf>multimedia.graphics</PartOf> <PartOf>multimedia.graphics</PartOf>
<Summary>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Summary> <Summary>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Summary>
<Description>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Description> <Description>The fbida project contains a few applications for viewing and editing images, with the main focus being photos.</Description>
<Archive sha1sum="fe2ec92dc98296e46cd8ddddcd8b3a169cb506a0" type="targz"> <Archive sha1sum="fbe36711bdf515015f7bcabd7b7079227982a049" type="tarbz2">
https://www.kraxel.org/releases/fbida/fbida-2.14.tar.gz https://gitlab.com/kraxel/fbida/-/archive/fbida-2.15-1/fbida-fbida-2.15-1.tar.bz2
</Archive> </Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gc-devel</Dependency> <Dependency>meson</Dependency>
<Dependency>util-linux</Dependency> <Dependency>ninja</Dependency>
<Dependency>mesa-devel</Dependency> <Dependency>gc-devel</Dependency>
<Dependency>lirc-devel</Dependency> <Dependency>util-linux</Dependency>
<Dependency>tiff-devel</Dependency> <Dependency>mesa-devel</Dependency>
<Dependency>webp-devel</Dependency> <Dependency>lirc-devel</Dependency>
<Dependency>cairo-devel</Dependency> <Dependency>tiff-devel</Dependency>
<Dependency>libdrm-devel</Dependency> <Dependency>webp-devel</Dependency>
<Dependency>libpng-devel</Dependency> <Dependency>cairo-devel</Dependency>
<Dependency>giflib-devel</Dependency> <Dependency>libdrm-devel</Dependency>
<Dependency>pixman-devel</Dependency> <Dependency>libpng-devel</Dependency>
<Dependency>libXpm-devel</Dependency> <Dependency>giflib-devel</Dependency>
<Dependency>libpcd-devel</Dependency> <Dependency>pixman-devel</Dependency>
<Dependency>sane-backends</Dependency> <Dependency>libXpm-devel</Dependency>
<Dependency>libexif-devel</Dependency> <Dependency>libpcd-devel</Dependency>
<Dependency>freetype-devel</Dependency> <Dependency>sane-backends</Dependency>
<Dependency>libepoxy-devel</Dependency> <Dependency>libexif-devel</Dependency>
<Dependency>openmotif-devel</Dependency> <Dependency>freetype-devel</Dependency>
<Dependency>fontconfig-devel</Dependency> <Dependency>libepoxy-devel</Dependency>
<Dependency>imagemagick-devel</Dependency> <Dependency>openmotif-devel</Dependency>
<Dependency>poppler-glib-devel</Dependency> <Dependency>fontconfig-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency> <Dependency>imagemagick-devel</Dependency>
</BuildDependencies> <Dependency>poppler-glib-devel</Dependency>
<Patches> <Dependency>libjpeg-turbo-devel</Dependency>
<Patch level="1">gcc10_build_fix.patch</Patch> </BuildDependencies>
</Patches> <Patches>
</Source> <!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Package> <Package>
<Name>fbida</Name> <Name>fbida</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>mesa</Dependency> <Dependency>mesa</Dependency>
<Dependency>tiff</Dependency> <Dependency>tiff</Dependency>
<Dependency>webp</Dependency> <Dependency>webp</Dependency>
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>libXt</Dependency> <Dependency>libXt</Dependency>
<Dependency>giflib</Dependency> <Dependency>giflib</Dependency>
<Dependency>libX11</Dependency> <Dependency>libX11</Dependency>
<Dependency>libXpm</Dependency> <Dependency>libXpm</Dependency>
<Dependency>libdrm</Dependency> <Dependency>libdrm</Dependency>
<Dependency>libpcd</Dependency> <Dependency>libpcd</Dependency>
<Dependency>libpng</Dependency> <Dependency>libpng</Dependency>
<Dependency>pixman</Dependency> <Dependency>pixman</Dependency>
<Dependency>libXext</Dependency> <Dependency>libXext</Dependency>
<Dependency>libexif</Dependency> <Dependency>libexif</Dependency>
<Dependency>freetype</Dependency> <Dependency>freetype</Dependency>
<Dependency>libepoxy</Dependency> <Dependency>libepoxy</Dependency>
<Dependency>openmotif</Dependency> <Dependency>openmotif</Dependency>
<Dependency>fontconfig</Dependency> <Dependency>fontconfig</Dependency>
<Dependency>imagemagick</Dependency> <Dependency>imagemagick</Dependency>
<Dependency>ghostscript</Dependency> <Dependency>ghostscript</Dependency>
<Dependency>poppler-glib</Dependency> <Dependency>poppler-glib</Dependency>
<Dependency>libjpeg-turbo</Dependency> <Dependency>libjpeg-turbo</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path> <Path fileType="data">/usr/share</Path>
<Path fileType="man">/usr/share/man</Path> </Files>
<Path fileType="doc">/usr/share/doc</Path> </Package>
</Files>
</Package>
<History> <History>
<Update release="1"> <Update release="2">
<Date>2020-12-06</Date> <Date>2026-02-28</Date>
<Version>2.14</Version> <Version>2.15</Version>
<Comment>First build</Comment> <Comment>Version bump.</Comment>
<Name>fury</Name> <Name>Pisi Linux Community</Name>
<Email>uglyside@yandex.ru</Email> <Email>admin@pisilinux.org</Email>
</Update> </Update>
</History> <Update release="1">
<Date>2020-12-06</Date>
<Version>2.14</Version>
<Comment>First build</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
</PISI> </PISI>
multimedia/graphics/ffmpegthumbnailer/actions.py
+4 -4
View File
@@ -17,12 +17,12 @@ j = ''.join([
]) ])
def setup(): def setup():
cmaketools.configure(j) cmaketools.configure(j)
def build(): def build():
mesontools.build() mesontools.build()
def install(): def install():
mesontools.install() mesontools.install()
pisitools.dodoc("AUTHORS", "COPYING") pisitools.dodoc("AUTHORS", "COPYING")
multimedia/graphics/ffmpegthumbnailer/pspec.xml
+78 -71
View File
@@ -1,78 +1,85 @@
<?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>ffmpegthumbnailer</Name> <Name>ffmpegthumbnailer</Name>
<Homepage>https://github.com/dirkvdb/ffmpegthumbnailer</Homepage> <Homepage>https://github.com/dirkvdb/ffmpegthumbnailer</Homepage>
<Packager> <Packager>
<Name>PisiLinux Community</Name> <Name>Pisi Linux Community</Name>
<Email>admins@pisilinux.org</Email> <Email>admin@pisilinux.org</Email>
</Packager> </Packager>
<License>GPLv2</License> <License>GPLv2</License>
<Summary>The video thumbnailer.</Summary> <Summary>The video thumbnailer.</Summary>
<Description>A lightweight video thumbnailer that can be used by file managers to create thumbnails for your video files.</Description> <Description>A lightweight video thumbnailer that can be used by file managers to create thumbnails for your video files.</Description>
<Archive sha1sum="64f3f11e66a8543904ea06de0d199ebc2e117f73" type="targz">https://github.com/dirkvdb/ffmpegthumbnailer/archive/2.2.3/ffmpegthumbnailer-2.2.3.tar.gz</Archive> <Archive sha1sum="a76d890984fdb70928daf9d7ab397bfc130154c9" type="targz">https://github.com/dirkvdb/ffmpegthumbnailer/archive/v2.3.0/ffmpegthumbnailer-v2.3.0.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<Dependency>ninja</Dependency> <Dependency>ninja</Dependency>
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>libpng-devel</Dependency> <Dependency>libpng-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency> <Dependency>ffmpeg-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency> <Dependency>libjpeg-turbo-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch level="1"></Patch> --> <!-- <Patch level="1"></Patch> -->
</Patches> </Patches>
</Source> </Source>
<Package> <Package>
<Name>ffmpegthumbnailer</Name> <Name>ffmpegthumbnailer</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency> <Dependency>libpng</Dependency>
<Dependency>ffmpeg</Dependency> <Dependency>ffmpeg</Dependency>
<Dependency>libjpeg-turbo</Dependency> <Dependency>libjpeg-turbo</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>
</Files> </Files>
</Package> </Package>
<Package> <Package>
<Name>ffmpegthumbnailer-devel</Name> <Name>ffmpegthumbnailer-devel</Name>
<Summary>Development files for ffmpegthumbnailer</Summary> <Summary>Development files for ffmpegthumbnailer</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">ffmpegthumbnailer</Dependency> <Dependency release="current">ffmpegthumbnailer</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="header">/usr/include</Path> <Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path> <Path fileType="data">/usr/lib/pkgconfig</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="3"> <Update release="4">
<Date>2025-01-30</Date> <Date>2026-02-28</Date>
<Version>2.2.3</Version> <Version>2.3.0</Version>
<Comment>Version bump.</Comment> <Comment>Version bump.</Comment>
<Name>fury</Name> <Name>Pisi Linux Community</Name>
<Email>uglyside@yandex.ru</Email> <Email>admin@pisilinux.org</Email>
</Update> </Update>
<Update release="2"> <Update release="3">
<Date>2024-08-10</Date> <Date>2025-01-30</Date>
<Version>2.2.2</Version> <Version>2.2.3</Version>
<Comment>First Beta release.</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="2">
<Date>2020-12-06</Date> <Date>2024-08-10</Date>
<Version>2.2.2</Version> <Version>2.2.2</Version>
<Comment>First Beta release.</Comment> <Comment>First Beta release.</Comment>
<Name>fury</Name> <Name>fury</Name>
<Email>uglyside@yandex.ru</Email> <Email>uglyside@yandex.ru</Email>
</Update> </Update>
</History> <Update release="1">
<Date>2020-12-06</Date>
<Version>2.2.2</Version>
<Comment>First Beta release.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
</PISI> </PISI>
multimedia/graphics/ffmpegthumbnailer/translations.xml
+9 -9
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<PISI> <PISI>
<Source> <Source>
<Name>ffmpegthumbnailer</Name> <Name>ffmpegthumbnailer</Name>
<Summary xml:lang="tr">Dosya yöneticileri için hafif görüntü önizleyicisi</Summary> <Summary xml:lang="tr">Dosya yöneticileri için hafif görüntü önizleyicisi</Summary>
<Description xml:lang="tr">Ffmpeg Thumbnailer, görüntü dosyalarınız için dosya yöneticilerinizde önizlemeler oluşturmaya yarar.</Description> <Description xml:lang="tr">Ffmpeg Thumbnailer, görüntü dosyalarınız için dosya yöneticilerinizde önizlemeler oluşturmaya yarar.</Description>
</Source> </Source>
<Package> <Package>
<Name>ffmpegthumbnailer-devel</Name> <Name>ffmpegthumbnailer-devel</Name>
<Summary xml:lang="tr">Ffmpegthumbnailer için geliştirme dosyaları</Summary> <Summary xml:lang="tr">Ffmpegthumbnailer için geliştirme dosyaları</Summary>
</Package> </Package>
</PISI> </PISI>
multimedia/graphics/geeqie/actions.py
+4 -8
View File
@@ -4,23 +4,19 @@
# 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 mesontools, pisitools, shelltools from pisi.actionsapi import mesontools, pisitools
y = ''.join([ y = ''.join([
' --prefix=/usr', ' --prefix=/usr',
' --buildtype=release', ' --buildtype=debugoptimized',
' -Darchive=enabled',
' -Dgps-map=enabled',
' -Dgtk4=disabled',
' -Dpdf=disabled', ' -Dpdf=disabled',
' -Ddjvu=disabled', ' -Ddjvu=disabled',
' -Devince=disabled', ' -Ddoxygen=disabled',
' -Dgit=disabled', ' -Dgit=disabled',
' -Dhelp_pdf=disabled', ' -Dhelp_pdf=disabled',
' -Dpandoc=disabled', ' -Dpandoc=disabled',
' -Dspell=disabled', ' -Dspell=disabled',
' -Dyelp-build=disabled', ' -Dyelp-build=disabled '
' -Dexecinfo=disabled '
]) ])
def setup(): def setup():
multimedia/graphics/geeqie/pspec.xml
+9 -9
View File
@@ -13,14 +13,12 @@
<PartOf>multimedia.graphics</PartOf> <PartOf>multimedia.graphics</PartOf>
<Summary>Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.</Summary> <Summary>Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.</Summary>
<Description>Geeqie can be used as a simple, fast, database-free image viewer, but equally it can be used to manage large collections of images.</Description> <Description>Geeqie can be used as a simple, fast, database-free image viewer, but equally it can be used to manage large collections of images.</Description>
<Archive sha1sum="31b1b3c09ea42dfaed5c814d0ba8bdebe4d94ded" type="tarxz"> <Archive sha1sum="e150e1e7f33992f7b1ac37a166d59a4c4758b19a" type="tarxz">
https://github.com/BestImageViewer/geeqie/releases/download/v2.6.1/geeqie-2.6.1.tar.xz https://github.com/BestImageViewer/geeqie/releases/download/v2.7/geeqie-2.7.tar.xz
</Archive> </Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>vim</Dependency> <Dependency>vim</Dependency>
<Dependency>meson</Dependency> <Dependency>meson</Dependency>
<Dependency>cmake</Dependency>
<Dependency>doxygen</Dependency>
<Dependency>xz-devel</Dependency> <Dependency>xz-devel</Dependency>
<Dependency>acl-devel</Dependency> <Dependency>acl-devel</Dependency>
<Dependency>lua-devel</Dependency> <Dependency>lua-devel</Dependency>
@@ -33,7 +31,6 @@
<Dependency>webp-devel</Dependency> <Dependency>webp-devel</Dependency>
<Dependency>lirc-devel</Dependency> <Dependency>lirc-devel</Dependency>
<Dependency>lcms2-devel</Dependency> <Dependency>lcms2-devel</Dependency>
<Dependency>lua51-devel</Dependency>
<Dependency>exiv2-devel</Dependency> <Dependency>exiv2-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency> <Dependency>ffmpeg-devel</Dependency>
<Dependency>libraw-devel</Dependency> <Dependency>libraw-devel</Dependency>
@@ -67,7 +64,6 @@
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>glib2</Dependency> <Dependency>glib2</Dependency>
<Dependency>lcms2</Dependency> <Dependency>lcms2</Dependency>
<Dependency>lua51</Dependency>
<Dependency>pango</Dependency> <Dependency>pango</Dependency>
<Dependency>ffmpeg</Dependency> <Dependency>ffmpeg</Dependency>
<Dependency>zenity</Dependency> <Dependency>zenity</Dependency>
@@ -91,13 +87,17 @@
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/lib</Path> <Path fileType="executable">/usr/lib</Path>
<Path fileType="data">/usr/share</Path> <Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man/man1</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="12">
<Date>2026-02-28</Date>
<Version>2.7</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="11"> <Update release="11">
<Date>2026-01-15</Date> <Date>2026-01-15</Date>
<Version>2.6.1</Version> <Version>2.6.1</Version>