Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (31eecd6f96732b513a26aa7187dd1168aed99bd1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (31eecd6f96732b513a26aa7187dd1168aed99bd1)
  • Date: Sun, 30 Jun 2024 12:04:01 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

graphics/gimp/DEPENDS
| 6
graphics/gimp/DETAILS
| 4
graphics/gimp/HISTORY
| 9
graphics/gimp/PRE_BUILD
| 6
graphics/gimp/patches/0001-plug-ins-Allow-building-without-librsvg.patch
| 142 ++++++++++

graphics/gimp/patches/0001-plug-ins-file-tiff-Fix-xres-yres-variable-type-misma.patch
| 32 ++
graphics/gimp/patches/0002-plug-ins-metadata-Fix-type-mismatch.patch
| 31 ++
7 files changed, 227 insertions(+), 3 deletions(-)

New commits:
commit 31eecd6f96732b513a26aa7187dd1168aed99bd1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gimp: Fix build errors

commit eaa62856e83588ae2f0a8df2b6157147834de844
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gimp: Make librsvg2 optional

commit f1148c8b8b2d9f2abc0aef87067ef5887cef94f6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gimp 2.10.38

diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 9247675..89a72d5 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -21,7 +21,6 @@ depends libart_lgpl &&
depends libglade2 &&
depends libmypaint &&
depends libpng &&
-depends librsvg2 &&
depends LZMA &&
depends mypaint-brushes &&
depends gegl &&
@@ -88,6 +87,11 @@ optional_depends libmng \
"--without-libmng" \
"for MNG animations support" &&

+optional_depends librsvg2 \
+ "--with-librsvg" \
+ "--without-librsvg" \
+ "for SVG support" &&
+
optional_depends libwebp \
"--with-webp" \
"--without-webp" \
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
old mode 100644
new mode 100755
index afe3263..b70a074
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -2,9 +2,9 @@
SPELL=gimp
#if [[ $GIMP_DEVEL == y ]]; then
#else
- VERSION=2.10.36
+ VERSION=2.10.38
SECURITY_PATCH=2
-
SOURCE_HASH=sha512:dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66
+
SOURCE_HASH=sha512:343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
#fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 5192a19..2eebbb8 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,12 @@
+2024-06-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.38
+ * DEPENDS, PRE_BUILD,
+ patches/0001-plug-ins-Allow-building-without-librsvg.patch:
+ made librsvg optional
+ *
patches/0001-plug-ins-file-tiff-Fix-xres-yres-variable-type-misma.patch,
+ patches/0002-plug-ins-metadata-Fix-type-mismatch.patch:
+ fixed build errors
+
2023-12-07 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.10.36
* PRE_BUILD: outdated, gone
diff --git a/graphics/gimp/PRE_BUILD b/graphics/gimp/PRE_BUILD
new file mode 100755
index 0000000..fc86f89
--- /dev/null
+++ b/graphics/gimp/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+# Fix up timestamps to avoid unnecessarily running autotools
+touch aclocal.m4 configure config.h.in &&
+find -name Makefile.in -exec touch {} +
diff --git
a/graphics/gimp/patches/0001-plug-ins-Allow-building-without-librsvg.patch
b/graphics/gimp/patches/0001-plug-ins-Allow-building-without-librsvg.patch
new file mode 100644
index 0000000..0d717f5
--- /dev/null
+++ b/graphics/gimp/patches/0001-plug-ins-Allow-building-without-librsvg.patch
@@ -0,0 +1,142 @@
+From bfc3db5a80c3c76d773d90d2327d8f042606c48d Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 30 Jun 2024 09:40:07 +0200
+Subject: [PATCH] plug-ins: Allow building without librsvg
+
+By specifying --without-librsvg to the configure script.
+
+Origin: Source Mage
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ configure | 25 ++++++++++++++++++++++++-
+ configure.ac | 12 ++++++++----
+ plug-ins/common/Makefile.am | 2 ++
+ plug-ins/common/Makefile.in | 2 +-
+ 4 files changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 48c3c77892a5..4dc62f28888b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2033,10 +2033,14 @@ AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" =
xyes)
+ # Check for librsvg
+ ###################
+
+-PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,,
+- [add_deps_error([rsvg >= rsvg_required_version])])
+-
+-MIME_TYPES="$MIME_TYPES;image/svg+xml"
++AC_ARG_WITH(librsvg,
++ AS_HELP_STRING([--without-librsvg], [don't build SVG support]))
++if test "x$with_librsvg" != xno; then
++ PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,,
++ [add_deps_error([rsvg >= rsvg_required_version])])
++ MIME_TYPES="$MIME_TYPES;image/svg+xml"
++fi
++AM_CONDITIONAL(WITH_LIBRSVG, test "x$with_librsvg" != xno)
+
+
+ ####################################
+diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
+index 75fbd6164fe5..3b22cb576dd1 100644
+--- a/plug-ins/common/Makefile.am
++++ b/plug-ins/common/Makefile.am
+@@ -191,7 +191,9 @@ file_ps_libexec_PROGRAMS = $(FILE_PS)
+ file_psp_libexec_PROGRAMS = file-psp
+ file_raw_data_libexec_PROGRAMS = file-raw-data
+ file_sunras_libexec_PROGRAMS = file-sunras
++if WITH_LIBRSVG
+ file_svg_libexec_PROGRAMS = file-svg
++endif
+ file_tga_libexec_PROGRAMS = file-tga
+ file_wmf_libexec_PROGRAMS = $(FILE_WMF)
+ file_xbm_libexec_PROGRAMS = file-xbm
+diff --git a/plug-ins/common/Makefile.in b/plug-ins/common/Makefile.in
+index 11f761320a12..4911aac033e1 100644
+--- a/plug-ins/common/Makefile.in
++++ b/plug-ins/common/Makefile.in
+@@ -136,7 +136,7 @@ file_pnm_libexec_PROGRAMS = file-pnm$(EXEEXT)
+ file_psp_libexec_PROGRAMS = file-psp$(EXEEXT)
+ file_raw_data_libexec_PROGRAMS = file-raw-data$(EXEEXT)
+ file_sunras_libexec_PROGRAMS = file-sunras$(EXEEXT)
+-file_svg_libexec_PROGRAMS = file-svg$(EXEEXT)
++@WITH_LIBRSVG_TRUE@file_svg_libexec_PROGRAMS = file-svg$(EXEEXT)
+ file_tga_libexec_PROGRAMS = file-tga$(EXEEXT)
+ file_xbm_libexec_PROGRAMS = file-xbm$(EXEEXT)
+ file_xwd_libexec_PROGRAMS = file-xwd$(EXEEXT)
+diff --git a/configure b/configure
+index 69cf4eae8fd9..da62e959a5a9 100755
+--- a/configure
++++ b/configure
+@@ -766,6 +766,8 @@ POPPLER_LIBS
+ POPPLER_CFLAGS
+ BUILD_PRINT_FALSE
+ BUILD_PRINT_TRUE
++WITH_LIBRSVG_FALSE
++WITH_LIBRSVG_TRUE
+ SVG_LIBS
+ SVG_CFLAGS
+ HAVE_WEBKIT_FALSE
+@@ -1203,6 +1205,7 @@ with_jpegxl
+ with_libbacktrace
+ with_libunwind
+ with_webkit
++with_librsvg
+ with_print
+ with_cairo_pdf
+ with_wmf
+@@ -2055,6 +2058,7 @@ Optional Packages:
+ --without-libbacktrace build without libbacktrace support
+ --without-libunwind build without libunwind support
+ --without-webkit don't build the help-browser and web-page plug-ins
++ --without-librsvg don't build SVG support
+ --without-print build without print support
+ --without-cairo-pdf build without cairo-pdf support
+ --without-wmf build without WMF support
+@@ -31253,6 +31257,13 @@ fi
+ ###################
+
+
++# Check whether --with-librsvg was given.
++if test "${with_librsvg+set}" = set; then :
++ withval=$with_librsvg;
++fi
++
++if test "x$with_librsvg" != xno; then
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >=
2.40.6" >&5
+ $as_echo_n "checking for librsvg-2.0 >= 2.40.6... " >&6; }
+@@ -31333,8 +31344,16 @@ $as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing
dep: rsvg >= 2.40.6" >&6;}
+ $as_echo "yes" >&6; }
+
+ fi
++ MIME_TYPES="$MIME_TYPES;image/svg+xml"
++fi
++ if test "x$with_librsvg" != xno; then
++ WITH_LIBRSVG_TRUE=
++ WITH_LIBRSVG_FALSE='#'
++else
++ WITH_LIBRSVG_TRUE='#'
++ WITH_LIBRSVG_FALSE=
++fi
+
+-MIME_TYPES="$MIME_TYPES;image/svg+xml"
+
+
+ ####################################
+@@ -35213,6 +35232,10 @@ if test -z "${HAVE_WEBKIT_TRUE}" && test -z
"${HAVE_WEBKIT_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_WEBKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${WITH_LIBRSVG_TRUE}" && test -z "${WITH_LIBRSVG_FALSE}"; then
++ as_fn_error $? "conditional \"WITH_LIBRSVG\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${BUILD_PRINT_TRUE}" && test -z "${BUILD_PRINT_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_PRINT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+--
+2.44.0
+
diff --git
a/graphics/gimp/patches/0001-plug-ins-file-tiff-Fix-xres-yres-variable-type-misma.patch

b/graphics/gimp/patches/0001-plug-ins-file-tiff-Fix-xres-yres-variable-type-misma.patch
new file mode 100644
index 0000000..be769a1
--- /dev/null
+++
b/graphics/gimp/patches/0001-plug-ins-file-tiff-Fix-xres-yres-variable-type-misma.patch
@@ -0,0 +1,32 @@
+From e8b0547cb3951cef2e9572efb3d5f7d5f8d22071 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 30 Jun 2024 09:39:32 +0200
+Subject: [PATCH 1/2] plug-ins: file-tiff: Fix xres & yres variable type
+ mismatch
+
+Origin: Source Mage
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ plug-ins/file-tiff/file-tiff-load.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plug-ins/file-tiff/file-tiff-load.c
b/plug-ins/file-tiff/file-tiff-load.c
+index 72e9538032e1..4fc3b6c75f35 100644
+--- a/plug-ins/file-tiff/file-tiff-load.c
++++ b/plug-ins/file-tiff/file-tiff-load.c
+@@ -1301,8 +1301,8 @@ load_image (GFile *file,
+
+ /* any resolution info in the file? */
+ {
+- gfloat xres = 72.0;
+- gfloat yres = 72.0;
++ gdouble xres = 72.0;
++ gdouble yres = 72.0;
+ gushort read_unit;
+ GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */
+
+--
+2.44.0
+Fixed up by sm-checkpatch 0.1
+
diff --git
a/graphics/gimp/patches/0002-plug-ins-metadata-Fix-type-mismatch.patch
b/graphics/gimp/patches/0002-plug-ins-metadata-Fix-type-mismatch.patch
new file mode 100644
index 0000000..441b62f
--- /dev/null
+++ b/graphics/gimp/patches/0002-plug-ins-metadata-Fix-type-mismatch.patch
@@ -0,0 +1,31 @@
+From 9ced926fcd46d372b6a82bb45d5fa940dfb64243 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 30 Jun 2024 09:58:02 +0200
+Subject: [PATCH 2/2] plug-ins: metadata: Fix type mismatch
+
+It results in an error when compiled with GCC 14.1.0.
+
+Origin: Source Mage
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ plug-ins/metadata/metadata-editor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plug-ins/metadata/metadata-editor.c
b/plug-ins/metadata/metadata-editor.c
+index 87a2e87098da..9de9d22be8b2 100644
+--- a/plug-ins/metadata/metadata-editor.c
++++ b/plug-ins/metadata/metadata-editor.c
+@@ -2140,7 +2140,7 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata
*metadata,
+ }
+ else
+ {
+- if (! g_strv_contains (values,
equiv_values[evi]))
++ if (! g_strv_contains ((const gchar * const
*)values, equiv_values[evi]))
+ {
+ gchar *tmpvalue;
+
+--
+2.44.0
+Fixed up by sm-checkpatch 0.1
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (31eecd6f96732b513a26aa7187dd1168aed99bd1), Ismael Luceno, 06/30/2024

Archive powered by MHonArc 2.6.24.

Top of Page