Archives
Archives
| From: | "Andreas Proschofsky (suka)" <suka@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-3.3-libpng-1.5.diff libreoffice-3.3-prefix.patch gentoo-3.3.0.diff |
| Date: | Thu, 24 Feb 2011 15:09:55 |
| Message-Id: | 20110224150945.937A720057@flycatcher.gentoo.org |
| 1 | suka 11/02/24 15:09:45 |
| 2 | |
| 3 | Added: libreoffice-3.3-libpng-1.5.diff |
| 4 | Removed: libreoffice-3.3-prefix.patch gentoo-3.3.0.diff |
| 5 | Log: |
| 6 | Fix build with libpng 1.5 #356281, also remove outdated ebuild |
| 7 | |
| 8 | (Portage version: 2.1.9.41/cvs/Linux x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: libreoffice-3.3-libpng-1.5.diff |
| 17 | =================================================================== |
| 18 | --- desktop/unx/source/splashx.c.ark 2011-01-16 20:25:10.846685172 +0100 |
| 19 | +++ desktop/unx/source/splashx.c 2011-01-16 20:27:12.673351839 +0100 |
| 20 | @@ -137,8 +137,8 @@ int splash_load_bmp( const char *filenam |
| 21 | PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL); |
| 22 | |
| 23 | bitmap_rows = png_get_rows( png_ptr, info_ptr ); |
| 24 | - width = info_ptr->width; |
| 25 | - height = info_ptr->height; |
| 26 | + width = png_get_image_width( png_ptr, info_ptr ); |
| 27 | + height = png_get_image_height( png_ptr, info_ptr ); |
| 28 | |
| 29 | #if 0 |
| 30 | { |