From 4ca87cb9535860bb685018dc3eab787fdd9085be Mon Sep 17 00:00:00 2001 From: cvs2git Date: Wed, 14 Oct 2009 20:30:33 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create tag 'MAIN'. Sprout from DEVEL 2009-09-07 10:59:42 UTC cvs2git 'This commit was manufactured by cvs2git to create branch 'DEVEL'.' Cherrypick from DEVEL 2009-10-14 20:30:33 UTC pawelz '- declare originalfocus variable as local': awesome-magnifier.patch -> 1.1.2.4 Delete: awesome.spec --- awesome-magnifier.patch | 36 ++++ awesome.spec | 357 ---------------------------------------- 2 files changed, 36 insertions(+), 357 deletions(-) create mode 100644 awesome-magnifier.patch delete mode 100644 awesome.spec diff --git a/awesome-magnifier.patch b/awesome-magnifier.patch new file mode 100644 index 0000000..9ada12a --- /dev/null +++ b/awesome-magnifier.patch @@ -0,0 +1,36 @@ +diff --git a/lib/awful/layout/suit/magnifier.lua.in b/lib/awful/layout/suit/magnifier.lua.in +index 2d4a526..74a2398 100644 +--- a/lib/awful/layout/suit/magnifier.lua.in ++++ b/lib/awful/layout/suit/magnifier.lua.in +@@ -34,6 +34,11 @@ function arrange(p) + fidx = 1 + end + ++ -- If focused window is floating, value of focus will change. We want to ++ -- save original value of focus and raise() it after seting geometry of ++ -- other clients. ++ local originalfocus = focus ++ + -- If focused window is not tiled, take the first one which is tiled. + if client.floating.get(focus) then + focus = cls[1] +@@ -56,7 +61,6 @@ function arrange(p) + geometry.height = area.height + end + focus:geometry(geometry) +- focus:raise() + + if #cls > 1 then + geometry.x = area.x +@@ -87,6 +91,11 @@ function arrange(p) + geometry.y = geometry.y + geometry.height + end + end ++ ++ -- Raise primary tiled window and then the originally focused window. If ++ -- there was no floating window it is the same window. ++ focus:raise() ++ originalfocus:raise() + end + + name = "magnifier" diff --git a/awesome.spec b/awesome.spec deleted file mode 100644 index eae9171..0000000 --- a/awesome.spec +++ /dev/null @@ -1,357 +0,0 @@ -Summary: awesome window manager -Summary(hu.UTF-8): awesome ablakkezelő -Summary(pl.UTF-8): Zarządca okien X - Awesome -Name: awesome -Version: 3.3.4 -Release: 1 -License: GPL v2 -Group: X11/Window Managers -Source0: http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2 -# Source0-md5: a8e20a5af2cb07191416c2b8198b450c -Source1: %{name}-xsession.desktop -Patch0: %{name}-3.0-lua-files.patch -Patch1: %{name}-client-bashizm.patch -Patch2: %{name}-xmlto.patch -URL: http://awesome.naquadah.org/ -BuildRequires: ImageMagick-coder-png -BuildRequires: asciidoc -BuildRequires: cairo-devel -BuildRequires: cmake >= 2.6 -BuildRequires: dbus-devel -BuildRequires: doxygen -BuildRequires: glib-devel -BuildRequires: glib2-devel -BuildRequires: gperf -BuildRequires: imlib2-devel -BuildRequires: libev-devel -BuildRequires: libxdg-basedir-devel >= 1.0.1 -BuildRequires: lua-doc -BuildRequires: lua51-devel -BuildRequires: pango-devel -BuildRequires: pkgconfig >= 0.9.0 -BuildRequires: readline-devel -BuildRequires: rpmbuild(macros) >= 1.293 -BuildRequires: sed >= 4.0 -BuildRequires: startup-notification-devel >= 0.10 -BuildRequires: xcb-util-devel >= 0.3.6 -BuildRequires: xmlto -BuildRequires: xorg-lib-libICE-devel -BuildRequires: xorg-lib-libXext-devel -BuildRequires: xorg-lib-libXft-devel -BuildRequires: xorg-lib-libXinerama-devel -BuildRequires: xorg-lib-libXrandr-devel -Requires: %{name}-client = %{version}-%{release} -Requires: startup-notification >= 0.10 -Requires: xcb-util >= 0.3.6 -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%define _sysconfdir /etc/X11 - -%description -awesome is a highly configurable, next generation framework window -manager for X. It is very fast, light and extensible. It is primarly -targeted at power user, developer and any people dealing with every -day computing tasks and want to have fine-grained control on its -graphical environment. - -%description -l hu.UTF-8 -awesome egy végletekig beállítható, következő generációs ablakkezelő -az X-hez. Nagyon gyors, könnyed és bővíthető. Az elsődleges -célközönség a "power user"-ek, fejlesztők és bárki, aki minden nap -számítógéppel dolgozik és teljeskörű irányítást akar a grafikus -felületén. - -%description -l pl.UTF-8 -awesome jest zarządcą okien charakteryzującym się bardzo dużymi -możliwościami konfiguracji i rozszerzania funkcjonalności, pozostając -przy tym szybkim i lekkim. Cel ten został osiągnięty dzięki wbudowaniu -w program języka skryptowego lua. Awesome został zaprojektowany z -myślą o bardziej zaawansowanych użytkownikach: programistach oraz -innych pracujących na codzień z komputerami, którzy chcą mieć dużą -kontrolę nad swoim środowiskiem graficznym. - -%package client -Summary: awesome window manager command line client -Summary(hu.UTF-8): Parancssoros kliens az awesome ablakkezelőhöz -Summary(pl.UTF-8): Klient zarządcy okien awesome -Group: X11/Window Managers/Tools -Requires: dbus -Requires: rlwrap - -%description client -awesome-client is command line utility (in fact shell script) for -executing an arbitrary lua code in working awesome window manager -instance. - -%description client -l hu.UTF-8 -awesome-client egy parancssoros eszköz (lényegében egy shell script) -tetszőleges lua kód futtatásához egy működő awesome ablakkezelőben. - -%description client -l pl.UTF-8 -awesome-client to skrypt powłoki pozwalający wykonać dowolny kod lua w -działającej instancji zarządcy okien awesome. - -%package doc -Summary: awesome window manager API documentation -Summary(hu.UTF-8): awesome ablakkezelő API dokumentációja -Summary(pl.UTF-8): Dokumentacja API awesome -Group: Documentation - -%description doc -awesome window manager API documentation. - -%description doc -l hu.UTF-8 -awesome ablakkezelő API dokumentációja. - -%description doc -l pl.UTF-8 -Dokumentacja API zarządcy okien awesome. - -%package example-config -Summary: Example config for awesome window manager -Summary(hu.UTF-8): Egy alap/példa konfig az awesome ablakkezelőhöz -Summary(pl.UTF-8): Przykładowy plik konfiguracyjny dla zarządcy okien awesome -Group: Documentation -Requires: %{name} = %{version}-%{release} -Requires: %{name}-plugin-awful = %{version}-%{release} -Requires: %{name}-plugin-beautiful = %{version}-%{release} -Requires: %{name}-plugin-tabulous = %{version}-%{release} -Requires: %{name}-themes = %{version}-%{release} - -%description example-config -Example config for awesome window manager. It can be a good starting -point for those people, who have never used awesome window manager -before. - -%description example-config -l hu.UTF-8 -Egy alap/példa konfig az awesome ablakkezelőhöz. Ha még sose -használtál awesome 3.x ablakkezelőt, jó kiindulópont lehet. - -%description example-config -l pl.UTF-8 -Przykładowy plik konfiguracyjny dla zarządcy okien awesome. Ten plik -jest dobrym punktem wyjścia dla osób nie używających wcześniej awesome -3.x. - -%package plugin-awful -Summary: awful plugin for awesome window manager -Summary(hu.UTF-8): awful plugin az awesome ablakkezelőhöz -Summary(pl.UTF-8): Wtyczka awful dla zarządcy okien awesome -Group: X11/Window Managers/Tools -Requires: %{name} = %{version}-%{release} - -%description plugin-awful -AWesome Functions very UsefuL: awful plugin for awesome window -manager. - -%description plugin-awful -l hu.UTF-8 -AWesome Functions very UsefuL: awful plugin az awesome ablakkezelőhöz. - -%description plugin-awful -l pl.UTF-8 -AWesome Functions very UsefuL: wtyczka awful dla zarządcy okien -awesome. - -%package plugin-beautiful -Summary: Theme library for awesome window manager -Summary(hu.UTF-8): Theme könyvtár az awesome ablakkezelőhöz -Summary(pl.UTF-8): Biblioteka styli dla zarządcy okien awesome -Group: X11/Window Managers/Tools -Requires: %{name} = %{version}-%{release} -Suggests: WallpaperChanger - -%description plugin-beautiful -Theme library for awesome window manager. - -%description plugin-beautiful -l hu.UTF-8 -Theme könyvtár az awesome ablakkezelőhöz. - -%description plugin-beautiful -l pl.UTF-8 -Biblioteka styli dla zarządcy okien awesome. - -%package plugin-invaders -Summary: Awesome Invaders game -Summary(hu.UTF-8): Awesome Invaders játék -Summary(pl.UTF-8): Gra Awesome Invaders -Group: X11/Window Managers/Tools -Requires: %{name} = %{version}-%{release} -Requires: %{name}-plugin-awful = %{version}-%{release} -Requires: %{name}-plugin-beautiful = %{version}-%{release} -Requires: ImageMagick - -%description plugin-invaders -Awesome Invaders is, as the name says, an implementation of Space -Invaders using awesome 3's Lua interface. - -%description plugin-invaders -l hu.UTF-8 -Awesome Invaders, ahogy a neve is mutatja, a Space Invaders -megvalósítása az awesome 3 lua interfészét használva. - -%description plugin-invaders -l pl.UTF-8 -Awesome Invaders jest grą Space Invaders zaimplementowaną w intefejsie -Lua zarządcy okien awesome 3. - -%package plugin-naughty -Summary: Naughty is a lua library that implements popup notifications for awesome 3 -Summary(hu.UTF-8): Naughty egy lua-könyvtár, amely felugró értesítéseket tesz lehetővé awesome3-ban -Summary(pl.UTF-8): Powiadomienia w postaci wyskakujących okienek dla awesome 3 -Group: X11/Window Managers/Tools -Requires: %{name} = %{version}-%{release} -Requires: %{name}-plugin-awful = %{version}-%{release} -Requires: %{name}-plugin-beautiful = %{version}-%{release} -Provides: dbus(org.freedesktop.Notifications) - -%description plugin-naughty -Naughty is a lua library that implements popup notifications for -awesome3. - -%description plugin-naughty -l hu.UTF-8 -Naughty egy lua-könyvtár, amely felugró értesítéseket tesz lehetővé -awesome3-ban. - -%description plugin-naughty -l pl.UTF-8 -Biblioteka lua dla zarządcy okien awesome 3 implementująca -powiadomienia w formie wyskakujących okienek. - -%package plugin-tabulous -Summary: Fabulous tabs for awesome window manager -Summary(hu.UTF-8): Tab-ok awesome-hoz -Summary(pl.UTF-8): Zakładki dla zarządcy okien awesome -Group: X11/Window Managers/Tools -Requires: %{name} = %{version}-%{release} - -%description plugin-tabulous -Fabulous tabs for awesome. - -%description plugin-tabulous -l hu.UTF-8 -Tab-ok awesome-hoz. - -%description plugin-tabulous -l pl.UTF-8 -Zakładki dla zarządcy okien awesome. - -%package plugin-telak -Summary: Root window image display library -Summary(hu.UTF-8): Root ablak kezeléséhez könyvtár -Summary(pl.UTF-8): Biblioteka pozwlająca ustawić tapetę w głównym oknie -Group: X11/Window Managers/Tools -Requires: %{name} = %{version}-%{release} -Requires: lua-socket - -%description plugin-telak -Root window image display library. - -%description plugin-telak -l hu.UTF-8 -Root ablak kezeléséhez könyvtár. - -%description plugin-telak -l pl.UTF-8 -Biblioteka pozwalająca ustawić tapetę wyświetlaną na głównym oknie. - -%package themes -Summary: Themes for awesome window manager -Summary(hu.UTF-8): Témák az awesome ablakkezelőhöz -Summary(pl.UTF-8): Tematy dla zarządcy okien awesome -Group: X11/Window Managers/Tools -Requires: %{name} = %{version}-%{release} - -%description themes -Themes for awesome window manager. - -%description themes -l hu.UTF-8 -Témák az awesome ablakkezelőhöz. - -%description themes -l pl.UTF-8 -Dodatkowe "tematy" (definicje wyglądu) zarządcy okien awesome. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -%build -%cmake \ - -DLUA_INC_DIR=%{_includedir}/lua51 \ - -DPREFIX=%{_prefix} \ - -DAWESOME_DOC_PATH=%{_docdir}/%{name}-%{version} \ - -DAWESOME_DATA_PATH=%{_datadir}/%{name} \ - -DSYSCONFDIR=%{_sysconfdir} -%{__make} - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_docdir}/%{name}-%{version}} -install AUTHORS BUGS README STYLE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop - -for file in $(%{__find} $RPM_BUILD_ROOT%{_datadir}/%{name} -iname "*.in"); do - %{__rm} ${file} -done - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(644,root,root,755) -%doc %{_docdir}/%{name}-%{version} -%exclude %{_docdir}/%{name}-%{version}/luadoc -%attr(755,root,root) %{_bindir}/%{name} -%attr(755,root,root) %{_bindir}/awsetbg -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/lib -%{_datadir}/%{name}/lib/capi.lua -%{_datadir}/%{name}/icons -%{_datadir}/xsessions/%{name}.desktop -%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/awsetbg.1* -%{_mandir}/man5/awesomerc.5* - -%files client -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/%{name}-client -%{_mandir}/man1/%{name}-client.1* - -%files doc -%defattr(644,root,root,755) -%doc %{_docdir}/%{name}-%{version}/luadoc - -%files example-config -%defattr(644,root,root,755) -%dir %{_sysconfdir}/xdg -%dir %{_sysconfdir}/xdg/awesome -%{_sysconfdir}/xdg/awesome/* - -%files plugin-awful -%defattr(644,root,root,755) -%dir %{_datadir}/awesome/lib/awful -%{_datadir}/awesome/lib/awful/*.lua -%{_datadir}/awesome/lib/awful/layout -%{_datadir}/awesome/lib/awful/widget - -%files plugin-beautiful -%defattr(644,root,root,755) -%{_datadir}/awesome/lib/beautiful.lua -%{_datadir}/awesome/themes - -%files themes -%defattr(644,root,root,755) -%dir %{_datadir}/awesome/themes -%{_datadir}/awesome/themes/default -%{_datadir}/awesome/themes/sky - -%files plugin-invaders -%defattr(644,root,root,755) -%{_datadir}/awesome/lib/invaders.lua -%dir %{_datadir}/awesome/icons/invaders -%{_datadir}/awesome/icons/invaders/*.png - -%files plugin-naughty -%defattr(644,root,root,755) -%{_datadir}/awesome/lib/naughty.lua - -%files plugin-tabulous -%defattr(644,root,root,755) -%{_datadir}/awesome/lib/tabulous.lua - -%files plugin-telak -%defattr(644,root,root,755) -%{_datadir}/awesome/lib/telak.lua -- 2.43.0