diff options
Diffstat (limited to '')
16 files changed, 408 insertions, 146 deletions
diff --git a/source/a/apmd/apmd.SlackBuild b/pasture/source/apmd/apmd.SlackBuild index b17ddf36f..b17ddf36f 100755 --- a/source/a/apmd/apmd.SlackBuild +++ b/pasture/source/apmd/apmd.SlackBuild diff --git a/source/a/apmd/slack-desc b/pasture/source/apmd/slack-desc index a6f5c9a65..a6f5c9a65 100644 --- a/source/a/apmd/slack-desc +++ b/pasture/source/apmd/slack-desc diff --git a/pasture/source/rexima/rexima.SlackBuild b/pasture/source/rexima/rexima.SlackBuild deleted file mode 100755 index 05133e7cd..000000000 --- a/pasture/source/rexima/rexima.SlackBuild +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# 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. - - -VERSION=1.4 -BUILD=${BUILD:-2} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-rexima - -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf rexima-$VERSION -tar xvf $CWD/rexima-$VERSION.tar.gz || exit 1 -cd rexima-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -make || exit 1 - -strip rexima -mkdir -p $PKG/usr/bin -cat rexima > $PKG/usr/bin/rexima -chmod 755 $PKG/usr/bin/rexima - -mkdir -p $PKG/usr/man/man1 -cat rexima.1 | gzip -9c > $PKG/usr/man/man1/rexima.1.gz - -mkdir -p $PKG/usr/doc/rexima-$VERSION -cp -a \ - COPYING README ChangeLog NEWS \ - $PKG/usr/doc/rexima-$VERSION -chmod 644 $PKG/usr/doc/rexima-$VERSION/* - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/rexima-$VERSION-$ARCH-$BUILD.txz - diff --git a/pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch b/pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch new file mode 100644 index 000000000..3817f02d2 --- /dev/null +++ b/pasture/source/xfce4-mixer/0001-Make-Unique-support-optional.patch @@ -0,0 +1,111 @@ +From 7a18841c988edb593127842ec5c919df537f9ce0 Mon Sep 17 00:00:00 2001 +From: Andrzej <ndrwrdck@gmail.com> +Date: Sat, 12 Apr 2014 08:53:09 +0100 +Subject: [PATCH] Make Unique support optional + +--- + configure.ac.in | 4 +++- + xfce4-mixer/main.c | 21 +++++++++++++++++++++ + 2 files changed, 24 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b00fd75..57ae07c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,7 +98,6 @@ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) + XDT_CHECK_PACKAGE([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10], [0.10.25]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +-XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.1]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) +@@ -109,6 +108,8 @@ dnl *** Check for optional packages *** + dnl *********************************** + XDT_CHECK_OPTIONAL_PACKAGE([KEYBINDER], [keybinder], [0.2.2], [keybinder], + [keybinder Support]) ++XDT_CHECK_OPTIONAL_PACKAGE([UNIQUE], [unique-1.0], [1.1], [unique], ++ [unique Support]) + + dnl *********************************** + dnl *** Check for debugging support *** +@@ -151,6 +152,7 @@ dnl *************************** + echo + echo "Build Configuration:" + echo ++echo " * unique Support: ${UNIQUE_FOUND:-no}" + echo " * keybinder Support: ${KEYBINDER_FOUND:-no}" + echo " * Debug Support: $enable_debug" + echo +diff --git a/xfce4-mixer/main.c b/xfce4-mixer/main.c +index 9e8417b..7fda388 100644 +--- a/xfce4-mixer/main.c ++++ b/xfce4-mixer/main.c +@@ -30,7 +30,10 @@ + #include <gst/gst.h> + + #include <gtk/gtk.h> ++ ++#ifdef HAVE_UNIQUE + #include <unique/unique.h> ++#endif + + #include <libxfce4util/libxfce4util.h> + #include <libxfce4ui/libxfce4ui.h> +@@ -42,6 +45,7 @@ + + + ++#ifdef HAVE_UNIQUE + static UniqueResponse + message_received (UniqueApp *app, + UniqueCommand command, +@@ -68,6 +72,7 @@ message_received (UniqueApp *app, + + return response; + } ++#endif + + + +@@ -75,7 +80,9 @@ int + main (int argc, + char **argv) + { ++#ifdef HAVE_UNIQUE + UniqueApp *app; ++#endif + GtkWidget *window; + GError *error = NULL; + gboolean debug_mode = FALSE; +@@ -162,6 +169,7 @@ main (int argc, + if (debug_mode) + xfce_mixer_dump_gst_data (); + ++#ifdef HAVE_UNIQUE + /* Create unique application */ + app = unique_app_new ("org.xfce.xfce4-mixer", NULL); + if (unique_app_is_running (app)) +@@ -192,6 +200,19 @@ main (int argc, + /* Destroy the window */ + gtk_widget_destroy (window); + } ++#else ++ /* Create the mixer window */ ++ window = xfce_mixer_window_new (); ++ ++ /* Display the mixer window */ ++ gtk_widget_show (window); ++ ++ /* Enter the GTK+ main loop */ ++ gtk_main (); ++ ++ /* Destroy the window */ ++ gtk_widget_destroy (window); ++#endif + + /* Shutdown the mixer library */ + xfce_mixer_shutdown (); +-- +2.3.1 + diff --git a/pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch b/pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch new file mode 100644 index 000000000..f0b32dad3 --- /dev/null +++ b/pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch @@ -0,0 +1,63 @@ +From a60d7b81674449d1753fcf8bb15c57fc178424e6 Mon Sep 17 00:00:00 2001 +From: Robby Workman <rworkman@slackware.com> +Date: Thu, 19 Feb 2015 19:36:21 -0600 +Subject: [PATCH 1/2] Use $(datadir)/xfce4/mixer/ as MIXER_DATADIR + +Follow common practice of other Xfce componenets and use +$(datadir)/xfce4/mixer/ instead of $(datadir)/xfce4-mixer/. +--- + icons/16x16/Makefile.am | 2 +- + icons/scalable/Makefile.am | 2 +- + libxfce4mixer/Makefile.am | 2 +- + xfce4-mixer/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am +index 803a2e4..ace4a07 100644 +--- a/icons/16x16/Makefile.am ++++ b/icons/16x16/Makefile.am +@@ -1,4 +1,4 @@ +-iconsdir = $(pkgdatadir)/icons/hicolor/16x16/status ++iconsdir = $(datadir)/xfce4/mixer/icons/hicolor/16x16/status + icons_DATA = audio-input-microphone-muted.png + + EXTRA_DIST = $(icons_DATA) +diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am +index 5bfc12c..5212e63 100644 +--- a/icons/scalable/Makefile.am ++++ b/icons/scalable/Makefile.am +@@ -1,4 +1,4 @@ +-iconsdir = $(pkgdatadir)/icons/hicolor/scalable/status ++iconsdir = $(datadir)/xfce4/mixer/icons/hicolor/scalable/status + icons_DATA = audio-input-microphone-muted.svg + + EXTRA_DIST = $(icons_DATA) +diff --git a/libxfce4mixer/Makefile.am b/libxfce4mixer/Makefile.am +index 792a95e..e864ea8 100644 +--- a/libxfce4mixer/Makefile.am ++++ b/libxfce4mixer/Makefile.am +@@ -25,7 +25,7 @@ libxfce4mixer_la_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DG_LOG_DOMAIN=\"libxfce4mixer\" \ +- -DMIXER_DATADIR=\"$(pkgdatadir)\" ++ -DMIXER_DATADIR=\"$(datadir)/xfce4/mixer\" + + libxfce4mixer_la_CFLAGS = \ + $(PLATFORM_CFLAGS) \ +diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am +index 4af69e9..f979b92 100644 +--- a/xfce4-mixer/Makefile.am ++++ b/xfce4-mixer/Makefile.am +@@ -23,7 +23,7 @@ xfce4_mixer_CPPFLAGS = \ + -I$(top_srcdir) \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DDATADIR=\"$(datadir)\" \ +- -DMIXER_DATADIR=\"$(pkgdatadir)\" \ ++ -DMIXER_DATADIR=\"$(datadir)/xfce4/mixer\" \ + -DG_LOG_DOMAIN=\"xfce4-mixer\" + + xfce4_mixer_CFLAGS = \ +-- +2.3.1 + diff --git a/pasture/source/xfce4-mixer/0001-icons-Makefile.am-Remove-unnecessary-gtk-update-icon.patch b/pasture/source/xfce4-mixer/0001-icons-Makefile.am-Remove-unnecessary-gtk-update-icon.patch new file mode 100644 index 000000000..ce1eae687 --- /dev/null +++ b/pasture/source/xfce4-mixer/0001-icons-Makefile.am-Remove-unnecessary-gtk-update-icon.patch @@ -0,0 +1,36 @@ +From 735927c7a72b69f60f13fe7bcf4a10c1a80ca151 Mon Sep 17 00:00:00 2001 +From: Robby Workman <rworkman@slackware.com> +Date: Thu, 19 Feb 2015 19:07:06 -0600 +Subject: [PATCH] icons/Makefile.am: Remove unnecessary gtk-update-icon-cache + +No icons are installed in the standard paths any more, so this +appears to be leftover code. +--- + icons/Makefile.am | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/icons/Makefile.am b/icons/Makefile.am +index 70638c1..035476a 100644 +--- a/icons/Makefile.am ++++ b/icons/Makefile.am +@@ -4,17 +4,4 @@ SUBDIRS = \ + 16x16 \ + scalable + +-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +- +-install-data-hook: +- @-if test -z "$(DESTDIR)"; then \ +- echo "Updating Gtk icon cache."; \ +- $(gtk_update_icon_cache); \ +- else \ +- echo "*** Icon cache not updated. Remember to run:"; \ +- echo "***"; \ +- echo "*** $(gtk_update_icon_cache)"; \ +- echo "***"; \ +- fi +- + # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: +-- +2.3.1 + diff --git a/source/xfce/xfce4-mixer/doinst.sh b/pasture/source/xfce4-mixer/doinst.sh index 9830478e8..9830478e8 100644 --- a/source/xfce/xfce4-mixer/doinst.sh +++ b/pasture/source/xfce4-mixer/doinst.sh diff --git a/source/xfce/xfce4-mixer/slack-desc b/pasture/source/xfce4-mixer/slack-desc index 727418746..727418746 100644 --- a/source/xfce/xfce4-mixer/slack-desc +++ b/pasture/source/xfce4-mixer/slack-desc diff --git a/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild b/pasture/source/xfce4-mixer/xfce4-mixer.SlackBuild index 4787144b4..8d383e4a1 100755 --- a/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild +++ b/pasture/source/xfce4-mixer/xfce4-mixer.SlackBuild @@ -24,11 +24,11 @@ PKGNAM=xfce4-mixer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} 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 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -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" @@ -67,6 +67,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/0001-Make-Unique-support-optional.patch +patch -p1 < $CWD/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch +patch -p1 < $CWD/0001-icons-Makefile.am-Remove-unnecessary-gtk-update-icon.patch + +xdt-autogen + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -77,6 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-debug \ + --disable-unique \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 @@ -85,6 +92,8 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +gzip -9 $PKG/usr/man/man?/*.? + mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS TODO \ diff --git a/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch b/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch new file mode 100644 index 000000000..f3f43ea1f --- /dev/null +++ b/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch @@ -0,0 +1,37 @@ +From 2ee3b12be641501ee3a9ce0278291b8c5a865021 Mon Sep 17 00:00:00 2001 +From: Steve Dodier <sidnioulz@gmail.com> +Date: Thu, 3 Mar 2011 11:43:26 +0100 +Subject: [PATCH 1/3] Removed deprecated "Encoding" entry in .desktop file + (thanks to Samuli Suominen) + +--- + ChangeLog | 3 +++ + data/xfce4-volumed.desktop | 1 - + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index e1690ba..beeb5f6 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,4 +1,7 @@ + 2011-03-03 Steve Dodier <sidnioulz@gmail.com> ++ * Removed deprecated "Encoding" entry in .desktop file (thanks to Samuli Suominen) ++ ++2011-03-03 Steve Dodier <sidnioulz@gmail.com> + * Allow compatibility with Libnotify 0.7 (thanks to Samuli Suominen for the patch) + + 2011-03-03 Steve Dodier <sidnioulz@gmail.com> +diff --git a/data/xfce4-volumed.desktop b/data/xfce4-volumed.desktop +index 8ac7dc7..be362c5 100644 +--- a/data/xfce4-volumed.desktop ++++ b/data/xfce4-volumed.desktop +@@ -1,6 +1,5 @@ + + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + Terminal=false + Name=XFCE Volume Daemon +-- +2.3.0 + diff --git a/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch b/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch new file mode 100644 index 000000000..8d45bae32 --- /dev/null +++ b/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch @@ -0,0 +1,80 @@ +From ac129e178c24d7ec79b020a7912cc680a6008c5b Mon Sep 17 00:00:00 2001 +From: Steve Dodier-Lazaro <sidnioulz@gmail.com> +Date: Wed, 10 Dec 2014 03:38:32 +0000 +Subject: [PATCH 3/3] Removing edge-case memleaks + +--- + src/main.c | 2 +- + src/xvd_mixer.c | 30 ++++++++++++++++++------------ + 2 files changed, 19 insertions(+), 13 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 18e8e01..d04920c 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -81,7 +81,7 @@ xvd_shutdown() + xvd_keys_release (Inst); + xvd_xfconf_shutdown (Inst); + +- //TODO xvd_instance_free ++ g_free (Inst); + } + + static void +diff --git a/src/xvd_mixer.c b/src/xvd_mixer.c +index 1d580bf..cef3151 100644 +--- a/src/xvd_mixer.c ++++ b/src/xvd_mixer.c +@@ -102,31 +102,37 @@ _xvd_mixer_bus_message (GstBus *bus, GstMessage *message, + { + gst_mixer_message_parse_mute_toggled (message, &msg_track, &Inst->muted); + g_object_get (msg_track, "label", &label, NULL); +- if (g_strcmp0 (Inst->track_label, label) != 0) +- return; ++ ++ if (g_strcmp0 (Inst->track_label, label) == 0) ++ { + #ifdef HAVE_LIBNOTIFY +- if (Inst->muted) +- xvd_notify_notification (Inst, "audio-volume-muted", 0); +- else { +- xvd_mixer_init_volume (Inst); +- xvd_notify_volume_notification (Inst); ++ if (Inst->muted) ++ xvd_notify_notification (Inst, "audio-volume-muted", 0); ++ else { ++ xvd_mixer_init_volume (Inst); ++ xvd_notify_volume_notification (Inst); + #endif ++ } + } ++ + g_free (label); + } + else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) + { + gst_mixer_message_parse_volume_changed (message, &msg_track, &volumes, &num_channels); + g_object_get (msg_track, "label", &label, NULL); +- if (g_strcmp0 (Inst->track_label, label) != 0) +- return; +- xvd_calculate_avg_volume (Inst, volumes, num_channels); ++ if (g_strcmp0 (Inst->track_label, label) == 0) ++ { ++ xvd_calculate_avg_volume (Inst, volumes, num_channels); + #ifdef HAVE_LIBNOTIFY +- xvd_notify_volume_notification (Inst); ++ xvd_notify_volume_notification (Inst); + #endif ++ } ++ + g_free (label); + } +- else if (type == GST_MIXER_MESSAGE_MIXER_CHANGED) { ++ else if (type == GST_MIXER_MESSAGE_MIXER_CHANGED) ++ { + // This kind of message shouldn't happen on an hardware card + g_debug ("GST_MIXER_MESSAGE_MIXER_CHANGED event\n"); + } +-- +2.3.0 + diff --git a/source/xfce/xfce4-volumed/slack-desc b/pasture/source/xfce4-volumed/slack-desc index e9266cbca..e9266cbca 100644 --- a/source/xfce/xfce4-volumed/slack-desc +++ b/pasture/source/xfce4-volumed/slack-desc diff --git a/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild b/pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild index 147716ea1..d1123f784 100755 --- a/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild +++ b/pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild @@ -26,11 +26,11 @@ PKGNAM=xfce4-volumed VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; @@ -43,8 +43,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -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" @@ -70,6 +70,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch +patch -p1 < $CWD/0003-Removing-edge-case-memleaks.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/pasture/source/aumix/aumix.SlackBuild b/source/d/Cython/Cython.SlackBuild index e500c0531..117160688 100755 --- a/pasture/source/aumix/aumix.SlackBuild +++ b/source/d/Cython/Cython.SlackBuild @@ -1,6 +1,8 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Slackware build script for Cython + +# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -9,7 +11,7 @@ # 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 +# 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, @@ -20,64 +22,60 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PKGNAM=aumix +PKGNAM=Cython VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "x86_64" ]; then +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -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 -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-aumix - rm -rf $PKG mkdir -p $TMP $PKG - cd $TMP -rm -rf aumix-$VERSION -tar xvf $CWD/aumix-$VERSION.tar.?z* || exit 1 -cd aumix-$VERSION +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 + 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - --without-gtk1 \ - --build=$ARCH-slackware-linux +python setup.py install --root=$PKG --prefix=/usr || exit 1 -make || exit 1 -make install DESTDIR=$PKG -strip $PKG/usr/bin/* -mkdir -p $PKG/usr/doc/aumix-$VERSION -cp -a \ - ABOUT-NLS AUTHORS BUGS COPYING* INSTALL NEWS README* TODO \ - $PKG/usr/doc/aumix-$VERSION -# This is obsolete (besides being broken) -rm -f $PKG/usr/bin/xaumix $PKG/usr/man/man1/xaumix.1 +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# More fluff, doesn't deserve mainsteam placement -mv $PKG/usr/bin/mute $PKG/usr/doc/aumix-$VERSION/mute.sh -mv $PKG/usr/man/man1/mute* $PKG/usr/doc/aumix-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a *.txt Doc/* $PKG/usr/doc/$PKGNAM-$VERSION -gzip -9 $PKG/usr/man/man1/* -mkdir $PKG/install +mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/aumix-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/pasture/source/aumix/slack-desc b/source/kde/slack-desc/kcron index 70e780877..d4be744f2 100644 --- a/pasture/source/aumix/slack-desc +++ b/source/kde/slack-desc/kcron @@ -6,14 +6,14 @@ # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -aumix: aumix (GTK+/ncurses audio mixer) -aumix: -aumix: This is a program for adjusting audio mixers from the command line or -aumix: scripts, or interactively at the console or a terminal with a -aumix: full-screen, ncurses-based interface or a GTK-based X interface. -aumix: -aumix: -aumix: -aumix: -aumix: -aumix: +kcron: kcron (task scheduler) +kcron: +kcron: kcron is a module for scheduling programs to run in the background. +kcron: It is a graphical user interface to cron, the UNIX system scheduler. +kcron: +kcron: +kcron: +kcron: +kcron: +kcron: +kcron: diff --git a/pasture/source/rexima/slack-desc b/source/l/libnih/slack-desc index 8a8adabcc..d0535e658 100644 --- a/pasture/source/rexima/slack-desc +++ b/source/l/libnih/slack-desc @@ -6,14 +6,16 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -rexima: rexima (console audio mixer) -rexima: -rexima: Rexima is a curses-based interactive audio mixer. It can also be used -rexima: from the command-line. It's designed to be small, fast, and -rexima: straightforward. It also offers a command line mode so you can script -rexima: mixer settings. -rexima: -rexima: Rexima was written by Russell Marks. -rexima: -rexima: -rexima: +libnih: libnih (lightweight library of C functions) +libnih: +libnih: libnih is a lightweight "standard library" of C functions to ease the +libnih: development of other libraries and applications. +libnih: +libnih: libnih was written by Scott James Remnant <scott@netsplit.com>. +libnih: +libnih: Homepage: https://github.com/keybuk/libnih +libnih: +libnih: +libnih: +libnih: +libnih: |