Hello community, here is the log from the commit of package compiz checked in at Mon Aug 27 18:06:54 CEST 2007. -------- --- compiz/compiz.changes 2007-08-20 21:24:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-08-27 16:29:05.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Aug 27 13:45:00 IST 2007 - cyberorg@cyberorg.info + +- Apply compiz-prepend-glib-gconf-to-plugins-list.diff, + prevent gconf unload if compiz launched with gconf. + +------------------------------------------------------------------- +Wed Aug 22 19:11:00 IST 2007 - cyberorg@cyberorg.info + +- Add %post and %postun to run ldconfig- shut rpmlint up +- Fix config.kcfg installation +------------------------------------------------------------------- +Wed Aug 22 15:25:50 CEST 2007 - mhopf@suse.de + +- Fix strict aliasing issue in gnome-xgl-settings (#241515). +- Removed -fno-strict-aliasing (except for Mesa where necessary). + +------------------------------------------------------------------- @@ -11,0 +29,11 @@ +Tue Aug 14 12:31:01 IST 2007 - cyberorg@cyberorg.info + +- Fix Requires for -devel package + +------------------------------------------------------------------- +Tue Aug 7 15:10:01 IST 2007 - cyberorg@cyberorg.info + +- Make gnome-xgl-switch and gnome-xgl-info install in proper place +- clean up spec file + +------------------------------------------------------------------- New: ---- compiz-prepend-glib-gconf-to-plugins-list.diff gnome-xgl-settings-strict-aliasing.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.E30908/_old 2007-08-27 18:05:20.000000000 +0200 +++ /var/tmp/diff_new_pack.E30908/_new 2007-08-27 18:05:20.000000000 +0200 @@ -11,13 +11,19 @@ # norootforbuild Name: compiz -BuildRequires: Mesa-devel control-center2-devel freeglut-devel fuse-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel +BuildRequires: Mesa-devel control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel %if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10" BuildRequires: xorg-x11-compat70-devel %endif %if 0%{suse_version} >= 01021 BuildRequires: metacity-devel %endif +%if %suse_version <= 1021 +BuildRequires: gconf2-rpm-macros +%endif +%if 0%{suse_version} >= 01020 +BuildRequires: fuse-devel +%endif URL: http://www.go-compiz.org License: GPL v2 or later, LGPL v2 or later, Most of the code is MIT licensed, some code is instead licensed Group: System/GUI/Other @@ -25,7 +31,7 @@ Enhances: xgl >= git_070104 Autoreqprov: on Version: 0.5.4 -Release: 1 +Release: 6 Requires: compiz-decorator = %{version} Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,11 +48,13 @@ Patch4: compiz-ldpreload-indirect.diff Patch5: compiz-no-focus-prevention-for-windows-without-decorations.diff Patch6: compiz-scale-mode-toggle-1.diff +Patch7: compiz-prepend-glib-gconf-to-plugins-list.diff Patch30: gnome-xgl-switch-md5dir.diff Patch31: gnome-xgl-settings-246659-hwinfo.diff Patch32: gnome-xgl-settings-linguas.diff Patch33: gnome-xgl-settings-266157-driver-check.diff Patch34: gnome-xgl-settings-0.9-compiz-0.5.4-update.diff +Patch35: gnome-xgl-settings-strict-aliasing.diff Patch60: Mesa-x86_64-fixes.diff %if "%(xft-config --prefix)" == "/usr" %define xorg_prefix %_prefix @@ -56,13 +64,12 @@ %define gnome_prefix %(pkg-config --variable=prefix gnome-desktop-2.0) %if "%gnome_prefix" == "/usr" %define gnome_etc /etc -%define kde_prefix %(kde-config --prefix) - -%gconf_schemas_prereq %else %define gnome_etc /etc%gnome_prefix -PreReq: gconf2 %endif +%define kde_prefix %(kde-config --prefix) + +%gconf_schemas_prereq %description Compiz is an OpenGL compositing manager that use @@ -114,7 +121,19 @@ %package devel Summary: OpenGL window and compositing manager. Group: System/GUI/Other -Requires: xorg-x11-libICE-devel xorg-x11-libXfixes-devel xorg-x11-libSM-devel xorg-x11-libXrender-devel xorg-x11-devel libpng-devel startup-notification-devel libxml2-devel libxslt-devel %name = %version +Requires: Mesa-devel control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel %name = %version +%if 0%{suse_version} < 01020 +Requires: xorg-x11-compat70-devel +%endif +%if 0%{suse_version} >= 01021 +Requires: metacity-devel +%endif +%if %suse_version <= 1021 +Requires: gconf2-rpm-macros +%endif +%if 0%{suse_version} >= 01020 +Requires: fuse-devel +%endif Autoreqprov: on %description devel @@ -143,6 +162,7 @@ %patch4 %patch5 -p1 %patch6 -p1 +%patch7 cd - cd gnome-xgl-* %patch30 @@ -150,6 +170,7 @@ %patch32 -p1 %patch33 -p1 %patch34 +%patch35 -p1 sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch cd - cd Mesa-* @@ -185,10 +206,10 @@ ##### compiz # pushd compiz-* -%configure --prefix=%_prefix --libdir=%_prefix/%_lib \ - --sysconfdir=%gnome_etc \ +%configure --sysconfdir=%gnome_etc \ + --disable-schemas-install \ "$mesagl" -make %{?jobs:-j%jobs} CFLAGS="%optflags -fno-strict-aliasing" +make %{?jobs:-j%jobs} CFLAGS="%optflags" if [ ! -f /usr/%_lib/libIndirectGL.so.1 ] ; then sed -i -e "s@$mesagl@@g" compiz.pc fi @@ -198,50 +219,43 @@ # pushd gnome-xgl-settings-* ./configure --prefix=%gnome_prefix -make %{?jobs:-j%jobs} CFLAGS="%optflags -fno-strict-aliasing" +make %{?jobs:-j%jobs} CFLAGS="%optflags" popd %install pushd compiz-* -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make DESTDIR=%buildroot install +%makeinstall +#remove locale data as it is not required anymore, translations are merged in .xml and .schemas rm -r %buildroot/usr/share/locale -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL popd pushd gnome-xgl-settings-* -make DESTDIR=%buildroot install +%makeinstall popd install -d -m 755 %buildroot%xorg_prefix install -d -m 755 %buildroot/var/adm/fillup-templates find %buildroot ( -name *.a -o -name *.la ) -print0 | xargs -0 rm -f install -m 444 %_sourcedir/opensuse.png %buildroot%_datadir/compiz/ -%if "%gnome_prefix" == "/usr" %find_gconf_schemas -%endif %find_lang xgl-settings touch %name.schemas_pre %name.schemas_preun %name.schemas_posttrans %name.schemas_list -mv %gnome_prefix/bin/gnome-xgl-info %gnome_prefix/bin/gnome-xgl-switch %_bindir/ || true - -%post -%run_ldconfig - -%post gnome %if "%gnome_prefix" != "/usr" -export GCONF_CONFIG_SOURCE=`%gnome_prefix/bin/gconftool-2 --get-default-source` -for schemas in compiz-core.schemas compiz-annotate.schemas compiz-blur.schemas compiz-clone.schemas compiz-cube.schemas compiz-dbus.schemas compiz-decoration.schemas compiz-fade.schemas compiz-fs.schemas compiz-gconf.schemas compiz-glib.schemas compiz-ini.schemas compiz-inotify.schemas compiz-minimize.schemas compiz-move.schemas compiz-place.schemas compiz-plane.schemas compiz-png.schemas compiz-regex.schemas compiz-resize.schemas compiz-rotate.schemas compiz-scale.schemas compiz-screenshot.schemas compiz-svg.schemas compiz-switcher.schemas compiz-video.schemas compiz-water.schemas compiz-wobbly.schemas compiz-zoom.schemas gwd.schemas; do -%gnome_prefix/bin/gconftool-2 --makefile-install-rule %gnome_etc/gconf/schemas/$schemas >/dev/null -done +mv %buildroot%gnome_prefix/bin/gnome-xgl-info %buildroot%gnome_prefix/bin/gnome-xgl-switch %buildroot%_bindir/ || true %endif -%postun -%run_ldconfig - %pre -f %name.schemas_pre %preun -f %name.schemas_preun +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %posttrans -f %name.schemas_posttrans +%clean + +%__rm -rf %{buildroot} + %files -f %name.schemas_list %defattr(-, root, root) %_bindir/compiz @@ -286,7 +300,6 @@ %dir %_includedir/compiz %_includedir/compiz/*.h %_datadir/compiz/*.xslt -%kde_prefix/share/config.kcfg/compiz-* %files -f xgl-settings.lang gnome %defattr(-, root, root) @@ -316,8 +329,18 @@ %_bindir/kde-window-decorator %_libdir/compiz/libkconfig.so %kde_prefix/share/config/compizrc +%kde_prefix/share/config.kcfg/compiz-* %changelog +* Mon Aug 27 2007 - cyberorg@cyberorg.info +- Apply compiz-prepend-glib-gconf-to-plugins-list.diff, + prevent gconf unload if compiz launched with gconf. +* Wed Aug 22 2007 - cyberorg@cyberorg.info +- Add %%post and %%postun to run ldconfig- shut rpmlint up +- Fix config.kcfg installation +* Wed Aug 22 2007 - mhopf@suse.de +- Fix strict aliasing issue in gnome-xgl-settings (#241515). +- Removed -fno-strict-aliasing (except for Mesa where necessary). * Mon Aug 20 2007 - dreveman@suse.de - Update to compiz 0.5.4, which include proper KDE configuration support and fixes to a number of upstream @@ -325,6 +348,11 @@ - Track changes to compiz in gnome-xgl-settings and fix issue that caused it to crash. (#296701) - Move gconf plugin into compiz-gnome package. +* Tue Aug 14 2007 - cyberorg@cyberorg.info +- Fix Requires for -devel package +* Tue Aug 07 2007 - cyberorg@cyberorg.info +- Make gnome-xgl-switch and gnome-xgl-info install in proper place +- clean up spec file * Mon Aug 06 2007 - dreveman@suse.de - Update gnome-xgl-settings so it works with compiz 0.5.2. - Fix schemas install. ++++++ compiz-prepend-glib-gconf-to-plugins-list.diff ++++++ diff --git a/plugins/gconf.c b/plugins/gconf.c index 0e5fe9e..fc7b6b5 100644 --- ./plugins/gconf.c +++ ./plugins/gconf.c @@ -401,6 +401,51 @@ gconfReadOptionValue (CompDisplay *d, } 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, "gconf")) + break; + + /* gconf is in the list, everything is ok */ + if (i != value->list.nValue) + return; + + /* gconf plugin is missing from the plugin list, let's append it */ + /* first check if glib plugin is in the list */ + for (i = 0; i < value->list.nValue && i < value->list.nValue; i++) + if (!strcmp (value->list.value[i].s, "glib")) + break; + + if (i != value->list.nValue) + length = value->list.nValue + 1; + else + length = value->list.nValue + 2; + + new = calloc (length, sizeof (CompOptionValue)); + if (!new) + return; + + new[0].s = strdup ("glib"); + new[1].s = strdup ("gconf"); + j = 2; + for (i = 0; i < value->list.nValue; i++) + { + if (strcmp (value->list.value[i].s, "glib")) + 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 gconfGetDisplayOption (CompDisplay *d, CompOption *o, const char *plugin) @@ -425,7 +470,16 @@ gconfGetDisplayOption (CompDisplay *d, if (gconfReadOptionValue (d, entry, o, &value)) { if (strcmp (plugin, "core") == 0) - (*d->setDisplayOption) (d, o->name, &value); + { + if (!strcmp (o->name, "active_plugins")) + { + gconfFixupPluginList (&value); + (*d->setDisplayOption) (d, o->name, &value); + gconfSetOption (d, o, "core", "allscreens"); + } + else + (*d->setDisplayOption) (d, o->name, &value); + } else (*d->setDisplayOptionForPlugin) (d, plugin, o->name, &value); @@ -862,9 +916,20 @@ gconfKeyChanged (GConfClient *client, option->name, &value); else - (*display->setDisplayOption) (display, - option->name, - &value); + { + if (!strcmp (option->name, "active_plugins")) + { + gconfFixupPluginList (&value); + (*display->setDisplayOption) (display, + option->name, + &value); + gconfSetOption (display, option, "core", "allscreens"); + } + else + (*display->setDisplayOption) (display, + option->name, + &value); + } compFiniOptionValue (&value, option->type); } ++++++ gnome-xgl-settings-strict-aliasing.diff ++++++ --- gnome-xgl-settings-0.9/xgl-settings/eggcellrendererkeys.c.orig 2007-08-22 15:22:47.000000000 +0200 +++ gnome-xgl-settings-0.9/xgl-settings/eggcellrendererkeys.c 2007-08-22 15:18:20.000000000 +0200 @@ -591,7 +591,7 @@ egg_cell_renderer_keys_start_editing (Gt NULL); keys->edit_widget = eventbox; g_object_add_weak_pointer (G_OBJECT (keys->edit_widget), - (void**) &keys->edit_widget); + (void*) &keys->edit_widget); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org