aboutsummaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-09 15:03:02 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-12 22:47:48 +0700
commite7a5915900e7b64ff402e035051ce0ba5437c10b (patch)
tree8812a9060f5d48aa8d3aaec231c5cad8f220e4c7 /desktop
parent18d84420aa0021d278594dbf4aa81d052e493620 (diff)
desktop/recorditnow: Fix build on -current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/recorditnow/gcc7.patch11
-rw-r--r--desktop/recorditnow/recorditnow.SlackBuild24
2 files changed, 23 insertions, 12 deletions
diff --git a/desktop/recorditnow/gcc7.patch b/desktop/recorditnow/gcc7.patch
new file mode 100644
index 0000000000000..fb3526e92512f
--- /dev/null
+++ b/desktop/recorditnow/gcc7.patch
@@ -0,0 +1,11 @@
+--- recorditnow-0.8.1/src/mainwindow.cpp.orig 2017-07-09 14:27:15.653631058 +0700
++++ recorditnow-0.8.1/src/mainwindow.cpp 2017-07-09 14:27:42.712300823 +0700
+@@ -1114,7 +1114,7 @@
+ if (m_zoomDock) {
+ removeDockWidget(m_zoomDock);
+ delete m_zoomDock;
+- m_zoomDock = false;
++ m_zoomDock = 0;
+ }
+ }
+
diff --git a/desktop/recorditnow/recorditnow.SlackBuild b/desktop/recorditnow/recorditnow.SlackBuild
index 782d44e534d32..79fe746765325 100644
--- a/desktop/recorditnow/recorditnow.SlackBuild
+++ b/desktop/recorditnow/recorditnow.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-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"
@@ -54,7 +54,7 @@ else
LIBDIRSUFFIX=""
fi
-set -e
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -64,10 +64,12 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p1 < $CWD/gcc7.patch
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
@@ -85,13 +87,11 @@ make install DESTDIR=$PKG
# not the *global* config dir
mv $PKG/etc/kde/* $PKG/etc ; rmdir $PKG/etc/kde
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING DEPENDENCIES INSTALL \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING DEPENDENCIES INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install