diff options
Diffstat (limited to 'desktop/emerald')
| -rw-r--r-- | desktop/emerald/README | 31 | ||||
| -rw-r--r-- | desktop/emerald/README.Slackware | 46 | ||||
| -rw-r--r-- | desktop/emerald/emerald.SlackBuild | 10 | ||||
| -rw-r--r-- | desktop/emerald/emerald.info | 8 | ||||
| -rw-r--r-- | desktop/emerald/tar_ordering_fix.patch | 25 |
5 files changed, 49 insertions, 71 deletions
diff --git a/desktop/emerald/README b/desktop/emerald/README index e303166af1fd..180a7cfa9f44 100644 --- a/desktop/emerald/README +++ b/desktop/emerald/README @@ -1,23 +1,16 @@ The Emerald Window Decorator is a custom window decorator shipped -with Compiz Fusion that allows for theming and full composite window +with Compiz that allows for theming and full composite window decorations with the use of engines. -PLEASE read the README.Slackware file BEFORE you install any of the -compiz packages. The install order is listed below but there are -some important notes you need to be aware of before you install/use -compiz. - For correct installation, build in this order: - 1. compiz (not available at SBo, see the README.Slackware file) - 2. compiz-bcop - 3. protobuf (optional but recommended) - 4. libcompizconfig - 5. compiz (optional, see the README.Slackware file) - 6. compizconfig-python - 7. ccsm - 8. compiz-plugins-main - 9. compiz-plugins-extra (optional) -10. compiz-plugins-experimental (optional) -11. emerald (optional) -12. emerald-themes (optional) -13. fusion-icon (optional) +compiz-bcop +protobuf3 (optional but recommended) +libcompizconfig +compizconfig-python +ccsm +compiz-plugins-main +compiz-plugins-extra (optional) +compiz-plugins-experimental (optional) +emerald (optional) +emerald-themes (optional) +fusion-icon (optional) diff --git a/desktop/emerald/README.Slackware b/desktop/emerald/README.Slackware deleted file mode 100644 index cb4f9f8c018d..000000000000 --- a/desktop/emerald/README.Slackware +++ /dev/null @@ -1,46 +0,0 @@ -1) Slackware still ships the old 0.8.8 release of compiz that was - released back in 2011. The project has recently been picked up - and is being actively maintained by the compiz-reloaded team. - You can still use the 0.8.8 version of the compiz that ships - with Slackware with the companion packages since there has not been - any ABI changes to the code. But there is a good chance you will run - into stabilty issues if you do, so it is HIGHLY recommended you use - the version of compiz that matches the companion packages. Because - you will be replacing a stock Slackware package the SlackBuild is - not hosted at www.slackbuilds.org. You can download the SlackBuild - from the link below. - - https://www.dropbox.com/s/t08cb1u00he4cyo/compiz-0.8.14-SlackBuild.tar.gz - - This SlackBuild is based off the 14.2 stock Slackware SlackBuild so you - shouldn't run into any problems. If you do use this version of compiz you - will need to blacklist compiz in your /etc/slackpkg/blacklist file to keep - slackpkg from reverting the package back to 0.8.8 - -2) Compiz now has basic support for the MATE desktop. You will have to install - MATE before you install compiz for support. The MATE slackware project - website is located here https://mateslackbuilds.github.io/ - -3) The compizconfig-backend-kconfig4 package has been removed from the - project so if you are upgrading from a previous version you will want - to remove this package. Also compiz-plugins-unsupported has now been - renamed to compiz-plugins-experimental so you will need to remove - compiz-plugins-unsupported before you upgrade to the newest packages. - -4) The install order has compiz listed twice. libcompizconfig depends - on compiz, but compiz has some extra window decorator related features - that depend on libcompizconfig. So if you want these extra features you - will have to recompile compiz again AFTER you build and install - libcompizconfig. This is not required it is just an option if you want - to do it. - -5) After you install compiz and the companion packages you will need to - launch CCSM and enable "Move", "Resize Window", and "Window Decorations" - before you start compiz. This way you can manage your windows. After - you enable those three options you can start compiz and customize to - your liking. - - - - - diff --git a/desktop/emerald/emerald.SlackBuild b/desktop/emerald/emerald.SlackBuild index 797c6e0ddbae..a663b34bdc55 100644 --- a/desktop/emerald/emerald.SlackBuild +++ b/desktop/emerald/emerald.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for emerald -# Copyright 2016 Matt Dinslage, Springfield, MO +# Copyright 2021 Matt Dinslage, Springfield, MO # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=emerald -VERSION=${VERSION:-0.8.14} +VERSION=${VERSION:-0.8.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,6 +79,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 {} \; +# make emerald-theme-manager compatible with newer versions of tar +patch -p1 < $CWD/tar_ordering_fix.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -95,6 +98,9 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +# Don't ship .la files: +find $PKG -type f -iname '*.la' -exec rm -rf {} \+ + 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/emerald/emerald.info b/desktop/emerald/emerald.info index 588b65dc7632..e0da09358286 100644 --- a/desktop/emerald/emerald.info +++ b/desktop/emerald/emerald.info @@ -1,8 +1,8 @@ PRGNAM="emerald" -VERSION="0.8.14" -HOMEPAGE="https://github.com/raveit65/emerald" -DOWNLOAD="https://github.com/compiz-reloaded/emerald/releases/download/v0.8.14/emerald-0.8.14.tar.xz" -MD5SUM="f1d152b57d5844cf9b00f0f705d0b534" +VERSION="0.8.18" +HOMEPAGE="https://github.com/compiz-reloaded/emerald" +DOWNLOAD="http://www.northfield.ws/projects/compiz/releases/0.8.18/emerald-0.8.18.tar.xz" +MD5SUM="8a0119cd80aae2c8a9a0dfdd463b7670" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ccsm" diff --git a/desktop/emerald/tar_ordering_fix.patch b/desktop/emerald/tar_ordering_fix.patch new file mode 100644 index 000000000000..10fd120efd9e --- /dev/null +++ b/desktop/emerald/tar_ordering_fix.patch @@ -0,0 +1,25 @@ +From ddc504ea11ee9f16202be0aa5fb104bae1273643 Mon Sep 17 00:00:00 2001 +From: Steven M Campbell <scampbell@scampbell.net> +Date: Sun, 2 May 2021 17:39:16 -0400 +Subject: [PATCH] emerald-theme-manager is now compatible with newer versions + of tar. The tar command now requires that the exclude directives come before + the specification of files to archive. This new ordering is compatible with + older versions of tar as well making this an easy fix. + +--- + themer/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/themer/main.c b/themer/main.c +index c936a64..9aad0b4 100644 +--- a/themer/main.c ++++ b/themer/main.c +@@ -512,7 +512,7 @@ static void export_theme(gchar * file) + at = g_shell_quote(fn); + g_free(fn); + fn = g_shell_quote(file); +- ot = g_strdup_printf("tar -czf %s -C %s ./ --exclude=*~",fn,at); ++ ot = g_strdup_printf("tar -czf %s -C %s --exclude=*~ ./",fn,at); + if (!g_spawn_command_line_sync(ot,NULL,NULL,&ex,NULL) || + (WIFEXITED(ex)&&WEXITSTATUS(ex))) + { |