sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c8de54ca745b0ff31ef269b5b748e1569904d9ec)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c8de54ca745b0ff31ef269b5b748e1569904d9ec)
- Date: Mon, 1 Dec 2008 09:17:41 -0600
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
graphics-libs/libpng/HISTORY | 5 +++++
graphics-libs/libpng/PRE_BUILD | 2 ++
graphics-libs/libpng/pngconf-setjmp.patch | 13 +++++++++++++
3 files changed, 20 insertions(+)
New commits:
commit c8de54ca745b0ff31ef269b5b748e1569904d9ec
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libpng: fixed compilation for the apps like inkscape
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index 74dd9c8..da4f8a9 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,8 @@
+2008-12-01 Vlad Glagolev <stealth AT 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 AT sourcemage.org>
* DETAILS: updated spell to 1.2.33
diff --git a/graphics-libs/libpng/PRE_BUILD b/graphics-libs/libpng/PRE_BUILD
index 0896920..b1de161 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 0000000..d50032d
--- /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__ */
+
-
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c8de54ca745b0ff31ef269b5b748e1569904d9ec),
Vlad Glagolev, 12/01/2008
- Re: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c8de54ca745b0ff31ef269b5b748e1569904d9ec), Ladislav Hagara, 12/01/2008
- <Possible follow-up(s)>
- Re: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c8de54ca745b0ff31ef269b5b748e1569904d9ec), Vlad Glagolev, 12/01/2008
Archive powered by MHonArc 2.6.24.