[Lunar-commits] <moonbase> scribus: fix & simplify build

Michael 'v4hn' Goerner v4hn at lunar-linux.org
Sun May 13 02:12:37 CEST 2012


commit 102617d1bb629a5f9a3adb66d543cbcaad4a6349
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Sat May 12 12:01:15 2012 +0200

    scribus: fix & simplify build
---
 qt4-apps/scribus/BUILD   |   26 +-------------------------
 qt4-apps/scribus/DETAILS |    1 +
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/qt4-apps/scribus/BUILD b/qt4-apps/scribus/BUILD
index 4d35aff..4547327 100644
--- a/qt4-apps/scribus/BUILD
+++ b/qt4-apps/scribus/BUILD
@@ -1,31 +1,7 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
-
   source /etc/profile.d/qt4.rc &&
 
-  mkdir $OOTB_DIR &&
-  cd $OOTB_DIR &&
-
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE             \
-                           $OPTS                                 &&
-
-  default_make &&
-
-# Lets make a Desktop menu entry
-
-  cat > ${MODULE}.desktop << EOF  &&
-[Desktop Entry]
-Type=Application
-Name=Scribus
-Comment=A Qt desktop publishing program
-Exec=$QTDIR/bin/scribus
-Icon=$QTDIR/share/scribus/icons/scribus.png
-Categories=Qt;KDE;Office;
-EOF
-
-  install -D -m644 ${MODULE}.desktop /usr/share/applications/${MODULE}.desktop
-
+  default_cmake_build
 
 ) > $C_FIFO 2>&1
diff --git a/qt4-apps/scribus/DETAILS b/qt4-apps/scribus/DETAILS
index a1cf592..f67851e 100644
--- a/qt4-apps/scribus/DETAILS
+++ b/qt4-apps/scribus/DETAILS
@@ -3,6 +3,7 @@
           SOURCE=$MODULE-$VERSION.tar.xz
       SOURCE_URL=$SFORGE_URL/$MODULE
       SOURCE_VFY=sha1:fb48bc492d79abc2275b1903692defe9b3931adf
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/Scribus
    MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://www.scribus.net
          ENTERED=20100116


More information about the Lunar-commits mailing list