Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ed2db6bb2a5dc91f8c0fd2588512ca0f147e8909)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ed2db6bb2a5dc91f8c0fd2588512ca0f147e8909)
  • Date: Sat, 23 Sep 2017 09:07:28 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/poppler/BUILD | 26 +-
graphics-libs/poppler/CONFIGURE | 12 -
graphics-libs/poppler/DEPENDS | 100
+----------
graphics-libs/poppler/HISTORY | 5
graphics-libs/poppler/INSTALL | 1
graphics-libs/poppler/PRE_BUILD | 11 -
graphics-libs/poppler/PRE_SUB_DEPENDS | 2
graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS | 2
graphics-libs/poppler/SUB_DEPENDS | 9
graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch | 24 ++
10 files changed, 69 insertions(+), 123 deletions(-)

New commits:
commit ed2db6bb2a5dc91f8c0fd2588512ca0f147e8909
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

poppler-0.59+ only supports cmake. teh autotools stuff has been removed.
the poppler spell has been updated accordingly.

diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index 8c23020..5ace80c 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -1,15 +1,11 @@
-OPTS="$POPPLER_OPTS $OPTS" &&
-
-# -lm fixes the ./configure problem (http://www.sourcemage.org/issues/15)
-LDFLAGS="-lm $LDFLAGS" &&
-
-if is_depends_enabled $SPELL qt4; then
- export PATH="$QT4DIR/bin:$PATH" &&
- export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig/"
-fi &&
-if is_depends_enabled $SPELL qtbase; then
- export PATH="$QT5DIR/bin:$PATH" &&
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig/"
-fi &&
-
-default_build
+if is_depends_enabled $SPELL qt4;then
+ QTP=/opt/qt4
+fi&&
+if is_depends_enabled $SPELL qtbase;then
+ QTP+=":/opt/qt5"
+fi&&
+export CMAKE_PREFIX_PATH=$QTP &&
+OPTS+=" $XPDF_HEADERS -DCMAKE_BUILD_TYPE=$KDE_BUILD_TYPE" &&
+OPTS+=" -DBUILD_GTK_TESTS=0 -DBUILD_QT4_TESTS=0 -DBUILD_CPP_TESTS=0 " &&
+OPTS+=" -DBUILD_QT5_TESTS=0" &&
+cmake_build
diff --git a/graphics-libs/poppler/CONFIGURE b/graphics-libs/poppler/CONFIGURE
index ae7a3dc..b2f02c3 100755
--- a/graphics-libs/poppler/CONFIGURE
+++ b/graphics-libs/poppler/CONFIGURE
@@ -1,11 +1 @@
-config_query_option POPPLER_OPTS "Install unsupported xpdf headers?" n \
- "--enable-xpdf-headers" \
- "--disable-xpdf-headers" &&
-
-config_query_option POPPLER_OPTS "Compile poppler command line utils?" n \
- "--enable-utils" \
- "--disable-utils" &&
-
-config_query_option POPPLER_OPTS "Enable CMYK support for rasterization?" n \
- "--enable-cmyk" \
- "--disable-cmyk"
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 855971b..095c920 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -1,84 +1,20 @@
-depends -sub CXX gcc &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends libxml2 &&
+depends freetype2 &&
depends fontconfig &&
depends poppler-data &&
-
-if [[ $POPPLER_BRANCH == scm ]]; then
- depends git
-fi &&
-
-optional_depends libpng \
- "--enable-libpng" \
- "--disable-libpng" \
- "for png support" &&
-
-optional_depends openjpeg \
- "--enable-openjpeg=openjpeg2" \
- "--enable-openjpeg=none" \
- "for JPEG2000 images" &&
-
-optional_depends tiff \
- "--enable-libtiff" \
- "--disable-libtiff" \
- "for TIFF support" &&
-
-optional_depends lcms2 \
- "--enable-cms=lcms2" \
- "--disable-cms" \
- "for color management" &&
-
-optional_depends JPEG \
- "--enable-libjpeg" \
- "--disable-libjpeg" \
- "for JPEG image support" &&
-
-optional_depends zlib \
- "--enable-zlib" \
- "--disable-zlib" \
- "for compressed file support" &&
-
-optional_depends glib2 \
- "--enable-poppler-glib" \
- "--disable-poppler-glib" \
- "for glib wrapper" &&
-
-if is_depends_enabled $SPELL glib2; then
- optional_depends gtk+3 \
- "--enable-gtk-test" \
- "--disable-gtk-test" \
- "to compile GTK+ test program"
-else
- list_add "POPPLER_OPTS" "--disable-gtk-test"
-fi &&
-
-optional_depends gobject-introspection \
- "--enable-introspection" \
- "--disable-introspection" \
- "for introspection support" &&
-
-
-optional_depends qtbase \
- "--enable-poppler-qt5" \
- "--disable-poppler-qt5" \
- "for QT5 wrapper" &&
-
-optional_depends -sub "TOOLS" qt4 \
- "--enable-poppler-qt4" \
- "--disable-poppler-qt4" \
- "for QT4 wrapper" &&
-
-if spell_ok cairo; then
-optional_depends cairo \
- "--enable-cairo-output" \
- "--disable-cairo-output" \
- "for cairo output"
-fi &&
-
-optional_depends curl \
- "--enable-libcurl" \
- "--disable-libcurl" \
- "for libcurl based HTTP support" &&
-
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "generate gtk-docs"
+depends openjpeg &&
+optional_depends curl ' -DENABLE_LIBCURL=1' '' 'HTTP support' &&
+optional_depends glib2 '' '' 'GLib support' &&
+optional_depends gobject-introspection '' '' 'introspection support' &&
+optional_depends libpng '' '' 'for pdftohtml' &&
+optional_depends lcms2 '' '' 'for color management' &&
+optional_depends nss '' '' 'crypto support' &&
+optional_depends JPEG '' '' "for jpeg support" &&
+optional_depends tiff '' '' 'for TIFF support' &&
+optional_depends zlib '' '' "for compressed file support" &&
+optional_depends gtk+3 '' ' -DBUILD_GTK_TESTS=0' "GTK tests" &&
+optional_depends qt4 '' '' 'qt4 support' &&
+optional_depends qtbase '' '' 'qt5 support' &&
+optional_depends cairo '' '' 'for cairo output' &&
+optional_depends gtk-doc '' '' 'build GTK documentation'
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 07ffdaa..5af3a9e 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,8 @@
+2017-09-23 Treeve Jelbert <treeve AT sourcemage.org>
+ version 0.59+ nolonger supports autotools, now useS cmake
+ all files updated accordingly
+ patches/*: added, fix broken cmake file
+
2017-09-04 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.59.0

diff --git a/graphics-libs/poppler/INSTALL b/graphics-libs/poppler/INSTALL
new file mode 100755
index 0000000..157bcdc
--- /dev/null
+++ b/graphics-libs/poppler/INSTALL
@@ -0,0 +1 @@
+cmake_install
diff --git a/graphics-libs/poppler/PRE_BUILD b/graphics-libs/poppler/PRE_BUILD
index dfd1d9d..922c0ab 100755
--- a/graphics-libs/poppler/PRE_BUILD
+++ b/graphics-libs/poppler/PRE_BUILD
@@ -1,8 +1,3 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $POPPLER_BRANCH == scm ]]; then
- sed -i "s:automake-1.7:automake-1.13 automake-1.7:" autogen.sh &&
- sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac &&
- NOCONFIGURE=ON ./autogen.sh
-fi
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/graphics-libs/poppler/PRE_SUB_DEPENDS
b/graphics-libs/poppler/PRE_SUB_DEPENDS
index fd55dd9..515213f 100755
--- a/graphics-libs/poppler/PRE_SUB_DEPENDS
+++ b/graphics-libs/poppler/PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
case $THIS_SUB_DEPENDS in
QT4) is_depends_enabled $SPELL qt4 && return 0;;
QT5) is_depends_enabled $SPELL qtbase && return 0;;
- XPDF_HEADERS) list_find "$POPPLER_OPTS" "--enable-xpdf-headers" && return
0;;
+ XPDF_HEADERS) list_find "$XPDF_HEADERS" "-DENABLE_XPDF_HEADERS=ON" &&
return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
b/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
index fd55dd9..515213f 100755
--- a/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
+++ b/graphics-libs/poppler/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
case $THIS_SUB_DEPENDS in
QT4) is_depends_enabled $SPELL qt4 && return 0;;
QT5) is_depends_enabled $SPELL qtbase && return 0;;
- XPDF_HEADERS) list_find "$POPPLER_OPTS" "--enable-xpdf-headers" && return
0;;
+ XPDF_HEADERS) list_find "$XPDF_HEADERS" "-DENABLE_XPDF_HEADERS=ON" &&
return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/graphics-libs/poppler/SUB_DEPENDS
b/graphics-libs/poppler/SUB_DEPENDS
index c2fa551..f818601 100755
--- a/graphics-libs/poppler/SUB_DEPENDS
+++ b/graphics-libs/poppler/SUB_DEPENDS
@@ -1,13 +1,12 @@
case $THIS_SUB_DEPENDS in
QT4) echo "QT4 support requested, forcing qt4 dependency." &&
- depends -sub TOOLS qt4 '--enable-poppler-qt4'
+ depends -sub TOOLS qt4 ''
;;
QT5) echo "QT5 support requested, forcing qtbase dependency." &&
- depends qtbase '--enable-poppler-qt5'
+ depends qtbase ''
;;
- XPDF_HEADERS) echo "XPDF_HEADERS requested, forcing --enable-xpdf-headers"
&&
- list_add POPPLER_OPTS --enable-xpdf-headers &&
- list_remove POPPLER_OPTS --disable-xpdf-headers
+ XPDF_HEADERS) echo "XPDF_HEADERS requested, forcing
-DENABLE_XPDF_HEADERS=ON" &&
+ list_add XPDF_HEADERS "-DENABLE_XPDF_HEADERS=ON"
;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac
diff --git a/graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch
b/graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch
new file mode 100644
index 0000000..6d09d71
--- /dev/null
+++ b/graphics-libs/poppler/patches/0001-bypass-broken-cmake.patch
@@ -0,0 +1,24 @@
+From 024b2472fd71e7fed13b77142b2ca965d6ed65c6 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 10 Mar 2017 15:15:23 +0100
+Subject: [PATCH] bypass broken cmake
+
+---
+ qt5/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
+index 6bd7a6be..cb7c5574 100644
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ set(CMAKE_AUTOMOC ON)
+
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++#add_subdirectory(tests)
++#add_subdirectory(demos)
+--
+2.14.1
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ed2db6bb2a5dc91f8c0fd2588512ca0f147e8909), Treeve Jelbert, 09/23/2017

Archive powered by MHonArc 2.6.24.

Top of Page