Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
651
Issues
651
List
Boards
Labels
Service Desk
Milestones
Merge Requests
194
Merge Requests
194
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
3a6f2abf
Commit
3a6f2abf
authored
May 14, 2011
by
Ariadne Conill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/abiword: fix compile with libpng 1.5
parent
438cb611
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
3 deletions
+51
-3
main/abiword/APKBUILD
main/abiword/APKBUILD
+3
-3
main/abiword/abiword-png15.patch
main/abiword/abiword-png15.patch
+48
-0
No files found.
main/abiword/APKBUILD
View file @
3a6f2abf
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
abiword
pkgver
=
2.8.6
pkgrel
=
3
pkgrel
=
4
pkgdesc
=
"A fully-featured word processor"
url
=
"http://www.abisource.com"
arch
=
""
arch
=
"
all
"
license
=
"GPL"
makedepends
=
"pkgconfig libglade-dev libgsf-dev enchant-dev fribidi-dev wv-dev
popt-dev jpeg-dev librsvg-dev bzip2-dev goffice-dev"
...
...
@@ -73,4 +73,4 @@ plugins() {
}
md5sums
=
"f883b0a7f26229a9c66fd6a1a94381aa abiword-2.8.6.tar.gz
08a7fd39dbec279e0eea33fc70692093
abiword-png15.patch"
1d0bb11ed10b431ab312173de81d12c4
abiword-png15.patch"
main/abiword/abiword-png15.patch
View file @
3a6f2abf
...
...
@@ -31,3 +31,51 @@ diff -Naur abiword-vanilla//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp abiwor
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
--- abiword-vanilla/plugins/garble/xp/abiword-garble-png.cpp
+++ abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp
@@ -79,7 +79,7 @@
png_set_strip_alpha( png_ptr );
png_set_interlace_handling( png_ptr );
png_set_bgr( png_ptr );
- rowbytes = info_ptr->rowbytes;
+ rowbytes = png_get_rowbytes( png_ptr, info_ptr );
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
}
--- abiword-vanilla/plugins/bmp/xp/ie_impGraphic_BMP.cpp
+++ abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp
@@ -191,7 +191,6 @@
/* Clean Up Memory Used */
- FREEP(m_pPNGInfo->palette);
DELETEP(pBB);
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -313,7 +312,7 @@
* 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 (setjmp(m_pPNG->jmpbuf))
+ if (setjmp(png_jmpbuf(m_pPNG)))
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -332,7 +331,7 @@
UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
{
/* Reset error handling for libpng */
- if (setjmp(m_pPNG->jmpbuf))
+ if (setjmp(png_jmpbuf(m_pPNG)))
{
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
return UT_ERROR;
@@ -372,7 +371,7 @@
UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
{
/* Reset error handling for libpng */
- if (setjmp(m_pPNG->jmpbuf))
+ if (setjmp(png_jmpbuf(m_pPNG)))
{
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
return UT_ERROR;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment