diff options
| -rw-r--r-- | desktop/crystal/crystal.SlackBuild | 49 | ||||
| -rw-r--r-- | desktop/crystal/crystal.info | 12 | ||||
| -rw-r--r-- | desktop/crystal/doinst.sh | 3 | ||||
| -rw-r--r-- | desktop/crystal/slack-desc | 2 |
4 files changed, 42 insertions, 24 deletions
diff --git a/desktop/crystal/crystal.SlackBuild b/desktop/crystal/crystal.SlackBuild index 863122f2383b2..c7d4e0ce2a867 100644 --- a/desktop/crystal/crystal.SlackBuild +++ b/desktop/crystal/crystal.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# SlackBuild script for crystal (A Native KDE 3.x Window decoration) +# SlackBuild script for crystal (A Native KDE4 Window decoration) # Copyright 2007-2009 Michiel van Wessem, Manchester, United Kingdom # All rights reserved. # @@ -24,7 +24,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=crystal -VERSION=${VERSION:-1.0.7} +VERSION=${VERSION:-2.0.5} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,9 +35,14 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e # Exit on most errors @@ -55,19 +60,26 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-debug \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. + + make VERBOSE=1 + make install VERBOSE=1 DESTDIR=$PKG +cd - + +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null +) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION @@ -75,6 +87,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/crystal/crystal.info b/desktop/crystal/crystal.info index 5c2278a9a7106..74cee3bc76054 100644 --- a/desktop/crystal/crystal.info +++ b/desktop/crystal/crystal.info @@ -1,8 +1,10 @@ PRGNAM="crystal" -VERSION="1.0.7" -HOMEPAGE="http://www.kde-look.org/content/show.php?content=13969" -DOWNLOAD="http://www.kde-look.org/CONTENT/content-files/13969-crystal-1.0.7.tar.bz2" -MD5SUM="07b426b929a41c5eee6fc7c686be632a" +VERSION="2.0.5" +HOMEPAGE="http://www.kde-look.org/content/show.php/crystal?content=75140" +DOWNLOAD="http://www.kde-look.org/CONTENT/content-files/75140-crystal-2.0.5.tar.bz2" +MD5SUM="259ee0ebe5af3c1d586c79e364e78103" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" -APPROVED="dsomero" +APPROVED="Erik Hanson" diff --git a/desktop/crystal/doinst.sh b/desktop/crystal/doinst.sh new file mode 100644 index 0000000000000..5fb28930db0b9 --- /dev/null +++ b/desktop/crystal/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/desktop/crystal/slack-desc b/desktop/crystal/slack-desc index e5423f89edba9..851ea48d51676 100644 --- a/desktop/crystal/slack-desc +++ b/desktop/crystal/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| crystal: crystal (kwin window decoration theme) crystal: crystal: Crystal is a native kwin window decoration theme for KDE 3.2+ which |