From ba1ea9e5924a1a0dc57773b82b9e75d425947085 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 05 2019 19:46:50 +0000 Subject: import gdk-pixbuf2-2.36.12-5.el8 --- diff --git a/.gdk-pixbuf2.metadata b/.gdk-pixbuf2.metadata index bdc5504..f2537c3 100644 --- a/.gdk-pixbuf2.metadata +++ b/.gdk-pixbuf2.metadata @@ -1 +1,2 @@ +66649b7bd255e315f4561ad72db48d15224de589 SOURCES/bug753605-atsize.jpg 2a32bf71fd7c47b22abd9843bc3116e771772fbe SOURCES/gdk-pixbuf-2.36.12.tar.xz diff --git a/.gitignore b/.gitignore index 6f7daf0..564e364 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +SOURCES/bug753605-atsize.jpg SOURCES/gdk-pixbuf-2.36.12.tar.xz diff --git a/SOURCES/Turn-off-mmx-support.diff b/SOURCES/Turn-off-mmx-support.diff new file mode 100644 index 0000000..87af258 --- /dev/null +++ b/SOURCES/Turn-off-mmx-support.diff @@ -0,0 +1,11 @@ +--- a/configure.ac 2015-08-19 02:48:05.000000000 +0200 ++++ b/configure.ac 2015-08-19 02:48:05.000000000 +0200 +@@ -872,7 +872,7 @@ + AC_MSG_CHECKING(for x86 platform) + case $host_cpu in + i386|i486|i586|i686|i786|k6|k7) +- use_x86_asm=yes ++ use_x86_asm=no + ;; + *) + use_x86_asm=no diff --git a/SPECS/gdk-pixbuf2.spec b/SPECS/gdk-pixbuf2.spec index aac4445..c13ca24 100644 --- a/SPECS/gdk-pixbuf2.spec +++ b/SPECS/gdk-pixbuf2.spec @@ -2,13 +2,17 @@ Name: gdk-pixbuf2 Version: 2.36.12 -Release: 2%{?dist} +Release: 5%{?dist} Summary: An image loading library License: LGPLv2+ URL: http://www.gtk.org #VCS: git:git://git.gnome.org/gdk-pixbuf Source0: http://download.gnome.org/sources/gdk-pixbuf/2.36/gdk-pixbuf-%{version}.tar.xz +Source1: bug753605-atsize.jpg + +# https://bugzilla.redhat.com/show_bug.cgi?id=1630565 +Patch0: Turn-off-mmx-support.diff BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: libpng-devel @@ -25,6 +29,9 @@ Requires: glib2%{?_isa} >= %{glib2_version} # We also need MIME information at runtime Requires: shared-mime-info +# Bootstrap requirements +BuildRequires: autoconf automake libtool gtk-doc +BuildRequires: gettext-autopoint # gdk-pixbuf was included in gtk2 until 2.21.2 Conflicts: gtk2 <= 2.21.2 @@ -87,6 +94,7 @@ the functionality of the installed %{name} package. %autosetup -n gdk-pixbuf-%{version} -p1 %build +autoreconf -fi %configure \ --with-x11 \ --with-libjasper \ @@ -99,6 +107,8 @@ make %{?_smp_mflags} %install %make_install RUN_QUERY_LOADER_TEST=false +cp -a ${RPM_SOURCE_DIR}/bug753605-atsize.jpg $RPM_BUILD_ROOT%{_libexecdir}/installed-tests/gdk-pixbuf + # Remove unpackaged files rm $RPM_BUILD_ROOT%{_libdir}/*.la rm $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.la @@ -169,6 +179,22 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache %changelog +* Thu Aug 29 2019 Benjamin Otte - 2.36.12-5 +- Disable mmx support + Resolves: #1630565 + +* Fri Dec 14 2018 Ray Strode - 2.36.12-4 +- Install missing test image + Related: #1625683 +- Fix up tests.yml + +* Fri Dec 14 2018 Ray Strode - 2.36.12-3 +- rebuild + +* Mon Dec 10 2018 Josh Boyer - 2.36.12-2 +- Rebuild for CET note fixes + Resolves: #1657310 + * Sun Apr 08 2018 Kalev Lember - 2.36.12-1 - Update to 2.36.12