Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d860a5ac9ad34650a08e5845c5b528dcc44936a5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d860a5ac9ad34650a08e5845c5b528dcc44936a5)
  • Date: Sun, 6 Mar 2016 02:40:33 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics-libs/libwmf/DETAILS | 2 +-
graphics-libs/libwmf/HISTORY | 4 ++++
graphics-libs/libwmf/PRE_BUILD | 17 ++++++++++++++++-
graphics-libs/libwmf/libwmf-0.2.8.4-libpng-1.5.patch | 12 ++++++++++++
4 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit d860a5ac9ad34650a08e5845c5b528dcc44936a5
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libwmf: fix build with new png

commit a9bc456ac1a4b237bb144abf7bac4d9abf55f296
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libwmf: fix DETAILS by removing a stray quote

The build is still broken, as it is incompatible with libpng16.

diff --git a/graphics-libs/libwmf/DETAILS b/graphics-libs/libwmf/DETAILS
index e2e767f..123d8bc 100755
--- a/graphics-libs/libwmf/DETAILS
+++ b/graphics-libs/libwmf/DETAILS
@@ -1,6 +1,6 @@
SPELL=libwmf
VERSION=0.2.8.4
-
SOURCE_HASH='sha512:d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
+
SOURCE_HASH=sha512:d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/wvware/$SOURCE
diff --git a/graphics-libs/libwmf/HISTORY b/graphics-libs/libwmf/HISTORY
index 927f38f..b3e6ba9 100644
--- a/graphics-libs/libwmf/HISTORY
+++ b/graphics-libs/libwmf/HISTORY
@@ -1,3 +1,7 @@
+2016-03-06 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: remove stray quote that broke things
+ * PRE_BUILD: another PNG patch to fix build
+
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: corrected WEB_SITE

diff --git a/graphics-libs/libwmf/PRE_BUILD b/graphics-libs/libwmf/PRE_BUILD
index 0008b1e..97484e3 100755
--- a/graphics-libs/libwmf/PRE_BUILD
+++ b/graphics-libs/libwmf/PRE_BUILD
@@ -1,3 +1,18 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/png_header_fix.patch
+patch -p0 < $SCRIPT_DIRECTORY/png_header_fix.patch &&
+# libpng-1.5 fix from
https://raw.githubusercontent.com/KaOSx/main/master/libwmf/libwmf-0.2.8.4-libpng-1.5.patch.gz
+patch -p1 <<'EOT'
+diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h
libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000
+0200
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200
+@@ -66,7 +66,7 @@
+ return;
+ }
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp
failed)");
+ png_destroy_write_struct (&png_ptr,&info_ptr);
+ wmf_free (API,buffer);
+EOT
diff --git a/graphics-libs/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
b/graphics-libs/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
new file mode 100644
index 0000000..3528c74
--- /dev/null
+++ b/graphics-libs/libwmf/libwmf-0.2.8.4-libpng-1.5.patch
@@ -0,0 +1,12 @@
+diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h
libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000
+0200
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200
+@@ -66,7 +66,7 @@
+ return;
+ }
+
+- if (setjmp (png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp
failed)");
+ png_destroy_write_struct (&png_ptr,&info_ptr);
+ wmf_free (API,buffer);



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d860a5ac9ad34650a08e5845c5b528dcc44936a5), Thomas Orgis, 03/05/2016

Archive powered by MHonArc 2.6.24.

Top of Page