Bug#694375: xterm: Please update to a later upstream version
On Tue, Nov 27, 2012 at 20:33:06 -0500, Thomas Dickey wrote: > On Tue, Nov 27, 2012 at 08:40:26PM +0100, Julien Cristau wrote: > > I'm looking at 287, and have a problem with the desktop file: > > > > ACTUAL_XTERM=`echo xterm|sed 's,x,x,'` \ > > /bin/sh -c 'for n in ../xterm.desktop ../uxterm.desktop; \ > > do /bin/sh df-install $ACTUAL_XTERM --vendor debian > > --dir=/XXX/pkg-xorg/app/xterm/debian/tmp/usr/share/applications $n; \ > > done' > > --- ../xterm.desktop2012-11-27 19:21:40.0 + > > +++ tempdir29859/xterm.desktop 2012-11-27 19:27:14.0 + > > @@ -37,6 +37,6 @@ > > Exec=xterm > > Terminal=false > > Type=Application > > -Encoding=UTF-8 > > -Icon=xterm-color_48x48 > > -Categories=System;TerminalEmulator; > > +#Encoding=UTF-8 > > +Icon=xterm-color > > +Categories=auto > > xterm.desktop: warning: key "Categories" is a list and does not have a > > semicolon as trailing character, fixing > > /home/julien/src/debian.org/git/pkg-xorg/app/xterm/debian/tmp/usr/share/applications/debian-xterm.desktop: > > error: value "auto;" for key "Categories" in group "Desktop Entry" > > contains an unregistered value "auto"; values extending the format should > > start with "X-" > > /home/julien/src/debian.org/git/pkg-xorg/app/xterm/debian/tmp/usr/share/applications/debian-xterm.desktop: > > error: (will be fatal in the future): value "auto;" for key "Categories" > > in group "Desktop Entry" does not contain a registered main category > > Error on file "xterm.desktop": Failed to validate the created desktop file > > hmm - I assume I overlooked this due to the way I build my test package - > on a machine which has one or more desktop environments installed. > > Mine has this (xterm-dev.desktop of course): > > [Desktop Entry] > Name=XTermDev > #GenericName=Terminal > Comment=standard terminal emulator for the X window system > Exec=xterm-dev > Terminal=false > Type=Application > #Encoding=UTF-8 > Icon=xterm-dev-color > Categories=Application;System;TerminalEmulator;Utility; > X-Desktop-File-Install-Version=0.15 > > > I can probably work around this by setting the category explicitly, but > > as far as I can tell, CF_WITH_DESKTOP_CATEGORY doesn't actually use $3 > > as a default value? > > doesn't seem that way - a quick check of the history doesn't show a > change in usage for the parameter (though I may have had a different > intent when starting to code this). > OK, I was confused by this comment: dnl $3 = suggested categories, also a case-pattern but without wildcards, dnl since it doubles as a default value. > It's only used in a case statement for "other" desktops that I hadn't seen > and collected there, and doesn't directly affect the category. > > The macro's not that recent - is this a new bug, or just noticed one > that existed last year? > cf-install.in changed in 280 to replace Categories. In previous versions the 'Categories=System;TerminalEmulator;' line in xterm.desktop would have been left unmodified. Cheers, Julien signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Tue, Nov 27, 2012 at 08:40:26PM +0100, Julien Cristau wrote: > On Sun, Nov 25, 2012 at 19:38:15 -0500, Thomas Dickey wrote: > > > On Sun, Nov 25, 2012 at 09:04:07PM +, Paul Evans wrote: > > > Package: xterm > > > Version: 278-2 > > > Severity: normal > > > > > > (re-submission in case the previous did not make it) > > > > > > Current version in debian is still 278; this is rather old by now. There > > > are several updates in later versions that I would like to make use of. > > > Ideally at least version 282 would be lovely. > > > > There are several features and fixes. I released #279 a few weeks before > > the current freeze began; however it was fairly large, and according to > > the package maintainer beyond his ability to inspect it. Direct access > > to my source archives would not change that assessment, however I've long > > been cooperative about digesting changes to assist packagers in applying > > specific changes. > > > I'm looking at 287, and have a problem with the desktop file: > > ACTUAL_XTERM=`echo xterm|sed 's,x,x,'` \ > /bin/sh -c 'for n in ../xterm.desktop ../uxterm.desktop; \ > do /bin/sh df-install $ACTUAL_XTERM --vendor debian > --dir=/XXX/pkg-xorg/app/xterm/debian/tmp/usr/share/applications $n; \ > done' > --- ../xterm.desktop2012-11-27 19:21:40.0 + > +++ tempdir29859/xterm.desktop 2012-11-27 19:27:14.0 + > @@ -37,6 +37,6 @@ > Exec=xterm > Terminal=false > Type=Application > -Encoding=UTF-8 > -Icon=xterm-color_48x48 > -Categories=System;TerminalEmulator; > +#Encoding=UTF-8 > +Icon=xterm-color > +Categories=auto > xterm.desktop: warning: key "Categories" is a list and does not have a > semicolon as trailing character, fixing > /home/julien/src/debian.org/git/pkg-xorg/app/xterm/debian/tmp/usr/share/applications/debian-xterm.desktop: > error: value "auto;" for key "Categories" in group "Desktop Entry" contains > an unregistered value "auto"; values extending the format should start with > "X-" > /home/julien/src/debian.org/git/pkg-xorg/app/xterm/debian/tmp/usr/share/applications/debian-xterm.desktop: > error: (will be fatal in the future): value "auto;" for key "Categories" in > group "Desktop Entry" does not contain a registered main category > Error on file "xterm.desktop": Failed to validate the created desktop file hmm - I assume I overlooked this due to the way I build my test package - on a machine which has one or more desktop environments installed. Mine has this (xterm-dev.desktop of course): [Desktop Entry] Name=XTermDev #GenericName=Terminal Comment=standard terminal emulator for the X window system Exec=xterm-dev Terminal=false Type=Application #Encoding=UTF-8 Icon=xterm-dev-color Categories=Application;System;TerminalEmulator;Utility; X-Desktop-File-Install-Version=0.15 > I can probably work around this by setting the category explicitly, but > as far as I can tell, CF_WITH_DESKTOP_CATEGORY doesn't actually use $3 > as a default value? doesn't seem that way - a quick check of the history doesn't show a change in usage for the parameter (though I may have had a different intent when starting to code this). It's only used in a case statement for "other" desktops that I hadn't seen and collected there, and doesn't directly affect the category. The macro's not that recent - is this a new bug, or just noticed one that existed last year? -- Thomas E. Dickey http://invisible-island.net ftp://invisible-island.net signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Tue, Nov 27, 2012 at 10:20:02PM +0100, Julien Cristau wrote: > On Tue, Nov 27, 2012 at 20:40:26 +0100, Julien Cristau wrote: > > > I'm looking at 287, and have a problem with the desktop file: > > > Another thing: the manpage change in 283 (to use a macro for xterm) > seems to break 'whatis': > > $ lexgrog xterm.man > xterm.man: parse failed > > resulting in: > > $ whatis xterm > xterm (1)- (unknown subject) > > Maybe the change should be reverted from the NAME section. yes - I overlooked whatis. I can special-case that instance (most of the substitutions were to simplify the sed script, of course) -- Thomas E. Dickey http://invisible-island.net ftp://invisible-island.net signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Tue, Nov 27, 2012 at 20:40:26 +0100, Julien Cristau wrote: > I'm looking at 287, and have a problem with the desktop file: > Another thing: the manpage change in 283 (to use a macro for xterm) seems to break 'whatis': $ lexgrog xterm.man xterm.man: parse failed resulting in: $ whatis xterm xterm (1)- (unknown subject) Maybe the change should be reverted from the NAME section. Cheers, Julien signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Sun, Nov 25, 2012 at 19:38:15 -0500, Thomas Dickey wrote: > On Sun, Nov 25, 2012 at 09:04:07PM +, Paul Evans wrote: > > Package: xterm > > Version: 278-2 > > Severity: normal > > > > (re-submission in case the previous did not make it) > > > > Current version in debian is still 278; this is rather old by now. There > > are several updates in later versions that I would like to make use of. > > Ideally at least version 282 would be lovely. > > There are several features and fixes. I released #279 a few weeks before > the current freeze began; however it was fairly large, and according to > the package maintainer beyond his ability to inspect it. Direct access > to my source archives would not change that assessment, however I've long > been cooperative about digesting changes to assist packagers in applying > specific changes. > I'm looking at 287, and have a problem with the desktop file: ACTUAL_XTERM=`echo xterm|sed 's,x,x,'` \ /bin/sh -c 'for n in ../xterm.desktop ../uxterm.desktop; \ do /bin/sh df-install $ACTUAL_XTERM --vendor debian --dir=/XXX/pkg-xorg/app/xterm/debian/tmp/usr/share/applications $n; \ done' --- ../xterm.desktop2012-11-27 19:21:40.0 + +++ tempdir29859/xterm.desktop 2012-11-27 19:27:14.0 + @@ -37,6 +37,6 @@ Exec=xterm Terminal=false Type=Application -Encoding=UTF-8 -Icon=xterm-color_48x48 -Categories=System;TerminalEmulator; +#Encoding=UTF-8 +Icon=xterm-color +Categories=auto xterm.desktop: warning: key "Categories" is a list and does not have a semicolon as trailing character, fixing /home/julien/src/debian.org/git/pkg-xorg/app/xterm/debian/tmp/usr/share/applications/debian-xterm.desktop: error: value "auto;" for key "Categories" in group "Desktop Entry" contains an unregistered value "auto"; values extending the format should start with "X-" /home/julien/src/debian.org/git/pkg-xorg/app/xterm/debian/tmp/usr/share/applications/debian-xterm.desktop: error: (will be fatal in the future): value "auto;" for key "Categories" in group "Desktop Entry" does not contain a registered main category Error on file "xterm.desktop": Failed to validate the created desktop file I can probably work around this by setting the category explicitly, but as far as I can tell, CF_WITH_DESKTOP_CATEGORY doesn't actually use $3 as a default value? Cheers, Julien signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Tue, Nov 27, 2012 at 08:10:15AM +0100, Julien Cristau wrote:
> On Mon, Nov 26, 2012 at 19:43:57 -0500, Thomas Dickey wrote:
>
> > On Mon, Nov 26, 2012 at 11:13:05PM +0100, Julien Cristau wrote:
> > > On Mon, Nov 26, 2012 at 16:50:32 -0500, Thomas Dickey wrote:
> > >
> > > > That's a question for the package maintainer (who seems to be absent).
> > > >
> > > That, or they have limited free time.
> >
> > no problem (the followup helps).
> >
> > It still would be useful to have those 4 fixes applied (before Debian 7...).
> > If you find some time, I can make a set of patches for those.
> >
> Yes, that shouldn't be a problem.
attached
>Patch #280 - 2012/06/24
> * add null-pointer checks to input-method caching added in
> [313]patch #277 to fix a problem in the exposure code, when
> deselecting a window (report by Kriston Rehberg).
>
> (the packager applied a _part_ of this - I noted in #685458 that its
> change did not address the report which I received, and my followup
> with a patch was ignored)
xterm-278-p4.patch
(this is the whole diff - some part was already applied)
>Patch #279 - 2012/05/10
> * amend fix for Debian #650291 in [314]patch #277 changes to account
> for different data returned by vnc4server (Debian #670638).
xterm-278-p3.patch
> * correct macro definition used for testing modes used in ANSI/DEC
> request-mode controls introduced in [316]patch #262.
xterm-278-p2.patch
> * add a null-pointer check in OkPasswd macro to fix a problem in
> resize with Fedora 17 and a serial console (report/patch by Daniel
> Drake).
xterm-278-p1.patch
(I later changed this fix for a compiler warning, final version given here)
--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net
# ftp://invisible-island.net/temp/xterm-278-p1.patch.gz
# patch by Thomas E. Dickey
# created Tue Nov 27 10:17:11 UTC 2012
# --
# xstrings.c |4 ++--
# 1 file changed, 2 insertions(+), 2 deletions(-)
# --
Index: xstrings.c
--- xterm-278+/xstrings.c 2011-09-11 20:20:12.0 +
+++ xterm-278-p1/xstrings.c 2012-11-27 10:01:42.0 +
@@ -214,7 +214,7 @@
struct passwd *ptr = getpwnam(name);
Boolean code;
-if (OkPasswd(ptr)) {
+if (ptr != 0 && OkPasswd(ptr)) {
code = True;
alloc_pw(result, ptr);
} else {
@@ -234,7 +234,7 @@
struct passwd *ptr = getpwuid((uid_t) uid);
Boolean code;
-if (OkPasswd(ptr)) {
+if (ptr != 0 && OkPasswd(ptr)) {
code = True;
alloc_pw(result, ptr);
} else {
# ftp://invisible-island.net/temp/xterm-278-p2.patch.gz
# patch by Thomas E. Dickey
# created Tue Nov 27 10:17:13 UTC 2012
# --
# misc.c |2 +-
# 1 file changed, 1 insertion(+), 1 deletion(-)
# --
Index: misc.c
--- xterm-278+/misc.c 2012-01-07 01:57:52.0 +
+++ xterm-278-p2/misc.c 2012-11-27 10:00:55.0 +
@@ -3770,7 +3770,7 @@
};
#define MdBool(bool) ((bool) ? mdMaybeSet : mdMaybeReset)
-#define MdFlag(mode,flag) MdBool(xw->keyboard.flags & MODE_KAM)
+#define MdFlag(mode,flag) MdBool((mode) & (flag))
/*
* Reply is the same format as the query, with pair of mode/value:
# ftp://invisible-island.net/temp/xterm-278-p3.patch.gz
# patch by Thomas E. Dickey
# created Tue Nov 27 10:17:15 UTC 2012
# --
# misc.c | 90 ++-
# 1 file changed, 78 insertions(+), 12 deletions(-)
# --
Index: misc.c
--- xterm-278+/misc.c 2012-01-07 01:57:52.0 +
+++ xterm-278-p3/misc.c 2012-11-27 10:10:36.0 +
@@ -2176,16 +2176,79 @@
#define ULONG_MAX (unsigned long)(~(0L))
#endif
-static unsigned short
-searchColortable(XColor * colortable, unsigned length, unsigned color)
+#define CheckColor(result, value) \
+ result = 0; \
+ if (value.red) \
+ result |= 1; \
+ if (value.green) \
+ result |= 2; \
+ if (value.blue) \
+ result |= 4
+
+#define SelectColor(state, value, result) \
+ switch (state) { \
+ default: \
+ case 1: \
+ result = value.red; \
+ break; \
+ case 2: \
+ result = value.green; \
+ break; \
+ case 4: \
+ result = value.blue; \
+ break; \
+ }
+
+/*
+ * Check if the color map consists of values in exactly one of the red, green
+ * or blue columns. If it is not, we do not know how to use it for the exact
+ * match.
+ */
+static int
+simpleColors(XColor * colortable, unsigned length)
+{
+unsigned n;
+int state = -1;
+int check;
+
+for (n =
Bug#694375: xterm: Please update to a later upstream version
On Mon, Nov 26, 2012 at 19:43:57 -0500, Thomas Dickey wrote: > On Mon, Nov 26, 2012 at 11:13:05PM +0100, Julien Cristau wrote: > > On Mon, Nov 26, 2012 at 16:50:32 -0500, Thomas Dickey wrote: > > > > > That's a question for the package maintainer (who seems to be absent). > > > > > That, or they have limited free time. > > no problem (the followup helps). > > It still would be useful to have those 4 fixes applied (before Debian 7...). > If you find some time, I can make a set of patches for those. > Yes, that shouldn't be a problem. Thanks, Julien signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Mon, Nov 26, 2012 at 11:13:05PM +0100, Julien Cristau wrote: > On Mon, Nov 26, 2012 at 16:50:32 -0500, Thomas Dickey wrote: > > > That's a question for the package maintainer (who seems to be absent). > > > That, or they have limited free time. no problem (the followup helps). It still would be useful to have those 4 fixes applied (before Debian 7...). If you find some time, I can make a set of patches for those. -- Thomas E. Dickey http://invisible-island.net ftp://invisible-island.net signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Mon, Nov 26, 2012 at 16:50:32 -0500, Thomas Dickey wrote: > That's a question for the package maintainer (who seems to be absent). > That, or they have limited free time. Cheers, Julien signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Mon, Nov 26, 2012 at 05:50:42PM +, Paul LeoNerd Evans wrote: > On Sun, Nov 25, 2012 at 07:38:15PM -0500, Thomas Dickey wrote: > > There are several features and fixes. I released #279 a few weeks before > > the current freeze began; however it was fairly large, and according to > > the package maintainer beyond his ability to inspect it. Direct access > > to my source archives would not change that assessment, however I've long > > been cooperative about digesting changes to assist packagers in applying > > specific changes. > > OK, so what is the overall upshot here? > > I'd quite like to play around with the VT4xx column-based features > (DECSLRM, DECIC, DECDC) at least, and perhaps some of the other newer > features as well. > > Is an updated version in debian likely soon, or would I be best to fetch > sources and build an updated version locally myself? That's a question for the package maintainer (who seems to be absent). I routinely build my own programs, of course... -- Thomas E. Dickey http://invisible-island.net ftp://invisible-island.net signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Sun, Nov 25, 2012 at 07:38:15PM -0500, Thomas Dickey wrote: > There are several features and fixes. I released #279 a few weeks before > the current freeze began; however it was fairly large, and according to > the package maintainer beyond his ability to inspect it. Direct access > to my source archives would not change that assessment, however I've long > been cooperative about digesting changes to assist packagers in applying > specific changes. OK, so what is the overall upshot here? I'd quite like to play around with the VT4xx column-based features (DECSLRM, DECIC, DECDC) at least, and perhaps some of the other newer features as well. Is an updated version in debian likely soon, or would I be best to fetch sources and build an updated version locally myself? -- Paul "LeoNerd" Evans leon...@leonerd.org.uk ICQ# 4135350 | Registered Linux# 179460 http://www.leonerd.org.uk/ signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
On Sun, Nov 25, 2012 at 09:04:07PM +, Paul Evans wrote: > Package: xterm > Version: 278-2 > Severity: normal > > (re-submission in case the previous did not make it) > > Current version in debian is still 278; this is rather old by now. There > are several updates in later versions that I would like to make use of. > Ideally at least version 282 would be lovely. There are several features and fixes. I released #279 a few weeks before the current freeze began; however it was fairly large, and according to the package maintainer beyond his ability to inspect it. Direct access to my source archives would not change that assessment, however I've long been cooperative about digesting changes to assist packagers in applying specific changes. Notwithstanding that problem, there are a few fixes which the package maintainer should have noted. The freeze began June 30, according to http://www.debian.org/News/weekly/2012/13/#freeze Patch #280 - 2012/06/24 * add null-pointer checks to input-method caching added in [313]patch #277 to fix a problem in the exposure code, when deselecting a window (report by Kriston Rehberg). (the packager applied a _part_ of this - I noted in #685458 that its change did not address the report which I received, and my followup with a patch was ignored) Patch #279 - 2012/05/10 * amend fix for Debian #650291 in [314]patch #277 changes to account for different data returned by vnc4server (Debian #670638). * correct macro definition used for testing modes used in ANSI/DEC request-mode controls introduced in [316]patch #262. * add a null-pointer check in OkPasswd macro to fix a problem in resize with Fedora 17 and a serial console (report/patch by Daniel Drake). -- Thomas E. Dickey http://invisible-island.net ftp://invisible-island.net signature.asc Description: Digital signature
Bug#694375: xterm: Please update to a later upstream version
Package: xterm Version: 278-2 Severity: normal (re-submission in case the previous did not make it) Current version in debian is still 278; this is rather old by now. There are several updates in later versions that I would like to make use of. Ideally at least version 282 would be lovely. Thanks, -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages xterm depends on: ii libc6 2.13-35 ii libfontconfig1 2.9.0-7 ii libice6 2:1.0.8-2 ii libtinfo5 5.9-10 ii libutempter01.1.5-4 ii libx11-62:1.5.0-1 ii libxaw7 2:1.0.10-2 ii libxft2 2.3.1-1 ii libxmu6 2:1.1.1-1 ii libxt6 1:1.1.3-1 ii xbitmaps1.1.1-1 Versions of packages xterm recommends: ii x11-utils 7.7~1 Versions of packages xterm suggests: pn xfonts-cyrillic -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
