diff options
Diffstat (limited to 'desktop')
105 files changed, 1221 insertions, 982 deletions
diff --git a/desktop/arc-theme/README b/desktop/arc-theme/README index a9fc04447a..70bf665cae 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, optipng and sassc are build-time dependencies. diff --git a/desktop/arc-theme/arc-theme.SlackBuild b/desktop/arc-theme/arc-theme.SlackBuild index d3a596f6b3..a8104558dc 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:-20190917} 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,18 @@ 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 +sed -i "s|export-png=|export-type=png --export-filename=|" common/*/*.am + 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..c760871724 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="20190917" +HOMEPAGE="https://github.com/arc-design/arc-theme" +DOWNLOAD="https://github.com/arc-design/arc-theme/releases/download/20190917/arc-theme-20190917.tar.xz" +MD5SUM="160c0a746735a84dce6b3824209fc699" 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..aa89e5c313 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/arc-design/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..11c932e67e 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,31 @@ 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 +for i in $CWD/patches/* ; do patch -p1 < $i ; done +sed -i -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 +RUBY_SITELIBDIR=$(ruby -e 'print RbConfig::CONFIG["sitelibdir"]') +mkdir -p $PKG$RUBY_SITELIBDIR 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$RUBY_SITELIBDIR/CDApplet.rb $PKG$RUBY_SITELIBDIR/ 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 + mv $PKG/usr/CDApplet.rb $PKG$RUBY_SITELIBDIR/ 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/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch new file mode 100644 index 0000000000..846b4176fd --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch @@ -0,0 +1,40 @@ +From 9043010e2cdd384ff5de5f5f116229557d15721c Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedorapeople.org> +Date: Fri, 6 Mar 2015 19:06:34 +0900 +Subject: [PATCH] demo_ruby: fix traceback when changing themes + +Fix the "crash" when changing like: +./demo_ruby:108:in `reload': undefined local variable or method `myApplet' for #<Applet:0x00000002e6c060> (NameError) + from /usr/share/ruby/vendor_ruby/CDApplet.rb:203:in `_on_reload' + from /usr/share/ruby/vendor_ruby/CDApplet.rb:274:in `block in _connect_to_dock' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `call' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `block in on_signal' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `call' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `block in process' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `each' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `process' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:855:in `block in run' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `each' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `run' + from /usr/share/ruby/vendor_ruby/CDApplet.rb:83:in `run' + from ./demo_ruby:127:in `<main>' +--- + Dbus/demos/demo_ruby/demo_ruby | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Dbus/demos/demo_ruby/demo_ruby b/Dbus/demos/demo_ruby/demo_ruby +index 2df5cda..a9374bd 100755 +--- a/Dbus/demos/demo_ruby/demo_ruby ++++ b/Dbus/demos/demo_ruby/demo_ruby +@@ -105,7 +105,7 @@ class Applet < CDApplet + end + def reload + p "[+] our module was reloaded, welcome back!" +- self.icon.AddDataRenderer("gauge", 1, myApplet.config['theme']) ++ self.icon.AddDataRenderer("gauge", 1, self.configuration['theme']) + self.icon.RenderValues([Float(self.counter)/self.configuration['max_value']]) + self.sub_icons.RemoveSubIcon("any") + self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "natilus", "id2", "icon 3", "thunderbird", "id3"]) +-- +2.1.0 + diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch new file mode 100644 index 0000000000..035143fd3d --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch @@ -0,0 +1,52 @@ +From 402a2d7bb657be4ad4072f07612e008e846d5e97 Mon Sep 17 00:00:00 2001 +From: Fabounet <fabounet03@gmail.com> +Date: Sun, 22 May 2016 21:13:21 +0200 +Subject: [PATCH] [1581725] Updated the weather URL we retrieve data from + +--- + weather/src/applet-config.c | 2 +- + weather/src/applet-read-data.c | 3 --- + weather/src/applet-struct.h | 3 +++ + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/weather/src/applet-config.c b/weather/src/applet-config.c +index c9a33c2..0a27a8a 100755 +--- a/weather/src/applet-config.c ++++ b/weather/src/applet-config.c +@@ -174,7 +174,7 @@ static void _on_got_location_data (const gchar *cLocationData, GldiModuleInstanc + gldi_task_discard (myData.pGetLocationTask); + myData.pGetLocationTask = NULL; + } +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" ++ + static void _cd_weather_search_for_location (GtkEntry *pEntry, GldiModuleInstance *myApplet) + { + const gchar *cLocationName = gtk_entry_get_text (pEntry); +diff --git a/weather/src/applet-read-data.c b/weather/src/applet-read-data.c +index 0bbdce7..8ca8d21 100755 +--- a/weather/src/applet-read-data.c ++++ b/weather/src/applet-read-data.c +@@ -30,9 +30,6 @@ + #include "applet-load-icons.h" + #include "applet-read-data.h" + +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" +- +- + static xmlDocPtr _cd_weather_open_xml_buffer (const gchar *cData, xmlNodePtr *root_node, const gchar *cRootNodeName, GError **erreur) + { + if (cData == NULL || *cData == '\0') +diff --git a/weather/src/applet-struct.h b/weather/src/applet-struct.h +index e96191e..02ba3d0 100755 +--- a/weather/src/applet-struct.h ++++ b/weather/src/applet-struct.h +@@ -29,6 +29,9 @@ + + #define WEATHER_DEFAULT_NAME "weather" + ++#define CD_WEATHER_BASE_URL "http://wxdata.weather.com/wxdata" ++ ++ + #define _display(cValue) ((cValue) == NULL || *((gchar*)cValue) == 'N' ? "?" : (const gchar*)(cValue)) + + struct _AppletConfig { diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch new file mode 100644 index 0000000000..637c1ca494 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-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/cairo-dock-plugins-3.4.1-port-WebKit2.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch new file mode 100644 index 0000000000..bec6e5fcac --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch @@ -0,0 +1,77 @@ +--- cairo-dock-plugins-3.4.1/CMakeLists.txt.wk2 2017-04-01 03:09:09.171381809 +0900 ++++ cairo-dock-plugins-3.4.1/CMakeLists.txt 2017-04-01 03:09:09.172381805 +0900 +@@ -1391,7 +1391,7 @@ + set (with_weblets no) + enable_if_not_defined (enable-weblets) + if (enable-weblets) +- set (WEBKIT_MODULE webkitgtk-3.0) ++ set (WEBKIT_MODULE webkit2gtk-4.0) + pkg_check_modules (WEBKIT ${WEBKIT_MODULE}) + if (NOT WEBKIT_FOUND) + message (STATUS "Could not find ${WEBKIT_MODULE}; Cairo-Dock won't be built with Weblets applet.") +--- cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h.wk2 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h 2017-04-01 03:09:09.172381805 +0900 +@@ -28,7 +28,7 @@ + #include "config.h" + #endif + +-#include <webkit/webkit.h> ++#include <webkit2/webkit2.h> + + //\___________ structure containing the applet's configuration parameters. + struct _AppletConfig { +--- cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c.wk2 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c 2017-04-01 03:14:59.380001735 +0900 +@@ -62,13 +62,19 @@ + return gldi_dialog_new (&attr); + } + +-/* Will be called when loading of the page is finished*/ +-void load_finished_cb(WebKitWebView *pWebKitView, WebKitWebFrame* widget ++/* Will be called when loading of the page is changed*/ ++void load_changed_cb(WebKitWebView *pWebKitView, WebKitLoadEvent load_event + , GldiModuleInstance *myApplet) + { +- cd_debug ("weblets : (re)load finished\n"); +- // update scrollbars status +- show_hide_scrollbars(myApplet); ++ switch (load_event) { ++ case WEBKIT_LOAD_FINISHED: ++ cd_debug ("weblets : (re)load finished\n"); ++ // update scrollbars status ++ show_hide_scrollbars(myApplet); ++ break; ++ default: ++ break; ++ } + } + + /* Build the embedded widget */ +@@ -80,8 +86,8 @@ + myData.pWebKitView = WEBKIT_WEB_VIEW (webkit_web_view_new ()); + gtk_container_add (GTK_CONTAINER (myData.pGtkMozEmbed), GTK_WIDGET (myData.pWebKitView)); + g_signal_connect(G_OBJECT(myData.pWebKitView), +- "load_finished", +- G_CALLBACK (load_finished_cb), ++ "load-changed", ++ G_CALLBACK (load_changed_cb), + myApplet); + gtk_widget_show_all (myData.pGtkMozEmbed); + +@@ -120,10 +126,14 @@ + } + } + +- webkit_web_view_open(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com"); ++ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com"); + } + /* available since rev. 30985, from fev. 2008 */ +- webkit_web_view_set_transparent(myData.pWebKitView, myConfig.bIsTransparent); ++ { ++ GdkRGBA rgba = {0}; ++ if (myConfig.bIsTransparent) rgba.alpha = 0.5; ++ webkit_web_view_set_background_color(myData.pWebKitView, &rgba); ++ } + + return TRUE; + } diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch new file mode 100644 index 0000000000..0a2ea720d1 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-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 e75ed7fab2..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="orphaned - no maintainer" -EMAIL="nobody@nowhere" 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/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/dmenu/dmenu-4.8-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff deleted file mode 100644 index 5c8f5e341a..0000000000 --- a/desktop/dmenu/dmenu-4.8-libdir_cflags_fixups.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur dmenu-4.8-orig/config.mk dmenu-4.8/config.mk ---- dmenu-4.8-orig/config.mk 2018-03-14 13:26:40.000000000 -0600 -+++ dmenu-4.8/config.mk 2018-04-01 18:03:50.431134881 -0600 -@@ -4,6 +4,7 @@ - # paths - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man -+LIBDIR = /usr/local/lib - - X11INC = /usr/X11R6/include - X11LIB = /usr/X11R6/lib -@@ -20,11 +21,12 @@ - - # includes and libs - INCS = -I${X11INC} -I${FREETYPEINC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -+LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} - - # flags -+OPTS ?= -Os - CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -+CFLAGS = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS} - LDFLAGS = -s ${LIBS} - - # compiler and linker diff --git a/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff b/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff new file mode 100644 index 0000000000..8618a911de --- /dev/null +++ b/desktop/dmenu/dmenu-4.9-libdir_cflags_fixups.diff @@ -0,0 +1,25 @@ +--- dmenu-4.9-orig/config.mk 2019-02-02 05:55:02.000000000 -0700 ++++ dmenu-4.9/config.mk 2020-04-19 13:12:15.427727907 -0600 +@@ -4,6 +4,7 @@ + # paths + PREFIX = /usr/local + MANPREFIX = $(PREFIX)/share/man ++LIBDIR = /usr/local/lib + + X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib +@@ -20,11 +21,12 @@ + + # includes and libs + INCS = -I$(X11INC) -I$(FREETYPEINC) +-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) ++LIBS = -L$(LIBDIR) -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) + + # flags ++OPTS ?= -Os + CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) ++CFLAGS = -std=c99 -pedantic -Wall $(OPTS) $(INCS) $(CPPFLAGS) + LDFLAGS = $(LIBS) + + # compiler and linker diff --git a/desktop/dmenu/dmenu.SlackBuild b/desktop/dmenu/dmenu.SlackBuild index 290289798d..f251b62b8a 100644 --- a/desktop/dmenu/dmenu.SlackBuild +++ b/desktop/dmenu/dmenu.SlackBuild @@ -24,7 +24,7 @@ # Modified by Phillip Warner for version >= 4.0 PRGNAM=dmenu -VERSION=${VERSION:-4.8} +VERSION=${VERSION:-4.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,7 +71,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Fixup the CFLAGS and LIBDIR settings to prevent multilib conflicts -patch -p1 < $CWD/dmenu-4.8-libdir_cflags_fixups.diff +patch -p1 < $CWD/dmenu-4.9-libdir_cflags_fixups.diff make install \ OPTS="$SLKCFLAGS" \ diff --git a/desktop/dmenu/dmenu.info b/desktop/dmenu/dmenu.info index 04b4630d18..1eaa82ac00 100644 --- a/desktop/dmenu/dmenu.info +++ b/desktop/dmenu/dmenu.info @@ -1,8 +1,8 @@ PRGNAM="dmenu" -VERSION="4.8" +VERSION="4.9" HOMEPAGE="http://tools.suckless.org/dmenu" -DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.8.tar.gz" -MD5SUM="72da14fb2b07c18bc74bffcc19dcaf42" +DOWNLOAD="http://dl.suckless.org/tools/dmenu-4.9.tar.gz" +MD5SUM="9a537ec9a3a2ce9f08963d66b56cc030" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/ffmpegthumbnailer/README b/desktop/ffmpegthumbnailer/README deleted file mode 100644 index 814e96fe45..0000000000 --- a/desktop/ffmpegthumbnailer/README +++ /dev/null @@ -1,4 +0,0 @@ -FFmpegthumbnailer is a lightweight video thumbnailer that can be -used by file managers to create thumbnails for your video files. -The thumbnailer uses ffmpeg to decode frames from the video files, so -supported videoformats depend on the configuration flags of ffmpeg. diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild deleted file mode 100644 index 7a0f0a2b93..0000000000 --- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for FFmpegthumbnailer - -# Copyright 2007-2009 Frank Caraballo <fecaraballo{at}gmail{dot}com> -# Copyright 2012-2017 Heinz Wiesinger, Amsterdam, The Netherlands -# 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=ffmpegthumbnailer -VERSION=${VERSION:-2.2.0} -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.?z* -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_CXX_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_C_FLAGS="${SLKCFLAGS}" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \ - -DCMAKE_INSTALL_MANDIR="man" \ - -DENABLE_GIO="yes" \ - -DENABLE_THUMBNAILER="yes" \ - .. - - 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 - -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 ChangeLog COPYING INSTALL NEWS README TODO \ - $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info deleted file mode 100644 index 13bf41d9a8..0000000000 --- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ffmpegthumbnailer" -VERSION="2.2.0" -HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer" -DOWNLOAD="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.0/ffmpegthumbnailer-2.2.0.tar.bz2" -MD5SUM="ed3754b3b8b9af93a93c490e17def0d0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ffmpeg" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/desktop/ffmpegthumbnailer/slack-desc b/desktop/ffmpegthumbnailer/slack-desc deleted file mode 100644 index 3ff7f2e6c6..0000000000 --- a/desktop/ffmpegthumbnailer/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------------------------------------------------------| -ffmpegthumbnailer: ffmpegthumbnailer (Lightweight Video Thumbnailer) -ffmpegthumbnailer: -ffmpegthumbnailer: FFmpegthumbnailer is a lightweight video thumbnailer that can be -ffmpegthumbnailer: used by file managers to create thumbnails for your video files. -ffmpegthumbnailer: The thumbnailer uses ffmpeg to decode frames from the video files, -ffmpegthumbnailer: so supported videoformats depend on the configuration flags of -ffmpegthumbnailer: ffmpeg. -ffmpegthumbnailer: -ffmpegthumbnailer: Homepage: https://github.com/dirkvdb/ffmpegthumbnailer -ffmpegthumbnailer: -ffmpegthumbnailer: diff --git a/desktop/i3/add_HAVE_strndup.diff b/desktop/i3/add_HAVE_strndup.diff deleted file mode 100644 index d780aec8d9..0000000000 --- a/desktop/i3/add_HAVE_strndup.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- include/libi3.h 2020-07-26 05:11:37.000000000 -0300 -+++ include/libi3.h 2020-09-20 18:15:40.063201808 -0300 -@@ -341,6 +341,8 @@ - */ - uint32_t get_colorpixel(const char *hex) __attribute__((const)); - -+#define HAVE_strndup 1 -+ - #ifndef HAVE_strndup - /** - * Taken from FreeBSD diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild index d37335bf75..aa671ea17a 100644 --- a/desktop/i3/i3.SlackBuild +++ b/desktop/i3/i3.SlackBuild @@ -75,8 +75,6 @@ find -L . \ autoreconf -fi -cat ${CWD}/add_HAVE_strndup.diff | patch -p0 || exit - mkdir -p build ( cd build CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild index ab2dc77cb1..6f4311fc72 100644 --- a/desktop/lumina/lumina.SlackBuild +++ b/desktop/lumina/lumina.SlackBuild @@ -81,6 +81,7 @@ qmake-qt5 \ QMAKE_CFLAGS_ISYSTEM= \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QMAKE_CFLAGS_ISYSTEM= \ QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ CONFIG+=WITH_I18N \ L_ETCDIR=/etc diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info index be31b8a229..82815dcf8a 100644 --- a/desktop/lxpanel/lxpanel.info +++ b/desktop/lxpanel/lxpanel.info @@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.0.tar.xz" MD5SUM="e6a1f9bd5cf39812e1c5d2453a34a7c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libfm" +REQUIRES="keybinder libfm" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/desktop/neofetch/README b/desktop/neofetch/README deleted file mode 100644 index 7064e16d60..0000000000 --- a/desktop/neofetch/README +++ /dev/null @@ -1,8 +0,0 @@ -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ascii file of your choice. The main purpose of neofetch is to be -used in screenshots to show other users what OS/Distro you're running, -what Theme/Icons you're using and etc. - -To see any optional dependencies that you might need, you can view it in -https://github.com/dylanaraps/neofetch/wiki/Dependencies diff --git a/desktop/neofetch/neofetch.SlackBuild b/desktop/neofetch/neofetch.SlackBuild deleted file mode 100644 index 812f0ff8b2..0000000000 --- a/desktop/neofetch/neofetch.SlackBuild +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -# Slackware build script for neofetch -# Copyright 2019 Muhammad Herdiansyah, Jakarta -# -# 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=neofetch -VERSION=${VERSION:-7.0.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -DOCS="LICENSE.md README.md" - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chmod 644 $DOCS - -DESTDIR=$PKG MANDIR=/usr/man make install || exit - -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 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/neofetch/neofetch.info b/desktop/neofetch/neofetch.info deleted file mode 100644 index 9e90148dbd..0000000000 --- a/desktop/neofetch/neofetch.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="neofetch" -VERSION="7.0.0" -HOMEPAGE="https://github.com/dylanaraps/neofetch" -DOWNLOAD="https://github.com/dylanaraps/neofetch/archive/7.0.0/neofetch-7.0.0.tar.gz" -MD5SUM="b4e1231561d15be12f334de607c4327e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Muhammad Herdiansyah" -EMAIL="herdiansyah@netc.eu" diff --git a/desktop/neofetch/slack-desc b/desktop/neofetch/slack-desc deleted file mode 100644 index d9504b847b..0000000000 --- a/desktop/neofetch/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------------------------------------------------------| -neofetch: neofetch (simple system information script) -neofetch: -neofetch: neofetch is a script similar to screenfetch. This script can be used -neofetch: to generate any information about your system, it will auto-detect -neofetch: your system and print it to the terminal next to an image, a distro -neofetch: logo or an ASCII art of your choice. -neofetch: -neofetch: Home page: https://github.com/dylanaraps/neofetch -neofetch: -neofetch: Bugs? Report to: https://github.com/dylanaraps/neofetch/issues -neofetch: diff --git a/desktop/picom/README b/desktop/picom/README new file mode 100644 index 0000000000..a32a53c5af --- /dev/null +++ b/desktop/picom/README @@ -0,0 +1,6 @@ +Picom is a compositor for X, and a fork of compton (stuff will +retain the original name inside the package). + +Out of frustration with the low count of standalone lightweight +compositors, picom was forked from Dana Jansens' fork of xcompmgr +and refactored. Bugs were fixed and features were added. diff --git a/desktop/seafile-gui/doinst.sh b/desktop/picom/doinst.sh index 65c7e2eeb9..65c7e2eeb9 100644 --- a/desktop/seafile-gui/doinst.sh +++ b/desktop/picom/doinst.sh diff --git a/desktop/ssr/ssr.SlackBuild b/desktop/picom/picom.SlackBuild index 9e35e632c0..5feac1e3a6 100644 --- a/desktop/ssr/ssr.SlackBuild +++ b/desktop/picom/picom.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# SlackBuild script for ssr +# Slackware build script for picom -# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=ssr -VERSION=${VERSION:-0.4.2} +PRGNAM=picom +VERSION=${VERSION:-20200916_9bb21fc} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,40 +60,29 @@ 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 . \ \( -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_PULSEAUDIO=TRUE \ - -DWITH_JACK="${JACK:-FALSE}" \ - -DWITH_QT5="${QT5:-FALSE}" \ - .. - - make install DESTDIR=$PKG -cd - +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +meson build . -D build_docs=true -D b_ndebug=true --prefix=/usr +DESTDIR=$PKG ninja -C build install 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 -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.sample.conf $PKG/etc/$PRGNAM.conf +install -D -m 0644 $PRGNAM-dbus.desktop $PKG/usr/share/applications/$PRGNAM-dbus.desktop mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS.md CHANGELOG.md COPYING notes.txt README.md todo.txt \ + desc.txt dbus-examples $PRGNAM.sample.conf COPYING LICENSES \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/picom/picom.info b/desktop/picom/picom.info new file mode 100644 index 0000000000..fa877ecf7f --- /dev/null +++ b/desktop/picom/picom.info @@ -0,0 +1,10 @@ +PRGNAM="picom" +VERSION="20200916_9bb21fc" +HOMEPAGE="https://github.com/yshui/picom/" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/picom-20200916_9bb21fc.tar.xz" +MD5SUM="fcea2c46fbeee33772739b5bae20dd0b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libconfig libev libxdg-basedir setconf uthash" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/desktop/ssr/slack-desc b/desktop/picom/slack-desc index 22f1467c53..a996bb5019 100644 --- a/desktop/ssr/slack-desc +++ b/desktop/picom/slack-desc @@ -5,15 +5,15 @@ # 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------------------------------------------------------| -ssr: ssr (screen recorder) -ssr: -ssr: SimpleScreenRecorder is a feature-rich screen recorder for Linux. -ssr: -ssr: -ssr: -ssr: -ssr: -ssr: -ssr: -ssr: + |-----handy-ruler------------------------------------------------------| +picom: picom (X compositor) +picom: +picom: Picom is a compositor for X, and a fork of compton. +picom: +picom: homepage: https://github.com/yshui/picom/ +picom: +picom: +picom: +picom: +picom: +picom: 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-glx/patches/pixelcity-cpp.patch b/desktop/rss-glx/patches/pixelcity-cpp.patch new file mode 100644 index 0000000000..1c56e61050 --- /dev/null +++ b/desktop/rss-glx/patches/pixelcity-cpp.patch @@ -0,0 +1,15 @@ +Index: rss-glx-0.9.1/src/Makefile.am +=================================================================== +--- rss-glx-0.9.1.orig/src/Makefile.am ++++ rss-glx-0.9.1/src/Makefile.am +@@ -38,7 +38,9 @@ matrixview_CFLAGS = @Wand_CFLAGS@ + matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@ + plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h + pixelcity_SOURCES = driver.c +-pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity ++pixelcity_LDADD = -LPixelCity -lPixelCity @quesoglc_LIBS@ ++# Dummy file, not built. Forces g++ linking ++nodist_EXTRA_pixelcity_SOURCES = dummy.cpp + skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h + solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h + spirographx_SOURCES = driver.c spirographx.c diff --git a/desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch b/desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch new file mode 100644 index 0000000000..c92eb1e1d3 --- /dev/null +++ b/desktop/rss-glx/patches/rss-glx-0.9.1-imagemagick-7.patch @@ -0,0 +1,178 @@ +--- a/configure.in ++++ b/configure.in +@@ -38,6 +38,8 @@ + AC_PROG_LIBTOOL + AC_PROG_LN_S + ++PKG_PROG_PKG_CONFIG ++ + # Checks for libraries. + AC_CHECK_LIB([m], [pow],,AC_MSG_ERROR(-lm was not found but required.)) + +@@ -81,7 +83,15 @@ + AC_CHECK_FUNCS(random_r nrand48) + + # Check for ImageMagick. +-PKG_CHECK_MODULES(Wand, Wand >= 6.4) ++PKG_CHECK_MODULES(Wand, [Wand >= 6.4],, ++ [PKG_CHECK_MODULES(Wand, MagickWand >= 6.4)] ++) ++ ++old_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$Wand_CFLAGS" ++AC_CHECK_HEADERS([magick/api.h] [wand/magick-wand.h],, ++ AC_CHECK_HEADERS([MagickCore/MagickCore.h] [MagickWand/MagickWand.h]) ++) ++CPPFLAGS="$old_CPPFLAGS" + + if test -d src/skyrocket_sounds ; then + AC_ARG_ENABLE(sound, [ --disable-sound Don't compile with sound.]) +--- a/src/TexMgr.cpp ++++ b/src/TexMgr.cpp +@@ -25,8 +25,19 @@ + #endif + #include <cstdlib> + ++#ifdef HAVE_MAGICK_API_H ++#ifdef HAVE_WAND_MAGICK_WAND_H + #include <magick/api.h> + #include <wand/magick-wand.h> ++#endif /* HAVE_WAND_MAGICK_WAND_H */ ++#endif /* HAVE_MAGICK_API_H */ ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++#ifdef HAVE_MAGICKWAND_MAGICKWAND_H ++#include <MagickCore/MagickCore.h> ++#include <MagickWand/MagickWand.h> ++#endif /* HAVE_MAGICKWAND_MAGICKWAND_H */ ++#endif /* HAVE_MAGICKCORE_MAGICKCORE_H */ ++ + #include <dirent.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -255,10 +266,18 @@ + // Directory scanning + image loading code in a separate function callable either from loadNextImage or another thread if pthreads is available. + void TexMgr::loadNextImageFromDisk() { + MagickWand *magick_wand = NewMagickWand(); ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ ExceptionInfo *exception; ++#else + ExceptionInfo exception; ++#endif + int dirLoop = 0; + ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ exception = AcquireExceptionInfo (); ++#else + GetExceptionInfo (&exception); ++#endif + + int imageLoaded = 0; + do { +@@ -317,7 +336,11 @@ + nextH = ohh; + } + ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, exception); ++#else + ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, oww, ohh, "RGBA", CharPixel, nextTex, &exception); ++#endif + + magick_wand = DestroyMagickWand (magick_wand); + +--- a/src/matrixview.c ++++ b/src/matrixview.c +@@ -84,8 +84,19 @@ + float *texcoords; + unsigned char *colors; + ++#ifdef HAVE_MAGICK_API_H ++#ifdef HAVE_WAND_MAGICK_WAND_H + #include <magick/api.h> + #include <wand/magick-wand.h> ++#endif /* HAVE_WAND_MAGICK_WAND_H */ ++#endif /* HAVE_MAGICK_API_H */ ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++#ifdef HAVE_MAGICKWAND_MAGICKWAND_H ++#include <MagickCore/MagickCore.h> ++#include <MagickWand/MagickWand.h> ++#endif /* HAVE_MAGICKWAND_MAGICKWAND_H */ ++#endif /* HAVE_MAGICKCORE_MAGICKCORE_H */ ++ + #include <dirent.h> + #include <sys/types.h> + #include <sys/stat.h> +@@ -99,10 +110,18 @@ + // Directory scanning + image loading code in a separate function callable either from loadNextImage or another thread if pthreads is available. + void loadNextImageFromDisk() { + MagickWand *magick_wand = NewMagickWand(); ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ ExceptionInfo *exception; ++#else + ExceptionInfo exception; ++#endif + int dirLoop = 0; + ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ exception = AcquireExceptionInfo (); ++#else + GetExceptionInfo (&exception); ++#endif + + int imageLoaded = 0; + do { +@@ -159,7 +178,11 @@ + if (!next_pic) + next_pic = (unsigned char *)malloc (text_x * text_y); + ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, text_x, text_y, "I", CharPixel, next_pic, exception); ++#else + ExportImagePixels (GetImageFromMagickWand(magick_wand), 0, 0, text_x, text_y, "I", CharPixel, next_pic, &exception); ++#endif + + magick_wand = DestroyMagickWand (magick_wand); + } +@@ -211,11 +234,19 @@ + pthread_cond_signal(next_pic_cond); + } + } else { ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ ExceptionInfo *exception; ++#else + ExceptionInfo exception; ++#endif + Image *image = NULL, *scaled_image; + ImageInfo *image_info; + ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ exception = AcquireExceptionInfo (); ++#else + GetExceptionInfo (&exception); ++#endif + + if (!pics) + LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size) +@@ -227,6 +258,15 @@ + image_info = CloneImageInfo ((ImageInfo *) NULL); + image_info->size = AcquireMagickMemory(sizeof("90x70")); + strcpy(image_info->size, "90x70"); ++#ifdef HAVE_MAGICKCORE_MAGICKCORE_H ++ image = AcquireImage(image_info, exception); ++ ++ ImportImagePixels(image, 0, 0, 90, 70, "I", CharPixel, (unsigned char *)(pics + ((random () & 15) * (90 * 70))), exception); ++ ++ scaled_image = ScaleImage (image, text_x, text_y, exception); ++ ++ ExportImagePixels (scaled_image, 0, 0, text_x, text_y, "I", CharPixel, pic, exception); ++#else + image = AcquireImage(image_info); + + ImportImagePixels(image, 0, 0, 90, 70, "I", CharPixel, (unsigned char *)(pics + ((random () & 15) * (90 * 70)))); +@@ -234,6 +274,7 @@ + scaled_image = ScaleImage (image, text_x, text_y, &exception); + + ExportImagePixels (scaled_image, 0, 0, text_x, text_y, "I", CharPixel, pic, &exception); ++#endif + + DestroyImage (image); + DestroyImage (scaled_image); diff --git a/desktop/rss-glx/rss-glx.SlackBuild b/desktop/rss-glx/rss-glx.SlackBuild index 45b8891604..5f55e74f89 100644 --- a/desktop/rss-glx/rss-glx.SlackBuild +++ b/desktop/rss-glx/rss-glx.SlackBuild @@ -69,6 +69,8 @@ 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 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + # Magick Wand detection is broken. ./autogen.sh Wand_CFLAGS=$(pkg-config --cflags "Wand >= 6.2") \ 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/ssr/doinst.sh b/desktop/seafile-client/doinst.sh index 726ffe403b..65c7e2eeb9 100644 --- a/desktop/ssr/doinst.sh +++ b/desktop/seafile-client/doinst.sh @@ -1,5 +1,5 @@ if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then 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 ad3cfb261e..fe80e6f627 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/ssr/README b/desktop/ssr/README deleted file mode 100644 index 6d78559a71..0000000000 --- a/desktop/ssr/README +++ /dev/null @@ -1,6 +0,0 @@ -SimpleScreenRecorder is a feature-rich screen recorder for Linux that -supports X11 and OpenGL. - -For JACK audio support (requires jack) set JACK=TRUE. - -To build with Qt5 (requires qt5) set QT5=TRUE. diff --git a/desktop/ssr/ssr.info b/desktop/ssr/ssr.info deleted file mode 100644 index 3fd83cacf3..0000000000 --- a/desktop/ssr/ssr.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ssr" -VERSION="0.4.2" -HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/" -DOWNLOAD="https://github.com/MaartenBaert/ssr/archive/0.4.2/ssr-0.4.2.tar.gz" -MD5SUM="c43eb407d13006e0173f087ba5111214" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ffmpeg" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" 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 82f4825ac7..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-2020 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 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 7da19c3132..0000000000 --- a/desktop/thunar-dropbox/README +++ /dev/null @@ -1,2 +0,0 @@ -Thunar-dropbox is a Thunar plugin that adds context-menu items from -dropbox. 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/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild index 80e9013173..187524a742 100644 --- a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild +++ b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=thunar-vcs-plugin -VERSION=${VERSION:-0.1.5} +VERSION=${VERSION:-0.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info index c3bc3fadd6..d2a9625e7e 100644 --- a/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info +++ b/desktop/thunar-vcs-plugin/thunar-vcs-plugin.info @@ -1,8 +1,8 @@ PRGNAM="thunar-vcs-plugin" -VERSION="0.1.5" +VERSION="0.2.0" HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin" -DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.1/thunar-vcs-plugin-0.1.5.tar.bz2" -MD5SUM="2dd39b28039430c3b3c568c12672441f" +DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/0.2/thunar-vcs-plugin-0.2.0.tar.bz2" +MD5SUM="e19cca5efdab3ad38ed4cb99dfd8afe8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild b/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild index 84fcee6489..15ebf56467 100644 --- a/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild +++ b/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vala-panel-appmenu -VERSION=${VERSION:-0.5.6} +VERSION=${VERSION:-20191009_060f7ac} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ 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 . \ @@ -69,6 +69,8 @@ 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 {} \; +sed -i "s|X11\ WAYLAND|X11|" CMakeLists.txt +sed -i "s|\ \${WAYLAND_INCLUDE}||" subprojects/appmenu-gtk-module/src/CMakeLists.txt mkdir -p build cd build cmake \ diff --git a/desktop/vala-panel-appmenu/vala-panel-appmenu.info b/desktop/vala-panel-appmenu/vala-panel-appmenu.info index 6f74381b18..a4c512de18 100644 --- a/desktop/vala-panel-appmenu/vala-panel-appmenu.info +++ b/desktop/vala-panel-appmenu/vala-panel-appmenu.info @@ -1,8 +1,8 @@ PRGNAM="vala-panel-appmenu" -VERSION="0.5.6" +VERSION="20191009_060f7ac" HOMEPAGE="https://github.com/rilian-la-te/vala-panel-appmenu" -DOWNLOAD="https://github.com/rilian-la-te/vala-panel-appmenu/releases/download/0.5.6/vala-panel-appmenu-0.5.6.tar.gz" -MD5SUM="0ec763e3fa1a8e1179868dfa4c522f4a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/vala-panel-appmenu-20191009_060f7ac.tar.xz" +MD5SUM="faaffc16f9f5872ee60e8c0891b44b51" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vala bamf" 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/weston/README.SBo b/desktop/weston/README.SBo new file mode 100644 index 0000000000..4d1f41110b --- /dev/null +++ b/desktop/weston/README.SBo @@ -0,0 +1,112 @@ +Weston: reference implementation of a Wayland compositor. +========================================================== + +This README is current as of Weston 8.0.0. + +*** NOTE *** +------------ + +This is the bleeding edge version of this SlackBuild that is ONLY compatible +with Slackware Current which has been relatively newly PAM-ified as of the +time of writing (May, 2020). + +If you are running Slackware stable (14.2 at the time of writing), you are NOT +in the right place. Please utilize the Slackbuild from slackbuilds.org ( git: +https://git.slackbuilds.org/slackbuilds/ ). + +In addition to this SlackBuild not working unless your Slackware install is +PAM-ified, Weston >= 8.0.0 will not work on Slackware 14.2 as the graphics +stack is simply too old. + +Introduction +------------ + +Weston is the reference implementation of a Wayland compositor, as well +as a useful environment in and of itself. + +Out of the box, Weston provides a very basic desktop, or a full-featured +environment for non-desktop uses such as automotive, embedded, +in-flight, industrial, kiosks, set-top boxes and TVs. It also provides a +library allowing other projects to build their own full-featured +environments on top of Weston's core. + +A small suite of example or demo clients are also provided: though they +can be useful in themselves, their main purpose is to be an example or +test case for others building compositors or clients. + + +Slackware-specific Information +------------------------------ + +***************************************** +IMPORTANT: MANUAL INTERVENTION REQUIRED. +***************************************** + +This SlackBuild of Weston takes a fairly "hands off" approach, and there +are a few things users need to be aware of. + +To launch Weston, here are some required steps. + +Please note that setting weston-launch suid root is NOT required any longer +under PAM-ified Slackware Current. + +1. If you do not have another script exporting XDG_RUNTIME_DIR, you +should enable the one that comes with this SlackBuild: + + # chmod +x /etc/profile.d/weston.sh + (or .csh, depending on your shell) + +(NOTE: You may want to grep your /etc/profile.d directory for other +scripts setting XDG_RUNTIME_DIR before doing this. AlienBob's ktown Plasma5 +install, for instance, already includes a script that sets up XDG_RUNTIME_DIR, +so doubling up by doing Step 1 above may cause unwanted behaviour.) + + +2. Logout (if necessary) and re-login as root. + +Once you've logged out and back in as root, run: + + `exec weston-launch -u $USER` + +where $USER is the username of the normal user you would like to launch Weston +as. + +To launch with Xwayland support, run: + + `exec weston-launch -u $USER -- --xwayland` + +You can use the Ctrl+Alt+Backspace keyboard combination to kill Weston. + + +Optional Dependencies +--------------------- + +At the present time, the only optional dependency for this SlackBuild is +colord, which is disabled by default. That is because colord pulls in many +dependencies, while building Weston without colord requires no dependencies at +all on Slackware current, which may be more desirable for users that just want +to quickly test out Wayland by getting Weston up and running. + +If you would like to enable colord functionality in this SlackBuild, +set the USE_COLORD variable to "true" before running the SlackBuild. + + +Known Issues +------------ + +* I have not had success getting Weston to launch with the proprietary nvidia +drivers in use. YMMV. I have had the best luck with the Intel KMS drivers. + +* In testing 8.0.0 on the newly PAM-ified Slackware current, I have found that +after running Ctrl+Alt+Backspace to quit, I am brought back to a blank, +black screen. If this happens, try waiting a few seconds and then hit +Ctrl+Alt+F2 (for instance) followed by Ctrl+Alt+F1 to get back to the console. + +* I want to stress and emphasize that this is still relatively experimental +software, that talks to your hardware at a fairly low level. For the most +part, I have not had any major issues, but I have seen some odd bugs and +behaviour, including Weston hard-locking my system upon exit and having to +reboot. I have also returned to my shell to find that some keystrokes I had +inputted while using Weston had been inputted into my console with a series of +"Command not found" errors. I do not believe Weston has been widely tested on +non-systemd/logind systems such as Slackware. Use at your own risk. diff --git a/desktop/weston/weston-7.0.0-nopam.patch b/desktop/weston/weston-7.0.0-nopam.patch deleted file mode 100644 index 8ad7b3639c..0000000000 --- a/desktop/weston/weston-7.0.0-nopam.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -Naur weston-7.0.0.orig/libweston/meson.build weston-7.0.0/libweston/meson.build ---- weston-7.0.0.orig/libweston/meson.build 2019-08-23 16:59:16.000000000 -0400 -+++ weston-7.0.0/libweston/meson.build 2019-10-17 22:22:55.415927653 -0400 -@@ -199,16 +199,11 @@ - ) - - if get_option('weston-launch') -- dep_pam = cc.find_library('pam') -- -- if not cc.has_function('pam_open_session', dependencies: dep_pam) -- error('pam_open_session not found for weston-launch') -- endif - - executable( - 'weston-launch', - 'weston-launch.c', -- dependencies: [dep_pam, systemd_dep, dep_libdrm], -+ dependencies: [systemd_dep, dep_libdrm], - include_directories: include_directories('..'), - install: true - ) -diff -Naur weston-7.0.0.orig/libweston/weston-launch.c weston-7.0.0/libweston/weston-launch.c ---- weston-7.0.0.orig/libweston/weston-launch.c 2019-08-23 16:59:16.000000000 -0400 -+++ weston-7.0.0/libweston/weston-launch.c 2019-10-17 22:52:18.991891665 -0400 -@@ -51,7 +51,6 @@ - - #include <pwd.h> - #include <grp.h> --#include <security/pam_appl.h> - - #ifdef HAVE_SYSTEMD_LOGIN - #include <systemd/sd-login.h> -@@ -100,8 +99,6 @@ - #endif - - struct weston_launch { -- struct pam_conv pc; -- pam_handle_t *ph; - int tty; - int ttynr; - int sock[2]; -@@ -193,47 +190,6 @@ - } - - static int --pam_conversation_fn(int msg_count, -- const struct pam_message **messages, -- struct pam_response **responses, -- void *user_data) --{ -- return PAM_SUCCESS; --} -- --static int --setup_pam(struct weston_launch *wl) --{ -- int err; -- -- wl->pc.conv = pam_conversation_fn; -- wl->pc.appdata_ptr = wl; -- -- err = pam_start("login", wl->pw->pw_name, &wl->pc, &wl->ph); -- if (err != PAM_SUCCESS) { -- fprintf(stderr, "failed to start pam transaction: %d: %s\n", -- err, pam_strerror(wl->ph, err)); -- return -1; -- } -- -- err = pam_set_item(wl->ph, PAM_TTY, ttyname(wl->tty)); -- if (err != PAM_SUCCESS) { -- fprintf(stderr, "failed to set PAM_TTY item: %d: %s\n", -- err, pam_strerror(wl->ph, err)); -- return -1; -- } -- -- err = pam_open_session(wl->ph, 0); -- if (err != PAM_SUCCESS) { -- fprintf(stderr, "failed to open pam session: %d: %s\n", -- err, pam_strerror(wl->ph, err)); -- return -1; -- } -- -- return 0; --} -- --static int - setup_launcher_socket(struct weston_launch *wl) - { - if (socketpair(AF_LOCAL, SOCK_SEQPACKET, 0, wl->sock) < 0) { -@@ -431,14 +387,6 @@ - close(wl->signalfd); - close(wl->sock[0]); - -- if (wl->new_user) { -- err = pam_close_session(wl->ph, 0); -- if (err) -- fprintf(stderr, "pam_close_session failed: %d: %s\n", -- err, pam_strerror(wl->ph, err)); -- pam_end(wl->ph, err); -- } -- - if (ioctl(wl->tty, KDSKBMUTE, 0) && - ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) - fprintf(stderr, "failed to restore keyboard mode: %s\n", -@@ -660,15 +608,6 @@ - setenv("HOME", wl->pw->pw_dir, 1); - setenv("SHELL", wl->pw->pw_shell, 1); - -- env = pam_getenvlist(wl->ph); -- if (env) { -- for (i = 0; env[i]; ++i) { -- if (putenv(env[i]) != 0) -- fprintf(stderr, "putenv %s failed\n", env[i]); -- } -- free(env); -- } -- - /* - * We open a new session, so it makes sense - * to run a new login shell -@@ -739,8 +678,6 @@ - help(const char *name) - { - fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); -- fprintf(stderr, " -u, --user Start session as specified username,\n" -- " e.g. -u joe, requires root.\n"); - fprintf(stderr, " -t, --tty Start session on alternative tty,\n" - " e.g. -t /dev/tty4, requires -u option.\n"); - fprintf(stderr, " -v, --verbose Be verbose\n"); -@@ -754,7 +691,6 @@ - int i, c; - char *tty = NULL; - struct option opts[] = { -- { "user", required_argument, NULL, 'u' }, - { "tty", required_argument, NULL, 't' }, - { "verbose", no_argument, NULL, 'v' }, - { "help", no_argument, NULL, 'h' }, -@@ -766,11 +702,7 @@ - while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { - switch (c) { - case 'u': -- wl.new_user = optarg; -- if (getuid() != 0) { -- fprintf(stderr, "weston: Permission denied. -u allowed for root only\n"); -- exit(EXIT_FAILURE); -- } -+ fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n"); - break; - case 't': - tty = optarg; -@@ -822,9 +754,6 @@ - if (setup_tty(&wl, tty) < 0) - exit(EXIT_FAILURE); - -- if (wl.new_user && setup_pam(&wl) < 0) -- exit(EXIT_FAILURE); -- - if (setup_launcher_socket(&wl) < 0) - exit(EXIT_FAILURE); - diff --git a/desktop/weston/weston.SlackBuild b/desktop/weston/weston.SlackBuild index d44a73d774..b3a5c474cc 100644 --- a/desktop/weston/weston.SlackBuild +++ b/desktop/weston/weston.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=weston -VERSION=${VERSION:-7.0.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-8.0.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,19 +60,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -# If you have PAM installed on your system and would like to make use -# of it, run this as USE_PAM=true ./weston.Slackbuild -# otherwise, a patch will be applied to remove the PAM dependency. - -USE_PAM=${USE_PAM:-false} - -if [ "$USE_PAM" != 'true' ]; then - patch -p1 < $CWD/weston-7.0.0-nopam.patch -fi - # Make sure ownerships and permissions are sane: chown -R root:root . find -L . \ @@ -189,9 +179,9 @@ EOF # Install some documentation and finish up. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README.md CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CONTRIBUTING.md COPYING DCO-1.1.txt README.md notes.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware +cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/desktop/weston/weston.info b/desktop/weston/weston.info index b9bf225c8f..2b0bfddeb7 100644 --- a/desktop/weston/weston.info +++ b/desktop/weston/weston.info @@ -1,10 +1,10 @@ PRGNAM="weston" -VERSION="7.0.0" +VERSION="8.0.0" HOMEPAGE="https://wayland.freedesktop.org/" -DOWNLOAD="https://wayland.freedesktop.org/releases/weston-7.0.0.tar.xz" -MD5SUM="cbfda483bc2501d0831af3f33c707850" +DOWNLOAD="https://github.com/wayland-project/weston/archive/8.0.0/weston-8.0.0.tar.gz" +MD5SUM="f8a67cd7902589e7a4e33b008ca88757" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libinput libwebp libxkbcommon wayland wayland-protocols" +REQUIRES="" MAINTAINER="Logan Rathbone" EMAIL="poprocks@gmail.com" diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild index b742c2b5bf..e9d2116c19 100644 --- a/desktop/wmCalClock/wmCalClock.SlackBuild +++ b/desktop/wmCalClock/wmCalClock.SlackBuild @@ -54,7 +54,7 @@ find -L . \ cd Src make \ - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" mkdir -p $PKG/usr/{bin,man/man1} diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild index 72d0829603..897b14e6e2 100644 --- a/desktop/wmMoonClock/wmMoonClock.SlackBuild +++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild @@ -56,7 +56,7 @@ find -L . \ cd Src mkdir -p $PKG/usr/{bin,man/man1} make \ - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" make install DESTDIR=$PKG/usr diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild index abd74e5aeb..b8e5395186 100644 --- a/desktop/wmSun/wmSun.SlackBuild +++ b/desktop/wmSun/wmSun.SlackBuild @@ -55,7 +55,7 @@ find -L . \ cd wmSun mkdir -p $PKG/usr/{bin,man/man1} make \ - COPTS="$SLKCFLAGS" \ + COPTS="$SLKCFLAGS -fcommon" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" make install DESTDIR=$PKG/usr diff --git a/desktop/wmakerconf/README b/desktop/wmakerconf/README deleted file mode 100644 index 6be3f64ed9..0000000000 --- a/desktop/wmakerconf/README +++ /dev/null @@ -1,5 +0,0 @@ -WMakerConf (short for Window Maker Configurator) is a configuration -utility for the Window Maker window manager. - -WMakerConf requires WindowMaker to be installed (it's part of -Slackware). diff --git a/desktop/wmakerconf/doinst.sh b/desktop/wmakerconf/doinst.sh deleted file mode 100644 index 2e82bb7622..0000000000 --- a/desktop/wmakerconf/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 -fi diff --git a/desktop/wmakerconf/slack-desc b/desktop/wmakerconf/slack-desc deleted file mode 100644 index 60fed0e4d6..0000000000 --- a/desktop/wmakerconf/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------------------------------------------------------| -wmakerconf: wmakerconf (GTK+ based configuration tool for Window Maker) -wmakerconf: -wmakerconf: WMakerConf (short for Window Maker Configurator) is a configuration -wmakerconf: utility for the Window Maker window manager. -wmakerconf: -wmakerconf: homepage: http://wmakerconf.sourceforge.net -wmakerconf: -wmakerconf: -wmakerconf: -wmakerconf: -wmakerconf: diff --git a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch b/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch deleted file mode 100644 index 5b598c3c15..0000000000 --- a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -Naur wmakerconf-2.12.orig/src/menu.c wmakerconf-2.12/src/menu.c ---- wmakerconf-2.12.orig/src/menu.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/menu.c 2012-02-10 17:35:03.917287748 +0100 -@@ -500,10 +500,10 @@ - * No return value. - */ - { -- if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES)) -+ if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname)) - warning (_("Can't revert to backupfile of `WindowMaker'. " - "Please manually revert from file WindowMaker.bak.")); -- if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES)) -+ if (orig_rootmenu && !WMWritePropListToFile(orig_rootmenu, orig_rootmenu_fname)) - warning (_("Can't revert to backupfile of `WMRootMenu'. " - "Please manually revert from file WMRootMenu.bak.")); - gtk_main_quit (); -diff -Naur wmakerconf-2.12.orig/src/rootmenu.c wmakerconf-2.12/src/rootmenu.c ---- wmakerconf-2.12.orig/src/rootmenu.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/rootmenu.c 2012-02-10 17:35:03.929287391 +0100 -@@ -365,7 +365,7 @@ - node_freeitem, NULL); - g_node_destroy (node); - -- if (WMWritePropListToFile (menu, filename, YES)) -+ if (WMWritePropListToFile(menu, filename)) - { - menu_changed = NO; - message (_("Window Maker root menu file '%s' saved."), filename); -diff -Naur wmakerconf-2.12.orig/src/themebrowser.c wmakerconf-2.12/src/themebrowser.c ---- wmakerconf-2.12.orig/src/themebrowser.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/themebrowser.c 2012-02-10 17:35:56.515722786 +0100 -@@ -2705,7 +2705,7 @@ - oldfiles = g_list_remove (oldfiles, tmp); - Free (tmp); - } -- if (!WMWritePropListToFile (theme, stylename, YES)) -+ if (!WMWritePropListToFile(theme, stylename)) - { - dialog_popup (DIALOG_ERROR, NULL, NULL, - _("Can't save theme file\n`%s'\n" -diff -Naur wmakerconf-2.12.orig/src/window.c wmakerconf-2.12/src/window.c ---- wmakerconf-2.12.orig/src/window.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/window.c 2012-02-10 17:35:03.953286677 +0100 -@@ -1069,7 +1069,7 @@ - WMReleasePropList (all_keys); - } - -- if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES)) -+ if (WMWritePropListToFile(newwm, orig_wmaker_fname)) - { - changed = NO; - message (_("Window Maker config file '%s' saved."), -diff -Naur wmakerconf-2.12.orig/src/wmconfig.c wmakerconf-2.12/src/wmconfig.c ---- wmakerconf-2.12.orig/src/wmconfig.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/wmconfig.c 2012-02-10 17:35:03.957286559 +0100 -@@ -216,7 +216,7 @@ - /* - * Generate backup file "'path'.bak" - */ -- if (WMWritePropListToFile (orig_rootmenu, new, YES)) -+ if (WMWritePropListToFile(orig_rootmenu, new)) - message (_("Backupfile `%s' generated."), new); - else - error (_("Can't write backupfile `%s'."), new); -@@ -280,7 +280,7 @@ - if (!windowmaker) - { - windowmaker = global_windowmaker; -- if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES)) -+ if (WMWritePropListToFile(windowmaker, orig_wmaker_fname)) - warning (_("New WindowMaker configuration file `%s' created."), - orig_wmaker_fname); - else -@@ -294,7 +294,7 @@ - /* - * Generate backup file "'path'.bak" - */ -- if (WMWritePropListToFile (windowmaker, new, YES)) -+ if (WMWritePropListToFile(windowmaker, new)) - message (_("Backupfile `%s' generated."), new); - else - error (_("Can't write backupfile `%s'."), new); diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild deleted file mode 100644 index a971aba9b7..0000000000 --- a/desktop/wmakerconf/wmakerconf.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script for wmakerconf -# Written by Cezary M. Kruk (c.kruk@bigfoot.com) -# -# Modified by the SlackBuilds.org project. - -PRGNAM=wmakerconf -VERSION=${VERSION:-2.12} -BUILD=${BUILD:-3} -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.gz -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Fix for building over windowmaer >= 0.95.2 -# http://sourceforge.net/tracker/?func=detail&aid=3522083&group_id=196469&atid=957581 -patch -p1 < $CWD/wmakerconf-2.12-wmaker-0.95_support.patch - -# Fix linking to X11 libs -sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --with-wmakeretcprefix=/etc/X11 \ - --localstatedir=/var \ - --mandir=/usr/man \ - --disable-debug \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 COPYING ChangeLog INSTALL MANUAL NEWS NLS-TEAM1 README TODO \ - $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/wmakerconf/wmakerconf.info b/desktop/wmakerconf/wmakerconf.info deleted file mode 100644 index 4052e2da2e..0000000000 --- a/desktop/wmakerconf/wmakerconf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wmakerconf" -VERSION="2.12" -HOMEPAGE="http://wmakerconf.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/wmakerconf/wmakerconf_2.12.tar.gz" -MD5SUM="252114b5ee5fc5bec99477497ee045cc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Cezary M. Kruk" -EMAIL="c.kruk@bigfoot.com" diff --git a/desktop/wminfo/wminfo.SlackBuild b/desktop/wminfo/wminfo.SlackBuild index 4ee642a4b6..5058af6cb2 100644 --- a/desktop/wminfo/wminfo.SlackBuild +++ b/desktop/wminfo/wminfo.SlackBuild @@ -56,7 +56,7 @@ cd wminfo ./configure --prefix=/usr make \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \ - CFLAGS="$SLKCFLAGS -fgnu89-inline" + CFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon" # Copy executable to the correct location mkdir -p $PKG/usr/bin diff --git a/desktop/wmsm.app/wmsm.app.SlackBuild b/desktop/wmsm.app/wmsm.app.SlackBuild index f11e4996e2..9c4f7eb1f1 100644 --- a/desktop/wmsm.app/wmsm.app.SlackBuild +++ b/desktop/wmsm.app/wmsm.app.SlackBuild @@ -54,7 +54,7 @@ find -L . \ cd wmsm make \ - CFLAGS="$SLKCFLAGS -fgnu89-inline" \ + CFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" # Executable is copied to the correct location diff --git a/desktop/wmtop/wmtop.SlackBuild b/desktop/wmtop/wmtop.SlackBuild index 26413c4b92..3434d0a1de 100644 --- a/desktop/wmtop/wmtop.SlackBuild +++ b/desktop/wmtop/wmtop.SlackBuild @@ -56,7 +56,7 @@ make \ PREFIX=/usr \ INCS="-I/usr/include" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" \ - OPTS="$SLKCFLAGS -fgnu89-inline" \ + OPTS="$SLKCFLAGS -fgnu89-inline -fcommon" \ linux mkdir -p $PKG/usr/bin $PKG/usr/man/man1 diff --git a/desktop/wmweather/wmweather.SlackBuild b/desktop/wmweather/wmweather.SlackBuild index b7f8d24235..5f347e662a 100644 --- a/desktop/wmweather/wmweather.SlackBuild +++ b/desktop/wmweather/wmweather.SlackBuild @@ -51,7 +51,7 @@ find -L . \ -exec chmod 644 {} \; cd src - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/workrave/README b/desktop/workrave/README new file mode 100644 index 0000000000..446e900f7e --- /dev/null +++ b/desktop/workrave/README @@ -0,0 +1,4 @@ +Workrave is a program that assists in the recovery and prevention of +Repetitive Strain Injury (RSI). +The program frequently alerts you to take micro-pauses, rest breaks +and restricts you to your daily limit. diff --git a/desktop/workrave/doinst.sh b/desktop/workrave/doinst.sh new file mode 100644 index 0000000000..b34040d04c --- /dev/null +++ b/desktop/workrave/doinst.sh @@ -0,0 +1,19 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +# If other icon themes are installed, then add to/modify this as needed +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 + +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + +# If needed -- be sure to sed @LIBDIR@ inside the build script +chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ 1> /dev/null 2> /dev/null diff --git a/desktop/workrave/slack-desc b/desktop/workrave/slack-desc new file mode 100644 index 0000000000..a6374fc7cf --- /dev/null +++ b/desktop/workrave/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------------------------------------------------------| +workrave: workrave (work breaks alerts) +workrave: +workrave: Workrave is a program that assists in the recovery and prevention of +workrave: Repetitive Strain Injury (RSI). +workrave: The program frequently alerts you to take micro-pauses, rest breaks +workrave: and restricts you to your daily limit. +workrave: +workrave: homepage: http://workrave.org +workrave: +workrave: +workrave: diff --git a/desktop/thunar-dropbox/thunar-dropbox.SlackBuild b/desktop/workrave/workrave.SlackBuild index 0f9be96ad8..ec4764038a 100644 --- a/desktop/thunar-dropbox/thunar-dropbox.SlackBuild +++ b/desktop/workrave/workrave.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for Thunar Dropbox +# Slackware build script for workrave -# Copyright 2010 Murat D. Kadirov <banderols@gmail.com> +# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,15 +22,14 @@ # 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} +PRGNAM=workrave +VERSION=${VERSION:-1.10.34} 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 @@ -41,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" @@ -61,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -70,19 +69,30 @@ 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 {} \; -./waf configure --prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} -./waf build -./waf install --destdir=$PKG +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.txt $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 +sed "s|@LIBDIR@|/usr/lib$LIBDIRSUFFIX|" $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/workrave/workrave.info b/desktop/workrave/workrave.info new file mode 100644 index 0000000000..f464aa52a0 --- /dev/null +++ b/desktop/workrave/workrave.info @@ -0,0 +1,10 @@ +PRGNAM="workrave" +VERSION="1.10.34" +HOMEPAGE="http://workrave.org" +DOWNLOAD="https://github.com/rcaelers/workrave/releases/download/v1_10_34/workrave-1.10.34.tar.gz" +MD5SUM="25914f54ea1e6395da7b88be2f189093" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="Jinja2" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info index dd1a239415..a1e321ac1c 100644 --- a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info +++ b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.info @@ -5,6 +5,6 @@ DOWNLOAD="https://git.xfce.org/apps/xfce4-volumed-pulse/snapshot/xfce4-volumed-p MD5SUM="017b42c2de12ce74f1f7833c6edbd082" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="keybinder" MAINTAINER="Dominik Drobek" EMAIL="dominik.drobek@o2.pl" diff --git a/desktop/yad/README b/desktop/yad/README index d8cbddb7e6..934b1583dd 100644 --- a/desktop/yad/README +++ b/desktop/yad/README @@ -4,7 +4,4 @@ Yad is a fork of Zenity with many improvements, including custom buttons, additional dialogs and a pop-up menu in the notification area. -The optional dependency webkitgtk enables the html widget. - -By default this is built against gtk+2: if you want to use it -with gtk+3 pass the script the parameter GTK=3 +Optional dependencies: gtksourceview3 and webkit2gtk. diff --git a/desktop/yad/doinst.sh b/desktop/yad/doinst.sh index 19400050fd..d6d225b6df 100644 --- a/desktop/yad/doinst.sh +++ b/desktop/yad/doinst.sh @@ -4,3 +4,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi diff --git a/desktop/yad/slack-desc b/desktop/yad/slack-desc index 07875fb003..edf960164a 100644 --- a/desktop/yad/slack-desc +++ b/desktop/yad/slack-desc @@ -11,9 +11,9 @@ yad: yad: Yad (yet another dialog) is a fork of Zenity with many improvements, yad: including custom buttons, additional dialogs and a pop-up menu in yad: the notification area. -yad: yad: There were two main reasons for this fork. The first was to remove yad: dependencies on deprecated libraries like libglade and gnome-canvas. yad: The second was the slow pace of Zenity development including many yad: unimplemented enhancement suggestions in the GNOME Bugzilla. yad: +yad: homepage: https://github.com/v1cont/yad/ diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild index 0b08f08e7a..2fbe6bd2a9 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-2020 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:-7.3} 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..3724eb5749 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="7.3" +HOMEPAGE="https://github.com/v1cont/yad/" +DOWNLOAD="https://github.com/v1cont/yad/releases/download/v7.3/yad-7.3.tar.xz" +MD5SUM="75883db190160e613709239049fe777a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |