[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-196-g1be3330

[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  1be3330d1d4f6635b1f81fc573711fedd4dcfdde (commit)
      from  e6db62abf9e0deafcbd78e91de27b958d4e73d66 (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 1be3330d1d4f6635b1f81fc573711fedd4dcfdde
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed Mar 26 12:01:04 2014 +0100

    [BUILDROOT] Put fontconfig dependencies out of Qt condition in Poppler patch.

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

Summary of changes:
 .../2013.11/210-poppler-qt_compiling.patch         |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/patches/buildroot/2013.11/210-poppler-qt_compiling.patch b/patches/buildroot/2013.11/210-poppler-qt_compiling.patch
index 35babb8..0b12c6b 100644
--- a/patches/buildroot/2013.11/210-poppler-qt_compiling.patch
+++ b/patches/buildroot/2013.11/210-poppler-qt_compiling.patch
@@ -6,8 +6,8 @@ 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 @@
++++ buildroot/package/poppler/poppler.mk	2014-03-26 11:53:49.000000000 +0100
+@@ -7,10 +7,18 @@
  POPPLER_VERSION = 0.24.2
  POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
  POPPLER_SITE = http://poppler.freedesktop.org
@@ -17,10 +17,11 @@ Index: buildroot/package/poppler/poppler.mk
  POPPLER_CONF_OPT = --with-font-configuration=fontconfig
 +POPPLER_INSTALL_STAGING = YES
 +
++POPPLER_DEPENDENCIES = fontconfig
++
 +ifeq ($(BR2_PACKAGE_QT),y)
-+	POPPLER_DEPENDENCIES = qt fontconfig
++	POPPLER_DEPENDENCIES += qt
 +else
-+	POPPLER_DEPENDENCIES = fontconfig
 +	POPPLER_CONF_OPT += --disable-poppler-qt4
 +endif
  


hooks/post-receive
-- 
armadeus