From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gdk-pixbuf: update to 2.42.10.
Date: Fri, 24 Feb 2023 04:47:45 +0100 [thread overview]
Message-ID: <20230224034745.jE9FLmhL65q04NSuohJRRsEHw4EA5X06PqdHi7645qE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42418@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gdk-pixbuf
https://github.com/void-linux/void-packages/pull/42418
gdk-pixbuf: update to 2.42.10.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42418.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdk-pixbuf-42418.patch --]
[-- Type: text/x-diff, Size: 3741 bytes --]
From 26c63c2308746c143f784e0a7fcf636faaeca553 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Feb 2023 18:43:26 -0800
Subject: [PATCH 1/2] libjpeg-turbo: update to 2.1.5.1.
---
srcpkgs/libjpeg-turbo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 357453271f06..3c73aeb9b89f 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
# Template file for 'libjpeg-turbo'
pkgname=libjpeg-turbo
-version=2.1.4
+version=2.1.5.1
revision=1
build_style=cmake
configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -11,7 +11,7 @@ license="IJG, BSD-3-Clause, Zlib"
homepage="https://libjpeg-turbo.org/"
changelog="https://raw.githubusercontent.com/libjpeg-turbo/libjpeg-turbo/main/ChangeLog.md"
distfiles="${SOURCEFORGE_SITE}/libjpeg-turbo/libjpeg-turbo-${version}.tar.gz"
-checksum=d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b
+checksum=2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf
provides="jpeg-8_1"
replaces="jpeg>=0"
From eb29e57a2004f769b15e4c4f86f02a98f92eecf0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Thu, 23 Feb 2023 18:43:51 -0800
Subject: [PATCH 2/2] gdk-pixbuf: update to 2.42.10.
---
.../gdk-pixbuf/patches/largejpeg-oom-test.patch | 14 ++++++++++++++
srcpkgs/gdk-pixbuf/template | 12 ++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/gdk-pixbuf/patches/largejpeg-oom-test.patch
diff --git a/srcpkgs/gdk-pixbuf/patches/largejpeg-oom-test.patch b/srcpkgs/gdk-pixbuf/patches/largejpeg-oom-test.patch
new file mode 100644
index 000000000000..efb3b968f1c5
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/patches/largejpeg-oom-test.patch
@@ -0,0 +1,14 @@
+--- a/tests/pixbuf-jpeg.c
++++ b/tests/pixbuf-jpeg.c
+@@ -196,10 +196,7 @@ test_jpeg_fbfbfbfb (void)
+ g_assert_no_error (error);
+
+ gdk_pixbuf_loader_close (loader, &error);
+- g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE);
+-
+- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+- g_assert_nonnull (pixbuf);
++ g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY);
+
+ g_object_unref (loader);
+ g_free (contents);
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 02c825703059..0f2117fa95d1 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -1,13 +1,13 @@
# Template file for 'gdk-pixbuf'
pkgname=gdk-pixbuf
-version=2.42.6
+version=2.42.10
revision=1
build_style=meson
build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dpng=true
- -Dinstalled_tests=false"
-hostmakedepends="gettext-devel glib-devel pkg-config libxslt docbook-xsl"
-makedepends="libglib-devel libpng-devel tiff-devel
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dpng=enabled
+ -Djpeg=enabled -Dtiff=enabled -Dinstalled_tests=false"
+hostmakedepends="gettext-devel glib-devel pkg-config python3-docutils"
+makedepends="libglib-devel libpng-devel tiff-devel libjpeg-turbo-devel
shared-mime-info"
depends="shared-mime-info"
short_desc="Image loading library for The GTK+ toolkit (v2)"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GdkPixbuf"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f
+checksum=ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b
# Package build options
build_options="gir"
next prev parent reply other threads:[~2023-02-24 3:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 2:44 [PR PATCH] " oreo639
2023-02-24 3:06 ` [PR PATCH] [Updated] " oreo639
2023-02-24 3:40 ` oreo639
2023-02-24 3:47 ` oreo639 [this message]
2023-03-30 20:53 ` [PR PATCH] [Merged]: " paper42
-- strict thread matches above, loose matches on Subject: below --
2022-11-25 11:45 [PR PATCH] " Eloitor
2022-11-30 11:15 ` [PR PATCH] [Updated] " Eloitor
2023-03-01 12:44 ` Eloitor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230224034745.jE9FLmhL65q04NSuohJRRsEHw4EA5X06PqdHi7645qE@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).