[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-187-g496db9e

[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  496db9ef69a8de9f391308891cb1d941163e1d2d (commit)
      from  cb24c212c8c9a91c58013707b88a43f72dd710b9 (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 496db9ef69a8de9f391308891cb1d941163e1d2d
Author: Jeremie Scheer <jer...@ar...>
Date:   Fri Mar 7 17:08:06 2014 +0100

    [BUILDROOT] Delete Poppler to-fix patch.

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

Summary of changes:
 .../2013.11/210-poppler-qt_compiling.patch.tofix   |   38 --------------------
 1 files changed, 0 insertions(+), 38 deletions(-)
 delete mode 100644 patches/buildroot/2013.11/210-poppler-qt_compiling.patch.tofix

diff --git a/patches/buildroot/2013.11/210-poppler-qt_compiling.patch.tofix b/patches/buildroot/2013.11/210-poppler-qt_compiling.patch.tofix
deleted file mode 100644
index 8a12729..0000000
--- a/patches/buildroot/2013.11/210-poppler-qt_compiling.patch.tofix
+++ /dev/null
@@ -1,38 +0,0 @@
-Compile Poppler with Qt.
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
----
-
-Index: buildroot/package/poppler/Config.in
-===================================================================
---- buildroot.orig/package/poppler/Config.in	2013-05-31 22:29:04.000000000 +0200
-+++ buildroot/package/poppler/Config.in	2013-09-03 11:36:33.000000000 +0200
-@@ -1,6 +1,7 @@
- config BR2_PACKAGE_POPPLER
- 	bool "poppler"
- 	depends on BR2_INSTALL_LIBSTDCPP
-+	select BR2_PACKAGE_QT
- 	select BR2_PACKAGE_FONTCONFIG
- 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
- 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
-Index: buildroot/package/poppler/poppler.mk
-===================================================================
---- buildroot.orig/package/poppler/poppler.mk	2013-09-03 11:28:33.000000000 +0200
-+++ buildroot/package/poppler/poppler.mk	2013-09-03 11:36:51.000000000 +0200
-@@ -4,12 +4,14 @@
- #
- #############################################################
- 
--POPPLER_VERSION = 0.22.3
-+POPPLER_VERSION = 0.24.1
- POPPLER_SITE = http://poppler.freedesktop.org
--POPPLER_DEPENDENCIES = fontconfig
-+POPPLER_SOURCE  = poppler-$(POPPLER_VERSION).tar.xz
-+POPPLER_DEPENDENCIES = qt fontconfig
- POPPLER_LICENSE = GPLv2+
- POPPLER_LICENSE_FILES = COPYING
- POPPLER_CONF_OPT = --with-font-configuration=fontconfig
-+POPPLER_INSTALL_STAGING = YES
- 
- ifeq ($(BR2_PACKAGE_LCMS2),y)
- 	POPPLER_CONF_OPT += --enable-cms=lcms2


hooks/post-receive
-- 
armadeus