diff options
author | Tom William Payne <twp@gentoo.org> | 2005-12-10 22:31:44 +0000 |
---|---|---|
committer | Tom William Payne <twp@gentoo.org> | 2005-12-10 22:31:44 +0000 |
commit | a74da0724e690818cfd4a9827da44ed22f3b1ae5 (patch) | |
tree | 0ac14597fbee93e762d20abf0be2f86ce995df41 /x11-wm/ion3 | |
parent | Stable on alpha. (diff) | |
download | gentoo-2-a74da0724e690818cfd4a9827da44ed22f3b1ae5.tar.gz gentoo-2-a74da0724e690818cfd4a9827da44ed22f3b1ae5.tar.bz2 gentoo-2-a74da0724e690818cfd4a9827da44ed22f3b1ae5.zip |
Version bump.
(Portage version: 2.0.53)
Diffstat (limited to 'x11-wm/ion3')
-rw-r--r-- | x11-wm/ion3/ChangeLog | 8 | ||||
-rw-r--r-- | x11-wm/ion3/Manifest | 7 | ||||
-rw-r--r-- | x11-wm/ion3/files/digest-ion3-20050820 | 1 | ||||
-rw-r--r-- | x11-wm/ion3/files/digest-ion3-20051023-r1 | 1 | ||||
-rw-r--r-- | x11-wm/ion3/files/digest-ion3-20051210 | 1 | ||||
-rw-r--r-- | x11-wm/ion3/files/ion3-20051023-r1.patch | 178 | ||||
-rw-r--r-- | x11-wm/ion3/ion3-20051023-r1.ebuild | 70 | ||||
-rw-r--r-- | x11-wm/ion3/ion3-20051210.ebuild (renamed from x11-wm/ion3/ion3-20050820.ebuild) | 2 |
8 files changed, 11 insertions, 257 deletions
diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog index 126ced1e3a52..8bb7671c9859 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.28 2005/11/01 23:04:29 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.29 2005/12/10 22:31:44 twp Exp $ + +*ion3-20051210 (10 Dec 2005) + + 10 Dec 2005; Tom Payne <twp@gentoo.org> -files/ion3-20051023-r1.patch, + -ion3-20050820.ebuild, -ion3-20051023-r1.ebuild, +ion3-20051210.ebuild: + Version bump. 01 Nov 2005; Tom Payne <twp@gentoo.org> +files/ion3-20051029-statusd-locale.patch, ion3-20051029.ebuild: diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest index 3c07074eaaa2..dc784ceded6d 100644 --- a/x11-wm/ion3/Manifest +++ b/x11-wm/ion3/Manifest @@ -1,14 +1,11 @@ MD5 c3f9466ce4cdb0fa653dbc9ba64e64ac ChangeLog 3987 MD5 f5a4c637813405c5a7b6a5fa8c68c748 files/digest-ion3-20050116 68 -MD5 d2e9b37a47d3fc3cbb27f5da794f4eb2 files/digest-ion3-20050820 68 -MD5 6cad8bd6cf9ed6738c455bf359ce1201 files/digest-ion3-20051023-r1 68 MD5 776df82659ec1f00d3e91d59968d7d01 files/digest-ion3-20051029 68 -MD5 09ea5f50bc26d0e5aaf4d81172771233 files/ion3-20051023-r1.patch 7554 +MD5 89fe9e1eac7cb1a31e2c903f8f07bb87 files/digest-ion3-20051210 68 MD5 b5d7e3f2f5b68f51a4bcde5048e1a76c files/ion3-20051029-statusd-locale.patch 684 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 0cbbd360ffac763e4de376e723f18bab ion3-20051023-r1.ebuild 1629 MD5 671494f27e3af1f41523e37a2bb394f1 ion3-20051029.ebuild 1640 +MD5 3c06232f79e01bb82c0c8f9a57849814 ion3-20051210.ebuild 1593 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 diff --git a/x11-wm/ion3/files/digest-ion3-20050820 b/x11-wm/ion3/files/digest-ion3-20050820 deleted file mode 100644 index c03b8a7f687f..000000000000 --- a/x11-wm/ion3/files/digest-ion3-20050820 +++ /dev/null @@ -1 +0,0 @@ -MD5 a18103e8fc1a8934e1458b5df04d40e8 ion-3ds-20050820.tar.gz 587109 diff --git a/x11-wm/ion3/files/digest-ion3-20051023-r1 b/x11-wm/ion3/files/digest-ion3-20051023-r1 deleted file mode 100644 index aa48025cf4bd..000000000000 --- a/x11-wm/ion3/files/digest-ion3-20051023-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3d3d28526b3462324af028edfd3c6551 ion-3ds-20051023.tar.gz 590041 diff --git a/x11-wm/ion3/files/digest-ion3-20051210 b/x11-wm/ion3/files/digest-ion3-20051210 new file mode 100644 index 000000000000..c2aac3c41a52 --- /dev/null +++ b/x11-wm/ion3/files/digest-ion3-20051210 @@ -0,0 +1 @@ +MD5 e6aeff49f559d48e8cedea354c77a347 ion-3ds-20051210.tar.gz 592804 diff --git a/x11-wm/ion3/files/ion3-20051023-r1.patch b/x11-wm/ion3/files/ion3-20051023-r1.patch deleted file mode 100644 index 5a4a12c2772d..000000000000 --- a/x11-wm/ion3/files/ion3-20051023-r1.patch +++ /dev/null @@ -1,178 +0,0 @@ -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-r1.ebuild b/x11-wm/ion3/ion3-20051023-r1.ebuild deleted file mode 100644 index f7b52d717075..000000000000 --- a/x11-wm/ion3/ion3-20051023-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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-r1.ebuild,v 1.1 2005/10/26 12:00:12 twp Exp $ - -inherit eutils - -MY_PV=${PV/_p/-} -MY_PN=ion-3ds-${MY_PV} -DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind" -HOMEPAGE="http://www.iki.fi/tuomov/ion/" -SRC_URI="http://modeemi.cs.tut.fi/~tuomov/ion/dl/${MY_PN}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86" -IUSE="xinerama" -DEPEND="virtual/x11 - app-misc/run-mailcap - >=dev-lang/lua-5.0.2" -S=${WORKDIR}/${MY_PN} - -src_compile() { - - epatch ${FILESDIR}/${PF}.patch - - autoreconf -i - - local myconf="" - - if has_version '>=x11-base/xfree-4.3.0'; then - myconf="${myconf} --disable-xfree86-textprop-bug-workaround" - fi - - use hppa && myconf="${myconf} --disable-shared" - - econf \ - --sysconfdir=/etc/X11 \ - `use_enable xinerama` \ - ${myconf} || die - - make \ - DOCDIR=/usr/share/doc/${PF} || die - -} - -src_install() { - - make \ - prefix=${D}/usr \ - ETCDIR=${D}/etc/X11/ion3 \ - SHAREDIR=${D}/usr/share/ion3 \ - MANDIR=${D}/usr/share/man \ - DOCDIR=${D}/usr/share/doc/${PF} \ - LOCALEDIR=${D}/usr/share/locale \ - LIBDIR=${D}/usr/lib \ - MODULEDIR=${D}/usr/lib/ion3/mod \ - LCDIR=${D}/usr/lib/ion3/lc \ - VARDIR=${D}/var/cache/ion3 \ - install || die - - prepalldocs - - echo -e "#!/bin/sh\n/usr/bin/ion3" > ${T}/ion3 - echo -e "#!/bin/sh\n/usr/bin/pwm3" > ${T}/pwm3 - exeinto /etc/X11/Sessions - doexe ${T}/ion3 ${T}/pwm3 - - insinto /usr/share/xsessions - doins ${FILESDIR}/ion3.desktop ${FILESDIR}/pwm3.desktop - -} diff --git a/x11-wm/ion3/ion3-20050820.ebuild b/x11-wm/ion3/ion3-20051210.ebuild index 3ba84d1f22a8..aa6d0fabf6c7 100644 --- a/x11-wm/ion3/ion3-20050820.ebuild +++ b/x11-wm/ion3/ion3-20051210.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-20050820.ebuild,v 1.1 2005/09/16 17:43:42 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20051210.ebuild,v 1.1 2005/12/10 22:31:44 twp Exp $ inherit eutils |