update to 0.7.6
This commit is contained in:
parent
1ca7a6f514
commit
ed717a067f
@ -1,240 +0,0 @@
|
|||||||
From: Dennis Kasprzyk <onestone@opencompositing.org>
|
|
||||||
Date: Tue, 6 May 2008 20:57:17 +0000 (+0200)
|
|
||||||
Subject: Applied plasma API changes.
|
|
||||||
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/app/compiz.git;a=commitdiff;h=ea6a2ce70ed5ff1a3544fd3165e21559d4f70854
|
|
||||||
|
|
||||||
Applied plasma API changes.
|
|
||||||
---
|
|
||||||
|
|
||||||
--- a/kde/window-decorator-kde4/decorator.cpp
|
|
||||||
+++ b/kde/window-decorator-kde4/decorator.cpp
|
|
||||||
@@ -23,6 +23,7 @@
|
|
||||||
|
|
||||||
#include <KDE/KCmdLineArgs>
|
|
||||||
#include <KDE/KConfig>
|
|
||||||
+#include <KDE/KConfigGroup>
|
|
||||||
#include <KDE/KGlobal>
|
|
||||||
#include <kwindowsystem.h>
|
|
||||||
#include <KDE/KLocale>
|
|
||||||
@@ -106,6 +107,9 @@ KWD::Decorator::Decorator (Display* disp
|
|
||||||
|
|
||||||
mActiveId = 0;
|
|
||||||
|
|
||||||
+ KConfigGroup cfg (KSharedConfig::openConfig("plasmarc"), QString("Theme"));
|
|
||||||
+ Plasma::Theme::defaultTheme ()->setThemeName (cfg.readEntry ("name"));
|
|
||||||
+
|
|
||||||
Atoms::init ();
|
|
||||||
|
|
||||||
(void *) new KWinAdaptor (this);
|
|
||||||
@@ -237,9 +241,9 @@ KWD::Decorator::enableDecorations (Time
|
|
||||||
|
|
||||||
connect (&mIdleTimer, SIGNAL (timeout ()), SLOT (processDamage ()));
|
|
||||||
|
|
||||||
- connect (Plasma::Theme::self (), SIGNAL (changed ()),
|
|
||||||
+ connect (Plasma::Theme::defaultTheme (), SIGNAL (themeChanged ()),
|
|
||||||
SLOT (plasmaThemeChanged ()));
|
|
||||||
-
|
|
||||||
+
|
|
||||||
// select for client messages
|
|
||||||
XSelectInput (QX11Info::display(), QX11Info::appRootWindow(),
|
|
||||||
StructureNotifyMask | PropertyChangeMask);
|
|
||||||
--- a/kde/window-decorator-kde4/switcher.cpp
|
|
||||||
+++ b/kde/window-decorator-kde4/switcher.cpp
|
|
||||||
@@ -30,7 +30,7 @@
|
|
||||||
|
|
||||||
#include <fixx11h.h>
|
|
||||||
|
|
||||||
-#include <KDE/Plasma/Svg>
|
|
||||||
+#include <KDE/Plasma/PanelSvg>
|
|
||||||
#include <KDE/Plasma/Theme>
|
|
||||||
|
|
||||||
#include <kwindowsystem.h>
|
|
||||||
@@ -43,15 +43,20 @@ mId (id)
|
|
||||||
{
|
|
||||||
QPalette palette;
|
|
||||||
long prop[4];
|
|
||||||
- QColor color = Plasma::Theme::self ()->textColor ();
|
|
||||||
+ QColor color;
|
|
||||||
+ color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
|
|
||||||
|
|
||||||
- mBackground = new Plasma::Svg("widgets/background");
|
|
||||||
-
|
|
||||||
- mBorder.left = mBackground->elementSize ("left").width ();
|
|
||||||
- mBorder.right = mBackground->elementSize ("right").width ();
|
|
||||||
- mBorder.top = mBackground->elementSize ("top").height ();
|
|
||||||
- mBorder.bottom = mBackground->elementSize ("bottom").height () +
|
|
||||||
- Plasma::Theme::self ()->fontMetrics ().height () + 10;
|
|
||||||
+ mBackground = new Plasma::PanelSvg();
|
|
||||||
+ mBackground->setImagePath ("dialogs/background");
|
|
||||||
+ mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
|
|
||||||
+
|
|
||||||
+ kDebug() << Plasma::Theme::defaultTheme ()->themeName();
|
|
||||||
+ kDebug () << KGlobal::mainComponent().componentName();
|
|
||||||
+ mBorder.left = mBackground->marginSize(Plasma::LeftMargin);
|
|
||||||
+ mBorder.right = mBackground->marginSize(Plasma::RightMargin);
|
|
||||||
+ mBorder.top = mBackground->marginSize(Plasma::TopMargin);
|
|
||||||
+ mBorder.bottom = mBackground->marginSize(Plasma::BottomMargin) +
|
|
||||||
+ Plasma::Theme::defaultTheme ()->fontMetrics ().height () + 10;
|
|
||||||
|
|
||||||
mContext.extents.left = mBorder.left;
|
|
||||||
mContext.extents.right = mBorder.right;
|
|
||||||
@@ -115,14 +120,6 @@ KWD::Switcher::updateGeometry ()
|
|
||||||
updateWindowProperties ();
|
|
||||||
}
|
|
||||||
|
|
||||||
-/*
|
|
||||||
- * This code is taken from KDE/kdebase/workspace/libs/plasma/dialog.cpp
|
|
||||||
- *
|
|
||||||
- * Copyright (C) 2007 by Alexis Ménard <darktears31@gmail.com>
|
|
||||||
- * Copyright (C) 2007 Sebastian Kuegler <sebas@kde.org>
|
|
||||||
- * Copyright (C) 2006 Aaron Seigo <aseigo@kde.org>
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
void
|
|
||||||
KWD::Switcher::redrawPixmap ()
|
|
||||||
{
|
|
||||||
@@ -131,92 +128,14 @@ KWD::Switcher::redrawPixmap ()
|
|
||||||
const int contentWidth = mPixmap.width ();
|
|
||||||
const int contentHeight = mPixmap.height ();
|
|
||||||
|
|
||||||
- const int topHeight = mBackground->elementSize ("top").height ();
|
|
||||||
- const int topWidth = mBackground->elementSize ("top").width ();
|
|
||||||
- const int leftWidth = mBackground->elementSize ("left").width ();
|
|
||||||
- const int leftHeight = mBackground->elementSize ("left").height ();
|
|
||||||
- const int rightHeight = mBackground->elementSize ("right").height ();
|
|
||||||
- const int rightWidth = mBackground->elementSize ("right").width ();
|
|
||||||
- const int bottomHeight = mBackground->elementSize ("bottom").height ();
|
|
||||||
- const int bottomWidth = mBackground->elementSize ("bottom").width ();
|
|
||||||
-
|
|
||||||
- const int topOffset = 0;
|
|
||||||
- const int leftOffset = 0;
|
|
||||||
- const int rightOffset = contentWidth - rightWidth;
|
|
||||||
- const int bottomOffset = contentHeight - bottomHeight;
|
|
||||||
- const int contentTop = topHeight;
|
|
||||||
- const int contentLeft = leftWidth;
|
|
||||||
-
|
|
||||||
mPixmap.fill (Qt::transparent);
|
|
||||||
|
|
||||||
p.setCompositionMode (QPainter::CompositionMode_Source);
|
|
||||||
p.setRenderHint (QPainter::SmoothPixmapTransform);
|
|
||||||
|
|
||||||
- mBackground->resize (contentWidth, contentHeight);
|
|
||||||
- mBackground->paint (&p, QRect (contentLeft, contentTop, contentWidth,
|
|
||||||
- contentHeight), "center");
|
|
||||||
- mBackground->resize ();
|
|
||||||
-
|
|
||||||
- mBackground->paint (&p, QRect (leftOffset, topOffset,
|
|
||||||
- leftWidth, topHeight), "topleft");
|
|
||||||
- mBackground->paint (&p, QRect (rightOffset, topOffset,
|
|
||||||
- rightWidth, topHeight), "topright");
|
|
||||||
- mBackground->paint (&p, QRect (leftOffset, bottomOffset,
|
|
||||||
- leftWidth, bottomHeight), "bottomleft");
|
|
||||||
- mBackground->paint (&p, QRect (rightOffset, bottomOffset,
|
|
||||||
- rightWidth, bottomHeight), "bottomright");
|
|
||||||
-
|
|
||||||
- if (mBackground->elementExists ("hint-stretch-borders")) {
|
|
||||||
- mBackground->paint (&p, QRect (leftOffset, contentTop,
|
|
||||||
- leftWidth, contentHeight), "left");
|
|
||||||
- mBackground->paint (&p, QRect (rightOffset, contentTop,
|
|
||||||
- rightWidth, contentHeight), "right");
|
|
||||||
- mBackground->paint (&p, QRect (contentLeft, topOffset,
|
|
||||||
- contentWidth, topHeight), "top");
|
|
||||||
- mBackground->paint (&p, QRect (contentLeft, bottomOffset,
|
|
||||||
- contentWidth, bottomHeight), "bottom");
|
|
||||||
- } else {
|
|
||||||
- QPixmap left (leftWidth, leftHeight);
|
|
||||||
- QPixmap right (rightWidth, rightHeight);
|
|
||||||
- QPixmap top (topWidth, topHeight);
|
|
||||||
- QPixmap bottom (bottomWidth, bottomHeight);
|
|
||||||
-
|
|
||||||
- left.fill (Qt::transparent);
|
|
||||||
- {
|
|
||||||
- QPainter sidePainter (&left);
|
|
||||||
- sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
|
|
||||||
- mBackground->paint (&sidePainter, QPoint (0, 0), "left");
|
|
||||||
- }
|
|
||||||
- p.drawTiledPixmap (QRect (leftOffset, contentTop, leftWidth,
|
|
||||||
- contentHeight - topHeight - bottomHeight), left);
|
|
||||||
-
|
|
||||||
- right.fill (Qt::transparent);
|
|
||||||
- {
|
|
||||||
- QPainter sidePainter (&right);
|
|
||||||
- sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
|
|
||||||
- mBackground->paint (&sidePainter, QPoint (0, 0), "right");
|
|
||||||
- }
|
|
||||||
- p.drawTiledPixmap (QRect (rightOffset, contentTop, rightWidth,
|
|
||||||
- contentHeight - topHeight - bottomHeight), right);
|
|
||||||
-
|
|
||||||
- top.fill (Qt::transparent);
|
|
||||||
- {
|
|
||||||
- QPainter sidePainter (&top);
|
|
||||||
- sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
|
|
||||||
- mBackground->paint (&sidePainter, QPoint (0, 0), "top");
|
|
||||||
- }
|
|
||||||
- p.drawTiledPixmap (QRect (contentLeft, topOffset, contentWidth -
|
|
||||||
- rightWidth - leftWidth, topHeight), top);
|
|
||||||
-
|
|
||||||
- bottom.fill (Qt::transparent);
|
|
||||||
- {
|
|
||||||
- QPainter sidePainter (&bottom);
|
|
||||||
- sidePainter.setCompositionMode (QPainter::CompositionMode_Source);
|
|
||||||
- mBackground->paint (&sidePainter, QPoint (0, 0), "bottom");
|
|
||||||
- }
|
|
||||||
- p.drawTiledPixmap (QRect (contentLeft, bottomOffset, contentWidth -
|
|
||||||
- rightWidth - leftWidth, bottomHeight), bottom);
|
|
||||||
- }
|
|
||||||
+ mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
|
|
||||||
+ mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
|
|
||||||
+ contentHeight));
|
|
||||||
|
|
||||||
mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
|
|
||||||
mGeometry.width (),
|
|
||||||
@@ -230,8 +149,9 @@ KWD::Switcher::redrawPixmap ()
|
|
||||||
void
|
|
||||||
KWD::Switcher::update ()
|
|
||||||
{
|
|
||||||
- QFontMetrics fm = Plasma::Theme::self ()->fontMetrics ();
|
|
||||||
- QFont font (Plasma::Theme::self ()->font ());
|
|
||||||
+ QFontMetrics fm = Plasma::Theme::defaultTheme ()->fontMetrics ();
|
|
||||||
+ QFont font (Plasma::Theme::defaultTheme ()->
|
|
||||||
+ font (Plasma::Theme::DefaultFont));
|
|
||||||
QString name;
|
|
||||||
QPainter p (&mPixmap);
|
|
||||||
|
|
||||||
@@ -249,15 +169,12 @@ KWD::Switcher::update ()
|
|
||||||
|
|
||||||
p.setCompositionMode (QPainter::CompositionMode_Source);
|
|
||||||
|
|
||||||
- mBackground->resize (mPixmap.width (), mPixmap.height ());
|
|
||||||
mBackground->paint (&p, QRect (mBorder.left, mBorder.top +
|
|
||||||
mGeometry.height () + 5, mGeometry.width (),
|
|
||||||
fm.height ()), "center");
|
|
||||||
- mBackground->resize ();
|
|
||||||
-
|
|
||||||
|
|
||||||
p.setFont (font);
|
|
||||||
- p.setBrush (QBrush (Plasma::Theme::self()->backgroundColor()));
|
|
||||||
+ p.setPen (Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor));
|
|
||||||
|
|
||||||
p.drawText ((mPixmap.width () - fm.width (name)) / 2,
|
|
||||||
mBorder.top + mGeometry.height () + 5 + fm.ascent (), name);
|
|
||||||
--- a/kde/window-decorator-kde4/switcher.h
|
|
||||||
+++ b/kde/window-decorator-kde4/switcher.h
|
|
||||||
@@ -30,7 +30,7 @@
|
|
||||||
|
|
||||||
namespace Plasma
|
|
||||||
{
|
|
||||||
-class Svg;
|
|
||||||
+class PanelSvg;
|
|
||||||
}
|
|
||||||
|
|
||||||
class QSpacerItem;
|
|
||||||
@@ -70,7 +70,7 @@ class Switcher
|
|
||||||
|
|
||||||
QRect mGeometry;
|
|
||||||
|
|
||||||
- Plasma::Svg *mBackground;
|
|
||||||
+ Plasma::PanelSvg *mBackground;
|
|
||||||
QPixmap mPixmap;
|
|
||||||
QPixmap mBackgroundPixmap;
|
|
||||||
|
|
76
compiz.spec
76
compiz.spec
@ -1,31 +1,31 @@
|
|||||||
%define dialogversion 0.7.17
|
%define dialogversion 0.7.17
|
||||||
%define kde_dialogversion 0.0.5
|
%define kde_dialogversion 0.0.5
|
||||||
|
|
||||||
%define core_plugins blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom fs
|
%define core_plugins blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs
|
||||||
|
|
||||||
%define gnome_plugins annotate gconf glib svg
|
%define gnome_plugins annotate gconf glib svg
|
||||||
|
|
||||||
# List of plugins passed to ./configure. The order is important
|
# List of plugins passed to ./configure. The order is important
|
||||||
|
|
||||||
%define plugins core,glib,gconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,plane
|
%define plugins core,glib,gconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall
|
||||||
|
|
||||||
Name: compiz
|
Name: compiz
|
||||||
URL: http://www.go-compiz.org
|
URL: http://www.go-compiz.org
|
||||||
License: X11/MIT/GPL
|
License: X11/MIT/GPL
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
Version: 0.7.2
|
Version: 0.7.6
|
||||||
Release: 6%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: OpenGL window and compositing manager
|
Summary: OpenGL window and compositing manager
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
# libdrm is not available on these arches
|
# libdrm is not available on these arches
|
||||||
ExcludeArch: s390 s390x ppc64
|
ExcludeArch: s390 s390x ppc64
|
||||||
|
|
||||||
Requires: xorg-x11-server-Xorg >= 1.3.0.0-19.fc8
|
Requires: xorg-x11-server-Xorg >= 1.3.0.0-19.fc8
|
||||||
Requires: mesa-libGL >= 7.0.1-2.fc8
|
Requires: mesa-libGL >= 7.0.1-2.fc8
|
||||||
Requires: system-logos
|
Requires: system-logos
|
||||||
|
Requires: compiz-fusion = %{version}
|
||||||
Requires(post): desktop-file-utils
|
Requires(post): desktop-file-utils
|
||||||
|
|
||||||
BuildRequires: libX11-devel, libdrm-devel, libwnck-devel
|
BuildRequires: libX11-devel, libdrm-devel, libwnck-devel
|
||||||
@ -51,16 +51,13 @@ Source2: kde-desktop-effects-%{kde_dialogversion}.tar.bz2
|
|||||||
# Make sure that former beryl users still have bling
|
# Make sure that former beryl users still have bling
|
||||||
Obsoletes: beryl-core
|
Obsoletes: beryl-core
|
||||||
|
|
||||||
# Upstream patch to port kde4-window-decorator to KDE 4.1 libplasma
|
|
||||||
# (This has been committed after 0.7.4, will probably be in 0.7.6.)
|
|
||||||
Patch0: compiz-0.7.2-kde41-libplasma.patch
|
|
||||||
|
|
||||||
# Patches that are not upstream
|
# Patches that are not upstream
|
||||||
|
Patch102: desktop-effects-0.7.17-wall-plugin.patch
|
||||||
Patch103: composite-cube-logo.patch
|
Patch103: composite-cube-logo.patch
|
||||||
Patch105: fedora-logo.patch
|
Patch105: fedora-logo.patch
|
||||||
Patch106: redhat-logo.patch
|
Patch106: redhat-logo.patch
|
||||||
#Patch110: scale-key.patch
|
#Patch110: scale-key.patch
|
||||||
Patch111: gconf-core-plugin-loopfix.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Compiz is one of the first OpenGL-accelerated compositing window
|
Compiz is one of the first OpenGL-accelerated compositing window
|
||||||
@ -93,6 +90,7 @@ Requires: gnome-session >= 2.19.6-5
|
|||||||
Requires: metacity >= 2.18
|
Requires: metacity >= 2.18
|
||||||
Requires: libwnck >= 2.15.4
|
Requires: libwnck >= 2.15.4
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
|
Requires: compiz-fusion-gnome = %{version}
|
||||||
Requires(pre): GConf2
|
Requires(pre): GConf2
|
||||||
Requires(post): GConf2
|
Requires(post): GConf2
|
||||||
Requires(preun): GConf2
|
Requires(preun): GConf2
|
||||||
@ -120,7 +118,9 @@ and other kde integration related stuff.
|
|||||||
%setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
|
%setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch0 -p1 -b .kde41-libplasma
|
pushd ../desktop-effects-%{dialogversion}
|
||||||
|
%patch102 -p1 -b .wall-plugin
|
||||||
|
popd
|
||||||
|
|
||||||
%patch103 -p1 -b .composite-cube-logo
|
%patch103 -p1 -b .composite-cube-logo
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
@ -129,7 +129,6 @@ and other kde integration related stuff.
|
|||||||
%patch106 -p1 -b .redhat-logo
|
%patch106 -p1 -b .redhat-logo
|
||||||
%endif
|
%endif
|
||||||
#%patch110 -p1 -b .scale-key
|
#%patch110 -p1 -b .scale-key
|
||||||
%patch111 -p1 -b .gconf-core-loop
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -144,9 +143,9 @@ export LDFLAGS
|
|||||||
|
|
||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
--enable-gconf \
|
--enable-gconf \
|
||||||
--enable-dbus \
|
--enable-dbus \
|
||||||
--enable-place \
|
--enable-place \
|
||||||
--enable-librsvg \
|
--enable-librsvg \
|
||||||
--enable-gtk \
|
--enable-gtk \
|
||||||
--enable-metacity \
|
--enable-metacity \
|
||||||
@ -160,6 +159,7 @@ make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
|
|||||||
# desktop-effects
|
# desktop-effects
|
||||||
cd ../desktop-effects-%{dialogversion}
|
cd ../desktop-effects-%{dialogversion}
|
||||||
%configure
|
%configure
|
||||||
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -171,7 +171,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
|||||||
echo INSTALLING DESKTOP EFFECTS
|
echo INSTALLING DESKTOP EFFECTS
|
||||||
pushd ../desktop-effects-%{dialogversion}
|
pushd ../desktop-effects-%{dialogversion}
|
||||||
make DESTDIR=$RPM_BUILD_ROOT install || exit 1
|
make DESTDIR=$RPM_BUILD_ROOT install || exit 1
|
||||||
desktop-file-install --vendor redhat --delete-original \
|
desktop-file-install --vendor redhat --delete-original \
|
||||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
|
$RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
|
||||||
popd
|
popd
|
||||||
@ -189,8 +189,8 @@ for i in $iconlist; do
|
|||||||
cp -p ../desktop-effects-%{dialogversion}/desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
|
cp -p ../desktop-effects-%{dialogversion}/desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
|
||||||
done
|
done
|
||||||
|
|
||||||
desktop-file-install --vendor="" \
|
desktop-file-install --vendor="" \
|
||||||
--dir=%{buildroot}%{_datadir}/applications/kde \
|
--dir=%{buildroot}%{_datadir}/applications/kde \
|
||||||
kde-desktop-effects.desktop
|
kde-desktop-effects.desktop
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -224,10 +224,14 @@ done >> gnome-files.txt
|
|||||||
update-desktop-database -q %{_datadir}/applications
|
update-desktop-database -q %{_datadir}/applications
|
||||||
|
|
||||||
export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
|
export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
|
||||||
|
|
||||||
|
SCHEMA_FILES=""
|
||||||
for f in %{core_plugins} %{gnome_plugins} core; do
|
for f in %{core_plugins} %{gnome_plugins} core; do
|
||||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
|
SCHEMA_FILES+=compiz-$f\,
|
||||||
done
|
done
|
||||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
|
SCHEMA_FILES+=gwd
|
||||||
|
|
||||||
|
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/{$SCHEMA_FILES}.schemas >& /dev/null || :
|
||||||
|
|
||||||
touch --no-create %{_datadir}/icons/hicolor
|
touch --no-create %{_datadir}/icons/hicolor
|
||||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||||
@ -237,21 +241,29 @@ fi
|
|||||||
|
|
||||||
%pre gnome
|
%pre gnome
|
||||||
if [ "$1" -gt 1 ]; then
|
if [ "$1" -gt 1 ]; then
|
||||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||||
for f in %{core_plugins} %{gnome_plugins} core; do
|
|
||||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
|
SCHEMA_FILES=""
|
||||||
done
|
for f in %{core_plugins} %{gnome_plugins} core; do
|
||||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
|
SCHEMA_FILES+=compiz-$f\,
|
||||||
|
done
|
||||||
|
SCHEMA_FILES+=gwd
|
||||||
|
|
||||||
|
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/{$SCHEMA_FILES}.schemas >& /dev/null || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
%preun gnome
|
%preun gnome
|
||||||
if [ "$1" -eq 0 ]; then
|
if [ "$1" -eq 0 ]; then
|
||||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||||
for f in %{core_plugins} %{gnome_plugins} core; do
|
|
||||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/compiz-$f.schemas >& /dev/null || :
|
SCHEMA_FILES=""
|
||||||
done
|
for f in %{core_plugins} %{gnome_plugins} core; do
|
||||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
|
SCHEMA_FILES+=compiz-$f\,
|
||||||
|
done
|
||||||
|
SCHEMA_FILES+=gwd
|
||||||
|
|
||||||
|
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/{$SCHEMA_FILES}.schemas >& /dev/null || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -325,6 +337,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 05 2008 Adel Gadllah <adel.gadllah@gmail.com> - 0.7.6-1
|
||||||
|
- Update to 0.7.6
|
||||||
|
- Install all gconf schemas at once
|
||||||
|
- Drop unneeded patches
|
||||||
|
- Use wall instead of plane
|
||||||
|
|
||||||
* Thu Jun 05 2008 Caolán McNamara <caolanm@redhat.com> - 0.7.2-6
|
* Thu Jun 05 2008 Caolán McNamara <caolanm@redhat.com> - 0.7.2-6
|
||||||
- rebuild for dependancies
|
- rebuild for dependancies
|
||||||
|
|
||||||
|
@ -1,61 +0,0 @@
|
|||||||
diff -upNr compiz-0.7.2.orign/plugins/gconf.c compiz-0.7.2/plugins/gconf.c
|
|
||||||
--- compiz-0.7.2.orign/plugins/gconf.c 2008-03-06 18:52:26.000000000 +0100
|
|
||||||
+++ compiz-0.7.2/plugins/gconf.c 2008-03-27 19:44:11.000000000 +0100
|
|
||||||
@@ -443,6 +443,46 @@ gconfReadOptionValue (CompObject *o
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+gconfFixupPluginList (CompOptionValue *value)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, j, length;
|
|
||||||
+ CompOptionValue *new;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < value->list.nValue; i++)
|
|
||||||
+ if (!strcmp (value->list.value[i].s, "core"))
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ if (i != value->list.nValue)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ puts("fix up list");
|
|
||||||
+ length = value->list.nValue + 1;
|
|
||||||
+
|
|
||||||
+ new = calloc (length, sizeof (CompOptionValue));
|
|
||||||
+
|
|
||||||
+ if (!new)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ new[0].s = strdup ("core");
|
|
||||||
+
|
|
||||||
+ j = 1;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < value->list.nValue; i++)
|
|
||||||
+ {
|
|
||||||
+ if (strcmp (value->list.value[i].s, "core"))
|
|
||||||
+ new[j++].s = strdup (value->list.value[i].s);
|
|
||||||
+ free (value->list.value[i].s);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ free (value->list.value);
|
|
||||||
+
|
|
||||||
+ value->list.value = new;
|
|
||||||
+ value->list.nValue = length;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
gconfGetOption (CompObject *object,
|
|
||||||
CompOption *o,
|
|
||||||
@@ -462,6 +502,10 @@ gconfGetOption (CompObject *object,
|
|
||||||
|
|
||||||
if (gconfReadOptionValue (object, entry, o, &value))
|
|
||||||
{
|
|
||||||
+ if (strcmp (plugin, "core") == 0) {
|
|
||||||
+ if (!strcmp (o->name, "active_plugins"))
|
|
||||||
+ gconfFixupPluginList (&value);
|
|
||||||
+ }
|
|
||||||
(*core.setOptionForPlugin) (object, plugin, o->name, &value);
|
|
||||||
compFiniOptionValue (&value, o->type);
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user