Commits

Anonymous committed 9ed5389

Update calligra to 2.6.0

Signed-off-by: Lee Pak Hong <hata.ph@gmail.com>

  • Participants
  • Parent commits 61c533b
  • Branches veclinux-7.0

Comments (0)

Files changed (1)

var/vabs/calligra/src/calligra.SlackBuild

 # AUTHORS = 
 
 NAME="calligra"            #Enter package Name!
-VERSION=${VERSION:-"2.5.4"}      #Enter package Version!
+VERSION=${VERSION:-"2.6.0"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"hata_ph"}   #Enter your Name!
 LINK=${LINK:-"ftp://ftp.kde.org/pub/kde/stable/$NAME-$VERSION/$NAME-$VERSION.tar.bz2"}  #Enter URL for package here!
 
 #SYSTEM VARIABLES
 #----------------------------------------------------------------------------
-BUILDNUM=${BUILDNUM:-"2"}
+BUILDNUM=${BUILDNUM:-"1"}
 VL_VERSION=${VL_VERSION:-"$(ls /var/log/packages/|grep vlconfig2|cut -d "-" -f4|cut -c 2-5)"}
 BUILD=${BUILD:-"$BUILDNUM""$VL_VERSION"}
 ARCH=${ARCH:-"$(uname -m)"}
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
-MAKEDEPENDS=${MAKEDEPENDS:-"automoc4 kdelibs kdepimlibs eigen libkdcraw marble okular shared-desktop-ontologies libkexiv2 lcms2"} #Add deps needed TO BUILD this package here.
+MAKEDEPENDS=${MAKEDEPENDS:-"cmake qt automoc4 kdelibs kdepimlibs eigen kactivities \
+nepomuk-core libkdcraw marble okular shared-desktop-ontologies libkexiv2 lcms2 \
+libwps libvisio"} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
 # DO NOT EXECUTE if NORUN is set to 1
 PKG=$TMP/package-$NAME
 #--------------------------------------------
 
-
+NUMJOBS=${NUMJOBS:--j7}
 
 if [ $UID != 0 ]; then
    echo "You are not authorized to run this script. Please login as root"
  
 # Required patch for a successful compilation with gcc 4.7:
 # (still required for calligra-2.3.92)
-cat $CWD/patches/calligra-2.3.87_gcc47.patch | patch -p1 --verbose | exit 1
+#cat $CWD/patches/calligra-2.3.87_gcc47.patch | patch -p1 --verbose | exit 1
 
 # Patch for "corrupted document", side-effect of compiling calligra-2.4.0 with gcc-4.7.0:
-zcat $CWD/patches/calligra.git.6e4d171dfa5bad07e06277ef8e36d8a6a00005db.diff.gz | patch -p1 --verbose | exit 1
+#zcat $CWD/patches/calligra.git.6e4d171dfa5bad07e06277ef8e36d8a6a00005db.diff.gz | patch -p1 --verbose | exit 1
 
 #SET PERMISSIONS
 #-----------------------------------------
 cd build
 cmake \
 	.. \
+	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DIHAVEPATCHEDQT:BOOL=ON \
 
-make || exit 1
+make $NUMJOBS || make || exit 1
 
 make install DESTDIR=$PKG || exit