mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-24 10:02:29 +01:00
development/valkyrie: Included a couple of patches to fix build
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
parent
445456c0f4
commit
eb678e3cb8
4 changed files with 62 additions and 2 deletions
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
PRGNAM=valkyrie
|
PRGNAM=valkyrie
|
||||||
VERSION=2.0.0
|
VERSION=2.0.0
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
|
@ -50,6 +50,9 @@ elif [ "$ARCH" = "i686" ]; then
|
||||||
elif [ "$ARCH" = "x86_64" ]; then
|
elif [ "$ARCH" = "x86_64" ]; then
|
||||||
SLKCFLAGS="-O2 -fPIC"
|
SLKCFLAGS="-O2 -fPIC"
|
||||||
LIBDIRSUFFIX="64"
|
LIBDIRSUFFIX="64"
|
||||||
|
else
|
||||||
|
SLKCFLAGS="-O2"
|
||||||
|
LIBDIRSUFFIX=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
@ -61,17 +64,34 @@ rm -rf $PRGNAM-$VERSION
|
||||||
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
|
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
|
||||||
cd $PRGNAM-$VERSION
|
cd $PRGNAM-$VERSION
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
chmod -R u+w,go+r-w,a-s .
|
find . \
|
||||||
|
\( -perm 777 -o -perm 775 -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 {} \;
|
||||||
|
|
||||||
|
patch -p1 < $CWD/vk_configh.patch
|
||||||
|
patch -p1 < $CWD/vk_configpri.patch
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
qmake PREFIX=/usr
|
qmake PREFIX=/usr
|
||||||
|
|
||||||
make
|
make
|
||||||
make install INSTALL_ROOT=$PKG
|
make install INSTALL_ROOT=$PKG
|
||||||
|
|
||||||
find $PKG -print0 | xargs -0 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
|
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
||||||
|
|
||||||
|
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
|
||||||
|
cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
|
||||||
|
|
||||||
|
mkdir -p $PKG/usr/share/applications/
|
||||||
|
install -D -m644 $CWD/valkyrie.desktop $PKG/usr/share/applications/
|
||||||
|
|
||||||
|
mkdir -p $PKG/usr/share/pixmaps/
|
||||||
|
install -D -m644 icons/valkyrie.xpm $PKG/usr/share/pixmaps/
|
||||||
|
|
||||||
mkdir -p $PKG/install
|
mkdir -p $PKG/install
|
||||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||||
|
|
||||||
|
|
8
development/valkyrie/valkyrie.desktop
Normal file
8
development/valkyrie/valkyrie.desktop
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
Name=Valkyrie
|
||||||
|
Comment=Qt4-based GUI for the Valgrind
|
||||||
|
Exec=valkyrie
|
||||||
|
Icon=valkyrie
|
||||||
|
Categories=Development
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
10
development/valkyrie/vk_configh.patch
Normal file
10
development/valkyrie/vk_configh.patch
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
--- valkyrie-2.0.0/src/utils/vk_config.h.orig 2012-07-27 19:55:19.000000000 +0200
|
||||||
|
+++ valkyrie-2.0.0/src/utils/vk_config.h 2012-07-27 19:55:32.000000000 +0200
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QString>
|
||||||
|
#include <QVariant>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
|
||||||
|
// ============================================================
|
22
development/valkyrie/vk_configpri.patch
Normal file
22
development/valkyrie/vk_configpri.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
--- valkyrie-2.0.0/vk_config.pri.orig 2010-11-11 07:12:56.050000003 -0300
|
||||||
|
+++ valkyrie-2.0.0/vk_config.pri 2010-11-11 07:14:07.000000005 -0300
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
# Set a default value for PREFIX (etc) in the generated makefiles
|
||||||
|
# Note: ignore INSTALL_ROOT: it's a qt special, can't be set from here
|
||||||
|
isEmpty(PREFIX) {
|
||||||
|
- PREFIX = /usr/local
|
||||||
|
+ PREFIX = /usr
|
||||||
|
}
|
||||||
|
isEmpty(BINDIR) {
|
||||||
|
BINDIR = $$PREFIX/bin
|
||||||
|
@@ -25,8 +25,8 @@
|
||||||
|
######################################################################
|
||||||
|
# Install paths relative to $$PREFIX:
|
||||||
|
target.path = $$BINDIR
|
||||||
|
-doc.path = $$DATADIR/$$PACKAGE/doc
|
||||||
|
-doc_imgs.path = $$DATADIR/$$PACKAGE/doc/images
|
||||||
|
+doc.path = $$DATADIR/doc/$$PACKAGE
|
||||||
|
+doc_imgs.path = $$DATADIR/doc/$$PACKAGE/images
|
||||||
|
|
||||||
|
######################################################################
|
||||||
|
# Qt modules
|
Loading…
Reference in a new issue