diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-07 06:05:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-07 06:05:45 +0000 |
| commit | 03264849a5d3e86a7f14298c7c79a120107f9f8b (patch) | |
| tree | 022d668a2c70d17fcc66d04ff011beeaceccf2cb /media-gfx/gimageview/files | |
| parent | media-libs/libmp3splt: QA fixes (bug #377999) (diff) | |
| download | gentoo-2-03264849a5d3e86a7f14298c7c79a120107f9f8b.tar.gz gentoo-2-03264849a5d3e86a7f14298c7c79a120107f9f8b.tar.bz2 gentoo-2-03264849a5d3e86a7f14298c7c79a120107f9f8b.zip | |
Fix building with libpng15
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/gimageview/files')
5 files changed, 32 insertions, 24 deletions
diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff index 8455d81084c3..9b82d2f6479e 100644 --- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff +++ b/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff @@ -1,6 +1,5 @@ -diff -Nur gimageview-0.2.27-bak/src/gimv_thumb_win.c gimageview-0.2.27/src/gimv_thumb_win.c ---- gimageview-0.2.27-bak/src/gimv_thumb_win.c 2004-12-21 03:18:30.000000000 +0900 -+++ gimageview-0.2.27/src/gimv_thumb_win.c 2005-01-07 13:46:40.805458176 +0900 +--- src/gimv_thumb_win.c ++++ src/gimv_thumb_win.c @@ -2542,7 +2542,7 @@ { if (tw && tw->priv) diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch index 52e62b19cb06..7ab7ebb03212 100644 --- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch +++ b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch @@ -1,6 +1,5 @@ -diff -ur gimageview-0.2.27.orig/src/gimv_cell_pixmap.c gimageview-0.2.27/src/gimv_cell_pixmap.c ---- gimageview-0.2.27.orig/src/gimv_cell_pixmap.c 2004-05-23 17:07:54.000000000 +0300 -+++ gimageview-0.2.27/src/gimv_cell_pixmap.c 2008-12-21 15:01:34.000000000 +0200 +--- src/gimv_cell_pixmap.c ++++ src/gimv_cell_pixmap.c @@ -25,10 +25,6 @@ * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com> */ @@ -12,9 +11,8 @@ diff -ur gimageview-0.2.27.orig/src/gimv_cell_pixmap.c gimageview-0.2.27/src/gim #include "gimv_cell_pixmap.h" #if (GTK_MAJOR_VERSION >= 2) -diff -ur gimageview-0.2.27.orig/src/gimv_image.c gimageview-0.2.27/src/gimv_image.c ---- gimageview-0.2.27.orig/src/gimv_image.c 2004-09-21 11:44:31.000000000 +0300 -+++ gimageview-0.2.27/src/gimv_image.c 2008-12-21 15:01:59.000000000 +0200 +--- src/gimv_image.c ++++ src/gimv_image.c @@ -35,7 +35,7 @@ #include "gimv_io.h" #include "gimv_image_saver.h" diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch b/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch new file mode 100644 index 000000000000..2df9712869e1 --- /dev/null +++ b/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/361941 + +--- plugins/image_loader/png_loader.c ++++ plugins/image_loader/png_loader.c +@@ -255,7 +255,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) goto ERROR; ++ if (setjmp (png_jmpbuf(png_ptr))) goto ERROR; + + context.gio = gio; + context.bytes_read = 0; +--- plugins/image_saver/png_saver.c ++++ plugins/image_saver/png_saver.c +@@ -130,7 +130,7 @@ + return FALSE; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_write_struct (&png_ptr, &info_ptr); + fclose (handle); + return FALSE; diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff index 236e51651a8e..d65b3a07ad56 100644 --- a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff +++ b/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff @@ -1,6 +1,5 @@ -diff -Nur gimageview-0.2.27-bak/src/gimv_thumb_view.c gimageview-0.2.27/src/gimv_thumb_view.c ---- gimageview-0.2.27-bak/src/gimv_thumb_view.c 2004-12-20 20:07:31.000000000 +0900 -+++ gimageview-0.2.27/src/gimv_thumb_view.c 2005-01-11 20:00:00.039241976 +0900 +--- src/gimv_thumb_view.c ++++ src/gimv_thumb_view.c @@ -1533,9 +1533,13 @@ gimv_thumb_view_sort_data (tv); diff --git a/media-gfx/gimageview/files/gimv-gcc34.patch b/media-gfx/gimageview/files/gimv-gcc34.patch deleted file mode 100644 index 11b58c4bd9d0..000000000000 --- a/media-gfx/gimageview/files/gimv-gcc34.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gimageview-0.2.25/work/gimageview-0.2.25/src/gimv_thumb_win.c gimageview-0.2.25-fixed/work/gimageview-0.2.25/src/gimv_thumb_win.c ---- gimageview-0.2.25/work/gimageview-0.2.25/src/gimv_thumb_win.c 2003-07-06 09:46:21.000000000 -0700 -+++ gimageview-0.2.25-fixed/work/gimageview-0.2.25/src/gimv_thumb_win.c 2004-06-11 22:35:00.516094744 -0700 -@@ -202,7 +202,7 @@ - guint action, - GtkWidget *widget); - static void cb_move_tab (GimvThumbWin *tw, -- GimvSortItem sortitem, -+ MoveTabItem item, - GtkWidget *widget); - static void cb_cut_out_tab (GimvThumbWin *tw, - guint action, |