rpms/compiz/devel compiz-0.8.2-gnome-terminal.patch, NONE, 1.1 compiz-0.8.2-pin-initial-plugins.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 compiz-gtk, 1.9, 1.10 compiz.spec, 1.162, 1.163 sources, 1.45, 1.46 compiz-0.7.6-utility-windows.patch, 1.3, NONE compiz-0.7.8-decoration-placement.patch, 1.1, NONE compiz-0.7.8-fullscreen-top.patch, 1.1, NONE compiz-0.7.8-gnome-terminal.patch, 1.1, NONE compiz-0.7.8-gwd-pixmap-fix.patch, 1.1, NONE compiz-0.7.8-kde42-crash.patch, 1.1, NONE compiz-0.7.8-kde42-krunner.patch, 1.1, NONE compiz-0.7.8-kde42.patch, 1.2, NONE compiz-0.7.8-mem-leak-fixes.patch, 1.1, NONE compiz-0.7.8-pin-initial-plugins.patch, 1.1, NONE
Adel Gadllah
drago01 at fedoraproject.org
Mon May 25 19:47:12 UTC 2009
Author: drago01
Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24214
Modified Files:
.cvsignore compiz-gtk compiz.spec sources
Added Files:
compiz-0.8.2-gnome-terminal.patch
compiz-0.8.2-pin-initial-plugins.patch
Removed Files:
compiz-0.7.6-utility-windows.patch
compiz-0.7.8-decoration-placement.patch
compiz-0.7.8-fullscreen-top.patch
compiz-0.7.8-gnome-terminal.patch
compiz-0.7.8-gwd-pixmap-fix.patch
compiz-0.7.8-kde42-crash.patch
compiz-0.7.8-kde42-krunner.patch compiz-0.7.8-kde42.patch
compiz-0.7.8-mem-leak-fixes.patch
compiz-0.7.8-pin-initial-plugins.patch
Log Message:
update to 0.8.2
compiz-0.8.2-gnome-terminal.patch:
--- NEW FILE compiz-0.8.2-gnome-terminal.patch ---
diff -upNr compiz-0.8.2.orign/metadata/gnomecompat.xml.in compiz-0.8.2/metadata/gnomecompat.xml.in
--- compiz-0.8.2.orign/metadata/gnomecompat.xml.in 2009-02-15 10:10:23.000000000 +0100
+++ compiz-0.8.2/metadata/gnomecompat.xml.in 2009-05-25 21:27:20.864114328 +0200
@@ -40,7 +40,7 @@
<option name="command_terminal" type="string">
<_short>Terminal command line</_short>
<_long>Terminal command line</_long>
- <default></default>
+ <default>gnome-terminal</default>
</option>
<option name="run_command_terminal_key" type="key">
<_short>Open a terminal</_short>
compiz-0.8.2-pin-initial-plugins.patch:
--- NEW FILE compiz-0.8.2-pin-initial-plugins.patch ---
diff -upNr compiz-0.8.2.orign/include/compiz-core.h compiz-0.8.2/include/compiz-core.h
--- compiz-0.8.2.orign/include/compiz-core.h 2009-02-15 10:10:23.000000000 +0100
+++ compiz-0.8.2/include/compiz-core.h 2009-05-25 21:15:24.502138356 +0200
@@ -220,6 +220,9 @@ extern Bool noDetection;
extern Bool useDesktopHints;
extern Bool onlyCurrentScreen;
+extern char **initialPlugins;
+extern int nInitialPlugins;
+
extern int defaultRefreshRate;
extern char *defaultTextureFilter;
diff -upNr compiz-0.8.2.orign/src/display.c compiz-0.8.2/src/display.c
--- compiz-0.8.2.orign/src/display.c 2009-02-15 10:10:23.000000000 +0100
+++ compiz-0.8.2/src/display.c 2009-05-25 21:15:24.503089882 +0200
@@ -675,7 +675,7 @@ updatePlugins (CompDisplay *d)
{
CompOption *o;
CompPlugin *p, **pop = 0;
- int nPop, i, j;
+ int nPop, i, j, k;
d->dirtyPluginList = FALSE;
@@ -715,6 +715,30 @@ updatePlugins (CompDisplay *d)
free (d->plugin.list.value[d->plugin.list.nValue].s);
}
+ for ( k = 0; k < nInitialPlugins; k++)
+ {
+ for ( j = 0; j < nPop; j++)
+ {
+ if (pop[j] && strcmp (pop[j]->vTable->name,
+ initialPlugins[k]) == 0)
+ break;
+ }
+
+ if ( j == (nPop - 1))
+ {
+ p = loadPlugin (initialPlugins[k]);
+ if (p)
+ {
+ if (!pushPlugin (p))
+ {
+ unloadPlugin (p);
+ p = 0;
+ }
+ }
+ }
+ }
+
+
for (; i < o->value.list.nValue; i++)
{
p = 0;
diff -upNr compiz-0.8.2.orign/src/main.c compiz-0.8.2/src/main.c
--- compiz-0.8.2.orign/src/main.c 2009-02-16 14:57:22.000000000 +0100
+++ compiz-0.8.2/src/main.c 2009-05-25 21:15:24.503089882 +0200
@@ -40,6 +40,9 @@ char *programName;
char **programArgv;
int programArgc;
+char **initialPlugins = NULL;
+int nInitialPlugins = 0;
+
char *backgroundImage = NULL;
REGION emptyRegion;
@@ -413,6 +416,11 @@ main (int argc, char **argv)
ptr += sprintf (ptr, "</default>");
}
+
+ initialPlugins = malloc (nPlugin * sizeof (char *));
+ memcpy (initialPlugins, plugin, nPlugin * sizeof (char *));
+ nInitialPlugins = nPlugin;
+
}
xmlInitParser ();
@@ -462,6 +470,9 @@ main (int argc, char **argv)
xmlCleanupParser ();
+ if (initialPlugins != NULL)
+ free (initialPlugins);
+
if (restartSignal)
{
execvp (programName, programArgv);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore 4 Dec 2008 20:59:54 -0000 1.40
+++ .cvsignore 25 May 2009 19:46:42 -0000 1.41
@@ -1,2 +1 @@
-compiz-0.7.8.tar.bz2
-glx_tfp_test.c
+compiz-0.8.2.tar.bz2
Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- compiz-gtk 5 Apr 2009 11:13:26 -0000 1.9
+++ compiz-gtk 25 May 2009 19:46:42 -0000 1.10
@@ -2,7 +2,7 @@
function runCompiz() {
gtk-window-decorator &
- exec compiz --ignore-desktop-hints glib gconf $@
+ exec compiz --ignore-desktop-hints glib gconf gnomecompat$@
}
DIRECT=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`
Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- compiz.spec 5 Apr 2009 11:13:26 -0000 1.162
+++ compiz.spec 25 May 2009 19:46:42 -0000 1.163
@@ -3,7 +3,7 @@
%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 obs
-%define gnome_plugins annotate gconf glib svg
+%define gnome_plugins annotate gconf glib svg gnomecompat
# List of plugins passed to ./configure. The order is important
@@ -13,8 +13,8 @@ Name: compiz
URL: http://www.go-compiz.org
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
-Version: 0.7.8
-Release: 18%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,32 +62,12 @@ Patch106: redhat-logo.patch
#Patch110: scale-key.patch
# update translations in desktop-effects
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
# Make sure configuration plugins never get unloaded
-Patch123: compiz-0.7.8-pin-initial-plugins.patch
-
-# Memory leak fixes from upstream
-Patch124: compiz-0.7.8-mem-leak-fixes.patch
+Patch123: compiz-0.8.2-pin-initial-plugins.patch
# Make the terminal keybinding work (RH #439665)
-Patch125: compiz-0.7.8-gnome-terminal.patch
-
-# KDE-4.2 fixes from upstream:
-# 814809ffffe47f829b784f7bd246026bfcdecf0f
-Patch126: compiz-0.7.8-kde42-crash.patch
-# 4cc1d813a9748c3740662233a2add3fe65a4c533
-Patch127: compiz-0.7.8-kde42-krunner.patch
-
-# backport to fix RH #484056
-Patch128: compiz-0.7.8-gwd-pixmap-fix.patch
+Patch125: compiz-0.8.2-gnome-terminal.patch
%description
Compiz is one of the first OpenGL-accelerated compositing window
@@ -162,21 +142,8 @@ popd
%endif
#%patch110 -p1 -b .scale-key
-%patch116 -p1 -b .utility
-
-%patch120 -p1 -b .kde42
-sleep 1
-touch configure
-
-%patch121 -p1 -b .decoration-placement
-%patch122 -p1 -b .fullscreen-top
%patch123 -p1 -b .initial-plugins
-%patch124 -p1 -b .mem-leaks
-%patch125 -p1 -b .terminal
-%patch126 -p1 -b .kde-crash
-%patch127 -p1 -b .krunner
-%define _default_patch_fuzz 2
-%patch128 -p1 -b .gwd-pixmap
+%patch125 -p1 -b .gnome-terminal
%build
rm -rf $RPM_BUILD_ROOT
@@ -388,6 +355,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 25 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-1
+- Update to 0.8.2
+- Drop upstreamed patches
+
* Sun Apr 05 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.7.8-18
- Direct rendering does not mean that we have hw 3D
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources 8 Dec 2008 12:00:01 -0000 1.45
+++ sources 25 May 2009 19:46:42 -0000 1.46
@@ -1,4 +1,4 @@
-cb8baed2983dec5184f196346f973ad2 compiz-0.7.8.tar.bz2
d56f2f6456fc89b06e1e0d21cab74f55 desktop-effects-0.7.18.tar.bz2
7a7766f43797239ca0a4a0881d91f646 kde-desktop-effects-0.0.5.tar.bz2
892ce372ff673202db52034a0473f262 glx_tfp_test.c
+c161975eb0fe8deac7be8d99408a80fc compiz-0.8.2.tar.bz2
--- compiz-0.7.6-utility-windows.patch DELETED ---
--- compiz-0.7.8-decoration-placement.patch DELETED ---
--- compiz-0.7.8-fullscreen-top.patch DELETED ---
--- compiz-0.7.8-gnome-terminal.patch DELETED ---
--- compiz-0.7.8-gwd-pixmap-fix.patch DELETED ---
--- compiz-0.7.8-kde42-crash.patch DELETED ---
--- compiz-0.7.8-kde42-krunner.patch DELETED ---
--- compiz-0.7.8-kde42.patch DELETED ---
--- compiz-0.7.8-mem-leak-fixes.patch DELETED ---
--- compiz-0.7.8-pin-initial-plugins.patch DELETED ---
More information about the scm-commits
mailing list