SLFO-pool/gdk-pixbuf
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main gdk-pixbuf revision 09219abb17ccaa2331580708e1dd28d6

Browse Source
This commit is contained in:
Adrian Schröter 2024-06-14 17:15:02 +02:00
parent 6d1e2ed098
commit bd42d62b57
8 changed files with 106 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
_service
View File

@ -1,9 +1,19 @@
<?xml version="1.0"?>
<services>
<service name="download_url" mode="manual">
<param name="protocol">https</param>
<param name="host">download.gnome.org</param>
<param name="path">sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz</param>
</service>
<service name="set_version" mode="manual" />
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gdk-pixbuf.git</param>
<param name="revision">2.42.12</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v?(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<!-- <param name="changesgenerate">enable</param> -->
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">zst</param>
</service>
<service name="set_version" mode="manual" />
</services>

BIN
gdk-pixbuf-2.42.10.zip (Stored with Git LFS)
View File

Binary file not shown.

BIN
gdk-pixbuf-2.42.12.obscpio (Stored with Git LFS) Normal file
View File

Binary file not shown.

13
gdk-pixbuf-jpeg-slow.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/tests/meson.build b/tests/meson.build
index 37810666..eff43cc3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -81,7 +81,7 @@ installed_tests = {
'suites': ['io'],
},
'pixbuf-jpeg': {
- 'suites': ['format'],
+ 'suites': ['format', 'slow'],
'skip': not enabled_loaders.contains('jpeg'),
},
'pixbuf-dpi': {

56
gdk-pixbuf.changes
View File

@ -1,3 +1,59 @@
-------------------------------------------------------------------
Thu May 16 13:30:50 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Enable test suite on x86_64 (other arches seem too flaky for now):
+ Add %check section and call %meson_test
+ Add gdk-pixbuf-jpeg-slow.patch: allow pixbuf-jpeg to run for
more than 30s, by marking it as a slow test
(glgo#GNOME/gdk-pixbuf!174).
-------------------------------------------------------------------
Thu May 16 11:26:04 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Migrate package to a regular obs_scm service, no longer password
protecting a zip file. The originally reported bsc#1159337 seems
no longer be applicable and we prefer the easier route.
- Drop unzip BuildRequires and pre_checkin.sh script.
-------------------------------------------------------------------
Wed May 15 11:49:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.42.12:
+ Fix a build failure,
+ Fix occasional build failures,
+ ani: Reject files with multiple INA or IART chunks,
+ ani: Reject files with multiple anih chunks (CVE-2022-48622),
+ ani: validate chunk size,
+ Updated translations.
- Drop 238893d8cd6f9c2616a05ab521a29651a17a38c2.patch: fixed
upstream.
-------------------------------------------------------------------
Mon May 6 07:03:01 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Pass -Dothers=enabled to meson: enable other image loaders (most
notably beeded seems xpm,xbm). This is in line with upstreams
recommendation for now, but won't be working past version 2.43.x.
The loaders will likely be split out into a separate repo.
(boo#1223903, glgo#GNOME/gdk-pixbuf!169).
- Add 238893d8cd6f9c2616a05ab521a29651a17a38c2.patch: Fix test
suite with other loaders enabled.
-------------------------------------------------------------------
Thu May 2 08:53:08 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.42.11:
+ Disable fringe loaders by default.
+ Introspection fixes.
+ Updated translations.
-------------------------------------------------------------------
Mon Apr 15 13:29:37 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix path to gdk-pixbuf-query-loader in pkg-config file: we rename
the loader to be multi-arch compatible and thus also need to
adjust the .pc file to have build-systems find it.
-------------------------------------------------------------------
Wed Oct 26 11:58:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

4
gdk-pixbuf.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: gdk-pixbuf
version: 2.42.12
mtime: 1715739341
commit: e4315fb8553776e13d39e3f2e0ea8792db61720c

28
gdk-pixbuf.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gdk-pixbuf
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,22 +20,19 @@
%define gdk_pixbuf_binary_version 2.10.0
Name: gdk-pixbuf
Version: 2.42.10
Version: 2.42.12
Release: 0
Summary: An image loading library
License: LGPL-2.1-or-later
Group: Development/Libraries/GNOME
URL: https://www.gnome.org/
# A filefrom the test suite is correctly identified by clamav to be a
# malicious BC.Gif.Exploit.Agent-1425366.Agent. This is an intentional part of
# the test suite to ensure it has no negative side effects. Change the Source0
# from tar.xz to zip to bypass clamav scanning on SLE.
Source0: %{name}-%{version}.zip
Source0: %{name}-%{version}.tar.zst
Source1: macros.gdk-pixbuf
Source2: README.SUSE
Source3: gdk-pixbuf-rpmlintrc
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM gdk-pixbuf-jpeg-slow.patch -- https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/174
Patch0: gdk-pixbuf-jpeg-slow.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docutils
@ -43,7 +40,6 @@ BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: meson >= 0.55.3
BuildRequires: pkgconfig
BuildRequires: unzip
BuildRequires: xsltproc
BuildRequires: pkgconfig(gi-docgen)
BuildRequires: pkgconfig(glib-2.0) >= 2.56.0
@ -131,16 +127,13 @@ This package contains the development files for gdk-pixbuf.
%lang_package
%prep
%setup -c -T -q
unzip -P gecko %{SOURCE0}
%if "%{_lib}" == "lib64"
%autosetup -p1
cp -a %{SOURCE2} .
%endif
%autopatch -p1
%build
%meson \
-Dinstalled_tests=false \
-Dothers=enabled \
%{nil}
%meson_build
@ -152,6 +145,8 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders
%if "%{_lib}" == "lib64"
mv %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders-64
mv %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders.1 %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders-64.1
sed -i 's|gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders|gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders-64|' \
%{buildroot}%{_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
%endif
# Install rpm macros
mkdir -p %{buildroot}%{_rpmmacrodir}
@ -169,6 +164,11 @@ cp %{SOURCE1} %{buildroot}%{_rpmmacrodir}
%endif
%define _gdk_pixbuf_query_loaders_update_cache %{_gdk_pixbuf_query_loaders} --update-cache
%ifarch x86_64
%check
%meson_test
%endif
%post -n libgdk_pixbuf-2_0-0
/sbin/ldconfig
%if 0

15
pre_checkin.sh
View File

@ -1,15 +0,0 @@
#!/bin/sh
# To update the package:
## 1. update the version tags in _service
## 2. run `osc service ra`; # get the upstream release, and set the version string in spec
## 3. run `./pre_checkin.sh`; # generate the zip file
## 4. edit changelog and commit the change # the tar.xz file generated by the step 2 is not necessarily to commit
EXTRACTDIR=$(mktemp -d);
BASENAME=$(grep ^Name\: gdk-pixbuf.spec | cut -d: -f2 | sed 's/[[:space:]]//g');
VERSION=$(grep ^Version\: gdk-pixbuf.spec | cut -d: -f2 | sed 's/[[:space:]]//g');
tar xvfJ $BASENAME-$VERSION.tar.xz -C $EXTRACTDIR;
pushd $EXTRACTDIR/$BASENAME-$VERSION && zip -r -P gecko $BASENAME-$VERSION.zip * && popd && mv $EXTRACTDIR/$BASENAME-$VERSION/$BASENAME-$VERSION.zip .;
rm -fr $EXTRACTDIR && rm -fr $BASENAME-$VERSION.tar.xz;