Author: arekm Date: Tue Sep 8 18:42:32 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; libjpeg 7 fixes
---- Files affected:
packages/gtk+2:
gtk+2.spec (1.308 -> 1.309) , gtk+2-libjpeg.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gtk+2/gtk+2.spec
diff -u packages/gtk+2/gtk+2.spec:1.308 packages/gtk+2/gtk+2.spec:1.309
--- packages/gtk+2/gtk+2.spec:1.308 Mon Aug 31 18:21:58 2009
+++ packages/gtk+2/gtk+2.spec Tue Sep 8 20:42:26 2009
@@ -21,7 +21,7 @@
Summary(tr.UTF-8): GIMP ToolKit arayüz kitaplığı
Name: gtk+2
Version: 2.16.6
-Release: 1
+Release: 2
Epoch: 2
License: LGPL v2+
Group: X11/Libraries
@@ -30,6 +30,7 @@
Patch0: %{name}-objective-c++.patch
Patch1: %{name}-arch_confdir.patch
Patch2: %{name}-gtk-builder-convert.patch
+Patch3: %{name}-libjpeg.patch
URL: http://www.gtk.org/
BuildRequires: atk-devel >= 1:1.26.0
BuildRequires: autoconf >= 2.54
@@ -231,6 +232,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{?with_apidocs:%{__gtkdocize}}
@@ -436,6 +438,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.309 2009/09/08 18:42:26 arekm
+- rel 2; libjpeg 7 fixes
+
Revision 1.308 2009/08/31 16:21:58 lisu
- reverse. that URL is more unified
================================================================
Index: packages/gtk+2/gtk+2-libjpeg.patch
diff -u /dev/null packages/gtk+2/gtk+2-libjpeg.patch:1.1
--- /dev/null Tue Sep 8 20:42:32 2009
+++ packages/gtk+2/gtk+2-libjpeg.patch Tue Sep 8 20:42:26 2009
@@ -0,0 +1,25 @@
+Author: Romain Perier <[email protected]>
+Subject: Ensure gdk-pixbuf is backward compatible with jpeg6, even if it's
works with jpeg7
+Date: 2009-09-01 10:27 UTC
+
+---
+ gdk-pixbuf/io-jpeg.c | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
+index cf8c9ed..9af55ba 100644
+--- a/gdk-pixbuf/io-jpeg.c
++++ b/gdk-pixbuf/io-jpeg.c
+@@ -921,8 +921,11 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
+ return FALSE;
+ }
+ }
+-
++#if JPEG_LIB_VERSION >= 70
++ for (cinfo->scale_denom = 2; cinfo->scale_denom <= 16;
cinfo->scale_denom *= 2) {
++#else
+ for (cinfo->scale_denom = 2; cinfo->scale_denom <= 8;
cinfo->scale_denom *= 2) {
++#endif
+ jpeg_calc_output_dimensions (cinfo);
+ if (cinfo->output_width < width ||
cinfo->output_height < height) {
+ cinfo->scale_denom /= 2;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gtk+2.spec?r1=1.308&r2=1.309&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
