libraries/compiz-plugins-main: Updated for version 0.8.18.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
parent
12afbc3c79
commit
ebdc308f03
|
@ -1,21 +1,14 @@
|
|||
This is the main plugin package for Compiz Fusion.
|
||||
|
||||
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.
|
||||
This is the main plugin package for 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)
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Slackware build script for compiz-plugins-main
|
||||
|
||||
# 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=compiz-plugins-main
|
||||
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 {} \;
|
||||
|
||||
# Fix focus position on some situations with ATK >= 2.36
|
||||
patch -p1 < $CWD/fix_focus_position.patch
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
|
@ -93,6 +96,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
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="compiz-plugins-main"
|
||||
VERSION="0.8.14"
|
||||
HOMEPAGE="https://github.com/raveit65/compiz-plugins-main"
|
||||
DOWNLOAD="https://github.com/compiz-reloaded/compiz-plugins-main/releases/download/v0.8.14/compiz-plugins-main-0.8.14.tar.xz"
|
||||
MD5SUM="b39a9a250931285574ef296542ceb6cc"
|
||||
VERSION="0.8.18"
|
||||
HOMEPAGE="https://github.com/compiz-reloaded/compiz-plugins-main"
|
||||
DOWNLOAD="http://www.northfield.ws/projects/compiz/releases/0.8.18/compiz-plugins-main-0.8.18.tar.xz"
|
||||
MD5SUM="d981f1c2606e07f8f0e5e52372f7d7bd"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="ccsm"
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
diff --git a/src/focuspoll/accessibilitywatcher.cpp b/src/focuspoll/accessibilitywatcher.cpp
|
||||
index 9952755..840763e 100644
|
||||
--- a/src/focuspoll/accessibilitywatcher.cpp
|
||||
+++ b/src/focuspoll/accessibilitywatcher.cpp
|
||||
@@ -595,7 +595,7 @@ AccessibilityWatcher::activityEvent (const AtspiEvent *event, const gchar *type)
|
||||
}
|
||||
|
||||
// still no offset, it's probably a newline and we're at bugzilla #1319273 (with new paragraph obj)
|
||||
- if (res->x == 0 && res->y == 0 &&
|
||||
+ if (((res->x == 0 && res->y == 0) || (res->x == -1 && res->y == -1)) &&
|
||||
(strcmp (event->type, "object:text-changed:insert") == 0 ||
|
||||
strcmp (event->type, "object:text-changed:removed") == 0 ||
|
||||
strcmp (event->type, "object:text-caret-moved") == 0 ||
|
||||
@@ -698,7 +698,7 @@ AccessibilityWatcher::appSpecificFilter (FocusInfo *focus, const AtspiEvent* eve
|
||||
focus->w = focus->wAlt;
|
||||
focus->h = focus->hAlt;
|
||||
}
|
||||
- if (!(focus->x == 0 && focus->y == 0))
|
||||
+ if (!((focus->x == 0 && focus->y == 0) || (focus->x == -1 && focus->y == -1)))
|
||||
{ // prevents compose window loss of tracking in HTML mode (active flag ok, but no focused flag)
|
||||
queueFocus (focus);
|
||||
return true;
|
||||
@@ -743,14 +743,14 @@ AccessibilityWatcher::appSpecificFilter (FocusInfo *focus, const AtspiEvent* eve
|
||||
isEditableText = atspi_state_set_contains (stateSet.get (), ATSPI_STATE_EDITABLE);
|
||||
}
|
||||
if ((strcmp (focus->type, "caret") == 0 || isEditableText) &&
|
||||
- !(focus->x == 0 && focus->y == 0))
|
||||
+ !((focus->x == 0 && focus->y == 0) || (focus->x == -1 && focus->y == -1)))
|
||||
{
|
||||
queueFocus (focus);
|
||||
return true;
|
||||
}
|
||||
getAlternativeCaret (focus, event);
|
||||
if ((strcmp (focus->type, "caret") == 0 || isEditableText) &&
|
||||
- !(focus->xAlt == 0 && focus->yAlt == 0))
|
||||
+ !((focus->xAlt == 0 && focus->yAlt == 0) || (focus->xAlt == -1 && focus->yAlt == -1)))
|
||||
{
|
||||
focus->x = focus->xAlt;
|
||||
focus->y = focus->yAlt;
|
||||
@@ -865,7 +865,7 @@ AccessibilityWatcher::getAlternativeCaret (FocusInfo *focus, const AtspiEvent* e
|
||||
string = unique_gmem (atspi_text_get_string_at_offset (text.get (), offset - charIndex, ATSPI_TEXT_GRANULARITY_CHAR, NULL));
|
||||
caretChar = string.get ()->content[0];
|
||||
// if we found a caret, check we're at beginning of line (or of text) to extrapolate position
|
||||
- if (size.get ()->x != 0 || size.get ()->y != 0)
|
||||
+ if ((size.get ()->x != 0 || size.get ()->y != 0) && (size.get ()->x != -1 || size.get ()->y != -1))
|
||||
{
|
||||
if (offset - charIndex -1 >= 0 && unique_gmem (atspi_text_get_string_at_offset (text.get (), offset - charIndex -1, ATSPI_TEXT_GRANULARITY_CHAR, NULL)).get ()->content[0] == '\n')
|
||||
{
|
||||
|
Loading…
Reference in New Issue