Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (3ea3d0f246dcc3bad74c1f0e8ab11b6fa4be1b47)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (3ea3d0f246dcc3bad74c1f0e8ab11b6fa4be1b47)
  • Date: Sat, 21 Aug 2010 05:36:49 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

x11-libs/cairo/HISTORY | 5 +++++
x11-libs/cairo/PRE_BUILD | 5 +++++
x11-libs/cairo/libpng14.patch | 12 ++++++++++++
3 files changed, 22 insertions(+)

New commits:
commit 3ea3d0f246dcc3bad74c1f0e8ab11b6fa4be1b47
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

cairo: added patch to stable so it compiles with libpng 1.4*

diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 753bdef..f6933d4 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,8 @@
+2010-08-21 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: apply the patch if VERSION is 1.8.8
+ * libpng14.patch: added to compile with libpng 1.4*. Based on
upstream patch:
+
http://cgit.freedesktop.org/cairo/patch/?id=0a5ec9802a39dee240a1a3476af1ef8a7db9b6b3
+
2010-08-17 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated devel to version 1.9.14
* PRE_SUB_DEPENDS: Added option for devel version
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
new file mode 100755
index 0000000..a3184fd
--- /dev/null
+++ b/x11-libs/cairo/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+unpack_file &&
+if [[ $VERSION == "1.8.8" ]]; then
+ patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/libpng14.patch
+fi
diff --git a/x11-libs/cairo/libpng14.patch b/x11-libs/cairo/libpng14.patch
new file mode 100644
index 0000000..1cd4a3c
--- /dev/null
+++ b/x11-libs/cairo/libpng14.patch
@@ -0,0 +1,12 @@
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -161,7 +161,7 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
+ AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using
pkg-config])
+ if test "x$png_REQUIRES" = x; then
+ # libpng13 is GnuWin32's libpng-1.2.8 :-(
+- for l in libpng12 libpng13 libpng10 ; do
++ for l in libpng12 libpng13 libpng10 libpng ; do
+ if $PKG_CONFIG --exists $l ; then
+ png_REQUIRES=$l
+ use_png=yes



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (3ea3d0f246dcc3bad74c1f0e8ab11b6fa4be1b47), Bor Kraljič, 08/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page