rpms/compiz/F-10 compiz-0.7.8-kde42.patch, NONE, 1.1 compiz.spec, 1.144, 1.145
Adel Gadllah
drago01 at fedoraproject.org
Tue Jan 27 22:05:30 UTC 2009
- Previous message (by thread): rpms/gnome-user-share/devel gnome-user-share.spec,1.44,1.45
- Next message (by thread): rpms/sj-fonts/devel import.log, NONE, 1.1 sj-fonts-delphine-fontconfig.conf, NONE, 1.1 sj-fonts-stevehand-fontconfig.conf, NONE, 1.1 sj-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: drago01
Update of /cvs/pkgs/rpms/compiz/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14280
Modified Files:
compiz.spec
Added Files:
compiz-0.7.8-kde42.patch
Log Message:
Fix build against KDE-4.2
compiz-0.7.8-kde42.patch:
--- NEW FILE compiz-0.7.8-kde42.patch ---
diff -ur compiz-0.7.8/configure compiz-0.7.8-kde42/configure
--- compiz-0.7.8/configure 2008-09-17 13:34:28.000000000 +0200
+++ compiz-0.7.8-kde42/configure 2008-12-01 19:07:49.000000000 +0100
@@ -25429,7 +25429,7 @@
kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
+ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
{ echo "$as_me:$LINENO: checking for KWin headers" >&5
echo $ECHO_N "checking for KWin headers... $ECHO_C" >&6; }
diff -ur compiz-0.7.8/configure.ac compiz-0.7.8-kde42/configure.ac
--- compiz-0.7.8/configure.ac 2008-09-17 13:33:40.000000000 +0200
+++ compiz-0.7.8-kde42/configure.ac 2008-12-01 19:07:33.000000000 +0100
@@ -487,7 +487,7 @@
kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
+ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
dnl Check for KWin headers
AC_MSG_CHECKING([for KWin headers])
diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp
--- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp 2008-08-08 13:20:31.000000000 +0200
+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp 2008-12-01 19:13:18.000000000 +0100
@@ -30,7 +30,7 @@
#include <fixx11h.h>
-#include <KDE/Plasma/PanelSvg>
+#include <KDE/Plasma/FrameSvg>
#include <KDE/Plasma/Theme>
#include <kwindowsystem.h>
@@ -46,9 +46,9 @@
QColor color;
color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
- mBackground = new Plasma::PanelSvg();
+ mBackground = new Plasma::FrameSvg();
mBackground->setImagePath ("dialogs/background");
- mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
+ mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
mBorder.left = mBackground->marginSize(Plasma::LeftMargin);
mBorder.right = mBackground->marginSize(Plasma::RightMargin);
@@ -131,8 +131,8 @@
p.setCompositionMode (QPainter::CompositionMode_Source);
p.setRenderHint (QPainter::SmoothPixmapTransform);
- mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
- mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
+ mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
+ mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
contentHeight));
mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
@@ -168,7 +168,7 @@
p.setCompositionMode (QPainter::CompositionMode_Source);
- mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top +
+ mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top +
mGeometry.height () + 5, mGeometry.width (),
fm.height ()));
diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.h compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h
--- compiz-0.7.8/kde/window-decorator-kde4/switcher.h 2008-08-08 13:20:31.000000000 +0200
+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h 2008-12-01 19:28:37.000000000 +0100
@@ -30,7 +30,7 @@
namespace Plasma
{
-class PanelSvg;
+class FrameSvg;
}
class QSpacerItem;
@@ -70,7 +70,7 @@
QRect mGeometry;
- Plasma::PanelSvg *mBackground;
+ Plasma::FrameSvg *mBackground;
QPixmap mPixmap;
QPixmap mBackgroundPixmap;
Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-10/compiz.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- compiz.spec 27 Jan 2009 21:19:24 -0000 1.144
+++ compiz.spec 27 Jan 2009 22:04:59 -0000 1.145
@@ -14,7 +14,7 @@
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
Version: 0.7.8
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,9 @@
Patch115: desktop-effects-linguas.patch
Patch116: compiz-0.7.6-utility-windows.patch
+# make kde4-window-decorator build against KDE 4.2's libplasma
+Patch120: compiz-0.7.8-kde42.patch
+
# backports from git
Patch121: compiz-0.7.8-decoration-placement.patch
Patch122: compiz-0.7.8-fullscreen-top.patch
@@ -150,6 +153,10 @@
%endif
#%patch110 -p1 -b .scale-key
+%patch120 -p1 -b .kde42
+sleep 1
+touch configure
+
%patch116 -p1 -b .utility
%patch121 -p1 -b .decoration-placement
%patch122 -p1 -b .fullscreen-top
@@ -372,6 +379,9 @@
%changelog
+* Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-6
+- Fix build against KDE-4.2
+
* Tue Jan 27 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-5
- Make the terminal keybinding work (RH #439665)
- Previous message (by thread): rpms/gnome-user-share/devel gnome-user-share.spec,1.44,1.45
- Next message (by thread): rpms/sj-fonts/devel import.log, NONE, 1.1 sj-fonts-delphine-fontconfig.conf, NONE, 1.1 sj-fonts-stevehand-fontconfig.conf, NONE, 1.1 sj-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list