[Lunar-commits] <moonbase-other> poppler: cleanup

[v4hn]

commit ab729571001ee725cc54b918a00c469fcc8b7a1b
Author: v4hn <me at v4hn.de>
Date: Mon, 10 Nov 2014 19:38:35 +0100
URL: https://github.com/lunar-linux/moonbase-other/commit/ab729571001ee725cc54b918a00c469fcc8b7a1b

poppler: cleanup

- move sedits to PRE_BUILD
- look for qt4 when sourcing qt4
- devoke_installwatch before second default_build
---
  libs/poppler/BUILD     | +2/-7     
  libs/poppler/PRE_BUILD | +7/-0     
  2 files changed, 9 insertions(+), 7 deletions(-)

--- a/libs/poppler/BUILD
+++ b/libs/poppler/BUILD
@@ -1,6 +1,4 @@
 
-  sedit "s:priv->quality, true: priv->quality, TRUE:" goo/JpegWriter.cc &&
-
   OPTS+=" --disable-static --disable-gtk-test --enable-xpdf-headers --enable-poppler-glib" &&
 
   if in_depends poppler qt5; then
@@ -11,14 +9,11 @@
     . /etc/profile.d/qt4.rc
   fi &&
 
-  if [ "`get_module_config DOCS`" = "n" ] ; then
-    sedit "s/SUBDIRS = . reference demo/SUBDIRS = . demo/g" glib/Makefile.in
-  fi  &&
-
   default_build &&
 
-# If in depends we will now build qt5 libs
+  # If in depends we will now build qt5 libs
   if in_depends poppler qt5; then
+    devoke_installwatch &&
     . /etc/profile.d/qt5.rc &&
     OPTS+=" --enable-poppler-qt5" &&
     default_build
--- /dev/null
+++ b/libs/poppler/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+sedit "s:priv->quality, true: priv->quality, TRUE:" goo/JpegWriter.cc &&
+
+if [ "`get_module_config DOCS`" = "n" ] ; then
+  sedit "s/SUBDIRS = . reference demo/SUBDIRS = . demo/g" glib/Makefile.in
+fi