[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-135-gdb6d652

[jscheer <js...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  db6d652fa48b9599a9f4a5678bfc6b0f92a3e0b2 (commit)
       via  d37571a5f76e0fdd5585eba0aefba828d9b30673 (commit)
       via  7440f548feaa77c25958a2a76a3e453edd19c99c (commit)
      from  38b2a80677e5142b99391ce9262feaa699cc0289 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit db6d652fa48b9599a9f4a5678bfc6b0f92a3e0b2
Merge: d37571a 38b2a80
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed Feb 19 10:58:57 2014 +0100

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit d37571a5f76e0fdd5585eba0aefba828d9b30673
Merge: 7440f54 fec9ccc
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Feb 18 15:14:15 2014 +0100

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit 7440f548feaa77c25958a2a76a3e453edd19c99c
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Feb 18 15:13:30 2014 +0100

    [BUILDROOT] Fix Poppler compilation when Qt isn't compiled in Buildroot.

-----------------------------------------------------------------------

Summary of changes:
 .../2013.11/210-poppler-qt_compiling.patch         |   28 ++++++++++++++++++++
 ....tofix => 210-poppler-qt_compiling.patch.tofix} |    0
 2 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2013.11/210-poppler-qt_compiling.patch
 rename patches/buildroot/2013.11/{210-poppler-qt_compiling.tofix => 210-poppler-qt_compiling.patch.tofix} (100%)

diff --git a/patches/buildroot/2013.11/210-poppler-qt_compiling.patch b/patches/buildroot/2013.11/210-poppler-qt_compiling.patch
new file mode 100644
index 0000000..35babb8
--- /dev/null
+++ b/patches/buildroot/2013.11/210-poppler-qt_compiling.patch
@@ -0,0 +1,28 @@
+Adapt package Poppler for Qt4 wrapper compilation.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/poppler/poppler.mk
+===================================================================
+--- buildroot.orig/package/poppler/poppler.mk	2013-11-30 14:16:03.000000000 +0100
++++ buildroot/package/poppler/poppler.mk	2014-02-18 14:06:50.000000000 +0100
+@@ -7,10 +7,17 @@
+ POPPLER_VERSION = 0.24.2
+ POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
+ POPPLER_SITE = http://poppler.freedesktop.org
+-POPPLER_DEPENDENCIES = fontconfig
+ POPPLER_LICENSE = GPLv2+
+ POPPLER_LICENSE_FILES = COPYING
+ POPPLER_CONF_OPT = --with-font-configuration=fontconfig
++POPPLER_INSTALL_STAGING = YES
++
++ifeq ($(BR2_PACKAGE_QT),y)
++	POPPLER_DEPENDENCIES = qt fontconfig
++else
++	POPPLER_DEPENDENCIES = fontconfig
++	POPPLER_CONF_OPT += --disable-poppler-qt4
++endif
+ 
+ ifeq ($(BR2_PACKAGE_LCMS2),y)
+ 	POPPLER_CONF_OPT += --enable-cms=lcms2
diff --git a/patches/buildroot/2013.11/210-poppler-qt_compiling.tofix b/patches/buildroot/2013.11/210-poppler-qt_compiling.patch.tofix
similarity index 100%
rename from patches/buildroot/2013.11/210-poppler-qt_compiling.tofix
rename to patches/buildroot/2013.11/210-poppler-qt_compiling.patch.tofix


hooks/post-receive
-- 
armadeus