diff options
author | Matteo Bernardini | 2019-08-31 16:24:12 +0200 |
---|---|---|
committer | Matteo Bernardini | 2019-08-31 16:24:12 +0200 |
commit | 82a6c2e466d4bdb1017e46447e56b0bce264f84b (patch) | |
tree | c13bd3ae8c2eae3546619b0d2912dbee78400d79 /desktop | |
parent | 155fd2582041b19a6ca7ca2efa805052553bf90a (diff) | |
download | slackbuilds-current-20190831.1.tar.gz |
20190831.1 global branch merge.current-20190831.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'desktop')
54 files changed, 743 insertions, 372 deletions
diff --git a/desktop/arc-theme/README b/desktop/arc-theme/README index a9fc04447a..9b44fa96a7 100644 --- a/desktop/arc-theme/README +++ b/desktop/arc-theme/README @@ -1,3 +1,5 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc. + +inkscape is a build-time dependency. diff --git a/desktop/arc-theme/arc-theme.SlackBuild b/desktop/arc-theme/arc-theme.SlackBuild index d3a596f6b3..0e3ce271dc 100644 --- a/desktop/arc-theme/arc-theme.SlackBuild +++ b/desktop/arc-theme/arc-theme.SlackBuild @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=arc-theme -VERSION=${VERSION:-20170302} +VERSION=${VERSION:-20181022} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,13 +56,15 @@ else LIBDIRSUFFIX="" fi +gnome_shell="--disable-gnome-shell" ; [[ $(which gnome-shell) ]] && gnome_shell="" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -71,16 +73,16 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sh autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ +./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + $gnome_shell \ --build=$ARCH-slackware-linux make diff --git a/desktop/arc-theme/arc-theme.info b/desktop/arc-theme/arc-theme.info index e653a09f81..3f7b6a1e22 100644 --- a/desktop/arc-theme/arc-theme.info +++ b/desktop/arc-theme/arc-theme.info @@ -1,10 +1,10 @@ PRGNAM="arc-theme" -VERSION="20170302" -HOMEPAGE="https://github.com/horst3180/arc-theme/" -DOWNLOAD="https://github.com/horst3180/arc-theme/archive/20170302/arc-theme-20170302.tar.gz" -MD5SUM="fe3e397ffc3633c1b5ba3b1d6e2456a7" +VERSION="20181022" +HOMEPAGE="https://github.com/NicoHood/arc-theme/" +DOWNLOAD="https://github.com/NicoHood/arc-theme/releases/download/20181022/arc-theme-20181022.tar.xz" +MD5SUM="4819afac384c9c63dabf4969026ad098" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="inkscape murrine optipng sassc" MAINTAINER="Marcel Saegebarth" EMAIL="marc@mos6581.de" diff --git a/desktop/arc-theme/slack-desc b/desktop/arc-theme/slack-desc index a4387212a0..5baedd24ef 100644 --- a/desktop/arc-theme/slack-desc +++ b/desktop/arc-theme/slack-desc @@ -12,7 +12,7 @@ arc-theme: Arc is a flat theme with transparent elements for GTK 3, GTK 2 and arc-theme: Gnome-Shell which supports GTK 3 and GTK 2 based desktop arc-theme: environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc. arc-theme: -arc-theme: Homepage: https://github.com/horst3180/arc-theme/ +arc-theme: Homepage: https://github.com/NicoHood/arc-theme/ arc-theme: arc-theme: arc-theme: diff --git a/desktop/cairo-dock-plugins/README b/desktop/cairo-dock-plugins/README index d758f4c722..496a240ad9 100644 --- a/desktop/cairo-dock-plugins/README +++ b/desktop/cairo-dock-plugins/README @@ -3,4 +3,4 @@ plug-ins for Cairo-Dock It provides some new functionnalities like controling music players or note-taking, a clock or a desktop switcher but also some views, dialogs and desklets skins, etc. -vala, python3 and mono are optional dependencies. +libetpan, vala, python3 and mono are optional dependencies. diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild index 1ef6650ec5..ff20324bc6 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock-plugins -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} 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 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf cairo-dock-plug-ins-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd cairo-dock-plug-ins-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,25 +69,33 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to fedora and archlinux +patch -p1 < $CWD/patches/mono.patch +patch -p1 < $CWD/patches/time_h-confict.patch +sed -i.wall -e 's|-Wno-all||' Dbus/interfaces/vala/src/CMakeLists.txt + +mkdir build +cd build cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release . + -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG +cd .. # Sheesh. Donchaloveruby? -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 if [ -d $PKG/usr/usr ]; then - mv $PKG/usr/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1/CDApplet.rb \ - $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 + mv $PKG/usr/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0/CDApplet.rb \ + $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 rm -rf $PKG/usr/usr elif [ -e $PKG/usr/CDApplet.rb ]; then - mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 - mv $PKG/usr/CDApplet.rb $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 + mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 + mv $PKG/usr/CDApplet.rb $PKG/usr/lib${LIBDIRSUFFIX}/ruby/2.4.0 fi find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.info b/desktop/cairo-dock-plugins/cairo-dock-plugins.info index b28117ab5d..3fb0f52e51 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.info +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.info @@ -1,8 +1,8 @@ PRGNAM="cairo-dock-plugins" -VERSION="3.3.2" +VERSION="3.4.1" HOMEPAGE="http://www.glx-dock.org" -DOWNLOAD="https://launchpad.net/cairo-dock-plug-ins/3.3/3.3.2/+download/cairo-dock-plugins-3.3.2.tar.gz" -MD5SUM="3c40afe91cba65da68a70e5e78b76c24" +DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/3.4.1/cairo-dock-plugins-3.4.1.tar.gz" +MD5SUM="434941926f9205fd8562a15b6ac5f243" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cairo-dock" diff --git a/desktop/cairo-dock-plugins/patches/mono.patch b/desktop/cairo-dock-plugins/patches/mono.patch new file mode 100644 index 0000000000..6e6ecfecb6 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/mono.patch @@ -0,0 +1,106 @@ +diff -rupN cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt cairo-dock-plug-ins-3.4.1/CMakeLists.txt +--- cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt 2015-03-12 09:43:57.171067365 +0100 ++++ cairo-dock-plug-ins-3.4.1/CMakeLists.txt 2015-03-12 09:46:20.717120675 +0100 +@@ -573,11 +573,11 @@ if (enable-mono-interface) + if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE}) + message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.") + else() +- pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0) ++ pkg_check_modules (MONO_PACKAGE dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0) + if (NOT MONO_PACKAGE_FOUND) +- message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.") +- message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0") +- set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0") ++ message (STATUS "Could not find dbus-sharp-2.0, dbus-sharp-glib-2.0 or glib-sharp-3.0; won't be built Mono interface.") ++ message (WARNING "These modules are required to compile DBus applet with Mono interface: dbus-sharp-2.0, dbus-sharp-glib-2.0 and glib-sharp-3.0") ++ set (MODULES_MISSING "${MODULES_MISSING} dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0") + else() + set (MONO_FOUND TRUE) + set (with_mono yes) +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:52:56.491934965 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:56:50.191652099 +0100 +@@ -21,7 +21,7 @@ + // Make your own class derive from a CDApplet, and override the functions you need (the ones which don't start with an underscore). + + // Compile it with the following command, then rename 'demo_mono.exe' to 'demo_mono'. +-// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 ++// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0 + ////////////////////////// + ////// dependancies ////// + ////////////////////////// +@@ -29,7 +29,7 @@ using System; // Environment + using System.IO; // Path, Directory + using System.Reflection; + using GLib; +-using NDesk.DBus; ++using DBus; + using CairoDock.Applet; + + //namespace CairoDock.Applet +@@ -258,8 +258,8 @@ public class CDApplet + + private void _connect_to_dock () + { +- NDesk.DBus.BusG.Init(); +- NDesk.DBus.Bus bus = NDesk.DBus.Bus.Session; ++ DBus.BusG.Init(); ++ DBus.Bus bus = DBus.Bus.Session; + this.icon = bus.GetObject<IApplet> ("org.cairodock.CairoDock", new ObjectPath (this.cBusPath)); + this.icon.on_click += new OnClickEvent (on_click); + this.icon.on_middle_click += new OnMiddleClickEvent (on_middle_click); +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:52:56.491934965 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:54:07.418777441 +0100 +@@ -3,7 +3,7 @@ + + execute_process(COMMAND ${GMCS_EXECUTABLE} + -target:library +- -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 ++ -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0 + -out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll + ${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs) + ### find how to register to GAC ... +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 09:59:41.064312097 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 10:02:39.473424651 +0100 +@@ -138,7 +138,7 @@ public class Applet : CDApplet + public override void on_build_menu () + { + Console.WriteLine("*** build menu"); +- /// Warning : teh AddMenuItems fails with NDesk-DBus 0.6.0; until this is fixed, use the PopulateMenu method. ++ /// Warning : the AddMenuItems fails with DBus Sharp 0.6.0; until this is fixed, use the PopulateMenu method. + /**Dictionary<string, object>[] pItems = new Dictionary<string, object>[] { + new Dictionary<string, object>() + { +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs 2015-03-12 09:59:41.067645289 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs 2015-03-12 10:00:35.395334804 +0100 +@@ -1,6 +1,6 @@ + using System; + using System.Collections.Generic; // Dictionnary +-using NDesk.DBus; ++using DBus; + + namespace CairoDock.Applet + { +@@ -27,7 +27,7 @@ namespace CairoDock.Applet + Left + } + +- [NDesk.DBus.Interface("org.cairodock.CairoDock.applet")] ++ [DBus.Interface("org.cairodock.CairoDock.applet")] + public interface IApplet + { + object Get(string cProperty); +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 09:59:41.067645289 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 10:00:16.522802989 +0100 +@@ -1,6 +1,6 @@ + using System; + using System.Collections.Generic; // Dictionnary +-using NDesk.DBus; ++using DBus; + + namespace CairoDock.Applet + { diff --git a/desktop/cairo-dock-plugins/patches/time_h-confict.patch b/desktop/cairo-dock-plugins/patches/time_h-confict.patch new file mode 100644 index 0000000000..0a2ea720d1 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/time_h-confict.patch @@ -0,0 +1,137 @@ +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c.glibc 2016-12-11 16:10:41.656840262 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c 2016-12-11 16:23:31.875117800 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <string.h> + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c.glibc 2016-12-11 16:10:41.657840257 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c 2016-12-11 16:22:24.465443591 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include "stdlib.h" + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c 2016-12-11 16:24:08.991938415 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <stdlib.h> + #include <string.h> + +@@ -66,4 +67,4 @@ + + + return GLDI_NOTIFICATION_LET_PASS; +-} +\ ファイル末尾に改行がありません ++} +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c 2016-12-11 16:23:55.137005376 +0900 +@@ -19,6 +19,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <stdlib.h> + #ifndef __FreeBSD__ + #include <endian.h> +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h.glibc 2016-12-11 16:10:41.657840257 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h 2016-12-11 16:22:59.589273837 +0900 +@@ -21,6 +21,7 @@ + #ifndef __CD_APPLET_STRUCT__ + #define __CD_APPLET_STRUCT__ + ++#include "applet-time_h-struct.h" + #include <sys/types.h> + #include <alsa/asoundlib.h> + #define _STRUCT_TIMEVAL +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 +@@ -0,0 +1,27 @@ ++/** ++* This file is a part of the Cairo-Dock project ++* ++* Copyright : (C) see the 'copyright' file. ++* E-mail : see the 'copyright' file. ++* ++* This program is free software; you can redistribute it and/or ++* modify it under the terms of the GNU General Public License ++* as published by the Free Software Foundation; either version 3 ++* of the License, or (at your option) any later version. ++* ++* This program is distributed in the hope that it will be useful, ++* but WITHOUT ANY WARRANTY; without even the implied warranty of ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++* GNU General Public License for more details. ++* You should have received a copy of the GNU General Public License ++* along with this program. If not, see <http://www.gnu.org/licenses/>. ++*/ ++ ++#ifndef __CD_APPLET_TIME_H_STRUCT__ ++#define __CD_APPLET_TIME_H_STRUCT__ ++ ++#define _POSIX_C_SOURCE 200809L ++#include <time.h> ++ ++#endif ++ +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c 2016-12-11 16:20:44.168928323 +0900 +@@ -20,6 +20,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <stdlib.h> + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h 2016-12-11 16:19:47.713201174 +0900 +@@ -20,6 +20,7 @@ + #ifndef __CD_APPLET_STRUCT__ + #define __CD_APPLET_STRUCT__ + ++#include "applet-time_h-struct.h" + #include <sys/types.h> + #include <alsa/asoundlib.h> + #define _STRUCT_TIMEVAL +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 +@@ -0,0 +1,27 @@ ++/** ++* This file is a part of the Cairo-Dock project ++* ++* Copyright : (C) see the 'copyright' file. ++* E-mail : see the 'copyright' file. ++* ++* This program is free software; you can redistribute it and/or ++* modify it under the terms of the GNU General Public License ++* as published by the Free Software Foundation; either version 3 ++* of the License, or (at your option) any later version. ++* ++* This program is distributed in the hope that it will be useful, ++* but WITHOUT ANY WARRANTY; without even the implied warranty of ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++* GNU General Public License for more details. ++* You should have received a copy of the GNU General Public License ++* along with this program. If not, see <http://www.gnu.org/licenses/>. ++*/ ++ ++#ifndef __CD_APPLET_TIME_H_STRUCT__ ++#define __CD_APPLET_TIME_H_STRUCT__ ++ ++#define _POSIX_C_SOURCE 200809L ++#include <time.h> ++ ++#endif ++ diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild index f12d52fb2d..9935833256 100644 --- a/desktop/cairo-dock/cairo-dock.SlackBuild +++ b/desktop/cairo-dock/cairo-dock.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} 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 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM-core-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM-core-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,16 +69,19 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +mkdir build +cd build cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release . + -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG +cd .. 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 diff --git a/desktop/cairo-dock/cairo-dock.info b/desktop/cairo-dock/cairo-dock.info index d439b98f7a..1c6f1ba104 100644 --- a/desktop/cairo-dock/cairo-dock.info +++ b/desktop/cairo-dock/cairo-dock.info @@ -1,8 +1,8 @@ PRGNAM="cairo-dock" -VERSION="3.3.2" +VERSION="3.4.1" HOMEPAGE="http://www.glx-dock.org" -DOWNLOAD="https://launchpad.net/cairo-dock-core/3.3/3.3.2/+download/cairo-dock-3.3.2.tar.gz" -MD5SUM="aae077803322049e2488ca7c2980cd0d" +DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-core/archive/3.4.1/cairo-dock-3.4.1.tar.gz" +MD5SUM="63285f2744a76354cea9cc4c012b3c11" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkglext" diff --git a/desktop/ceti-2-theme/README b/desktop/ceti-2-theme/README deleted file mode 100644 index 81caf7d90f..0000000000 --- a/desktop/ceti-2-theme/README +++ /dev/null @@ -1,10 +0,0 @@ -ceti-2-theme (GTK2|GTK3 themes) - -ceti-2 is a theme for GTK 3, GTK 2 and Gnome-Shell. It supports GTK 3 -and GTK 2 based desktop environments like Gnome, Unity, Budgie, -Pantheon, etc. - -It is the Official continuation of ceti for Gnome 3.14, 3.16 and 3.18. -It has been completely revamped and is now based on Vertex. - -Optional dependencies: gtk-engines, gtk-engines-unico. diff --git a/desktop/ceti-2-theme/ceti-2-theme.info b/desktop/ceti-2-theme/ceti-2-theme.info deleted file mode 100644 index 28f1dffa11..0000000000 --- a/desktop/ceti-2-theme/ceti-2-theme.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ceti-2-theme" -VERSION="20150923" -HOMEPAGE="https://github.com/horst3180/Ceti-2-theme" -DOWNLOAD="https://github.com/horst3180/ceti-2-theme/archive/20150923/ceti-2-theme-20150923.tar.gz" -MD5SUM="5da8e4e6c2260113b12fafc0a682b389" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="murrine" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" diff --git a/desktop/ceti-2-theme/doinst.sh b/desktop/ceti-2-theme/doinst.sh deleted file mode 100644 index aea0f894eb..0000000000 --- a/desktop/ceti-2-theme/doinst.sh +++ /dev/null @@ -1,13 +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 -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/desktop/ceti-2-theme/slack-desc b/desktop/ceti-2-theme/slack-desc deleted file mode 100644 index efcdc3ee26..0000000000 --- a/desktop/ceti-2-theme/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ceti-2-theme: ceti-2-theme (GTK2|GTK3 themes) -ceti-2-theme: -ceti-2-theme: ceti-2 is a theme for GTK 3, GTK 2 and Gnome-Shell. It supports GTK 3 -ceti-2-theme: and GTK 2 based desktop environments like Gnome, Unity, Budgie, -ceti-2-theme: Pantheon, etc. -ceti-2-theme: -ceti-2-theme: It is the Official continuation of Ceti for Gnome 3.14, 3.16 and 3.18. -ceti-2-theme: It has been completely revamped and is now based on Vertex. -ceti-2-theme: -ceti-2-theme: Home page: https://github.com/horst3180/Ceti-2-theme -ceti-2-theme: diff --git a/desktop/compton/compton.SlackBuild b/desktop/compton/compton.SlackBuild index a72d5cb66e..f9133cac40 100644 --- a/desktop/compton/compton.SlackBuild +++ b/desktop/compton/compton.SlackBuild @@ -22,7 +22,7 @@ # not, see <http://www.gnu.org/licenses/>. PRGNAM="compton" -VERSION=${VERSION:-316eac0613bf342ff91cc645a6c3c80e6b9083fb} +VERSION=${VERSION:-7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,9 +58,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-${VERSION} -tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,19 +68,25 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -make || exit 1 -make install DESTDIR=$PKG +sed -i "s|'no-unknown-warning-option',\ ||" meson.build +cp $CWD/meson.build $CWD/test.h subprojects/test.h/ + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +meson build . -D build_docs=true -D b_ndebug=true --prefix=/usr +DESTDIR=$PKG ninja -C build install + +mv $PKG/usr/share/man $PKG/usr/man 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 -mv $PKG/usr/share/man $PKG/usr/man -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +install -D -m 0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop +install -D -m 0644 $PRGNAM.sample.conf $PKG/etc/$PRGNAM.conf mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -ar \ - desc.txt dbus-examples compton.sample.conf LICENSE \ + desc.txt dbus-examples compton.sample.conf COPYING LICENSES \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/compton/compton.info b/desktop/compton/compton.info index dd49ce713e..334932e1ce 100644 --- a/desktop/compton/compton.info +++ b/desktop/compton/compton.info @@ -1,10 +1,10 @@ PRGNAM="compton" -VERSION="316eac0613bf342ff91cc645a6c3c80e6b9083fb" -HOMEPAGE="https://github.com/chjj/compton" -DOWNLOAD="https://github.com/chjj/compton/archive/316eac0/compton-316eac0613bf342ff91cc645a6c3c80e6b9083fb.tar.gz" -MD5SUM="eb3fddcd691af8239b3ab56bf89e038c" +VERSION="7.2" +HOMEPAGE="https://github.com/yshui/compton/" +DOWNLOAD="https://github.com/yshui/compton/archive/v7.2/compton-7.2.tar.gz" +MD5SUM="91e9aa659dfaa17ccd5653a2c0c5707f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libconfig" +REQUIRES="libconfig libev libxdg-basedir setconf uthash" MAINTAINER="melikamp" EMAIL="melikamp@melikamp.net" diff --git a/desktop/compton/meson.build b/desktop/compton/meson.build new file mode 100644 index 0000000000..042e5d5dd2 --- /dev/null +++ b/desktop/compton/meson.build @@ -0,0 +1,2 @@ +project('test.h', 'c') +test_h_dep = declare_dependency(include_directories: include_directories('.')) diff --git a/desktop/compton/test.h b/desktop/compton/test.h new file mode 100644 index 0000000000..46ceda4ee5 --- /dev/null +++ b/desktop/compton/test.h @@ -0,0 +1,158 @@ +// SPDX-License-Identifier: MIT +#pragma once + +#ifdef UNIT_TEST + +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +struct test_file_metadata; + +struct test_failure { + bool present; + const char *message; + const char *file; + int line; +}; + +struct test_case_metadata { + void (*fn)(struct test_case_metadata *, struct test_file_metadata *); + struct test_failure failure; + const char *name; + struct test_case_metadata *next; +}; + +struct test_file_metadata { + bool registered; + const char *name; + struct test_file_metadata *next; + struct test_case_metadata *tests; +}; + +struct test_file_metadata __attribute__((weak)) * test_file_head; + +#define SET_FAILURE(_message) \ + metadata->failure = (struct test_failure) { \ + .message = _message, .file = __FILE__, .line = __LINE__, \ + .present = true, \ + } + +#define TEST_EQUAL(a, b) \ + do { \ + if ((a) != (b)) { \ + SET_FAILURE(#a " != " #b); \ + return; \ + } \ + } while (0) + +#define TEST_TRUE(a) \ + do { \ + if (!(a)) { \ + SET_FAILURE(#a " is not true"); \ + return; \ + } \ + } while (0) + +#define TEST_STREQUAL(a, b) \ + do { \ + if (strcmp(a, b) != 0) { \ + SET_FAILURE(#a " != " #b); \ + return; \ + } \ + } while (0) + +#define TEST_CASE(_name) \ + static void __test_h_##_name(struct test_case_metadata *, \ + struct test_file_metadata *); \ + static struct test_file_metadata __test_h_file; \ + static struct test_case_metadata __test_h_meta_##_name = { \ + .name = #_name, \ + .fn = __test_h_##_name, \ + }; \ + static void __attribute__((constructor(101))) \ + __test_h_##_name##_register(void) { \ + __test_h_meta_##_name.next = __test_h_file.tests; \ + __test_h_file.tests = &__test_h_meta_##_name; \ + if (!__test_h_file.registered) { \ + __test_h_file.name = __FILE__; \ + __test_h_file.next = test_file_head; \ + test_file_head = &__test_h_file; \ + __test_h_file.registered = true; \ + } \ + } \ + static void __test_h_##_name( \ + struct test_case_metadata *metadata __attribute__((unused)), \ + struct test_file_metadata *file_metadata __attribute__((unused))) + +extern void __attribute__((weak)) (*test_h_unittest_setup)(void); +/// Run defined tests, return true if all tests succeeds +/// @param[out] tests_run if not NULL, set to whether tests were run +static inline void __attribute__((constructor(102))) run_tests(void) { + bool should_run = false; + FILE *cmdlinef = fopen("/proc/self/cmdline", "r"); + char *arg = NULL; + int arglen; + fscanf(cmdlinef, "%ms%n", &arg, &arglen); + fclose(cmdlinef); + for (char *pos = arg; pos < arg + arglen; pos += strlen(pos) + 1) { + if (strcmp(pos, "--unittest") == 0) { + should_run = true; + break; + } + } + free(arg); + + if (!should_run) { + return; + } + + if (&test_h_unittest_setup) { + test_h_unittest_setup(); + } + + struct test_file_metadata *i = test_file_head; + int failed = 0, success = 0; + while (i) { + fprintf(stderr, "Running tests from %s:\n", i->name); + struct test_case_metadata *j = i->tests; + while (j) { + fprintf(stderr, "\t%s ... ", j->name); + j->failure.present = false; + j->fn(j, i); + if (j->failure.present) { + fprintf(stderr, "failed (%s at %s:%d)\n", + j->failure.message, j->failure.file, + j->failure.line); + failed++; + } else { + fprintf(stderr, "passed\n"); + success++; + } + j = j->next; + } + fprintf(stderr, "\n"); + i = i->next; + } + int total = failed + success; + fprintf(stderr, "Test results: passed %d/%d, failed %d/%d\n", success, total, + failed, total); + exit(failed == 0 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +#else + +#include <stdbool.h> + +#define TEST_CASE(name) static void __attribute__((unused)) __test_h_##name(void) + +#define TEST_EQUAL(a, b) \ + (void)(a); \ + (void)(b) +#define TEST_TRUE(a) (void)(a) +#define TEST_STREQUAL(a, b) \ + (void)(a); \ + (void)(b) + +#endif diff --git a/desktop/devilspie/devilspie.SlackBuild b/desktop/devilspie/devilspie.SlackBuild index 471bd18014..5334d2b91d 100644 --- a/desktop/devilspie/devilspie.SlackBuild +++ b/desktop/devilspie/devilspie.SlackBuild @@ -55,7 +55,7 @@ sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am autoreconf -i LDFLAGS="-lX11" \ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-y2k" \ CPPFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/dwm/dwm.SlackBuild b/desktop/dwm/dwm.SlackBuild index 06a0579171..0587f25376 100644 --- a/desktop/dwm/dwm.SlackBuild +++ b/desktop/dwm/dwm.SlackBuild @@ -111,9 +111,6 @@ find -L . \ # patch -p0 < $CWD/patches/$i #done -# Reverse commit to continue support for fontconfig 2.11.1 -patch -R -p1 <$CWD/sbo-patches/0001-Prepare-6.2-release.patch - ## Fix options for our compilers, ## thanks to Brenton Earl. sed -i \ diff --git a/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch b/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch deleted file mode 100644 index 22da3facea..0000000000 --- a/desktop/dwm/sbo-patches/0001-Prepare-6.2-release.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/drw.c b/drw.c -index c638323..8fd1ca4 100644 ---- a/drw.c -+++ b/drw.c -@@ -132,6 +132,19 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) - die("no font specified."); - } - -+ /* Do not allow using color fonts. This is a workaround for a BadLength -+ * error from Xft with color glyphs. Modelled on the Xterm workaround. See -+ * https://bugzilla.redhat.com/show_bug.cgi?id=1498269 -+ * https://lists.suckless.org/dev/1701/30932.html -+ * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349 -+ * and lots more all over the internet. -+ */ -+ FcBool iscol; -+ if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) { -+ XftFontClose(drw->dpy, xfont); -+ return NULL; -+ } -+ - font = ecalloc(1, sizeof(Fnt)); - font->xfont = xfont; - font->pattern = pattern; -@@ -200,7 +213,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) - Clr *ret; - - /* need at least two colors for a scheme */ -- if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr)))) -+ if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) - return NULL; - - for (i = 0; i < clrcount; i++) -@@ -337,6 +350,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp - fcpattern = FcPatternDuplicate(drw->fonts->pattern); - FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); -+ FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); - - FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); - FcDefaultSubstitute(fcpattern); - ---------------false-- - - diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild index 6814c758bb..fddcea452b 100644 --- a/desktop/lumina/lumina.SlackBuild +++ b/desktop/lumina/lumina.SlackBuild @@ -80,6 +80,7 @@ qmake-qt5 \ LIBPREFIX=/usr/lib${LIBDIRSUFFIX} \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QMAKE_CFLAGS_ISYSTEM= \ QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ L_ETCDIR=/etc \ diff --git a/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch b/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch new file mode 100644 index 0000000000..81783617b9 --- /dev/null +++ b/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch @@ -0,0 +1,44 @@ +From 00165e1a6d5dd61bc153e1352b21ec07fc81245d Mon Sep 17 00:00:00 2001 +From: patrick96 <p.ziegler96@gmail.com> +Date: Sun, 11 Feb 2018 21:27:52 +0100 +Subject: [PATCH] fix(generators): Add support for eventstruct + +Newer xcb-proto commits after the 1.12 release require the 'eventstruct' +key in the output dictionary, otherwise the generator crashes. + +I don't see a need for xpp to actually support the eventstruct key and +thus it uses a NOP lambda function +--- + generators/cpp_client.py | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/generators/cpp_client.py b/generators/cpp_client.py +index 20d116f..709e8d8 100644 +--- a/generators/cpp_client.py ++++ b/generators/cpp_client.py +@@ -3130,15 +3130,16 @@ def cpp_type_classes(): + # } + + # Must create an "output" dictionary before any xcbgen imports. +-output = {'open' : c_open, +- 'close' : c_close, +- 'simple' : c_simple, # lambda x, y: None, +- 'enum' : lambda x, y: None, +- 'struct' : lambda x, y: None, +- 'union' : lambda x, y: None, +- 'request' : c_request, +- 'event' : cpp_event, +- 'error' : cpp_error, ++output = {'open' : c_open, ++ 'close' : c_close, ++ 'simple' : c_simple, # lambda x, y: None, ++ 'enum' : lambda x, y: None, ++ 'struct' : lambda x, y: None, ++ 'union' : lambda x, y: None, ++ 'request' : c_request, ++ 'event' : cpp_event, ++ 'error' : cpp_error, ++ 'eventstruct' : lambda x, y: None, + } + + # Boilerplate below this point diff --git a/desktop/polybar/polybar.SlackBuild b/desktop/polybar/polybar.SlackBuild index b86a3cabea..9856cb3da0 100644 --- a/desktop/polybar/polybar.SlackBuild +++ b/desktop/polybar/polybar.SlackBuild @@ -75,6 +75,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +( cd lib/xpp + patch -p1 < $CWD/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch ) + # Fixes install location sed -i -e '/share\/doc\/polybar/s/share\///' doc/CMakeLists.txt sed -i -e "/DESTINATION doc\/polybar/s/polybar/$PRGNAM-$VERSION/" doc/CMakeLists.txt @@ -87,7 +90,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=implicit-fallthrough -Wno-error=stringop-truncation -Wno-error=deprecated-copy" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. make -j1 diff --git a/desktop/rss-guard/01_min_qt_required_is_5.9.patch b/desktop/rss-guard/01_min_qt_required_is_5.9.patch new file mode 100644 index 0000000000..e54b533774 --- /dev/null +++ b/desktop/rss-guard/01_min_qt_required_is_5.9.patch @@ -0,0 +1,56 @@ +diff --git a/rssguard.pro b/rssguard.pro +index 21a897c7..f8eb8d28 100755 +--- a/rssguard.pro ++++ b/rssguard.pro +@@ -41,8 +41,8 @@ TARGET = rssguard +
+ message(rssguard: Welcome RSS Guard qmake script.)
+
+-lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7) {
+- warning(rssguard: At least Qt \"5.7.0\" is required!!!)
++lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) {
++ warning(rssguard: At least Qt \"5.9.0\" is required!!!)
+ }
+
+ APP_NAME = "RSS Guard"
+diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp +index 53451d63..f371d02d 100755 +--- a/src/miscellaneous/textfactory.cpp ++++ b/src/miscellaneous/textfactory.cpp +@@ -10,10 +10,11 @@ + + #include <QDir> + #include <QLocale> +-#include <QRandomGenerator> + #include <QString> + #include <QStringList> + ++#include <random> ++ + quint64 TextFactory::s_encryptionKey = 0x0; + + TextFactory::TextFactory() = default; +@@ -128,7 +129,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() { + QString encryption_file_path = qApp->settings()->pathName() + QDir::separator() + ENCRYPTION_FILE_NAME; + + try { +- s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toLongLong()); ++ s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toULongLong()); ++ ++ auto aa = s_encryptionKey; ++ auto bb = false; + } + catch (ApplicationException&) { + // Well, key does not exist or is invalid, generate and save one. +@@ -148,5 +152,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() { + } + + quint64 TextFactory::generateSecretEncryptionKey() { +- return QRandomGenerator().generate64(); ++ std::random_device rd; ++ std::mt19937 mt(rd()); ++ std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, ++ std::numeric_limits<quint64>().max()); ++ ++ return dist(mt); + } diff --git a/desktop/rss-guard/02_fix_random_class_name.patch b/desktop/rss-guard/02_fix_random_class_name.patch new file mode 100644 index 0000000000..06c49f7aba --- /dev/null +++ b/desktop/rss-guard/02_fix_random_class_name.patch @@ -0,0 +1,24 @@ +From d347ba63072ab13c0dbc1792d1a2b837af997a46 Mon Sep 17 00:00:00 2001 +From: Martin Rotter <rotter@praktik.cz> +Date: Thu, 6 Jun 2019 11:35:25 +0200 +Subject: [PATCH] Fix random class name + +--- + src/miscellaneous/textfactory.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp +index 48597235..1ac6f049 100755 +--- a/src/miscellaneous/textfactory.cpp ++++ b/src/miscellaneous/textfactory.cpp +@@ -151,8 +151,8 @@ quint64 TextFactory::initializeSecretEncryptionKey() { + quint64 TextFactory::generateSecretEncryptionKey() { + std::random_device rd; + std::mt19937 mt(rd()); +- std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, +- std::numeric_limits<quint64>().max()); ++ std::uniform_int_distribution<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, ++ std::numeric_limits<quint64>().max()); + + return dist(mt); + } diff --git a/desktop/rss-guard/rss-guard.SlackBuild b/desktop/rss-guard/rss-guard.SlackBuild index 470d4565c4..6dee54d811 100644 --- a/desktop/rss-guard/rss-guard.SlackBuild +++ b/desktop/rss-guard/rss-guard.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for rss-guard # -# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2012-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=rss-guard SRCNAM=rssguard -VERSION=${VERSION:-3.3.5} +VERSION=${VERSION:-3.5.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,18 +70,21 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/01_min_qt_required_is_5.9.patch +patch -p1 < $CWD/02_fix_random_class_name.patch + mkdir -p build cd build qmake-qt5 PREFIX=/usr .. make - make release-install INSTALL_ROOT=$PKG + make install INSTALL_ROOT=$PKG cd .. 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 $PKG/usr/share/$SRCNAM/information/* $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/rss-guard/rss-guard.info b/desktop/rss-guard/rss-guard.info index 4589139345..24591de685 100644 --- a/desktop/rss-guard/rss-guard.info +++ b/desktop/rss-guard/rss-guard.info @@ -1,8 +1,8 @@ PRGNAM="rss-guard" -VERSION="3.3.5" +VERSION="3.5.9" HOMEPAGE="https://github.com/martinrotter/rssguard" -DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.3.5.tar.gz" -MD5SUM="9ac44a786afe7b9c5a94e1a81120ada8" +DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.5.9/rssguard-3.5.9.tar.gz" +MD5SUM="fb9b713a18a2bb85e7a4f7ce40a054b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/desktop/seafile-gui/README b/desktop/seafile-client/README index 94ced6564e..94ced6564e 100644 --- a/desktop/seafile-gui/README +++ b/desktop/seafile-client/README diff --git a/desktop/seafile-gui/doinst.sh b/desktop/seafile-client/doinst.sh index 65c7e2eeb9..65c7e2eeb9 100644 --- a/desktop/seafile-gui/doinst.sh +++ b/desktop/seafile-client/doinst.sh diff --git a/desktop/seafile-gui/seafile-gui.SlackBuild b/desktop/seafile-client/seafile-client.SlackBuild index 9b7e62a867..a50bcb3248 100644 --- a/desktop/seafile-gui/seafile-gui.SlackBuild +++ b/desktop/seafile-client/seafile-client.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for "seafile-client". +# Slackware build script for seafile-client. # Copyright 2015 Marcel Saegebarth <marc@mos6581.de> # All rights reserved. @@ -24,15 +24,14 @@ # (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=seafile-gui -SRCNAM=seafile-client -VERSION=${VERSION:-4.4.2} +PRGNAM=seafile-client +VERSION=${VERSION:-6.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -43,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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" @@ -62,9 +61,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/desktop/seafile-client/seafile-client.info b/desktop/seafile-client/seafile-client.info new file mode 100644 index 0000000000..92933b6c01 --- /dev/null +++ b/desktop/seafile-client/seafile-client.info @@ -0,0 +1,10 @@ +PRGNAM="seafile-client" +VERSION="6.2.5" +HOMEPAGE="http://seafile.com/" +DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v6.2.5/seafile-client-6.2.5.tar.gz" +MD5SUM="3f3cd465109e1d49888fbca310033a3b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="qt5 seafile" +MAINTAINER="Marcel Saegebarth" +EMAIL="marc@mos6581.de" diff --git a/desktop/thunar-dropbox/slack-desc b/desktop/seafile-client/slack-desc index 2f60412719..2f39a14e33 100644 --- a/desktop/thunar-dropbox/slack-desc +++ b/desktop/seafile-client/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -thunar-dropbox: thunar-dropbox (dropbox plugin for thunar) -thunar-dropbox: -thunar-dropbox: Thunar Dropbox is a plugin for thunar that adds context-menu -thunar-dropbox: items from dropbox. -thunar-dropbox: -thunar-dropbox: http://www.softwarebakery.com/maato/thunar-dropbox.html -thunar-dropbox: -thunar-dropbox: -thunar-dropbox: -thunar-dropbox: -thunar-dropbox: +seafile-client: seafile-client (Seafile Desktop Client) +seafile-client: +seafile-client: Graphical desktop client for the Seafile next-generation open +seafile-client: source cloud storage system with advanced support for file syncing, +seafile-client: privacy protection and teamwork. +seafile-client: +seafile-client: Homepage: http://seafile.com/ +seafile-client: +seafile-client: +seafile-client: +seafile-client: diff --git a/desktop/seafile-gui/seafile-gui.info b/desktop/seafile-gui/seafile-gui.info deleted file mode 100644 index a878209924..0000000000 --- a/desktop/seafile-gui/seafile-gui.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="seafile-gui" -VERSION="4.4.2" -HOMEPAGE="http://seafile.com/" -DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v4.4.2.tar.gz" -MD5SUM="8749f059e9209df31e662c9325c735e5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="seafile-client" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/desktop/seafile-gui/slack-desc b/desktop/seafile-gui/slack-desc deleted file mode 100644 index 4de44d8853..0000000000 --- a/desktop/seafile-gui/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -seafile-gui: seafile-gui (Seafile Desktop Client) -seafile-gui: -seafile-gui: Graphical desktop client for the Seafile next-generation open -seafile-gui: source cloud storage system with advanced support for file syncing, -seafile-gui: privacy protection and teamwork. -seafile-gui: -seafile-gui: Homepage: http://seafile.com/ -seafile-gui: -seafile-gui: -seafile-gui: -seafile-gui: diff --git a/desktop/searchmonkey/patch.txt b/desktop/searchmonkey/patch.txt new file mode 100644 index 0000000000..08d9959efd --- /dev/null +++ b/desktop/searchmonkey/patch.txt @@ -0,0 +1,11 @@ +--- ./mainwindow.cpp 2010-05-16 11:42:14.000000000 -0400 ++++ ./mainwindow.cpp.new 2016-09-06 21:07:18.462298114 -0400 +@@ -781,7 +781,7 @@ + ******************************************************************************/ + void MainWindow::find () throw() { + +- auto autoSettingsReset asr(sui); // dtor calls sui->reset() ++ + + bool modeAdvanced = ui->actionAdvanced->isChecked(); + qDebug() << "modeAdvanced-" << modeAdvanced; diff --git a/desktop/searchmonkey/searchmonkey.SlackBuild b/desktop/searchmonkey/searchmonkey.SlackBuild index b1c2ef0824..f807c46128 100644 --- a/desktop/searchmonkey/searchmonkey.SlackBuild +++ b/desktop/searchmonkey/searchmonkey.SlackBuild @@ -69,6 +69,7 @@ find -L . \ -exec chmod 644 {} \; patch -p1 --verbose <$CWD/searchmonkey-2.0.0-gcc4.7.patch +patch -p1 --verbose <$CWD/patch.txt qmake \ QMAKE_CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/suru-plus-icon-theme/README b/desktop/suru-plus-icon-theme/README new file mode 100644 index 0000000000..bc31a6a5bb --- /dev/null +++ b/desktop/suru-plus-icon-theme/README @@ -0,0 +1,3 @@ +Suru++ is a cyberpunkish, elegant, futuristic, macOS-like, +Papirus-like and modern Suru icons based on Suru Icons +by Sam Hewitt. diff --git a/desktop/thunar-dropbox/doinst.sh b/desktop/suru-plus-icon-theme/doinst.sh index 19400050fd..4110f5514d 100644 --- a/desktop/thunar-dropbox/doinst.sh +++ b/desktop/suru-plus-icon-theme/doinst.sh @@ -3,4 +3,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi - diff --git a/desktop/suru-plus-icon-theme/slack-desc b/desktop/suru-plus-icon-theme/slack-desc new file mode 100644 index 0000000000..97b1322469 --- /dev/null +++ b/desktop/suru-plus-icon-theme/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +suru-plus-icon-theme: suru-plus-icon-theme (Extensive SVG icons set) +suru-plus-icon-theme: +suru-plus-icon-theme: Suru++ is a cyberpunkish, elegant, futuristic, macOS-like, +suru-plus-icon-theme: Papirus-like and modern Suru icons based on Suru Icons +suru-plus-icon-theme: by Sam Hewitt. +suru-plus-icon-theme: +suru-plus-icon-theme: homepage: https://github.com/gusbemacbe/suru-plus +suru-plus-icon-theme: +suru-plus-icon-theme: +suru-plus-icon-theme: +suru-plus-icon-theme: diff --git a/desktop/ceti-2-theme/ceti-2-theme.SlackBuild b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild index f5ed3c662c..665e22dc69 100644 --- a/desktop/ceti-2-theme/ceti-2-theme.SlackBuild +++ b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# -# Slackware build script for ceti-2-theme. -# -# Copyright 2016 Edinaldo P. Silva, Rio de Janeiro, Brazil. + +# Slackware build script for suru-plus-icon-theme + +# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,51 +22,37 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM="ceti-2-theme" -VERSION=${VERSION:-20150923} +PRGNAM=suru-plus-icon-theme +SRCNAM=suru-plus +VERSION=${VERSION:-30.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH=noarch +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -CWD=$(pwd) set -e -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT +rm -rf $PKG $SRCNAM-$VERSION +mkdir -p $PKG/usr/share/icons $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +cd $SRCNAM-$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 \ + -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 {} \; - -./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-silent-rules \ - --disable-gnome-shell \ - --disable-unity \ - --build=$ARCH-slackware-linux - -make install DESTDIR=$PKG + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -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 +cp -a eSuru++ Suru++ Suru++-Light $PKG/usr/share/icons/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a AUTHORS COPYING CREDITS LICENSE *.md tools $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info new file mode 100644 index 0000000000..045be3da36 --- /dev/null +++ b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info @@ -0,0 +1,10 @@ +PRGNAM="suru-plus-icon-theme" +VERSION="30.0" +HOMEPAGE="https://github.com/gusbemacbe/suru-plus" +DOWNLOAD="https://github.com/gusbemacbe/suru-plus/archive/v30.0/suru-plus-30.0.tar.gz" +MD5SUM="aba1a105215425e843b60b8edae38241" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild index fd27c5b191..4b3135bcda 100644 --- a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild +++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=thunar-archive-plugin -VERSION=${VERSION:-0.3.1} +VERSION=${VERSION:-0.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} 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 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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" diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.info b/desktop/thunar-archive-plugin/thunar-archive-plugin.info index 7181974b68..88e6670e73 100644 --- a/desktop/thunar-archive-plugin/thunar-archive-plugin.info +++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.info @@ -1,8 +1,8 @@ PRGNAM="thunar-archive-plugin" -VERSION="0.3.1" +VERSION="0.4.0" HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" -DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2" -MD5SUM="425f4faaace6dc7a4716a35b7795463a" +DOWNLOAD="http://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-0.4.0.tar.bz2" +MD5SUM="0a7738a3a5f84bf218ece3ffb5241c63" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xarchiver" diff --git a/desktop/thunar-dropbox/README b/desktop/thunar-dropbox/README deleted file mode 100644 index 23795731f9..0000000000 --- a/desktop/thunar-dropbox/README +++ /dev/null @@ -1 +0,0 @@ -Thunar-dropbox is a Thunar plugin that adds context-menu items from dropbox. diff --git a/desktop/thunar-dropbox/thunar-dropbox.SlackBuild b/desktop/thunar-dropbox/thunar-dropbox.SlackBuild deleted file mode 100644 index 0f9be96ad8..0000000000 --- a/desktop/thunar-dropbox/thunar-dropbox.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -# Slackware build script for Thunar Dropbox - -# Copyright 2010 Murat D. Kadirov <banderols@gmail.com> -# 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=thunar-dropbox -VERSION=${VERSION:-0.2.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -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.bz2 -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 {} \; - -./waf configure --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} -./waf build -./waf 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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -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:-tgz} diff --git a/desktop/thunar-dropbox/thunar-dropbox.info b/desktop/thunar-dropbox/thunar-dropbox.info deleted file mode 100644 index 1d8bd2a7f3..0000000000 --- a/desktop/thunar-dropbox/thunar-dropbox.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="thunar-dropbox" -VERSION="0.2.1" -HOMEPAGE="http://www.softwarebakery.com/maato/thunar-dropbox.html" -DOWNLOAD="http://www.softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-0.2.1.tar.bz2" -MD5SUM="52bb2caa26afaf80835a56b9ad3d2155" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Murat D. Kadirov" -EMAIL="banderols@gmail.com" diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch index 78db9be2b6..2d626e0ddd 100644 --- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch +++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch @@ -1,7 +1,7 @@ -diff -Nur thunar-media-tags-plugin-0.2.1.orig/configure thunar-media-tags-plugin-0.2.1/configure ---- thunar-media-tags-plugin-0.2.1.orig/configure 2013-05-11 04:57:03.000000000 -0500 -+++ thunar-media-tags-plugin-0.2.1/configure 2013-06-17 01:40:43.467622887 -0500 -@@ -14529,45 +14529,7 @@ +diff -Naur thunar-media-tags-plugin-0.3.0.orig/configure thunar-media-tags-plugin-0.3.0/configure +--- thunar-media-tags-plugin-0.3.0.orig/configure 2018-02-14 21:50:48.000000000 +0100 ++++ thunar-media-tags-plugin-0.3.0/configure 2019-08-29 09:11:23.390608000 +0200 +@@ -15292,45 +15292,8 @@ TAGLIBC_LIBS="" TAGLIBC_CFLAGS="" @@ -42,13 +42,13 @@ diff -Nur thunar-media-tags-plugin-0.2.1.orig/configure thunar-media-tags-plugin -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tag_c_taglib_file_new" >&5 -$as_echo "$ac_cv_lib_tag_c_taglib_file_new" >&6; } -if test "x$ac_cv_lib_tag_c_taglib_file_new" = xyes; then : -- + - ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default" +ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default" if test "x$ac_cv_header_taglib_tag_c_h" = xyes; then : TAGLIBC_LIBS="-ltag_c" -@@ -14579,10 +14541,6 @@ +@@ -15342,10 +15305,6 @@ diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild index d2837715b7..6ca665ed24 100644 --- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild +++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=thunar-media-tags-plugin -VERSION=${VERSION:-0.2.1} +VERSION=${VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} 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 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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,7 +70,7 @@ find -L . \ -exec chmod 644 {} \; # Fix taglib linking - thanks, Roberto Neri! :) -patch -p1 < $CWD/thunar-media-tags-plugin-0.2.1.patch +patch -p1 < $CWD/thunar-media-tags-plugin-0.3.0.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info index 4c2c75bd65..9c9c226e6d 100644 --- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info +++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info @@ -1,8 +1,8 @@ PRGNAM="thunar-media-tags-plugin" -VERSION="0.2.1" +VERSION="0.3.0" HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin" -DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.2/thunar-media-tags-plugin-0.2.1.tar.bz2" -MD5SUM="0106e900714f86ccbafdc72238d3cf8d" +DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.3/thunar-media-tags-plugin-0.3.0.tar.bz2" +MD5SUM="5e332113e4b0e548ee7abd87629667f7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/wbar/wbar.SlackBuild b/desktop/wbar/wbar.SlackBuild index 09fd3d2bc5..d16ff8a236 100644 --- a/desktop/wbar/wbar.SlackBuild +++ b/desktop/wbar/wbar.SlackBuild @@ -74,7 +74,7 @@ find -L . \ sed -i 's|pidof|/sbin/pidof|g' src/config/Run.cc CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=literal-suffix" \ ./configure \ --prefix=/usr \ --exec-prefix=/usr \ diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild index 0b08f08e7a..d96ebb91ee 100644 --- a/desktop/yad/yad.SlackBuild +++ b/desktop/yad/yad.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for yad # Copyright 2010-2014 Charles <SlackBuilds@catcons.co.uk> -# Copyright 2015-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yad -VERSION=${VERSION:-0.40.0} +VERSION=${VERSION:-4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,8 +55,8 @@ else LIBDIRSUFFIX="" fi -GTK=${GTK:-2} -if pkg-config --exists webkit-1.0 ; then HTML="--enable-html" ; else HTML="" ; fi +if pkg-config --exists webkit2gtk-4.0 ; then HTML="--enable-html" ; else HTML="" ; fi +if pkg-config --exists gtksourceview-3.0 ; then SOURCEVIEW="--enable-sourceview" ; else SOURCEVIEW="" ; fi set -e @@ -73,6 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +autoreconf -vif +intltoolize + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -84,8 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-rgb=/usr/share/X11/rgb.txt \ --enable-icon-browser \ - --with-gtk=gtk$GTK \ + --enable-pfd \ + --enable-tray \ + --enable-spell \ $HTML \ + $SOURCEVIEW \ --build=$ARCH-slackware-linux make @@ -95,7 +101,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING NEWS README* THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/yad/yad.info b/desktop/yad/yad.info index a5a5b9d17e..2498c778cb 100644 --- a/desktop/yad/yad.info +++ b/desktop/yad/yad.info @@ -1,8 +1,8 @@ PRGNAM="yad" -VERSION="0.40.0" -HOMEPAGE="https://sourceforge.net/projects/yad-dialog/" -DOWNLOAD="https://downloads.sf.net/yad-dialog/yad-0.40.0.tar.xz" -MD5SUM="82d458a2e1695dd0709f71ad26109812" +VERSION="4.1" +HOMEPAGE="https://github.com/v1cont/yad/" +DOWNLOAD="https://github.com/v1cont/yad/archive/4.1/yad-4.1.tar.gz" +MD5SUM="8b16119570fb03e3804bb6b33108eb9c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |