Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e354746b8723732bd9afc0ec06e2fb4130bdc41d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e354746b8723732bd9afc0ec06e2fb4130bdc41d)
  • Date: Thu, 18 Dec 2008 15:03:04 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

graphics-libs/poppler/BUILD | 19 +++++++++++---
graphics-libs/poppler/CONFIGURE | 2 +
graphics-libs/poppler/DEPENDS | 51
+++++++++++++++++++++++++++++++---------
graphics-libs/poppler/HISTORY | 6 ----
graphics-libs/poppler/PRE_BUILD | 6 ++++
5 files changed, 63 insertions(+), 21 deletions(-)

New commits:
commit e354746b8723732bd9afc0ec06e2fb4130bdc41d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "poppler - new build process"

This reverts commit afb0ba7b7c81224301de14b847167922225923a6.

Stop adding extra dependencies which aren't really needed to build
poppler.
I'm tired of your forcing of rc branches of the spells, and now you wanna
make
me install everything I don't really need to build something. So I
_don't_ need
cmake to build poppler. If you use KDE that doesn't mean everyone else
shold do
the same. I don't wanna see my box overbloated by the useless spells.

[23:50'50] --- You are now talking on #poppler
[23:50'50] --- Topic for #poppler is Poppler 0.10.2 is out, test it!
http://poppler.freedesktop.org
[23:50'50] --- Topic for #poppler set by tsdgeos at Wed Dec 10 02:37:12
2008
[23:50'50] --- Channel #poppler modes: +sn
[23:50'57] Stealth> hello
[23:51'11] Stealth> is cmake a preffered build system for poppler?
[23:56'04] tsdgeos> it's a buildsystem you can use

The keyword is _can_.

diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index f8344d7..0031aed 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -1,4 +1,15 @@
-if is_depends_enabled $SPELL qt4;then
- export CMAKE_PREFIX_PATH=$INSTALL_ROOT/usr/bin/qt4
-fi&&
-cmake_build
+if [[ $A4PAPER == y ]]; then
+ OPTS="$OPTS --enable-a4-paper"
+fi &&
+
+if [[ $PSOPI == y ]]; then
+ OPTS="$OPTS --enable-opi"
+fi &&
+
+OPTS="--disable-utils --enable-xpdf-headers $OPTS" &&
+
+if is_depends_enabled $SPELL qt4; then
+ export PATH="$INSTALL_ROOT/usr/bin/qt4:$PATH"
+fi &&
+
+default_build
diff --git a/graphics-libs/poppler/CONFIGURE b/graphics-libs/poppler/CONFIGURE
new file mode 100755
index 0000000..7586280
--- /dev/null
+++ b/graphics-libs/poppler/CONFIGURE
@@ -0,0 +1,2 @@
+config_query A4PAPER "Set A4 as the paper size instead of Letter for
PostScript?" n &&
+config_query PSOPI "Include support for OPI postscript comments?" n
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 423a4f4..db20592 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -1,18 +1,47 @@
depends g++ &&
-depends cmake &&
-depends libxml2 &&
-depends freetype2 &&
depends fontconfig &&
depends poppler-data &&

if [[ $POPPLER_VER == vcs ]]; then
depends CVS
fi &&
-optional_depends jpeg '' '' "for jpeg support" &&
-optional_depends openjpeg '' '' "for jpeg2000 support" &&
-optional_depends zlib '' '' "for compressed file support" &&
-optional_depends gtk+2 '' '' "for glib wrapper" &&
-optional_depends -sub "TOOLS" qt4 '' '' "for QT4 wrapper" &&
-optional_depends qt-x11 '' '' "for QT3 wrapper" &&
-optional_depends cairo '' '' "for cairo output" &&
-optional_depends gtk-doc '' '' "generate gtk-docs"
+
+optional_depends openjpeg \
+ "--enable-openjpeg" \
+ "--disable-openjpeg" \
+ "for jpeg2000 support" &&
+
+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "for compressed file support" &&
+
+optional_depends gtk+2 \
+ "--enable-poppler-glib" \
+ "--disable-poppler-glib" \
+ "for glib wrapper" &&
+
+optional_depends -sub "TOOLS" qt4 \
+ "--enable-poppler-qt4" \
+ "--disable-poppler-qt4" \
+ "for QT4 wrapper" &&
+
+optional_depends qt-x11 \
+ "--enable-poppler-qt" \
+ "--disable-poppler-qt" \
+ "for QT3 wrapper" &&
+
+optional_depends cairo \
+ "--enable-cairo-output" \
+ "--disable-cairo-output" \
+ "for cairo output" &&
+
+optional_depends abiword \
+ "--enable-abiword-output" \
+ "--disable-abiword-output" \
+ "generate gtk-docs" &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "generate gtk-docs"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 1c9da6a..f72d0f7 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,9 +1,3 @@
-2008-12-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add cmake, libxml2, freetype2, jpeg.
- change all options
- * BUILD: use cmake_build
- * CONFIGURE, PRE_BUILD: deleted, obsolete
-
2008-12-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.10.2

diff --git a/graphics-libs/poppler/PRE_BUILD b/graphics-libs/poppler/PRE_BUILD
new file mode 100755
index 0000000..f79b835
--- /dev/null
+++ b/graphics-libs/poppler/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $POPPLER_VER == vcs ]]; then
+ NOCONFIGURE=ON ./autogen.sh
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e354746b8723732bd9afc0ec06e2fb4130bdc41d), Vlad Glagolev, 12/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page