Hello community,
here is the log from the commit of package compiz
checked in at Wed Mar 21 00:59:44 CET 2007.
--------
--- compiz/compiz.changes 2007-03-20 15:23:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2007-03-20 18:53:46.000000000 +0100
@@ -1,0 +2,16 @@
+Tue Mar 20 16:46:41 CET 2007 - mhopf@suse.de
+
+- Update to 0.4.0
+- Additional patches, compare SLE10-SP1 version.
+- More translations.
+- Major cleanup.
+- Removed no longer needed compiz-broken-Mesa-decl.diff (Mesa update).
+- Commented temporary workaround for libpanel-applet-2.la dependency
+ (#256134).
+
+-------------------------------------------------------------------
+Tue Mar 20 15:06:37 CET 2007 - mhopf@suse.de
+
+- Minor cleanup.
+
+-------------------------------------------------------------------
Old:
----
compiz-0.3.7_array-subscript.patch
compiz-0.3.7.tar.bz2
compiz-broken-Mesa-decl.patch
compiz-decorator-default.diff
compiz-default-gconf-settings.patch
libqtpath.patch
Mesa-x86_64-fixes.patch
xgl-settings-246659-hwinfo.patch
New:
----
compiz-0.4.0.tar.bz2
compiz-decorator-command.diff
compiz-default-gconf-settings.diff
compiz-libqtpath.diff
compiz-linguas.diff
compiz-no-focus-prevention-for-windows-without-decorations.diff
compiz-po.tar.bz2
compiz-scale-mode-toggle-1.diff
gnome-xgl-settings-246659-hwinfo.diff
gnome-xgl-settings-linguas.diff
gnome-xgl-settings-po.tar.bz2
Mesa-x86_64-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.z30789/_old 2007-03-21 00:58:54.000000000 +0100
+++ /var/tmp/diff_new_pack.z30789/_new 2007-03-21 00:58:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package compiz (Version 0.3.7)
+# spec file for package compiz (Version 0.4.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,11 +22,11 @@
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/Other
PreReq: %fillup_prereq
-Requires: libpng libdrm gtk2 librsvg libwnck metacity >= 2.15.1
-Enhances: xgl >= git_070104
+Requires: libpng libdrm gtk2 librsvg libwnck metacity>=2.15.1
+Enhances: xgl>=git_070104
Autoreqprov: on
-Version: 0.3.7
-Release: 12
+Version: 0.4.0
+Release: 1
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
@@ -34,17 +34,21 @@
Source1: compiz-%version.tar.bz2
Source2: gnome-xgl-settings-0.9.tar.gz
Source3: opensuse.png
+Source4: gnome-xgl-settings-po.tar.bz2
+Source5: compiz-po.tar.bz2
Patch: compiz-java-config-notify.diff
-Patch1: compiz-default-gconf-settings.patch
-Patch2: compiz-broken-Mesa-decl.patch
-Patch3: compiz-decorator-default.diff
-Patch4: compiz-opensuse-logo.diff
-Patch5: libqtpath.patch
-Patch6: compiz-ldpreload-indirect.diff
-Patch32: gnome-xgl-switch-md5dir.diff
-Patch33: xgl-settings-246659-hwinfo.patch
-Patch60: Mesa-x86_64-fixes.patch
-Patch7: %{name}-%{version}_array-subscript.patch
+Patch1: compiz-default-gconf-settings.diff
+Patch2: compiz-decorator-command.diff
+Patch3: compiz-opensuse-logo.diff
+Patch4: compiz-libqtpath.diff
+Patch5: compiz-ldpreload-indirect.diff
+Patch6: compiz-linguas.diff
+Patch7: compiz-no-focus-prevention-for-windows-without-decorations.diff
+Patch8: compiz-scale-mode-toggle-1.diff
+Patch30: gnome-xgl-switch-md5dir.diff
+Patch31: gnome-xgl-settings-246659-hwinfo.diff
+Patch32: gnome-xgl-settings-linguas.diff
+Patch60: Mesa-x86_64-fixes.diff
%if "%(xft-config --prefix)" == "/usr"
%define xorg_prefix %_prefix
%else
@@ -75,7 +79,8 @@
%package gnome
Summary: OpenGL window and compositing manager configuration utilities
Group: System/GUI/GNOME
-Requires: gnome-desktop control-center2 xgl-hardware-list >= 060526 3ddiag freeglut pciutils %name = %version
+Requires: gnome-desktop control-center2 xgl-hardware-list>=060526 3ddiag freeglut pciutils %name=%version
+Autoreqprov: on
%description gnome
This package contains Gnome based configuration utilities for the
@@ -90,7 +95,8 @@
%package kde
Summary: OpenGL window and compositing managerdecorator
Group: System/GUI/KDE
-Requires: %name = %version
+Requires: kdebase3 %name=%version
+Autoreqprov: on
%description kde
This package contains the KDE window decorator for the Compiz
@@ -105,7 +111,8 @@
%package devel
Summary: OpenGL window and compositing manager.
Group: System/GUI/Other
-Requires: %{name} = %{version} xorg-x11-libICE-devel xorg-x11-libXfixes-devel xorg-x11-libSM-devel xorg-x11-libXrender-devel xorg-x11-devel libpng-devel startup-notification-devel
+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 %name=%version
+Autoreqprov: on
%description devel
Compiz is an OpenGL compositing manager that use
@@ -120,21 +127,27 @@
David Reveman
%prep
-%setup -q -c -n %name -T -a 0 -a 1 -a 2
+%setup -q -c -n %name -T -a 0 -a 1 -a 2 -a 4 -a 5
+mv xgl-settings/* gnome-xgl-settings-*/po/
+mv po/* compiz-*/po/
+rmdir xgl-settings po
cd compiz-*
%patch
%patch1 -p1
-%patch2 -p1
+%patch2
%patch3
-%patch4
%ifarch x86_64
-%patch5
+%patch4
%endif
+%patch5 -p1
%patch6 -p1
+%patch7 -p1
+%patch8 -p1
cd -
cd gnome-xgl-*
-%patch32
-%patch33 -p1
+%patch30
+%patch31 -p1
+%patch32 -p1
sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch
cd -
cd Mesa-*
@@ -145,13 +158,14 @@
configs/linux-indirect-static
echo "MKLIB_OPTIONS = -static" >>configs/linux-indirect-static
cd -
-%patch7
+## temporary - fix dependency (#256134)
+#sed -i -e 's/libpanel-applet-2\.la/libpanel-applet-2.so.0/g' /usr/lib/libgnome-window-settings.la
%build
#
##### Mesa
#
-if [ -f /usr/%_lib/libIndirectGL.so ] ; then
+if [ -f /usr/%_lib/libIndirectGL.so.1 ] ; then
mesagl="--prefix=%_prefix"
else
echo 1>&2 ""
@@ -179,7 +193,7 @@
"$mesagl" \
--with-default-plugins="png,decoration,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water,screenshot"
make %{?jobs:-j%jobs} CFLAGS="%optflags -fno-strict-aliasing"
-if [ ! -f /usr/%_lib/libIndirectGL.so ] ; then
+if [ ! -f /usr/%_lib/libIndirectGL.so.1 ] ; then
sed -i -e "s@$mesagl@@g" compiz.pc
fi
popd
@@ -209,6 +223,7 @@
%find_gconf_schemas
%endif
%find_lang xgl-settings
+touch %name.schemas_pre %name.schemas_preun %name.schemas_posttrans %name.schemas_list
%post
%run_ldconfig
@@ -220,19 +235,14 @@
%postun
%run_ldconfig
-%if "%gnome_prefix" == "/usr"
-
-%pre -f %{name}.schemas_pre
-%preun -f %{name}.schemas_preun
+%pre -f %name.schemas_pre
-%posttrans -f %{name}.schemas_posttrans
+%preun -f %name.schemas_preun
-%files -f %{name}.schemas_list
-%else
+%posttrans -f %name.schemas_posttrans
-%files
-%endif
+%files -f %name.schemas_list
%defattr(-, root, root)
%_bindir/compiz
%_bindir/gtk-window-decorator
@@ -272,8 +282,18 @@
%_bindir/kde-window-decorator
%changelog
+* Tue Mar 20 2007 - mhopf@suse.de
+- Update to 0.4.0
+- Additional patches, compare SLE10-SP1 version.
+- More translations.
+- Major cleanup.
+- Removed no longer needed compiz-broken-Mesa-decl.diff (Mesa update).
+- Commented temporary workaround for libpanel-applet-2.la dependency
+ (#256134).
* Tue Mar 20 2007 - danw@suse.de
- Add xgl-settings-246659-hwinfo.patch from sle10-sp. #255939
+* Tue Mar 20 2007 - mhopf@suse.de
+- Minor cleanup.
* Mon Mar 19 2007 - pgajdos@suse.cz
- gconf scriptlets, use %%find_lang, dependiences
* Wed Mar 14 2007 - pgajdos@suse.cz
++++++ compiz-0.3.7.tar.bz2 -> compiz-0.4.0.tar.bz2 ++++++
++++ 38903 lines of diff (skipped)
++++++ compiz-decorator-command.diff ++++++
diff -ur ../compiz-0.3.5.old/plugins/compiz.schemas.in ./plugins/compiz.schemas.in
--- ../compiz-0.3.5.old/plugins/compiz.schemas.in 2006-12-17 01:53:15.132066000 +0100
+++ ./plugins/compiz.schemas.in 2006-12-17 01:54:43.619490000 +0100
@@ -12218,7 +12218,7 @@
<applyto>/apps/compiz/plugins/decoration/allscreens/options/command</applyto>
<owner>compiz</owner>
<type>string</type>
- <default></default>
+ <default>gtk-window-decorator</default>
<locale name="C">
<short>Command</short>
<long>Decorator command line that is executed if no decorator is already running</long>
++++++ compiz-default-gconf-settings.diff ++++++
diff -ur ../compiz-0.3.7.old/plugins/compiz.schemas.in ./plugins/compiz.schemas.in
--- ../compiz-0.3.7.old/plugins/compiz.schemas.in 2007-02-13 22:42:19.687791000 +0100
+++ ./plugins/compiz.schemas.in 2007-02-13 22:47:47.399751000 +0100
@@ -10001,7 +10001,7 @@
<applyto>/apps/compiz/general/allscreens/options/audible_bell</applyto>
<owner>compiz</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Audible Bell</short>
<long>Audible system beep</long>
@@ -11297,7 +11297,7 @@
<applyto>/apps/compiz/general/allscreens/options/command_terminal</applyto>
<owner>compiz</owner>
<type>string</type>
- <default></default>
+ <default>gnome-terminal</default>
<locale name="C">
<short>Terminal command line</short>
<long>Terminal command line</long>
@@ -11309,7 +11309,7 @@
<applyto>/apps/compiz/general/allscreens/options/run_command_terminal_key</applyto>
<owner>compiz</owner>
<type>string</type>
- <default>Disabled</default>
+ <default><Control><Alt>t</default>
<locale name="C">
<short>Open a terminal</short>
<long>Open a terminal</long>
@@ -11370,7 +11370,7 @@
<applyto>/apps/compiz/general/allscreens/options/ping_delay</applyto>
<owner>compiz</owner>
<type>int</type>
- <default>5000</default>
+ <default>7500</default>
<locale name="C">
<short>Ping Delay</short>
<long>Interval between ping messages (1000-30000)</long>
@@ -13341,7 +13341,7 @@
<applyto>/apps/compiz/plugins/wobbly/screen0/options/map_effect</applyto>
<owner>compiz</owner>
<type>string</type>
- <default>Shiver</default>
+ <default>None</default>
<locale name="C">
<short>Map Effect</short>
<long>Map Window Effect (None, Shiver)</long>
@@ -13665,7 +13665,7 @@
<owner>compiz</owner>
<type>list</type>
string
- <default>[Toolbar,Menu,Utility,Dialog,ModalDialog,Normal]</default>
+ <default>[]</default>
<locale name="C">
<short>Move Window Types</short>
<long>Window types that should wobble when moved (Desktop, Dock, Toolbar, Menu, Utility, Splash, Dialog, Normal, DropdownMenu, PopupMenu, Tooltip, Notification, Combo, Dnd, ModalDialog, Fullscreen, Unknown)</long>
@@ -13729,7 +13729,7 @@
<applyto>/apps/compiz/plugins/wobbly/screen0/options/maximize_effect</applyto>
<owner>compiz</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Maximize Effect</short>
<long>Wobble effect when maximizing and unmaximizing windows</long>
@@ -13989,7 +13989,7 @@
<applyto>/apps/compiz/plugins/fade/screen0/options/fade_speed</applyto>
<owner>compiz</owner>
<type>float</type>
- <default>5.000000</default>
+ <default>10.000000</default>
<locale name="C">
<short>Fade Speed</short>
<long>Window fade speed (0.0-25.0)</long>
@@ -16775,7 +16775,7 @@
<applyto>/apps/compiz/plugins/scale/allscreens/options/initiate_key</applyto>
<owner>compiz</owner>
<type>string</type>
- <default><Control><Alt>Up</default>
+ <default>Pause</default>
<locale name="C">
<short>Initiate Window Picker</short>
<long>Layout and start transforming windows</long>
@@ -17218,7 +17218,7 @@
<applyto>/apps/compiz/plugins/scale/allscreens/options/initiate_output_key</applyto>
<owner>compiz</owner>
<type>string</type>
- <default>Disabled</default>
+ <default><Control><Alt>Up</default>
<locale name="C">
<short>Initiate Window Picker For Windows on Current Output</short>
<long>Layout and start transforming windows on current output</long>
@@ -18253,7 +18253,7 @@
<applyto>/apps/compiz/plugins/move/allscreens/options/opacity</applyto>
<owner>compiz</owner>
<type>int</type>
- <default>100</default>
+ <default>80</default>
<locale name="C">
<short>Opacity</short>
<long>Opacity level of moving windows (1-100)</long>
++++++ compiz-libqtpath.diff ++++++
--- configure 2007-01-06 17:04:02.000000000 +0530
+++ configure 2007-01-06 17:03:47.000000000 +0530
@@ -24391,7 +24391,7 @@
if test "x$use_kde" = "xyes"; then
qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
- qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/lib/qt3/lib64"
if test -n "$QTDIR" ; then
qt_incdirs="$QTDIR/include $qt_incdirs"
++++++ compiz-linguas.diff ++++++
--- compiz-0.3.7/configure.ac
+++ compiz-0.3.7/configure.ac
@@ -19,7 +19,7 @@
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])
-ALL_LINGUAS="cs de es fi fr hu it ja pl pt_BR sv zh_CN zh_TW"
+ALL_LINGUAS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt_BR pt ro ru sk sl sr sv ta tr uk vi xh zh_CN zh_TW zu"
AC_SUBST(ALL_LINGUAS)
AM_GLIB_GNU_GETTEXT
GETTEXT_PACKAGE=compiz
++++++ compiz-no-focus-prevention-for-windows-without-decorations.diff ++++++
--- a/src/window.c
+++ b/src/window.c
@@ -4249,6 +4249,9 @@ focusWindowOnMap (CompWindow *w)
if (!wUserTime)
return FALSE;
+ if (!(w->mwmDecor & (MwmDecorAll | MwmDecorTitle)))
+ return TRUE;
+
/* can't get user time for active window */
active = findWindowAtDisplay (d, d->activeWindow);
if (!active || !getWindowUserTime (active, &aUserTime))
++++++ compiz-scale-mode-toggle-1.diff ++++++
--- a/plugins/scale.c
+++ b/plugins/scale.c
@@ -1343,6 +1343,11 @@ scaleInitiate (CompDisplay *d,
ss->type = ScaleTypeNormal;
return scaleInitiateCommon (s, action, state, option, nOption);
}
+ else if (action->type & CompBindingTypeKey)
+ {
+ if ((state & CompActionStateInitKey) && !action->key.modifiers)
+ scaleTerminate (d, action, 0, option, nOption);
+ }
}
return FALSE;
++++++ gnome-xgl-settings-246659-hwinfo.diff ++++++
--- gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-info.orig 2007-02-19 17:35:16.539700000 +0100
+++ gnome-xgl-settings-0.9/xgl-settings/gnome-xgl-info 2007-02-19 17:35:30.516709000 +0100
@@ -19,7 +19,7 @@
xgl_opts=""
card_status=""
-card_info=$(hwinfo --gfxcard | \
+card_info=$(/usr/sbin/hwinfo --gfxcard | \
awk '/0300 VGA compatible controller/ { dev = gensub(/^([^:]*):.*/, "\\1", "g"); } \
/^ Vendor:/ { vendor[dev] = gensub(/.*pci 0x(....).*/, "\\1", "g"); \
name[dev] = gensub(/^.* "(.*)"$/, "\\1", "g"); } \
++++++ gnome-xgl-settings-linguas.diff ++++++
--- gnome-xgl-settings-0.9/configure.in
+++ gnome-xgl-settings-0.9/configure.in
@@ -15,7 +15,7 @@
AC_STDC_HEADERS
AM_PROG_LIBTOOL
-ALL_LINGUAS="bg bn br bs ca cs cy da de el en_GB es fi fr gl he hi hr hu it ja km ko lt nb nl pa pl pt_BR pt ro ru sk sl sr sv tr uk zh_CN zh_TW"
+ALL_LINGUAS="af ar bg bn br bs ca cs cy da de el en_GB en_US es et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt_BR pt ro ru sk sl sr sv ta tr uk vi xh zh_CN zh_TW zu"
GETTEXT_PACKAGE=xgl-settings
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
++++++ Mesa-x86_64-fixes.diff ++++++
diff -urp ../Mesa-6.5.2.orig/src/glx/x11/indirect_vertex_array.c ./src/glx/x11/indirect_vertex_array.c
--- ../Mesa-6.5.2.orig/src/glx/x11/indirect_vertex_array.c 2006-11-03 00:58:52.000000000 +0100
+++ ./src/glx/x11/indirect_vertex_array.c 2007-01-04 12:10:11.000000000 +0100
@@ -527,7 +527,7 @@ static GLubyte *
emit_DrawArrays_header_old( __GLXcontext * gc,
struct array_state_vector * arrays,
size_t * elements_per_request,
- unsigned int * total_requests,
+ size_t * total_requests,
GLenum mode, GLsizei count )
{
size_t command_size;
@@ -640,7 +640,7 @@ emit_DrawArrays_old( GLenum mode, GLint
GLubyte * pc;
size_t elements_per_request;
- unsigned total_requests = 0;
+ size_t total_requests = 0;
unsigned i;
size_t total_sent = 0;
@@ -770,7 +770,7 @@ emit_DrawElements_old( GLenum mode, GLsi
GLubyte * pc;
size_t elements_per_request;
- unsigned total_requests = 0;
+ size_t total_requests = 0;
unsigned i;
unsigned req;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org