diff options
author | Mart Raudsepp <leio@gentoo.org> | 2017-01-26 12:30:39 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2017-01-26 12:55:51 +0200 |
commit | 9a6d6221fad7b0e51264b3deb58896f5e43c75f1 (patch) | |
tree | a37a1f04e9aefe026123653c80293299f8e7a034 /x11-libs/gdk-pixbuf/files | |
parent | sys-apps/accountsservice: Remove old (diff) | |
download | gentoo-9a6d6221fad7b0e51264b3deb58896f5e43c75f1.tar.gz gentoo-9a6d6221fad7b0e51264b3deb58896f5e43c75f1.tar.bz2 gentoo-9a6d6221fad7b0e51264b3deb58896f5e43c75f1.zip |
x11-libs/gdk-pixbuf: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'x11-libs/gdk-pixbuf/files')
-rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch | 81 | ||||
-rw-r--r-- | x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch | 60 |
2 files changed, 0 insertions, 141 deletions
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch deleted file mode 100644 index 273956ea402e..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 2fb6bce8b3fdae67b8cdd93f253dad3743fc01b8 Mon Sep 17 00:00:00 2001 -From: Mike Gorse <mgorse@suse.com> -Date: Tue, 6 Oct 2015 11:46:24 -0500 -Subject: [PATCH] pixops: use gint64 in more places to avoid overflow when - shifting - ---- - gdk-pixbuf/pixops/pixops.c | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c -index b0abecd..6a4a096 100644 ---- a/gdk-pixbuf/pixops/pixops.c -+++ b/gdk-pixbuf/pixops/pixops.c -@@ -354,11 +354,11 @@ pixops_composite_nearest (guchar *dest_buf, - double scale_y, - int overall_alpha) - { -- int i; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -- int xmax, xstart, xstop, x_pos, y_pos; -+ gint64 i; -+ gint64 x; -+ gint64 x_step = (1 << SCALE_SHIFT) / scale_x; -+ gint64 y_step = (1 << SCALE_SHIFT) / scale_y; -+ gint64 xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - unsigned int a0; - -@@ -524,13 +524,13 @@ pixops_composite_color_nearest (guchar *dest_buf, - guint32 color1, - guint32 color2) - { -- int i, j; -- int x; -- int x_step = (1 << SCALE_SHIFT) / scale_x; -- int y_step = (1 << SCALE_SHIFT) / scale_y; -+ gint64 i, j; -+ gint64 x; -+ gint64 x_step = (1 << SCALE_SHIFT) / scale_x; -+ gint64 y_step = (1 << SCALE_SHIFT) / scale_y; - int r1, g1, b1, r2, g2, b2; - int check_shift = get_check_shift (check_size); -- int xmax, xstart, xstop, x_pos, y_pos; -+ gint64 xmax, xstart, xstop, x_pos, y_pos; - const guchar *p; - unsigned int a0; - -@@ -1338,20 +1338,20 @@ pixops_process (guchar *dest_buf, - PixopsLineFunc line_func, - PixopsPixelFunc pixel_func) - { -- int i, j; -- int x, y; /* X and Y position in source (fixed_point) */ -+ gint64 i, j; -+ gint64 x, y; /* X and Y position in source (fixed_point) */ - - guchar **line_bufs; - int *filter_weights; - -- int x_step; -- int y_step; -+ gint64 x_step; -+ gint64 y_step; - - int check_shift; -- int scaled_x_offset; -+ gint64 scaled_x_offset; - -- int run_end_x; -- int run_end_index; -+ gint64 run_end_x; -+ gint64 run_end_index; - - x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */ - y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */ --- -2.6.1 - diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch deleted file mode 100644 index cb508993638f..000000000000 --- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-lowmem-test-glibc.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e1fd25a3d0c18bd941f685bbdf5aa3812403a48e Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 6 Oct 2015 09:11:38 +0200 -Subject: [PATCH] Run only pixbuf-lowmem test on GNU libc - -The test case depends on GNU libc specific internals so we only run it -on GNU libc. - -This fixes build on Linux with musl libc. - -https://bugzilla.gnome.org/show_bug.cgi?id=756078 ---- - tests/Makefile.am | 5 ----- - tests/pixbuf-lowmem.c | 8 ++++++++ - 2 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1f09711..2a0325a 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -19,13 +19,8 @@ LDADD = \ - noinst_PROGRAMS += \ - pixbuf-read \ - pixbuf-random \ -- $(NULL) -- --if OS_LINUX --noinst_PROGRAMS += \ - pixbuf-lowmem \ - $(NULL) --endif - - test_programs = \ - animation \ -diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c -index ae71788..9e9571f 100644 ---- a/tests/pixbuf-lowmem.c -+++ b/tests/pixbuf-lowmem.c -@@ -24,6 +24,7 @@ - #include <time.h> - #include <string.h> - -+#if defined(__GLIBC__) && !defined(__UCLIBC__) - #define PRETEND_MEM_SIZE (16 * 1024 * 1024) - #define REMAINING_MEM_SIZE 100000 - -@@ -225,3 +226,10 @@ main (int argc, char **argv) - - return 0; - } -+#else -+int -+main (int argc, char **argv) -+{ -+ return 0; -+} -+#endif --- -2.6.1 - |