diff options
author | Tom William Payne <twp@gentoo.org> | 2005-10-26 12:00:12 +0000 |
---|---|---|
committer | Tom William Payne <twp@gentoo.org> | 2005-10-26 12:00:12 +0000 |
commit | 9066afb136ff783094db4ba7d5a59a0206661af3 (patch) | |
tree | c4eb1145a40357057717c2b24cebd3611b9cd8b4 /x11-wm/ion3 | |
parent | Install man-file into the correct path, fixes bug #110510 (diff) | |
download | gentoo-2-9066afb136ff783094db4ba7d5a59a0206661af3.tar.gz gentoo-2-9066afb136ff783094db4ba7d5a59a0206661af3.tar.bz2 gentoo-2-9066afb136ff783094db4ba7d5a59a0206661af3.zip |
Apply patch to fix status bar issue. Bug # 110417. Thanks Frank Zschockelt
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'x11-wm/ion3')
-rw-r--r-- | x11-wm/ion3/ChangeLog | 8 | ||||
-rw-r--r-- | x11-wm/ion3/Manifest | 5 | ||||
-rw-r--r-- | x11-wm/ion3/files/digest-ion3-20051023-r1 (renamed from x11-wm/ion3/files/digest-ion3-20051023) | 0 | ||||
-rw-r--r-- | x11-wm/ion3/files/ion3-20051023-r1.patch | 178 | ||||
-rw-r--r-- | x11-wm/ion3/ion3-20051023-r1.ebuild (renamed from x11-wm/ion3/ion3-20051023.ebuild) | 4 |
5 files changed, 191 insertions, 4 deletions
diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog index cb88b81739d6..ae6176161e8f 100644 --- a/x11-wm/ion3/ChangeLog +++ b/x11-wm/ion3/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/ion3 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.25 2005/10/24 09:53:17 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.26 2005/10/26 12:00:12 twp Exp $ + +*ion3-20051023-r1 (26 Oct 2005) + + 26 Oct 2005; Tom Payne <twp@gentoo.org> +files/ion3-20051023-r1.patch, + -ion3-20051023.ebuild, +ion3-20051023-r1.ebuild: + Apply patch to fix status bar issue. Bug # 110417. Thanks Frank Zschockelt *ion3-20051023 (24 Oct 2005) diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest index 1cb2d1be789b..02babb49c147 100644 --- a/x11-wm/ion3/Manifest +++ b/x11-wm/ion3/Manifest @@ -1,10 +1,11 @@ MD5 b86868c8902698d0dbe9d7be202f2ec5 ChangeLog 3493 MD5 f5a4c637813405c5a7b6a5fa8c68c748 files/digest-ion3-20050116 68 MD5 d2e9b37a47d3fc3cbb27f5da794f4eb2 files/digest-ion3-20050820 68 -MD5 6cad8bd6cf9ed6738c455bf359ce1201 files/digest-ion3-20051023 68 +MD5 6cad8bd6cf9ed6738c455bf359ce1201 files/digest-ion3-20051023-r1 68 +MD5 f3ff9c0fee4e8cba611efdbd38c81a39 files/ion3-20051023-r1.patch 7548 MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217 MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170 MD5 15e7cfd3c18e353dd36647b6e5b2023d ion3-20050116.ebuild 1588 MD5 b3f87a9c4eed784ced6d47f947de5527 ion3-20050820.ebuild 1593 -MD5 81c998ba0920f20ec9f7e8b8c6234f97 ion3-20051023.ebuild 1593 +MD5 3e016ba4408d9e4a9e4ae4fa3118a98c ion3-20051023-r1.ebuild 1626 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 diff --git a/x11-wm/ion3/files/digest-ion3-20051023 b/x11-wm/ion3/files/digest-ion3-20051023-r1 index aa48025cf4bd..aa48025cf4bd 100644 --- a/x11-wm/ion3/files/digest-ion3-20051023 +++ b/x11-wm/ion3/files/digest-ion3-20051023-r1 diff --git a/x11-wm/ion3/files/ion3-20051023-r1.patch b/x11-wm/ion3/files/ion3-20051023-r1.patch new file mode 100644 index 000000000000..5a4a12c2772d --- /dev/null +++ b/x11-wm/ion3/files/ion3-20051023-r1.patch @@ -0,0 +1,178 @@ +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/configure.ac ion-3/configure.ac +--- ion-3ds-20051023/configure.ac 2005-10-23 18:14:47.000000000 +0200 ++++ ion-3/configure.ac 2005-10-26 13:41:53.000000000 +0200 +@@ -3,7 +3,7 @@ + dnl $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/files/ion3-20051023-r1.patch,v 1.1 2005/10/26 12:00:12 twp Exp $ + + AC_INIT([Ion Window Manager], +- [3ds-20051023], ++ [3ds-20051023-r1], + [tuomov@iki.fi], + [ion3]) + AC_PREREQ([2.58]) +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/ioncore/clientwin.c ion-3/ioncore/clientwin.c +--- ion-3ds-20051023/ioncore/clientwin.c 2005-10-23 18:14:31.000000000 +0200 ++++ ion-3/ioncore/clientwin.c 2005-10-26 13:41:54.000000000 +0200 +@@ -721,36 +721,35 @@ + FRAME_SZH_USEMINMAX); + mreg=(WRegion*)frame; + mplex_managed_geom((WMPlex*)frame, &mg); ++ ++ /* border sizes */ ++ fp.g.w=REGION_GEOM(mreg).w-mg.w; ++ fp.g.h=REGION_GEOM(mreg).h-mg.h; ++ /* maximum inner size */ ++ mg.w=maxof(1, cwin->last_fp.g.w-fp.g.w); ++ mg.h=maxof(1, minof(REGION_GEOM(reg).h, cwin->last_fp.g.h-fp.g.h)); ++ /* adjust it to size hints (can only shrink) */ ++ correct_to_size_hints_of(&(mg.w), &(mg.h), reg); ++ /* final frame size */ ++ fp.g.w+=mg.w; ++ fp.g.h+=mg.h; ++ /* positioning */ ++ do_gravity(&(cwin->last_fp.g), fp.gravity, &(fp.g)); ++ ++ fp.mode=REGION_FIT_EXACT; + }else{ + mreg=reg; +- mg=REGION_GEOM(reg); ++ fp.g=cwin->last_fp.g; ++ fp.mode=REGION_FIT_BOUNDS|REGION_FIT_GRAVITY; ++ fp.gravity=clientwin_get_transients_gravity(cwin); + } +- +- +- /* border sizes */ +- fp.g.w=REGION_GEOM(mreg).w-mg.w; +- fp.g.h=REGION_GEOM(mreg).h-mg.h; +- /* maximum inner size */ +- mg.w=maxof(1, cwin->last_fp.g.w-fp.g.w); +- mg.h=maxof(1, minof(REGION_GEOM(reg).h, cwin->last_fp.g.h-fp.g.h)); +- /* adjust it to size hints (can only shrink) */ +- correct_to_size_hints_of(&(mg.w), &(mg.h), reg); +- /* final frame size */ +- fp.g.w+=mg.w; +- fp.g.h+=mg.h; +- /* positioning */ +- do_gravity(&(cwin->last_fp.g), fp.gravity, &(fp.g)); +- +- fp.mode=REGION_FIT_EXACT; + + region_fitrep((WRegion*)mreg, NULL, &fp); +- ++ + if(frame!=NULL){ + if(!mplex_attach_simple((WMPlex*)frame, reg, 0)){ + destroy_obj((Obj*)frame); + mreg=reg; +- }else{ +- mreg=(WRegion*)frame; + } + } + +@@ -1344,8 +1343,11 @@ + FOR_ALL_ON_PTRLIST(WRegion*, transient, cwin->transient_list, tmp){ + WFitParams fp2; + fp2.mode=REGION_FIT_EXACT; +- convert_transient_geom(&(fptmp), transient, &(fp2.g)); +- ++ if(ioncore_g.framed_transients) ++ convert_transient_geom(&(fptmp), transient, &(fp2.g)); ++ else ++ fp2=fptmp; ++ + if(!region_fitrep(transient, np, &fp2) && np!=NULL){ + warn(TR("Error reparenting %s."), region_name(transient)); + region_detach_manager(transient); +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/man/ion3.cs.in ion-3/man/ion3.cs.in +--- ion-3ds-20051023/man/ion3.cs.in 2005-10-23 18:14:31.000000000 +0200 ++++ ion-3/man/ion3.cs.in 2005-10-26 13:41:54.000000000 +0200 +@@ -24,7 +24,7 @@ + obrazovku (kořenové okno). (Tedy ne všechny, které byly zadány v parametru + -display nebo v proměnné DISPLAY.) + .TP +-.B \-sessionname název_sezení ++.B \-session název_sezení + Nastaví název sezení. Tato volba ovlivní, kam se uloží pracovní plochy + a ostatní soubory. Pokud není nastavená, použije se ~/.ion3/session_name. + .TP +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/man/ion3.de.in ion-3/man/ion3.de.in +--- ion-3ds-20051023/man/ion3.de.in 2005-10-23 18:14:31.000000000 +0200 ++++ ion-3/man/ion3.de.in 2005-10-26 13:41:54.000000000 +0200 +@@ -25,7 +25,7 @@ + voreingestellten Screen (Wurzelfenster); nicht alle, welche durch die '-display' + Option oder in der DISPLAY Umgebungsvariable bereitgestellt werden + .TP +-.B \-sessionname sitzungs_name ++.B \-session sitzungs_name + Setzt einen Sitzungsnamen. Diese Option beeinflusst wo der Arbeitsbereich und + andere Sicherungsdateien abgelegt werden (~/.ion3/sitzungs_name wenn die Option + gesetzt wurde). +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/man/ion3.fi.in ion-3/man/ion3.fi.in +--- ion-3ds-20051023/man/ion3.fi.in 2005-10-23 18:14:31.000000000 +0200 ++++ ion-3/man/ion3.fi.in 2005-10-26 13:41:54.000000000 +0200 +@@ -25,7 +25,7 @@ + (ei Xinerama) näyttö/juuri-ikkuna. Tämä näyttö voidaan valita -display + parametrillä tai DISPLAY ympäristömuuttujalla. + .TP +-.B \-sessionname session_name ++.B \-session session_name + Istunnon nimi. Tämä vaikuttaa talletustiedostojen sijaintiin. + .TP + .B \-xinerama 0|1 +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/man/ion3.in ion-3/man/ion3.in +--- ion-3ds-20051023/man/ion3.in 2005-10-23 18:14:31.000000000 +0200 ++++ ion-3/man/ion3.in 2005-10-26 13:41:54.000000000 +0200 +@@ -24,7 +24,7 @@ + default screen (root window), not all, as given by the -display option or + in the DISPLAY environment variable. + .TP +-.B \-sessionname session_name ++.B \-session session_name + Set session name. This option affects where workspace and other save files are + put (~/.ion3/session_name if option set). + .TP +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/mod_statusbar/draw.c ion-3/mod_statusbar/draw.c +--- ion-3ds-20051023/mod_statusbar/draw.c 2005-10-23 18:14:31.000000000 +0200 ++++ ion-3/mod_statusbar/draw.c 2005-10-26 13:41:54.000000000 +0200 +@@ -110,16 +110,17 @@ + mgr=OBJ_CAST(REGION_PARENT(sb), WMPlex); + if(mgr!=NULL){ + WRegion *std=NULL; +- int corner=MPLEX_STDISP_TL; +- mplex_get_stdisp(mgr, &std, &corner); ++ WMPlexSTDispInfo din; ++ din.pos=MPLEX_STDISP_TL; ++ mplex_get_stdisp(mgr, &std, &din); + if(std==(WRegion*)sb) +- right_align=(corner==MPLEX_STDISP_TR || corner==MPLEX_STDISP_BR); ++ right_align=(din.pos==MPLEX_STDISP_TR || din.pos==MPLEX_STDISP_BR); + } + + g.x+=bdw.left; + g.w-=bdw.left+bdw.right; +- g.y+=bdw.top; +- g.h-=bdw.top+bdw.bottom; ++ g.y+=bdw.top; ++ g.h-=bdw.top+bdw.bottom; + + ty=(g.y+fnte.baseline+(g.h-fnte.max_height)/2); + +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/mod_statusbar/mod_statusbar.lua ion-3/mod_statusbar/mod_statusbar.lua +--- ion-3ds-20051023/mod_statusbar/mod_statusbar.lua 2005-10-23 18:14:31.000000000 +0200 ++++ ion-3/mod_statusbar/mod_statusbar.lua 2005-10-26 13:41:54.000000000 +0200 +@@ -145,6 +145,7 @@ + function(t) + table.insert(res, { + type=(t=='f' and 4 or 3), ++ text=(t~='f' and t or nil), + }) + end) + return res +diff --exclude=_darcs --exclude=ChangeLog --exclude=exact-version -Naur ion-3ds-20051023/version.h ion-3/version.h +--- ion-3ds-20051023/version.h 2005-10-23 18:14:47.000000000 +0200 ++++ ion-3/version.h 2005-10-26 13:41:53.000000000 +0200 +@@ -1,2 +1,2 @@ +-#define ION_VERSION "3ds-20051023" ++#define ION_VERSION "3ds-20051023-r1" + #define ION_API_VERSION "3-"ION_VERSION diff --git a/x11-wm/ion3/ion3-20051023.ebuild b/x11-wm/ion3/ion3-20051023-r1.ebuild index 75393e4c5b92..f7b52d717075 100644 --- a/x11-wm/ion3/ion3-20051023.ebuild +++ b/x11-wm/ion3/ion3-20051023-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20051023.ebuild,v 1.1 2005/10/24 09:53:17 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20051023-r1.ebuild,v 1.1 2005/10/26 12:00:12 twp Exp $ inherit eutils @@ -20,6 +20,8 @@ S=${WORKDIR}/${MY_PN} src_compile() { + epatch ${FILESDIR}/${PF}.patch + autoreconf -i local myconf="" |