Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at 2015-11-28 15:19:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compiz (Old) and /work/SRC/openSUSE:Factory/.compiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compiz" Changes: -------- --- /work/SRC/openSUSE:Factory/compiz/compiz.changes 2015-11-26 17:03:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2015-11-28 15:19:33.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Nov 25 07:52:46 UTC 2015 - sor.ale...@meowr.ru + +- Rename compiz-default-settings.diff to + compiz-suse-defaults.patch. +- Rename mate-window-decorator to gnome-window-decorator to point + out it's not DE-centric. +- Adjust gnome-window-decorator so it will start accepting custom + options properly (transparently as gtk-window-decorator does). +- Remove compiz-decorator: automatical decorator detection lost its + meaning with the KDE decorator loss. +- Set gnome-window-decorator as a default decorator in + compiz-suse-defaults.patch. +- Modify compiz-suse-defaults.patch to center windows by default. +- Do not default Expo plugin: can be annoying. +- Drop compiz-unmanaged-window-position.patch: was fixed upstream, + reverse applying is a mistake. + +------------------------------------------------------------------- Old: ---- compiz-decorator.sh compiz-default-settings.diff compiz-unmanaged-window-position.patch mate-window-decorator.py New: ---- compiz-suse-defaults.patch gnome-window-decorator.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.oRkGTJ/_old 2015-11-28 15:19:34.000000000 +0100 +++ /var/tmp/diff_new_pack.oRkGTJ/_new 2015-11-28 15:19:34.000000000 +0100 @@ -27,27 +27,24 @@ Source: https://github.com/raveit65/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: opensuse.png Source2: sle.png -Source3: mate-window-decorator.py -Source4: %{name}-decorator.sh -Source5: %{name}.desktop -Source6: baselibs.conf +Source3: gnome-window-decorator.py +Source4: %{name}.desktop +Source5: baselibs.conf +# PATCH-FEATURE-OPENSUSE compiz-suse-defaults.patch dims...@opensuse.org -- Compiz default settings for openSUSE. +Patch0: %{name}-suse-defaults.patch # PATCH-FIX-UPSTREAM compiz-java-config-notify.diff dreve...@novell.com -- Java config notify workaround. -Patch0: %{name}-java-config-notify.diff -# PATCH-FEATURE-OPENSUSE compiz-default-settings.diff dims...@opensuse.org -- Compiz default settings for openSUSE. -Patch1: %{name}-default-settings.diff +Patch1: %{name}-java-config-notify.diff # PATCH-FIX-UPSTREAM boo#449168 dreve...@novell.com -- Avoid independent output painting. Patch2: bug-449168-avoid-independent-output-painting.diff # PATCH-FIX-UPSTREAM boo#474862 dreve...@novell.com -- Allow moving focus to fs window. Patch3: bug-474862-allow-moving-focus-to-fs-window.diff -# PATCH-FIX-UPSTREAM compiz-unmanaged-window-position.patch dims...@opensuse.org -- Fix gravity of unmanaged windows (clock applet for example). -Patch4: %{name}-unmanaged-window-position.patch -# PATCH-FEATURE-OPENSUSE compiz-add-manager-checks.patch amara...@ubuntu.com -- Add all relevant checks from compiz-manager. -Patch5: %{name}-add-manager-checks.patch +# PATCH-FEATURE-OPENSUSE compiz-add-manager-checks.patch -- Add all relevant checks from compiz-manager. +Patch4: %{name}-add-manager-checks.patch BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: libxslt-tools BuildRequires: mate-common -# To get keybindings. +# To get GNOME Control Centre keybindings. BuildRequires: metacity BuildRequires: pkg-config BuildRequires: update-desktop-files @@ -87,7 +84,7 @@ Obsoletes: %{name}-kde4 < %{version} ExclusiveArch: %ix86 x86_64 %arm aarch64 ppc ppc64 ia64 %if 0%{?suse_version} > 1310 -# To get keybindings. +# To get MATE Control Centre keybindings. BuildRequires: marco BuildRequires: pkgconfig(libmarco-private) %endif @@ -240,13 +237,11 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -R -%patch5 -p1 +%patch4 -p1 cp -f %{SOURCE1} opensuse.png cp -f %{SOURCE2} sle.png -cp -f %{SOURCE3} mate-window-decorator -cp -f %{SOURCE4} %{name}-decorator -cp -f %{SOURCE5} %{name}.desktop +cp -f %{SOURCE3} gnome-window-decorator +cp -f %{SOURCE4} %{name}.desktop # Do not install helper scripts, we already have one. sed -i 's/^\(SUBDIRS =.* \)scripts\(.*\)$/\1\2/' Makefile.am @@ -255,7 +250,7 @@ NOCONFIGURE=1 mate-autogen %configure \ --disable-static \ - --with-default-plugins=core,ccp,commands,matecompat,minimize,place,png,regex,resize,mousepoll,neg,session,vpswitch,workarounds,decoration,wall,expo,ezoom,snap,fade,move,switcher + --with-default-plugins=core,ccp,decoration,commands,ezoom,fade,minimize,mousepoll,move,neg,place,png,regex,resize,session,snap,switcher,vpswitch,wall,workarounds,matecompat make %{?_smp_mflags} %install @@ -263,8 +258,7 @@ install -Dm 0644 opensuse.png %{buildroot}%{_datadir}/%{name}/opensuse.png install -Dm 0644 sle.png %{buildroot}%{_datadir}/%{name}/sle.png -install -Dm 0755 %{name}-decorator %{buildroot}%{_bindir}/%{name}-decorator -install -Dm 0755 mate-window-decorator %{buildroot}%{_bindir}/mate-window-decorator +install -Dm 0755 gnome-window-decorator %{buildroot}%{_bindir}/gnome-window-decorator install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dm 0644 %{name}.desktop %{buildroot}%{_datadir}/mate/wm-properties/%{name}.desktop @@ -334,7 +328,6 @@ %defattr(-,root,root) %doc COPYING* %{_bindir}/%{name} -%{_bindir}/%{name}-decorator %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/*.* %dir %{_libdir}/%{name}/ @@ -397,7 +390,7 @@ %files gnome %defattr(-,root,root) %{_bindir}/gtk-window-decorator -%{_bindir}/mate-window-decorator +%{_bindir}/gnome-window-decorator %dir %{_datadir}/*-control-center/ %dir %{_datadir}/*-control-center/keybindings/ %{_datadir}/*-control-center/keybindings/* ++++++ compiz-suse-defaults.patch ++++++ --- a/metadata/core.xml.in.in +++ b/metadata/core.xml.in.in @@ -16,7 +16,7 @@ <option name="audible_bell" type="bool"> <_short>Audible Bell</_short> <_long>Audible system beep</_long> - <default>true</default> + <default>false</default> </option> <option name="ignore_hints_when_maximized" type="bool"> <_short>Ignore Hints When Maximized</_short> @@ -50,7 +50,7 @@ <option name="ping_delay" type="int"> <_short>Ping Delay</_short> <_long>Interval between ping messages</_long> - <default>5000</default> + <default>7500</default> <min>1000</min> <max>30000</max> </option> @@ -235,7 +235,7 @@ <option name="lighting" type="bool"> <_short>Lighting</_short> <_long>Use diffuse light when screen is transformed</_long> - <default>true</default> + <default>false</default> </option> <option name="detect_refresh_rate" type="bool"> <_short>Detect Refresh Rate</_short> --- a/metadata/cube.xml.in +++ b/metadata/cube.xml.in @@ -110,7 +110,7 @@ <type>string</type> <hints>file;image;</hints> <default> - <value>freedesktop</value> + <value>cube-image</value> </default> </option> <option name="adjust_image" type="bool"> @@ -124,7 +124,7 @@ <option name="skydome" type="bool"> <_short>Skydome</_short> <_long>Render skydome</_long> - <default>false</default> + <default>true</default> </option> <option name="skydome_image" type="string"> <_short>Skydome Image</_short> @@ -140,18 +140,18 @@ <_short>Skydome Gradient Start Color</_short> <_long>Color to use for the top color-stop of the skydome-fallback gradient</_long> <default> - <red>0x0d0d</red> - <green>0xb1b1</green> - <blue>0xfdfd</blue> + <red>0xafaf</red> + <green>0xafaf</green> + <blue>0xafaf</blue> </default> </option> <option name="skydome_gradient_end_color" type="color"> <_short>Skydome Gradient End Color</_short> <_long>Color to use for the bottom color-stop of the skydome-fallback gradient</_long> <default> - <red>0xfefe</red> - <green>0xffff</green> - <blue>0xc7c7</blue> + <red>0x7777</red> + <green>0x7777</green> + <blue>0x7777</blue> </default> </option> </subgroup> @@ -161,7 +161,7 @@ <option name="active_opacity" type="float"> <_short>Opacity During Rotation</_short> <_long>Opacity of desktop window during rotation.</_long> - <default>70.0</default> + <default>40.0</default> <min>0.0</min> <max>100.0</max> <precision>1.0</precision> @@ -177,7 +177,7 @@ <option name="transparent_manual_only" type="bool"> <_short>Transparency Only on Mouse Rotate</_short> <_long>Initiates Cube transparency only if rotation is mouse driven.</_long> - <default>true</default> + <default>false</default> </option> </group> </screen> --- a/metadata/decoration.xml.in +++ b/metadata/decoration.xml.in @@ -16,7 +16,7 @@ <option name="shadow_radius" type="float"> <_short>Shadow Radius</_short> <_long>Drop shadow radius</_long> - <default>8.0</default> + <default>7.0</default> <min>0.1</min> <max>18.0</max> <precision>0.1</precision> @@ -50,6 +50,7 @@ <option name="command" type="string"> <_short>Command</_short> <_long>Decorator command line that is executed if no decorator is already running</_long> + <default>gnome-window-decorator --replace</default> </option> <option name="mipmap" type="bool"> <_short>Mipmap</_short> --- a/metadata/place.xml.in +++ b/metadata/place.xml.in @@ -12,7 +12,7 @@ <option name="mode" type="int"> <_short>Placement Mode</_short> <_long>Algorithm to use for window placement</_long> - <default>0</default> + <default>1</default> <min>0</min> <max>5</max> <desc> --- a/metadata/resize.xml.in +++ b/metadata/resize.xml.in @@ -40,7 +40,7 @@ <option name="mode" type="int"> <_short>Default Resize Mode</_short> <_long>Default mode used for window resizing</_long> - <default>0</default> + <default>2</default> <min>0</min> <max>3</max> <desc> --- a/metadata/scale.xml.in +++ b/metadata/scale.xml.in @@ -167,7 +167,7 @@ <_long>Selects where windows are scaled if multiple output devices are used.</_long> <min>0</min> <max>1</max> - <default>0</default> + <default>1</default> <desc> <value>0</value> <_name>On current output device</_name> ++++++ gnome-window-decorator.py ++++++ #!/usr/bin/env python3 # # Copyright (c) 2015 Sorokin Alexei <sor.ale...@meowr.ru> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License. # global keyValueList, gwdProcess, gwdProcessOld def which(file): for path in os.environ["PATH"].split(os.pathsep): if os.path.exists(os.path.join(path, file)): return os.path.join(path, file) return None def execv_gwd(): os.execv(which("gtk-window-decorator"), sys.argv[:]) def self_killed(): global gwdProcess gwdProcess.force_exit() def gwd_killed(proc, result): global gwdProcess # Make false alarms impossible to happen. if (proc == gwdProcess) and (proc != gwdProcessOld): # Somebody killed decorator, dying as well… if (proc.get_if_exited()): sys.exit(proc.get_exit_status()) else: sys.exit(1) else: # Killed process is not the last started, why care? return 0 def on_gschema_changed(gsettings, key, gschemaSource, init=False): global keyValueList, gwdProcess, gwdProcessOld # All tracked keys. Check whether user has overriden them. keyList = [] if ("--marco-theme" not in sys.argv[1:]): keyList.append("theme") if ("--button-layout" not in sys.argv[1:]): keyList.append("button-layout") if ("--titlebar-font" not in sys.argv[1:]): keyList.extend(["titlebar-font", "titlebar-uses-system-font"]) # There is nothing to track at all, hence start gwd and die honourably. if (keyList == []): execv_gwd() # Check all keys at initialisation. if (init or key == ""): keys = keyList else: keys = [key] for key in keys: # Check that key is in list to prevent useless restartings and # avoid possible crashes by checking that key actually exists. if (key in keyList and key in gschemaSource.list_keys()): keyType = gschemaSource.get_key(key).get_value_type().dup_string() oldValue = keyValueList.get(key) if (keyType == "s"): keyValueList[key] = gsettings.get_string(key) elif (keyType == "b"): keyValueList[key] = gsettings.get_boolean(key) else: print("We got a GSettings key of unexpected type.", file=sys.stderr) keyValueList[key] = None # Why bother restarting decorator if nothing actually changed? if (not init) and (keyValueList.get(key) == oldValue): return 0 else: return 1 gwdProcessString = [which("gtk-window-decorator"), "--opacity", "1"] if ("--marco-theme" not in sys.argv[1:]) and (keyValueList["theme"] != None) and (keyValueList["theme"] != ""): gwdProcessString.extend(["--marco-theme", keyValueList["theme"]]) if ("--button-layout" not in sys.argv[1:]) and (keyValueList["button-layout"] != None) and \ (keyValueList["button-layout"] != ""): gwdProcessString.extend(["--button-layout", keyValueList["button-layout"]]) if ("--titlebar-font" not in sys.argv[1:]) and (keyValueList["titlebar-uses-system-font"] == False) and \ (keyValueList["titlebar-font"] != None) and (keyValueList["titlebar-font"] != ""): gwdProcessString.extend(["--titlebar-font", keyValueList["titlebar-font"]]) # Always at the end as this options can override already set ones. gwdProcessString.extend(sys.argv[1:]) if (not init): if ("--replace" not in gwdProcessString): gwdProcessString.append("--replace") gwdProcessOld = gwdProcess gwdProcess = Gio.Subprocess.new(gwdProcessString, Gio.SubprocessFlags.NONE) gwdProcess.wait_async(None, gwd_killed) import sys, os, atexit from gi.repository import GLib, Gio # Global variables. keyValueList = {} gwdProcess = None gwdProcessOld = None if (which("gtk-window-decorator") is None): print("gtk-window-decorator was not found, exiting...", file=sys.stderr) sys.exit(1) # Allow --metacity-theme option usage. while ("--metacity-theme" in sys.argv[1:]): sys.argv[sys.argv[1:].index("--metacity-theme") + 1] = "--marco-theme" if ("--disable-marco-theme" in sys.argv[1:]) or ("--disable-metacity-theme" in sys.argv[1:]): execv_gwd() gschema="" gsettings = None # Looking up for gschema, GNOME's or Marco's. if ("org.gnome.desktop.wm.preferences" in Gio.Settings.list_schemas()): gschema = "org.gnome.desktop.wm.preferences" if (os.environ["XDG_CURRENT_DESKTOP"] == "MATE" or gschema is Null) and \ ("org.mate.Marco.general" in Gio.Settings.list_schemas()): gschema = "org.mate.Marco.general" if (gschema != ""): gsettings = Gio.Settings.new(gschema) if (gsettings is None): print("No decoration theme was found, falling back to plain gtk-window-decorator.", file=sys.stderr) execv_gwd() gschemaSource = Gio.SettingsSchemaSource.get_default().lookup(gschema, False) # Poking on_gschema_changed() to start gwd. on_gschema_changed(gsettings, None, gschemaSource, True) # Kill decorator at exit. atexit.register(self_killed) # Checking for gschemas changes. gsettings.connect("changed", on_gschema_changed, gschemaSource) # Endless event loop. GLib.MainLoop().run()
