summaryrefslogtreecommitdiffstats
path: root/source/l/QScintilla/QScintilla.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/QScintilla/QScintilla.SlackBuild')
-rwxr-xr-xsource/l/QScintilla/QScintilla.SlackBuild18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild
index ca90d7f80..2e2d9654a 100755
--- a/source/l/QScintilla/QScintilla.SlackBuild
+++ b/source/l/QScintilla/QScintilla.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=QScintilla
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
@@ -37,7 +37,7 @@ PKG=$TMP/package-$PKGNAM
MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
case "$MARCH" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
armv7hl) export ARCH=$MARCH ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
@@ -45,8 +45,8 @@ if [ -z "$ARCH" ]; then
esac
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -75,7 +75,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-cd Qt4
+cd Qt4Qt5
qmake -o Makefile qscintilla.pro
make $NUMJOBS
make install INSTALL_ROOT=$PKG
@@ -83,16 +83,16 @@ cd Qt4
make install
cd -
-cd designer-Qt4
+cd designer-Qt4Qt5
qmake -o Makefile designer.pro
make $NUMJOBS
make install INSTALL_ROOT=$PKG
cd -
cd Python
- python configure.py -p 4
+ python configure.py
make $NUMJOBS
- make install DESTDIR=$PKG
+ make install INSTALL_ROOT=$PKG
cd -
# Link the shared libraries into /usr/lib${LIBDIRSUFFIX}:
@@ -107,7 +107,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- *GPL* COPYING* NEWS OPENSOURCE-NOTICE.TXT README* doc/html-Qt4 doc/Scintilla \
+ *GPL* COPYING* LICENSE NEWS OPENSOURCE-NOTICE.TXT README* doc/html-Qt4 doc/Scintilla \
$PKG/usr/doc/$PKGNAM-$VERSION
mkdir -p $PKG/install