diff options
author | Vlad Glagolev | 2008-12-01 18:19:19 +0000 |
---|---|---|
committer | Vlad Glagolev | 2008-12-01 18:19:19 +0000 |
commit | c8de54ca745b0ff31ef269b5b748e1569904d9ec (patch) | |
tree | ebc82b370898d2c2d4e2c2bbc5d8135910d36eea | |
parent | e59d059b55a2a94f50045881ccbcb12b69b34b4b (diff) |
libpng: fixed compilation for the apps like inkscape
-rw-r--r-- | graphics-libs/libpng/HISTORY | 5 | ||||
-rwxr-xr-x | graphics-libs/libpng/PRE_BUILD | 2 | ||||
-rw-r--r-- | graphics-libs/libpng/pngconf-setjmp.patch | 13 |
3 files changed, 20 insertions, 0 deletions
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY index 74dd9c86f8..da4f8a9f77 100644 --- a/graphics-libs/libpng/HISTORY +++ b/graphics-libs/libpng/HISTORY @@ -1,3 +1,8 @@ +2008-12-01 Vlad Glagolev <stealth@sourcemage.org> + * PRE_BUILD: fixed compiler error for the apps like inkscape + * DETAILS: PATCHLEVEL+=1 + * pngconf-setjmp.patch: added + 2008-10-31 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.2.33 diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD index 0896920565..b1de16165c 100755 --- a/graphics-libs/libpng/PRE_BUILD +++ b/graphics-libs/libpng/PRE_BUILD @@ -1,6 +1,8 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +patch -p0 < "$SPELL_DIRECTORY/pngconf-setjmp.patch" && + if [[ $ANI_PNG == y ]]; then bzcat "$SPELL_DIRECTORY/libpng-1.2.31-apng.patch.bz2" | patch -p0 fi diff --git a/graphics-libs/libpng/pngconf-setjmp.patch b/graphics-libs/libpng/pngconf-setjmp.patch new file mode 100644 index 0000000000..d50032dd99 --- /dev/null +++ b/graphics-libs/libpng/pngconf-setjmp.patch @@ -0,0 +1,13 @@ +--- pngconf.h.orig ++++ pngconf.h +@@ -323,8 +323,8 @@ + /* If you encounter a compiler error here, see the explanation + * near the end of INSTALL. + */ +- __pngconf.h__ already includes setjmp.h; +- __dont__ include it again.; ++#warning __pngconf.h__ already includes setjmp.h; ++#warning __dont__ include it again.; + # endif + # endif /* __linux__ */ + |