[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (193687e7ead8c32768645b85dfa6436e79073682)

Treeve Jelbert scm at sourcemage.org
Sun Aug 15 02:55:44 EDT 2010


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

 printer/exaro/BUILD     |   24 ------------------------
 printer/exaro/DEPENDS   |    2 +-
 printer/exaro/HISTORY   |    6 ++++++
 printer/exaro/PREPARE   |    1 -
 printer/exaro/PRE_BUILD |   12 ------------
 5 files changed, 7 insertions(+), 38 deletions(-)

New commits:
commit 193687e7ead8c32768645b85dfa6436e79073682
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    exaro - cleanup spell files

diff --git a/printer/exaro/BUILD b/printer/exaro/BUILD
index 700e2aa..2113434 100755
--- a/printer/exaro/BUILD
+++ b/printer/exaro/BUILD
@@ -1,25 +1 @@
-if [[ $EX_VER == y ]];then
 qt4_cmake_build
-else
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
-PATH="$QTDIR/bin/qt4:$PATH" &&
-qmake -set ZINT_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib
-qmake -set ZINT_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include
-
-qmake -set QUAZIP_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib  &&
-qmake -set QUAZIP_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include &&
-
-qmake -set EXARO_INSTALL_BINS ${INSTALL_ROOT}/usr/bin &&
-qmake -set EXARO_INSTALL_LIBS ${INSTALL_ROOT}/usr/lib &&
-qmake -set EXARO_INSTALL_HEADERS ${INSTALL_ROOT}/usr/include &&
-qmake -set EXARO_INSTALL_PLUGINS ${INSTALL_ROOT}/usr/lib &&
-
-qmake -set EXARO_INSTALL_MIMELNKS ${INSTALL_ROOT}/usr/share/mimelnk/application &&
-qmake -set EXARO_INSTALL_MIMES ${INSTALL_ROOT}/usr/share/mime &&
-qmake -set EXARO_INSTALL_MENUS ${INSTALL_ROOT}/usr/share/applications &&
-qmake -set EXARO_INSTALL_ICONS ${INSTALL_ROOT}/usr/share/icons &&
-
-qmake -set EXARO_INSTALL_TRANSLATIONS ${INSTALL_ROOT}/usr/share/eXaro/translations &&
-qmake &&
-make
-fi
diff --git a/printer/exaro/DEPENDS b/printer/exaro/DEPENDS
index bbdd5a0..fd514e7 100755
--- a/printer/exaro/DEPENDS
+++ b/printer/exaro/DEPENDS
@@ -1,9 +1,9 @@
 depends g++  &&
 depends qt4  &&
-depends zint &&
 depends shared-mime-info &&
 depends cmake &&
 depends xz-utils &&
+optional_depends zint           '' '' 'barcode support' &&
 optional_depends quazip         '' '' 'ods export' &&
 optional_depends propertyeditor '' '' 'build eXaro designer'
 
diff --git a/printer/exaro/HISTORY b/printer/exaro/HISTORY
index 6ced758..f7acfcf 100644
--- a/printer/exaro/HISTORY
+++ b/printer/exaro/HISTORY
@@ -1,3 +1,9 @@
+2010-08-14 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: zint is now optional
+	* PREPARE: deleted
+	* BUILD: only qt4_cmake_build is relevant now
+	* PRE_BUILD: simplify
+
 2009-09-26 Treeve Jelbert <treeve at sourcemage.org>
 	* TRIGGERS: added, for zint
 
diff --git a/printer/exaro/PREPARE b/printer/exaro/PREPARE
deleted file mode 100755
index e37bbfa..0000000
--- a/printer/exaro/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query EX_VER 'build devel version?' n
diff --git a/printer/exaro/PRE_BUILD b/printer/exaro/PRE_BUILD
index 7f5da36..127b750 100755
--- a/printer/exaro/PRE_BUILD
+++ b/printer/exaro/PRE_BUILD
@@ -1,14 +1,2 @@
-if [[ $EX_VER == y ]];then
   cd $BUILD_DIRECTORY &&
   unlzma -c -d $SOURCE_CACHE/$SOURCE | tar x
-else
-default_pre_build
-fi
-cd $SOURCE_DIRECTORY &&
-if [[ $EX_VER == n ]];then
-sed -i 's/libs//' exaro.pro &&
-# adapt to zint-2.0
-sed -i 's/barcoderender/qzint/;s/BareCode/QZint/;s/setBorder(/setBorderType(/' \
-plugins/report/items/barcode/barcode.cpp &&
-sed -i 's/QtZ/QZ/' plugins/report/items/barcode/barcode.pro
-fi



More information about the SM-Commit mailing list