sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (94610fcb9fbf735550001b6e61ec810ddbfe0a36)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (94610fcb9fbf735550001b6e61ec810ddbfe0a36)
- Date: Sun, 14 Aug 2022 16:56:05 +0000
GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:
graphics/geeqie/0001-don-t-install-ChangeLog.patch | 28 ----------
graphics/geeqie/BUILD | 3 -
graphics/geeqie/CONFIGURE | 1
graphics/geeqie/DEPENDS | 54
++++++++++++++-------
graphics/geeqie/DETAILS | 18 +------
graphics/geeqie/HISTORY | 4 +
graphics/geeqie/PREPARE | 5 -
graphics/geeqie/PRE_BUILD | 6 --
8 files changed, 46 insertions(+), 73 deletions(-)
New commits:
commit 94610fcb9fbf735550001b6e61ec810ddbfe0a36
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>
graphics/geeqie: version 2.0.1
diff --git a/graphics/geeqie/0001-don-t-install-ChangeLog.patch
b/graphics/geeqie/0001-don-t-install-ChangeLog.patch
deleted file mode 100644
index 120f276..0000000
--- a/graphics/geeqie/0001-don-t-install-ChangeLog.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e67d91c9ab7da671eb16c931fff5cdd6a6bca25c Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sun, 31 Dec 2017 14:13:57 +0100
-Subject: [PATCH] don't install ChangeLog
-
----
- Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 113719b..69b96ef 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,9 +10,9 @@ man_MANS = geeqie.1
- readmedir = @readmedir@
-
- if HAVE_MARKDOWN
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS
README.html ChangeLog.html
-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
- else
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS
ChangeLog.html
-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS
- endif
-
- desktopdir = $(datadir)/applications
---
-2.15.1
-
diff --git a/graphics/geeqie/BUILD b/graphics/geeqie/BUILD
index 19e32d3..c8d3384 100755
--- a/graphics/geeqie/BUILD
+++ b/graphics/geeqie/BUILD
@@ -1,2 +1,3 @@
-OPTS="--disable-clutter --disable-gps
--with-readmedir=$INSTALL_ROOT/usr/share/doc/geeqie $OPTS" &&
+OPTS+=" gps-map=disabled" &&
+
default_build
diff --git a/graphics/geeqie/CONFIGURE b/graphics/geeqie/CONFIGURE
new file mode 100755
index 0000000..d1cc655
--- /dev/null
+++ b/graphics/geeqie/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/MESON_CONFIGURE
diff --git a/graphics/geeqie/DEPENDS b/graphics/geeqie/DEPENDS
index 141d310..43b2efd 100755
--- a/graphics/geeqie/DEPENDS
+++ b/graphics/geeqie/DEPENDS
@@ -1,6 +1,6 @@
+. "$GRIMOIRE/MESON_DEPENDS" &&
+
depends atk &&
-depends autoconf &&
-depends automake &&
depends cairo &&
depends fontconfig &&
depends freetype2 &&
@@ -8,34 +8,52 @@ depends gdk-pixbuf2 &&
depends glib2 &&
depends gtk+3 &&
depends harfbuzz &&
-depends JPEG &&
depends librsvg2 &&
depends pango &&
-depends tiff &&
+optional_depends djvulibre \
+ "djvu=enabled" \
+ "djvu=disabled" \
+ "djvu support" &&
optional_depends exiv2 \
- "--enable-exiv2" \
- "--disable-exiv2" \
+ "exiv2=enabled" \
+ "exiv2=disabled" \
"exiv2 support" &&
optional_depends ffmpegthumbnailer \
- "--enable-ffmpegthumbnailer" \
- "--disable-ffmpegthumbnailer" \
+ "videothumbnailer=enabled" \
+ "videothumbnailer=disabled" \
"support for thumbnailing video clips" &&
optional_depends lcms2 \
- "--enable-lcms" \
- "--disable-lcms" \
+ "cms=enabled" \
+ "cms=disabled" \
"lcms support" &&
-optional_depends lirc \
- "--enable-lirc" \
- "--disable-lirc" \
- "for remote-control support" &&
+optional_depends openjpeg \
+ "j2k=enabled" \
+ "j2k=disabled" \
+ "JPEG2000 support" &&
+optional_depends JPEG \
+ "jpeg=enabled" \
+ "jpeg=disabled" \
+ "JPEG support" &&
+optional_depends libraw \
+ "libraw=enabled" \
+ "libraw=disabled" \
+ "RAW support" &&
optional_depends lua51 \
- "--enable-lua" \
- "--disable-lua" \
+ "lua=enabled" \
+ "lua=disabled" \
"lua support" &&
+optional_depends tiff \
+ "tiff=enabled" \
+ "tiff=disabled" \
+ "TIFF support" &&
+optional_depends libwebp \
+ "webp=enabled" \
+ "webp=disabled" \
+ "webp support" &&
optional_depends poppler \
- "--enable-pdf" \
- "--disable-pdf" \
+ "pdf=enabled" \
+ "pdf=disabled" \
"for PDF support" &&
suggest_depends libexif \
diff --git a/graphics/geeqie/DETAILS b/graphics/geeqie/DETAILS
index 99e3536..014a24a 100755
--- a/graphics/geeqie/DETAILS
+++ b/graphics/geeqie/DETAILS
@@ -1,22 +1,10 @@
+. "$GRIMOIRE"/MESON_FUNCTIONS
SPELL=geeqie
-if [[ "${GEEQIE_SVN}" == "y" ]] ; then
- if [[ "$GEEQIE_SVN_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE_IGNORE=volatile
- SOURCE=geeqie-svn.tar.bz2
-
SOURCE_URL[0]=svn_http://geeqie.svn.sourceforge.net/svnroot/geeqie/trunk:geeqie
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/geeqie-svn
- FORCE_DOWNLOAD=on
-else
- VERSION=1.7.3
+ VERSION=2.0.1
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]="https://github.com/BestImageViewer/geeqie/releases/download/v${VERSION}/${SOURCE}";
-
SOURCE_HASH=sha512:5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
+
SOURCE_HASH=sha512:cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-fi
WEB_SITE="http://www.geeqie.org";
LICENSE[0]=GPL
ENTERED=20080726
diff --git a/graphics/geeqie/HISTORY b/graphics/geeqie/HISTORY
index 36e0004..418002a 100644
--- a/graphics/geeqie/HISTORY
+++ b/graphics/geeqie/HISTORY
@@ -1,3 +1,7 @@
+2022-08-14 Florian Franzmann <bwlf AT bandrate.org>
+ * 0001-don-t-install-ChangeLog.patch, PRE_BUILD: removed
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, PREPARE, PRE_BUILD: version 2.0.1
+
2022-04-18 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.7.3
diff --git a/graphics/geeqie/PREPARE b/graphics/geeqie/PREPARE
deleted file mode 100755
index b312e57..0000000
--- a/graphics/geeqie/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query GEEQIE_SVN "Build the SVN version?" n &&
-
-if [[ "$GEEQIE_SVN" == "y" ]]; then
- config_query GEEQIE_SVN_AUTOUPDATE "Automatically update $SPELL on
system-update?" n
-fi
diff --git a/graphics/geeqie/PRE_BUILD b/graphics/geeqie/PRE_BUILD
deleted file mode 100755
index 9bfba47..0000000
--- a/graphics/geeqie/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/0001-don-t-install-ChangeLog.patch" &&
-
-./autogen.sh
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (94610fcb9fbf735550001b6e61ec810ddbfe0a36), Florian Franzmann, 08/14/2022
Archive powered by MHonArc 2.6.24.