diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/a/eudev/config/modprobe.d/watchdog.conf | 2 | ||||
-rwxr-xr-x | source/a/eudev/eudev.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/fribidi/fribidi.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/fribidi/fribidi.glib.h.diff | 76 | ||||
-rw-r--r-- | source/l/gsl/slack-desc | 2 | ||||
-rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 4 | ||||
-rw-r--r-- | source/xap/network-manager-applet/fix-double-free.diff | 13 | ||||
-rwxr-xr-x | source/xap/network-manager-applet/network-manager-applet.SlackBuild | 5 | ||||
-rwxr-xr-x | source/xap/rxvt-unicode/rxvt-unicode.SlackBuild | 2 | ||||
-rwxr-xr-x | source/xfce/Thunar/Thunar.SlackBuild | 2 | ||||
-rwxr-xr-x | source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild | 2 | ||||
-rwxr-xr-x | source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild | 4 | ||||
-rwxr-xr-x | source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild | 6 | ||||
-rwxr-xr-x | source/xfce/xfdesktop/xfdesktop.SlackBuild | 2 |
14 files changed, 17 insertions, 107 deletions
diff --git a/source/a/eudev/config/modprobe.d/watchdog.conf b/source/a/eudev/config/modprobe.d/watchdog.conf index e69fc008..c4902df9 100644 --- a/source/a/eudev/config/modprobe.d/watchdog.conf +++ b/source/a/eudev/config/modprobe.d/watchdog.conf @@ -14,6 +14,7 @@ blacklist cpu5wdt blacklist da9062_wdt blacklist da9063_wdt blacklist dw_wdt +blacklist ebc_c384_wdt blacklist eurotechwdt blacklist f71808e_wdt blacklist hpwdt @@ -39,6 +40,7 @@ blacklist pc87413_wdt blacklist pcwd blacklist pcwd_pci blacklist pcwd_usb +blacklist rave_sp_wdt blacklist retu_wdt blacklist rn5t618_wdt blacklist sbc60xxwdt diff --git a/source/a/eudev/eudev.SlackBuild b/source/a/eudev/eudev.SlackBuild index 28a38e30..0c8a22d9 100755 --- a/source/a/eudev/eudev.SlackBuild +++ b/source/a/eudev/eudev.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=eudev VERSION=${VERSION:-$(echo eudev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/l/fribidi/fribidi.SlackBuild b/source/l/fribidi/fribidi.SlackBuild index c0933e63..da72df30 100755 --- a/source/l/fribidi/fribidi.SlackBuild +++ b/source/l/fribidi/fribidi.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fribidi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/fribidi/fribidi.glib.h.diff b/source/l/fribidi/fribidi.glib.h.diff deleted file mode 100644 index 34caeb69..00000000 --- a/source/l/fribidi/fribidi.glib.h.diff +++ /dev/null @@ -1,76 +0,0 @@ -diff -u -r fribidi-0.19.2.orig/charset/fribidi-char-sets.c fribidi-0.19.2/charset/fribidi-char-sets.c ---- fribidi-0.19.2.orig/charset/fribidi-char-sets.c 2006-01-30 21:23:12.000000000 -0600 -+++ fribidi-0.19.2/charset/fribidi-char-sets.c 2012-07-17 23:14:53.602120679 -0500 -@@ -114,7 +114,7 @@ - }; - - #if FRIBIDI_USE_GLIB+0 --# include <glib/gstrfuncs.h> -+# include <glib.h> - # define fribidi_strcasecmp g_ascii_strcasecmp - #else /* !FRIBIDI_USE_GLIB */ - static char -diff -u -r fribidi-0.19.2.orig/lib/common.h fribidi-0.19.2/lib/common.h ---- fribidi-0.19.2.orig/lib/common.h 2008-04-08 16:38:23.000000000 -0500 -+++ fribidi-0.19.2/lib/common.h 2012-07-17 23:15:14.106120553 -0500 -@@ -57,7 +57,7 @@ - # define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P - # endif /* !SIZEOF_VOID_P */ - # ifndef __FRIBIDI_DOC --# include <glib/gmem.h> -+# include <glib.h> - # endif /* !__FRIBIDI_DOC */ - # ifndef fribidi_malloc - # define fribidi_malloc g_try_malloc -@@ -65,12 +65,12 @@ - # endif /* !fribidi_malloc */ - # ifndef fribidi_assert - # ifndef __FRIBIDI_DOC --# include <glib/gmessages.h> -+# include <glib.h> - # endif /* !__FRIBIDI_DOC */ - # define fribidi_assert g_assert - # endif /* !fribidi_assert */ - # ifndef __FRIBIDI_DOC --# include <glib/gmacros.h> -+# include <glib.h> - # endif /* !__FRIBIDI_DOC */ - # ifndef FRIBIDI_BEGIN_STMT - # define FRIBIDI_BEGIN_STMT G_STMT_START { -diff -u -r fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h ---- fribidi-0.19.2.orig/lib/fribidi-common.h 2007-04-05 11:13:24.000000000 -0500 -+++ fribidi-0.19.2/lib/fribidi-common.h 2012-07-17 23:15:30.546121341 -0500 -@@ -62,7 +62,7 @@ - - #if FRIBIDI_USE_GLIB+0 - # ifndef __FRIBIDI_DOC --# include <glib/gmacros.h> -+# include <glib.h> - # endif /* !__FRIBIDI_DOC */ - # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS - # define FRIBIDI_END_DECLS G_END_DECLS -diff -u -r fribidi-0.19.2.orig/lib/fribidi-types.h fribidi-0.19.2/lib/fribidi-types.h ---- fribidi-0.19.2.orig/lib/fribidi-types.h 2006-01-30 21:23:13.000000000 -0600 -+++ fribidi-0.19.2/lib/fribidi-types.h 2012-07-17 23:16:00.010122775 -0500 -@@ -40,8 +40,7 @@ - - #if FRIBIDI_USE_GLIB+0 - # ifndef __FRIBIDI_DOC --# include <glib/gtypes.h> --# include <glib/gunicode.h> -+# include <glib.h> - # endif /* !__FRIBIDI_DOC */ - # define FRIBIDI_INT8_LOCAL gint8 - # define FRIBIDI_INT16_LOCAL gint16 -diff -u -r fribidi-0.19.2.orig/lib/mem.h fribidi-0.19.2/lib/mem.h ---- fribidi-0.19.2.orig/lib/mem.h 2006-01-30 21:23:13.000000000 -0600 -+++ fribidi-0.19.2/lib/mem.h 2012-07-17 23:15:43.522121977 -0500 -@@ -42,7 +42,7 @@ - #if FRIBIDI_USE_GLIB+0 - - #ifndef __FRIBIDI_DOC --# include <glib/gmem.h> -+# include <glib.h> - #endif /* !__FRIBIDI_DOC */ - - #define FriBidiMemChunk GMemChunk diff --git a/source/l/gsl/slack-desc b/source/l/gsl/slack-desc index 5c5ea27d..2b911ff0 100644 --- a/source/l/gsl/slack-desc +++ b/source/l/gsl/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -gsl: GSL (a numerical library for C and C++ programmers) +gsl: gsl (a numerical library for C and C++ programmers) gsl: gsl: The GNU Scientific Library (GSL) is a collection of routines for gsl: numerical computing. The routines are written from scratch by the diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index ce18567f..149de510 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -188,7 +188,7 @@ tar xvf $CWD/firefox-$VERSION.source.tar.?z || exit 1 mv * .. cd .. rm -rf firefox-unpack -cd firefox-$VERSION || exit 1 +cd firefox-$RELEASEVER || exit 1 # Prevent failures building gkrust by suppressing useless warnings: sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \ @@ -200,7 +200,7 @@ zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 # Fetch localization, if requested # https://bugzilla.mozilla.org/show_bug.cgi?id=1256955 if [ ! -z $MOZLOCALIZE ]; then - LOC_URL="http://ftp.mozilla.org/pub/firefox/candidates/$VERSION-candidates/build1/l10n_changesets.txt" + LOC_URL="http://ftp.mozilla.org/pub/firefox/candidates/$RELEASEVER-candidates/build1/l10n_changesets.txt" LOC_COMMIT=$(wget -q -O - $LOC_URL | grep ^$MOZLOCALIZE | cut -d\ -f2) hg clone https://hg.mozilla.org/l10n-central/$MOZLOCALIZE -r $LOC_COMMIT fi diff --git a/source/xap/network-manager-applet/fix-double-free.diff b/source/xap/network-manager-applet/fix-double-free.diff deleted file mode 100644 index 45db62ff..00000000 --- a/source/xap/network-manager-applet/fix-double-free.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/ap-menu-item.c w/src/ap-menu-item.c -index 92953c04..7d614f45 100644 ---- i/src/ap-menu-item.c -+++ w/src/ap-menu-item.c -@@ -327,7 +327,6 @@ finalize (GObject *object) - g_free (priv->ssid_string); - - g_slist_free_full (priv->dupes, g_free); -- g_slist_free (priv->dupes); - - G_OBJECT_CLASS (nm_network_menu_item_parent_class)->finalize (object); - } - diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild index 000691c3..d987223b 100755 --- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild +++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=network-manager-applet VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -76,9 +76,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix crash: -zcat $CWD/fix-double-free.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild index dcca86a8..437ec3ea 100755 --- a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild +++ b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rxvt-unicode VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xfce/Thunar/Thunar.SlackBuild b/source/xfce/Thunar/Thunar.SlackBuild index c59cb3eb..a5740938 100755 --- a/source/xfce/Thunar/Thunar.SlackBuild +++ b/source/xfce/Thunar/Thunar.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=Thunar VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild index cada16b5..94a05d73 100755 --- a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild +++ b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-pulseaudio-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild index 2b921964..5e83921c 100755 --- a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild +++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-screenshooter VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -70,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild index 347b111f..665f4b38 100755 --- a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild +++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-taskmanager -# Copyright 2006-2014 Robby Workman, Northport, Alabama, USA +# Copyright 2006-2014 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-taskmanager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -67,7 +67,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild index 18d63ca0..f5636a96 100755 --- a/source/xfce/xfdesktop/xfdesktop.SlackBuild +++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfdesktop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) |