diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/ap/texinfo/texinfo.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/perl/DBD-mysql.net_buffer_length.diff | 35 | ||||
-rwxr-xr-x | source/d/perl/perl.SlackBuild | 25 | ||||
-rw-r--r-- | source/kde/build/perlkde | 2 | ||||
-rw-r--r-- | source/kde/build/perlqt | 2 | ||||
-rwxr-xr-x | source/n/epic5/epic5.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/irssi/irssi.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/net-snmp/net-snmp.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/ntp/ntp.SlackBuild | 2 | ||||
-rwxr-xr-x | source/xap/hexchat/hexchat.SlackBuild | 2 | ||||
-rwxr-xr-x | source/xap/rxvt-unicode/rxvt-unicode.SlackBuild | 2 | ||||
-rw-r--r-- | source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff | 51 | ||||
-rwxr-xr-x | source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild | 4 |
13 files changed, 30 insertions, 103 deletions
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild index 986f95ddf..11e98bbd5 100755 --- a/source/ap/texinfo/texinfo.SlackBuild +++ b/source/ap/texinfo/texinfo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=texinfo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/perl/DBD-mysql.net_buffer_length.diff b/source/d/perl/DBD-mysql.net_buffer_length.diff deleted file mode 100644 index cb88a951e..000000000 --- a/source/d/perl/DBD-mysql.net_buffer_length.diff +++ /dev/null @@ -1,35 +0,0 @@ -From 0f0cebe87fab335873fd3701bc304922da826940 Mon Sep 17 00:00:00 2001 -From: Michiel Beijen <michiel.beijen@gmail.com> -Date: Fri, 23 Feb 2018 07:52:33 +0000 -Subject: [PATCH] Use net_buffer_length macro if available - ---- - mysql.xs | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/mysql.xs b/mysql.xs -index 3a9373d..0f97645 100644 ---- a/mysql.xs -+++ b/mysql.xs -@@ -840,15 +840,14 @@ dbd_mysql_get_info(dbh, sql_info_type) - retsv = newSVpvn("`", 1); - break; - case SQL_MAXIMUM_STATEMENT_LENGTH: --#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 -- /* MariaDB 10 is not MySQL source level compatible so this -- only applies to MySQL*/ -- /* mysql_get_option() was added in mysql 5.7.3 */ -- /* MYSQL_OPT_NET_BUFFER_LENGTH was added in mysql 5.7.9 */ -+ /* net_buffer_length macro is not defined in MySQL 5.7 and some MariaDB -+ versions - if it is not available, use newer mysql_get_option */ -+#if !defined(net_buffer_length) -+ ; -+ unsigned long buffer_len; - mysql_get_option(NULL, MYSQL_OPT_NET_BUFFER_LENGTH, &buffer_len); - retsv = newSViv(buffer_len); - #else -- /* before mysql 5.7.9 use net_buffer_length macro */ - retsv = newSViv(net_buffer_length); - #endif - break; - diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild index 5607a1d8b..a793b9f50 100755 --- a/source/d/perl/perl.SlackBuild +++ b/source/d/perl/perl.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=perl -VERSION=5.28.0 +VERSION=5.28.1 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -57,10 +57,12 @@ PKG=$TMP/package-perl # Additional required modules: # +# https://metacpan.org/release/Devel-CheckLib +DEVELCHECKLIB=1.13 # https://metacpan.org/release/DBD-mysql -DBDMYSQL=4.046 +DBDMYSQL=4.049 # https://metacpan.org/release/DBI -DBI=1.641 +DBI=1.642 # https://metacpan.org/release/gettext GETTEXT=1.07 # https://metacpan.org/release/TermReadKey @@ -76,7 +78,7 @@ AUTHENSASL=2.16 # https://metacpan.org/release/MIME-Base64 MIMEBASE64=3.15 # https://metacpan.org/release/IO-Socket-SSL -IOSOCKETSSL=2.056 +IOSOCKETSSL=2.060 # https://metacpan.org/release/Net-SSLeay NETSSLEAY=1.85 # https://metacpan.org/release/libnet @@ -192,6 +194,20 @@ make install DESTDIR=$PKG || exit 1 # Add additional modules: ( cd ext + ( tar xzvf $CWD/Devel-CheckLib-${DEVELCHECKLIB}.tar.gz + cd Devel-CheckLib-${DEVELCHECKLIB} + chown -R root:root . + perl Makefile.PL INSTALLDIRS=vendor + make || exit 1 + if [ "$MAKETEST" = "yes" ]; then + make test || exit 1 + fi + make install || exit 1 + make install DESTDIR=$PKG || exit 1 + mkdir -p $PKG/usr/doc/perl-$VERSION/Devel-CheckLib-${DEVELCHECKLIB} + cp -a README* $PKG/usr/doc/perl-$VERSION/Devel-CheckLib-${DEVELCHECKLIB} + chmod 644 $PKG/usr/doc/perl-$VERSION/Devel-CheckLib-${DEVELCHECKLIB}/README* + ) || exit 1 ( tar xzvf $CWD/DBI-${DBI}.tar.gz cd DBI-${DBI} chown -R root:root . @@ -208,7 +224,6 @@ make install DESTDIR=$PKG || exit 1 ) || exit 1 ( tar xzvf $CWD/DBD-mysql-${DBDMYSQL}.tar.gz cd DBD-mysql-${DBDMYSQL} - zcat $CWD/DBD-mysql.net_buffer_length.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . perl Makefile.PL INSTALLDIRS=vendor make || exit 1 diff --git a/source/kde/build/perlkde b/source/kde/build/perlkde index 1e8b31496..7f8f011eb 100644 --- a/source/kde/build/perlkde +++ b/source/kde/build/perlkde @@ -1 +1 @@ -6 +7 diff --git a/source/kde/build/perlqt b/source/kde/build/perlqt index 7f8f011eb..45a4fb75d 100644 --- a/source/kde/build/perlqt +++ b/source/kde/build/perlqt @@ -1 +1 @@ -7 +8 diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index 54c038343..491beeed2 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild index 31dc068f3..47c9b6349 100755 --- a/source/n/irssi/irssi.SlackBuild +++ b/source/n/irssi/irssi.SlackBuild @@ -28,7 +28,7 @@ PKG=$TMP/package-irssi VERSION=${VERSION:-$(echo irssi-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DIRCD=${VERSION} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild index 87f0924e6..1ba785d17 100755 --- a/source/n/net-snmp/net-snmp.SlackBuild +++ b/source/n/net-snmp/net-snmp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=net-snmp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index 5611daa73..a0010eb39 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ntp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild index 352330c00..2d0ce38d5 100755 --- a/source/xap/hexchat/hexchat.SlackBuild +++ b/source/xap/hexchat/hexchat.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hexchat VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild index 02554b521..55c0d5073 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:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff deleted file mode 100644 index 2cdd26f82..000000000 --- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- ./panel-plugin/systemload.c.orig 2017-02-09 13:22:46.000000000 -0600 -+++ ./panel-plugin/systemload.c 2018-04-15 14:28:15.729304272 -0500 -@@ -55,6 +55,8 @@ - static gchar *DEFAULT_COLOR[] = { "#0000c0", "#00c000", "#f0f000" }; - static gchar *DEFAULT_COMMAND_TEXT = "xfce4-taskmanager"; - -+/* HOVER_TIMEOUT is a fixed constant in gtk+-3; this must match - Aargh */ -+#define HOVER_TIMEOUT 500 - #define UPDATE_TIMEOUT 250 - #define UPDATE_TIMEOUT_SECONDS 1 - -@@ -107,6 +109,7 @@ - guint timeout, timeout_seconds; - gboolean use_timeout_seconds; - guint timeout_id; -+ guint tooltip_timeout; - t_command command; - t_monitor *monitor[3]; - t_uptime_monitor *uptime; -@@ -174,6 +177,9 @@ - global->monitor[count]->value_read / 100.0); - } - } -+/* don't write tooltip too often */ -+ if((global->tooltip_timeout += global->timeout) <= HOVER_TIMEOUT) return TRUE; -+ global->tooltip_timeout = 0; - if (global->monitor[0]->options.enabled) - { - g_snprintf(caption, sizeof(caption), _("System Load: %ld%%"), -@@ -338,6 +344,7 @@ - #endif - global->plugin = plugin; - global->timeout = UPDATE_TIMEOUT; -+ global->tooltip_timeout = 0; - global->timeout_seconds = UPDATE_TIMEOUT_SECONDS; - global->use_timeout_seconds = TRUE; - global->timeout_id = 0; -@@ -435,13 +442,6 @@ - } - #endif - global->timeout_id = g_timeout_add(global->timeout, (GSourceFunc)update_monitors, global); -- /* reduce the default tooltip timeout to be smaller than the update interval otherwise -- * we won't see tooltips on GTK 2.16 or newer */ -- settings = gtk_settings_get_default(); -- if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout")) -- g_object_set(settings, "gtk-tooltip-timeout", -- global->timeout - 10, NULL); -- - } - - static void diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild index c174e0e01..01cfbbe9f 100755 --- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-systemload-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 @@ -78,8 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/xfce4-systemload-plugin.HOVER_TIMEOUT.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |