From 5b6021c5e56feacbde06ca5852e370f70f8a5e2a Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Wed, 30 Apr 2014 06:47:28 +0700 Subject: [PATCH] reorder build order. Signed-off-by: Willy Sudiarto Raharjo --- base/{mate-dialogs => engrampa}/doinst.sh | 0 {extra => base}/engrampa/engrampa.SlackBuild | 0 {extra => base}/engrampa/slack-desc | 0 base/mate-dialogs/mate-dialogs.SlackBuild | 129 ------------------ base/mate-dialogs/slack-desc | 12 -- {extra/engrampa => base/mate-media}/doinst.sh | 0 .../mate-media/mate-media.SlackBuild | 0 {extra => base}/mate-media/slack-desc | 0 .../mate-power-manager}/doinst.sh | 0 .../mate-power-manager.SlackBuild | 0 {extra => base}/mate-power-manager/slack-desc | 0 {extra => base}/mate-screensaver/README | 0 .../mate-screensaver}/doinst.sh | 0 .../mate-screensaver.SlackBuild | 0 {extra => base}/mate-screensaver/slack-desc | 0 {extra => base}/mate-system-monitor/README | 0 .../mate-system-monitor}/doinst.sh | 0 .../mate-system-monitor.SlackBuild | 0 .../mate-system-monitor/slack-desc | 0 extra/mate-system-monitor/doinst.sh | 19 --- mate-build-base.sh | 20 +-- mate-build-extra.sh | 15 +- 22 files changed, 17 insertions(+), 178 deletions(-) rename base/{mate-dialogs => engrampa}/doinst.sh (100%) rename {extra => base}/engrampa/engrampa.SlackBuild (100%) rename {extra => base}/engrampa/slack-desc (100%) delete mode 100644 base/mate-dialogs/mate-dialogs.SlackBuild delete mode 100644 base/mate-dialogs/slack-desc rename {extra/engrampa => base/mate-media}/doinst.sh (100%) rename {extra => base}/mate-media/mate-media.SlackBuild (100%) rename {extra => base}/mate-media/slack-desc (100%) rename {extra/mate-media => base/mate-power-manager}/doinst.sh (100%) rename {extra => base}/mate-power-manager/mate-power-manager.SlackBuild (100%) rename {extra => base}/mate-power-manager/slack-desc (100%) rename {extra => base}/mate-screensaver/README (100%) rename {extra/mate-power-manager => base/mate-screensaver}/doinst.sh (100%) rename {extra => base}/mate-screensaver/mate-screensaver.SlackBuild (100%) rename {extra => base}/mate-screensaver/slack-desc (100%) rename {extra => base}/mate-system-monitor/README (100%) rename {extra/mate-screensaver => base/mate-system-monitor}/doinst.sh (100%) rename {extra => base}/mate-system-monitor/mate-system-monitor.SlackBuild (100%) rename {extra => base}/mate-system-monitor/slack-desc (100%) delete mode 100644 extra/mate-system-monitor/doinst.sh diff --git a/base/mate-dialogs/doinst.sh b/base/engrampa/doinst.sh similarity index 100% rename from base/mate-dialogs/doinst.sh rename to base/engrampa/doinst.sh diff --git a/extra/engrampa/engrampa.SlackBuild b/base/engrampa/engrampa.SlackBuild similarity index 100% rename from extra/engrampa/engrampa.SlackBuild rename to base/engrampa/engrampa.SlackBuild diff --git a/extra/engrampa/slack-desc b/base/engrampa/slack-desc similarity index 100% rename from extra/engrampa/slack-desc rename to base/engrampa/slack-desc diff --git a/base/mate-dialogs/mate-dialogs.SlackBuild b/base/mate-dialogs/mate-dialogs.SlackBuild deleted file mode 100644 index 031b119..0000000 --- a/base/mate-dialogs/mate-dialogs.SlackBuild +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/sh - -# Slackware build script for mate-dialogs - -# Copyright 2013 Chess Griffin Raleigh, NC -# Copyright 2013-2014 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=mate-dialogs -VERSION=${VERSION:-1.8.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_msb} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -wget -c http://pub.mate-desktop.org/releases/1.8/$PRGNAM-$VERSION.tar.xz - -NUMJOBS=${NUMJOBS:-" -j8 "} - -CWD=$(pwd) -TMP=${TMP:-/tmp/msb} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -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-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --without-help-dir \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make -make install DESTDIR=$PKG - -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 - -# Compress and link manpages -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Remove unnecessary files from /usr/share/omf - this is old GNOME - confirmed -# w/ upstream -rm -rf $PKG/usr/share/omf/matedialog - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog HACKING NEWS NEWS.GNOME README THANKS TODO \ - $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 - -ln -sf /usr/bin/matedialog $PKG/usr/bin/zenity - -mkdir -p $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.${PKGTYPE:-txz} diff --git a/base/mate-dialogs/slack-desc b/base/mate-dialogs/slack-desc deleted file mode 100644 index e5e1e47..0000000 --- a/base/mate-dialogs/slack-desc +++ /dev/null @@ -1,12 +0,0 @@ - |-----handy-ruler------------------------------------------------------| -mate-dialogs: mate-dialogs (fork of gdialog for the MATE desktop) -mate-dialogs: -mate-dialogs: mate-dialogs allows the display of dialog boxes from the command -mate-dialogs: line and shell scripts. -mate-dialogs: -mate-dialogs: -mate-dialogs: -mate-dialogs: -mate-dialogs: -mate-dialogs: Homepage: http://www.mate-desktop.org -mate-dialogs: diff --git a/extra/engrampa/doinst.sh b/base/mate-media/doinst.sh similarity index 100% rename from extra/engrampa/doinst.sh rename to base/mate-media/doinst.sh diff --git a/extra/mate-media/mate-media.SlackBuild b/base/mate-media/mate-media.SlackBuild similarity index 100% rename from extra/mate-media/mate-media.SlackBuild rename to base/mate-media/mate-media.SlackBuild diff --git a/extra/mate-media/slack-desc b/base/mate-media/slack-desc similarity index 100% rename from extra/mate-media/slack-desc rename to base/mate-media/slack-desc diff --git a/extra/mate-media/doinst.sh b/base/mate-power-manager/doinst.sh similarity index 100% rename from extra/mate-media/doinst.sh rename to base/mate-power-manager/doinst.sh diff --git a/extra/mate-power-manager/mate-power-manager.SlackBuild b/base/mate-power-manager/mate-power-manager.SlackBuild similarity index 100% rename from extra/mate-power-manager/mate-power-manager.SlackBuild rename to base/mate-power-manager/mate-power-manager.SlackBuild diff --git a/extra/mate-power-manager/slack-desc b/base/mate-power-manager/slack-desc similarity index 100% rename from extra/mate-power-manager/slack-desc rename to base/mate-power-manager/slack-desc diff --git a/extra/mate-screensaver/README b/base/mate-screensaver/README similarity index 100% rename from extra/mate-screensaver/README rename to base/mate-screensaver/README diff --git a/extra/mate-power-manager/doinst.sh b/base/mate-screensaver/doinst.sh similarity index 100% rename from extra/mate-power-manager/doinst.sh rename to base/mate-screensaver/doinst.sh diff --git a/extra/mate-screensaver/mate-screensaver.SlackBuild b/base/mate-screensaver/mate-screensaver.SlackBuild similarity index 100% rename from extra/mate-screensaver/mate-screensaver.SlackBuild rename to base/mate-screensaver/mate-screensaver.SlackBuild diff --git a/extra/mate-screensaver/slack-desc b/base/mate-screensaver/slack-desc similarity index 100% rename from extra/mate-screensaver/slack-desc rename to base/mate-screensaver/slack-desc diff --git a/extra/mate-system-monitor/README b/base/mate-system-monitor/README similarity index 100% rename from extra/mate-system-monitor/README rename to base/mate-system-monitor/README diff --git a/extra/mate-screensaver/doinst.sh b/base/mate-system-monitor/doinst.sh similarity index 100% rename from extra/mate-screensaver/doinst.sh rename to base/mate-system-monitor/doinst.sh diff --git a/extra/mate-system-monitor/mate-system-monitor.SlackBuild b/base/mate-system-monitor/mate-system-monitor.SlackBuild similarity index 100% rename from extra/mate-system-monitor/mate-system-monitor.SlackBuild rename to base/mate-system-monitor/mate-system-monitor.SlackBuild diff --git a/extra/mate-system-monitor/slack-desc b/base/mate-system-monitor/slack-desc similarity index 100% rename from extra/mate-system-monitor/slack-desc rename to base/mate-system-monitor/slack-desc diff --git a/extra/mate-system-monitor/doinst.sh b/extra/mate-system-monitor/doinst.sh deleted file mode 100644 index ed28460..0000000 --- a/extra/mate-system-monitor/doinst.sh +++ /dev/null @@ -1,19 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi diff --git a/mate-build-base.sh b/mate-build-base.sh index 0a23760..da36ad2 100755 --- a/mate-build-base.sh +++ b/mate-build-base.sh @@ -39,22 +39,26 @@ MSBROOT=$(pwd) # Loop for all base packages for dir in \ base/mate-common \ + base/mate-desktop \ base/libmatekbd \ base/libmateweather \ base/mate-icon-theme \ - base/mate-dialogs \ - base/mate-desktop \ base/caja \ - base/mate-notification-daemon \ - base/mate-backgrounds \ - base/mate-menus \ - base/marco \ base/mate-polkit \ + base/marco \ base/mate-settings-daemon \ - base/mate-control-center \ - base/mate-panel \ base/mate-session-manager \ + base/mate-menus \ + base/mate-panel \ + base/mate-backgrounds \ base/mate-themes \ + base/mate-notification-daemon \ + base/mate-control-center \ + base/mate-screensaver \ + base/engrampa \ + base/mate-media \ + base/mate-power-manager \ + base/mate-system-monitor \ ; do # Get the package name package=$(echo $dir | cut -f2- -d /) diff --git a/mate-build-extra.sh b/mate-build-extra.sh index 91a1418..68e6d12 100755 --- a/mate-build-extra.sh +++ b/mate-build-extra.sh @@ -40,23 +40,18 @@ MSBROOT=$(pwd) for dir in \ extra/galculator \ extra/atril \ - extra/engrampa \ extra/caja-extensions \ - extra/mate-icon-theme-faenza \ extra/eom \ - extra/mate-media \ - extra/mozo \ extra/mate-applets \ - extra/mate-sensors-applet \ - extra/mate-power-manager \ - extra/mate-terminal \ - extra/pluma \ + extra/mate-icon-theme-faenza \ extra/mate-netspeed \ + extra/mate-sensors-applet \ + extra/mate-terminal \ extra/mate-utils \ - extra/mate-system-monitor \ + extra/mozo \ + extra/pluma \ extra/mate-system-tools \ extra/gnome-main-menu \ - extra/mate-screensaver \ ; do # Get the package name package=$(echo $dir | cut -f2- -d /)