diff --git a/BUILD_ORDER b/BUILD_ORDER index 60af52b..047fda1 100644 --- a/BUILD_ORDER +++ b/BUILD_ORDER @@ -7,7 +7,6 @@ setproctitle ptyprocess cjs python-pam -accountsservice cinnamon-desktop pangox-compat libgnomekbd diff --git a/TODO b/TODO index dbcda52..f2fd316 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,2 @@ -1. Build accountsservice with elogind -2. Rebuild cinnamon-control-center and cinnamon-settings-daemon -3. Fix caribou (or remove it?) +1. Rebuild cinnamon-control-center and cinnamon-settings-daemon +2. Fix caribou (or remove it?) diff --git a/accountsservice/accountsservice.SlackBuild b/accountsservice/accountsservice.SlackBuild deleted file mode 100644 index 5c23d76..0000000 --- a/accountsservice/accountsservice.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Slackware build script for accountsservice - -# Copyright 2014-2018 Willy Sudiarto Raharjo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=accountsservice -VERSION=${VERSION:-0.6.55} -COMMITVER=${COMMITVER:-22527b57ee077652c63bf7c5e2e50b7a93be7453} -BUILD=${BUILD:-1} -TAG=${TAG:-_csb} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/csb} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM -git clone https://gitlab.freedesktop.org/accountsservice/accountsservice.git -cd $PRGNAM -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -D systemd=false \ - -D systemdsystemunitdir=no \ - -D elogind=true - ninja - DESTDIR=$PKG ninja install -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -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 AUTHORS COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \; -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/accountsservice/slack-desc b/accountsservice/slack-desc deleted file mode 100644 index 944307b..0000000 --- a/accountsservice/slack-desc +++ /dev/null @@ -1,12 +0,0 @@ - |-----handy-ruler------------------------------------------------------| -accountsservice: accountsservice (D-Bus Service) -accountsservice: -accountsservice: AccountsService is a D-Bus service for accessing the list of user -accountsservice: accounts and information attached to those accounts. -accountsservice: -accountsservice: Project URL: -accountsservice: https://www.freedesktop.org/wiki/Software/AccountsService/ -accountsservice: -accountsservice: -accountsservice: -accountsservice: diff --git a/build-cinnamon.sh b/build-cinnamon.sh index 591ce99..edf5554 100755 --- a/build-cinnamon.sh +++ b/build-cinnamon.sh @@ -51,7 +51,6 @@ for dir in \ ptyprocess \ cjs \ python-pam \ - accountsservice \ cinnamon-desktop \ pangox-compat \ libgnomekbd \