This commit is contained in:
4fury-c3440d8
2022-02-02 05:32:39 +03:00
parent 9bd92cfe73
commit a74730dfc9
3 changed files with 38 additions and 13 deletions
+1 -9
View File
@@ -6,7 +6,6 @@
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
j = ''.join([
@@ -20,14 +19,7 @@ j = ''.join([
def setup():
pisitools.cflags.add("-Wno-deprecated-declarations")
# Fix instalation step
pisitools.dosed("Makefile.am", "\ ChangeLog\ ", " ")
pisitools.dosed("Makefile.am", "\ ChangeLog.html$", "")
# Fix version
pisitools.dosed("configure.ac", "\+git", "1.7.1")
shelltools.system("NOCONFIGURE=1 ./autogen.sh")
autotools.autoreconf("-vif")
autotools.configure(j)
@@ -37,5 +29,5 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.removeDir("/usr/share/doc/")
pisitools.dodoc("AUTHORS", "NEWS")
pisitools.removeDir("/usr/share/doc/geeqie-%s" % get.srcVERSION())
@@ -0,0 +1,23 @@
From d3d59ed1080795af43b892d7b49f160f358c6be7 Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Fri, 28 Jan 2022 10:17:04 +0000
Subject: [PATCH] Bug fix: Open archive not working
Open archive does not work if a default layout has not been set.
---
src/layout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/layout.c b/src/layout.c
index 5b08d51b..d72421f0 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -3090,7 +3090,7 @@ LayoutWindow *layout_new_from_default()
}
else
{
- layout_new_from_config(NULL, NULL, TRUE);
+ lw = layout_new_from_config(NULL, NULL, TRUE);
}
return lw;
}
+14 -4
View File
@@ -15,8 +15,8 @@
<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="bbbadf0148d5684b9f4a4fbe82982ffcfac993b0" type="targz">
https://github.com/BestImageViewer/geeqie/archive/refs/tags/v1.7.1.tar.gz
<Archive sha1sum="ffb680fb56603fe6b5f5079019a7659fa92862e4" type="tarxz">
https://github.com/BestImageViewer/geeqie/releases/download/v1.7.2/geeqie-1.7.2.tar.xz
</Archive>
<BuildDependencies>
<Dependency>doxygen</Dependency>
@@ -37,6 +37,9 @@
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>ffmpegthumbnailer-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">Open_archive_not_working.patch</Patch>
</Patches>
</Source>
<Package>
@@ -78,10 +81,17 @@
</Package>
<History>
<Update release="3">
<Date>2022-02-02</Date>
<Version>1.7.2</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="2">
<Date>2022-01-22</Date>
<Date>2022-01-18</Date>
<Version>1.7.1</Version>
<Comment>Version bump</Comment>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>