diff options
author | Matteo Bernardini | 2020-02-24 11:30:13 +0100 |
---|---|---|
committer | Matteo Bernardini | 2020-02-24 11:30:13 +0100 |
commit | 27811f4c33fd0b9a2e7ea64a4fbf4969d4e56bd4 (patch) | |
tree | 3887c02a1345299dccb436665f332db2411deec8 /desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild | |
parent | 5de2bc5ab8f479fb924d4c5b543c6e0a37999431 (diff) | |
download | slackbuilds-27811f4c33fd0b9a2e7ea64a4fbf4969d4e56bd4.tar.gz |
20200224.1 global branch merge.current-20200224.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild')
-rw-r--r-- | desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild index 1ef6650ec5..11c932e67e 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock-plugins -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} 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" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf cairo-dock-plug-ins-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd cairo-dock-plug-ins-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,25 +69,31 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to fedora and archlinux +for i in $CWD/patches/* ; do patch -p1 < $i ; done +sed -i -e 's|-Wno-all||' Dbus/interfaces/vala/src/CMakeLists.txt + +mkdir build +cd build cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release . + -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG +cd .. # Sheesh. Donchaloveruby? -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 +RUBY_SITELIBDIR=$(ruby -e 'print RbConfig::CONFIG["sitelibdir"]') +mkdir -p $PKG$RUBY_SITELIBDIR if [ -d $PKG/usr/usr ]; then - mv $PKG/usr/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1/CDApplet.rb \ - $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 + mv $PKG/usr$RUBY_SITELIBDIR/CDApplet.rb $PKG$RUBY_SITELIBDIR/ rm -rf $PKG/usr/usr elif [ -e $PKG/usr/CDApplet.rb ]; then - mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 - mv $PKG/usr/CDApplet.rb $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 + mv $PKG/usr/CDApplet.rb $PKG$RUBY_SITELIBDIR/ fi find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ |