From 25a990a653a7b15420e98aeceadfd97e526fea3d Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 26 Dec 2016 18:58:03 -0600 Subject: [PATCH] Update poppler. --- src/poppler-1-win32.patch | 13 +++++++++++++ src/poppler.mk | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index 80372641..744379b8 100644 --- a/src/poppler-1-win32.patch +++ b/src/poppler-1-win32.patch @@ -98,6 +98,19 @@ index 1111111..2222222 100644 # define _POPPLER_QT4_LIB_EXPORT __declspec(dllexport) # define _POPPLER_QT4_LIB_IMPORT __declspec(dllimport) #elif defined(__GNUC__) +diff --git a/qt5/src/poppler-export.h b/qt5/src/poppler-export.h +index 1111111..2222222 100644 +--- a/qt5/src/poppler-export.h ++++ b/qt5/src/poppler-export.h +@@ -2,7 +2,7 @@ + * This file is used to set the poppler_qt4_EXPORT macros right. + * This is needed for setting the visibility on windows, it will have no effect on other platforms. + */ +-#if defined(_WIN32) ++#if defined(_WIN32) && defined(DLL_EXPORT) + # define _POPPLER_QT5_LIB_EXPORT __declspec(dllexport) + # define _POPPLER_QT5_LIB_IMPORT __declspec(dllimport) + #elif defined(__GNUC__) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev diff --git a/src/poppler.mk b/src/poppler.mk index 70e70a88..3d703976 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -3,8 +3,8 @@ PKG := poppler $(PKG)_WEBSITE := http://poppler.freedesktop.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 0.30.0 -$(PKG)_CHECKSUM := b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5 +$(PKG)_VERSION := 0.50.0 +$(PKG)_CHECKSUM := c9c93318b789d3933f6e0bad3bc65110280c28eac3f0666284bb9c9a0ab4bc36 $(PKG)_SUBDIR := poppler-$($(PKG)_VERSION) $(PKG)_FILE := poppler-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://poppler.freedesktop.org/$($(PKG)_FILE)