Merge pull request #1375 from saiarcot895/upstream-poppler-qt5

Add plugin file to compile some libraries with Qt 5 only

plugins/qt5-deps/overrides.mk

@@ -0,0 +1,5 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+poppler_DEPS := $(filter-out qt ,$(poppler_DEPS)) qtbase
+openscenegraph_DEPS := $(filter-out qt ,$(openscenegraph_DEPS)) qtbase

src/openscenegraph-1-fixes.patch

@@ -182,3 +182,26 @@ index 1111111..2222222 100644
  IF(GSTREAMER_FOUND AND GLIB_FOUND)
      ADD_SUBDIRECTORY(gstreamer)
  ENDIF()
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Saikrishna Arcot <saiarcot895@gmail.com>
+Date: Mon, 6 Jun 2016 19:06:00 -0500
+Subject: [PATCH] Require the presence of either qt5 or qt4.
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -712,9 +712,9 @@ IF(OSG_USE_QT AND NOT ANDROID)
+ 
+     IF  (DESIRED_QT_VERSION)
+         IF  (DESIRED_QT_VERSION MATCHES 5)
+-            FIND_PACKAGE(Qt5Widgets)
++            FIND_PACKAGE(Qt5Widgets REQUIRED)
+         ELSEIF (DESIRED_QT_VERSION MATCHES 4)
+-            FIND_PACKAGE(Qt4)
++            FIND_PACKAGE(Qt4 REQUIRED)
+         ELSE()
+             FIND_PACKAGE(Qt3)
+         ENDIF()

src/openscenegraph.mk

@@ -32,6 +32,9 @@ define $(PKG)_BUILD
         -DBUILD_OSG_APPLICATIONS=OFF \
         -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
         -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
-        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1
+        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \
+        $(if $(filter qtbase,$($(PKG)_DEPS)), \
+          -DDESIRED_QT_VERSION=5, \
+          -DDESIRED_QT_VERSION=4)
     $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1
 endef

src/openthreads.mk

@@ -20,6 +20,7 @@ define $(PKG)_BUILD
         -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
         -DOSG_USE_QT=FALSE \
+        -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
         -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
         -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \
         '$(1)'

src/poppler.mk

@@ -24,14 +24,14 @@ define $(PKG)_BUILD
     cd '$(1)' \
         && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \
         ./configure \
-        --host='$(TARGET)' \
-        --build="`config.guess`" \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        $(MXE_CONFIGURE_OPTS) \
         --disable-silent-rules \
-        --disable-shared \
-        --enable-static \
         --enable-xpdf-headers \
-        --enable-poppler-qt4 \
+        $(if $(filter qtbase,$($(PKG)_DEPS)), \
+          --enable-poppler-qt5 \
+          --disable-poppler-qt4, \
+          --disable-poppler-qt5 \
+          --enable-poppler-qt4) \
         --enable-zlib \
         --enable-cms=lcms2 \
         --enable-libcurl \
@@ -64,6 +64,3 @@ define $(PKG)_BUILD
         '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \
         `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs`
 endef
-
-$(PKG)_BUILD_SHARED =
-