abiword: rebuild against libpng-1.5.
This commit is contained in:
parent
d71e59e111
commit
dc312b15ed
4 changed files with 111 additions and 4 deletions
|
@ -6,7 +6,6 @@ libgthread-2.0.so.0
|
||||||
librt.so.1
|
librt.so.1
|
||||||
libgobject-2.0.so.0
|
libgobject-2.0.so.0
|
||||||
libglib-2.0.so.0
|
libglib-2.0.so.0
|
||||||
libpng14.so.14
|
|
||||||
libjpeg.so.8
|
libjpeg.so.8
|
||||||
libstdc++.so.6
|
libstdc++.so.6
|
||||||
libm.so.6
|
libm.so.6
|
||||||
|
@ -22,3 +21,4 @@ libfreetype.so.6
|
||||||
libbz2.so.1
|
libbz2.so.1
|
||||||
libX11.so.6
|
libX11.so.6
|
||||||
libexpat.so.1
|
libexpat.so.1
|
||||||
|
libpng15.so.15
|
||||||
|
|
|
@ -2,7 +2,6 @@ libfribidi.so.0
|
||||||
libwv-1.2.so.3
|
libwv-1.2.so.3
|
||||||
libgsf-1.so.114
|
libgsf-1.so.114
|
||||||
libxml2.so.2
|
libxml2.so.2
|
||||||
libpng14.so.14
|
|
||||||
libenchant.so.1
|
libenchant.so.1
|
||||||
libz.so.1
|
libz.so.1
|
||||||
libgtk-x11-2.0.so.0
|
libgtk-x11-2.0.so.0
|
||||||
|
@ -27,3 +26,4 @@ libstdc++.so.6
|
||||||
libm.so.6
|
libm.so.6
|
||||||
libc.so.6
|
libc.so.6
|
||||||
libgcc_s.so.1
|
libgcc_s.so.1
|
||||||
|
libpng15.so.15
|
||||||
|
|
107
srcpkgs/abiword/patches/abiword-2.8.6-png15.patch
Normal file
107
srcpkgs/abiword/patches/abiword-2.8.6-png15.patch
Normal file
|
@ -0,0 +1,107 @@
|
||||||
|
--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.png15 2012-02-27 15:39:39.258617605 -0500
|
||||||
|
+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp 2012-02-27 15:48:37.830936901 -0500
|
||||||
|
@@ -191,7 +191,14 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
|
||||||
|
|
||||||
|
/* Clean Up Memory Used */
|
||||||
|
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||||
|
+ int num_palette;
|
||||||
|
+ png_colorp palette;
|
||||||
|
+ png_get_PLTE(m_pPNG, m_pPNGInfo, &palette, &num_palette);
|
||||||
|
+ FREEP(palette);
|
||||||
|
+#else
|
||||||
|
FREEP(m_pPNGInfo->palette);
|
||||||
|
+#endif
|
||||||
|
DELETEP(pBB);
|
||||||
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||||
|
|
||||||
|
@@ -313,7 +320,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
|
||||||
|
* the normal method of doing things with libpng). REQUIRED unless you
|
||||||
|
* set up your own error handlers in the png_create_read_struct() earlier.
|
||||||
|
*/
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||||
|
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||||
|
+#else
|
||||||
|
if (setjmp(m_pPNG->jmpbuf))
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||||
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||||
|
@@ -332,7 +343,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
|
||||||
|
UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
|
||||||
|
{
|
||||||
|
/* Reset error handling for libpng */
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||||
|
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||||
|
+#else
|
||||||
|
if (setjmp(m_pPNG->jmpbuf))
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||||
|
return UT_ERROR;
|
||||||
|
@@ -372,7 +387,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
|
||||||
|
UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
|
||||||
|
{
|
||||||
|
/* Reset error handling for libpng */
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||||
|
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||||
|
+#else
|
||||||
|
if (setjmp(m_pPNG->jmpbuf))
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||||
|
return UT_ERROR;
|
||||||
|
--- plugins/garble/xp/abiword-garble-png.cpp.png15 2012-02-27 15:31:30.178868169 -0500
|
||||||
|
+++ plugins/garble/xp/abiword-garble-png.cpp 2012-02-27 15:36:17.795368497 -0500
|
||||||
|
@@ -79,7 +79,11 @@ bool abiword_document::garble_png( void*
|
||||||
|
png_set_strip_alpha( png_ptr );
|
||||||
|
png_set_interlace_handling( png_ptr );
|
||||||
|
png_set_bgr( png_ptr );
|
||||||
|
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
|
||||||
|
+ rowbytes = png_get_rowbytes( png_ptr, info_ptr );
|
||||||
|
+#else
|
||||||
|
rowbytes = info_ptr->rowbytes;
|
||||||
|
+#endif
|
||||||
|
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
|
||||||
|
}
|
||||||
|
|
||||||
|
--- src/af/util/xp/ut_png.cpp.png15 2012-02-27 15:11:18.599397989 -0500
|
||||||
|
+++ src/af/util/xp/ut_png.cpp 2012-02-27 15:12:20.560859433 -0500
|
||||||
|
@@ -71,7 +71,11 @@ bool UT_PNG_getDimensions(const UT_ByteB
|
||||||
|
* the normal method of doing things with libpng). REQUIRED unless you
|
||||||
|
* set up your own error handlers in the png_create_read_struct() earlier.
|
||||||
|
*/
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||||
|
+ if (setjmp(png_jmpbuf(png_ptr)))
|
||||||
|
+#else
|
||||||
|
if (setjmp(png_ptr->jmpbuf))
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||||
|
png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
|
||||||
|
--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.png15 2012-02-27 15:24:23.959572417 -0500
|
||||||
|
+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-02-27 15:26:42.549367943 -0500
|
||||||
|
@@ -185,7 +185,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
|
||||||
|
/** needed for the stejmp context */
|
||||||
|
UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
|
||||||
|
{
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||||
|
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||||
|
+#else
|
||||||
|
if (setjmp(m_pPNG->jmpbuf))
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
DELETEP(m_pPngBB);
|
||||||
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
||||||
|
@@ -446,7 +450,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
|
||||||
|
* the normal method of doing things with libpng). REQUIRED unless you
|
||||||
|
* set up your own error handlers in the png_create_read_struct() earlier.
|
||||||
|
*/
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||||
|
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
||||||
|
+#else
|
||||||
|
if (setjmp(m_pPNG->jmpbuf))
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||||
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'abiword'
|
# Template file for 'abiword'
|
||||||
pkgname=abiword
|
pkgname=abiword
|
||||||
version=2.8.6
|
version=2.8.6
|
||||||
revision=3
|
revision=4
|
||||||
homepage="http://www.abisource.com/"
|
homepage="http://www.abisource.com/"
|
||||||
distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
|
distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
|
||||||
CPPFLAGS="-I/usr/include/boost"
|
CPPFLAGS="-I/usr/include/boost"
|
||||||
|
@ -12,7 +12,7 @@ configure_args="--enable-shave --enable-collab-backend-telepathy
|
||||||
subpackages="lib$pkgname $pkgname-devel"
|
subpackages="lib$pkgname $pkgname-devel"
|
||||||
gtk_iconcache_dirs="/usr/share/icons/hicolor"
|
gtk_iconcache_dirs="/usr/share/icons/hicolor"
|
||||||
depends="hicolor-icon-theme desktop-file-utils"
|
depends="hicolor-icon-theme desktop-file-utils"
|
||||||
makedepends="automake flex pkg-config fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel wv-devel boost-devel readline-devel libxslt-devel libwmf-devel"
|
makedepends="automake flex pkg-config jpeg-devel libpng-devel>=1.5.10 fribidi-devel libgsf-devel enchant-devel gtk+-devel librsvg-devel wv-devel boost-devel readline-devel libxslt-devel libwmf-devel"
|
||||||
short_desc="Free word processing program similar to Microsoft(R) Word."
|
short_desc="Free word processing program similar to Microsoft(R) Word."
|
||||||
maintainer="davehome <davehome@redthumb.info.tm>"
|
maintainer="davehome <davehome@redthumb.info.tm>"
|
||||||
license="GPL-3"
|
license="GPL-3"
|
||||||
|
|
Loading…
Reference in a new issue