diff options
-rw-r--r-- | desktop/cairo-dock-plugins/README | 2 | ||||
-rw-r--r-- | desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild | 29 | ||||
-rw-r--r-- | desktop/cairo-dock-plugins/cairo-dock-plugins.info | 6 |
3 files changed, 20 insertions, 17 deletions
diff --git a/desktop/cairo-dock-plugins/README b/desktop/cairo-dock-plugins/README index d758f4c722823..496a240ad95ae 100644 --- a/desktop/cairo-dock-plugins/README +++ b/desktop/cairo-dock-plugins/README @@ -3,4 +3,4 @@ plug-ins for Cairo-Dock It provides some new functionnalities like controling music players or note-taking, a clock or a desktop switcher but also some views, dialogs and desklets skins, etc. -vala, python3 and mono are optional dependencies. +libetpan, vala, python3 and mono are optional dependencies. diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild index 1ef6650ec583d..01054d0e6062c 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild @@ -23,13 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock-plugins -VERSION=${VERSION:-3.3.2} +SRCNAM=cairo-dock-plug-ins +VERSION=${VERSION:-20201022_a0d3415} 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 +41,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 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar -xvf $CWD/$SRCNAM-$VERSION.tar.?z +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,25 +70,27 @@ 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 {} \; +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 \ diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.info b/desktop/cairo-dock-plugins/cairo-dock-plugins.info index b28117ab5df71..64b7e384db36a 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.info +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.info @@ -1,8 +1,8 @@ PRGNAM="cairo-dock-plugins" -VERSION="3.3.2" +VERSION="20201022_a0d3415" HOMEPAGE="http://www.glx-dock.org" -DOWNLOAD="https://launchpad.net/cairo-dock-plug-ins/3.3/3.3.2/+download/cairo-dock-plugins-3.3.2.tar.gz" -MD5SUM="3c40afe91cba65da68a70e5e78b76c24" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/cairo-dock-plug-ins-20201022_a0d3415.tar.xz" +MD5SUM="154b87a595455b0e6d76b7f7ae58a07a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cairo-dock" |