Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4cc427b3f0b080550064a58ba7dd06594f920179)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4cc427b3f0b080550064a58ba7dd06594f920179)
  • Date: Mon, 13 Nov 2017 21:30:35 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

graphics-libs/poppler/BUILD
| 4 -
graphics-libs/poppler/HISTORY
| 5 ++

graphics-libs/poppler/patches/0002-Set-CMP0002-to-OLD-in-cmake-modules-PopplerMacros.cm.patch
| 24 ----------
3 files changed, 6 insertions(+), 27 deletions(-)

New commits:
commit 4cc427b3f0b080550064a58ba7dd06594f920179
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

graphics-libs/poppler: dropped fixes for .pc files and tests

diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index d7cca16..b8ea42e 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -5,7 +5,5 @@ if is_depends_enabled $SPELL qtbase;then
QTP+=":${INSTALL_ROOT}/opt/qt5"
fi &&
export CMAKE_PREFIX_PATH=$QTP &&
-OPTS+=" $XPDF_HEADERS -DBUILD_CPP_TESTS=0
- -DCMAKE_INSTALL_INCLUDEDIR=${INSTALL_ROOT}/usr/include
- -DCMAKE_INSTALL_LIBDIR=${INSTALL_ROOT}/usr/lib" &&
+OPTS+=" $XPDF_HEADERS -DBUILD_CPP_TESTS=0" &&
cmake_build
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index ff1a144..5d5ad16 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,8 @@
+2017-11-13 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: removed the .pc files fix, not needed anymore
+ * 0002-Set-CMP0002-to-OLD-in-cmake-modules-PopplerMacros.cm.patch:
+ removed, fixed by upstream
+
2017-11-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.61.1

diff --git
a/graphics-libs/poppler/patches/0002-Set-CMP0002-to-OLD-in-cmake-modules-PopplerMacros.cm.patch

b/graphics-libs/poppler/patches/0002-Set-CMP0002-to-OLD-in-cmake-modules-PopplerMacros.cm.patch
deleted file mode 100644
index 015258d..0000000
---
a/graphics-libs/poppler/patches/0002-Set-CMP0002-to-OLD-in-cmake-modules-PopplerMacros.cm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 263758e9844e24a37f90801d8f3a7c2838ee6a47 Mon Sep 17 00:00:00 2001
-From: Pavel Vinogradov <public AT sourcemage.org>
-Date: Tue, 26 Sep 2017 21:32:38 -0400
-Subject: [PATCH] Set CMP0002 to OLD in cmake/modules/PopplerMacros.cmake
-
----
- cmake/modules/PopplerMacros.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/modules/PopplerMacros.cmake
b/cmake/modules/PopplerMacros.cmake
-index ba4bceb3..ca1a1d8b 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -15,6 +15,7 @@ macro(POPPLER_ADD_TEST exe build_flag)
- if(NOT build_test AND NOT MSVC_IDE)
- get_directory_property(_buildtestsAdded BUILDTESTS_ADDED)
- if(NOT _buildtestsAdded)
-+ cmake_policy(SET CMP0002 OLD)
- add_custom_target(buildtests)
- set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE)
- endif(NOT _buildtestsAdded)
---
-2.14.2
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4cc427b3f0b080550064a58ba7dd06594f920179), Pavel Vinogradov, 11/13/2017

Archive powered by MHonArc 2.6.24.

Top of Page