Disable services again to allow submission to Factory

OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/xterm-console?expand=0&rev=13
This commit is contained in:
Marius Kittler 2021-06-10 13:52:44 +00:00 committed by Git OBS Bridge
parent bf4e0180e7
commit 9ad7fade02
12 changed files with 8 additions and 484 deletions

View File

@ -1,5 +1,5 @@
<services>
<service name="obs_scm">
<service name="obs_scm" mode="disabled">
<param name="extract">psf2bdf.pl</param>
<param name="extract">xterm-console</param>
<param name="extract">xterm-console.spec</param>
@ -10,7 +10,7 @@
<param name="changesgenerate">enable</param>
<param name="changesauthor">okurz@suse.com</param>
</service>
<service name="set_version"/>
<service name="set_version" mode="disabled"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="compression">xz</param>

View File

@ -1,4 +0,0 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/os-autoinst/xterm_console.git</param>
<param name="changesrevision">9392dd687a6dde84ee4d56f1331717cb18a26ffd</param></service></servicedata>

View File

@ -1,132 +0,0 @@
#!/usr/bin/env perl
# Convert PC Screen Font (PSF) font to Glyph Bitmap Distribution Format (BDF).
# Copyright (c) 2015 Kacper Gutowski
# Copyright (c) 2015 Susanne Oberhauser-Hirschoff
# The MIT License applies (http://opensource.org/licenses/MIT)
# https://gist.github.com/mwgamera/6ad86e71e002e5aef1b8/01ffe8208b2763dd353ea7afacedf83072477372
# with minor fixes
use strict;
use constant {
PSF1_MODE512 => 0x01,
PSF1_MODEHASTAB => 0x02,
PSF2_HAS_UNICODE_TABLE => 0x01,
};
push @ARGV, '-' unless scalar @ARGV;
for (@ARGV) {
my $fn = /^-$/ ? 'stdin' : $_;
eval {
my ($length, $width, $height);
my (@glyphs, @unicode);
my $unilen = 0;
open my $fh, $_ or die $!;
binmode $fh;
read $fh, $_, 4 or die $!;
if (0x0436 == unpack 'v') { # psf1
my ($mode, $size) = unpack 'x2CC';
$length = $mode & PSF1_MODE512 ? 512 : 256;
$height = $size;
$width = 8;
read $fh, $_, $length * $size;
@glyphs = unpack "(a$size)$length";
if ($mode & PSF1_MODEHASTAB) {
for my $i (0 .. $length - 1) {
my ($u, @u) = 0;
do {
read $fh, $_, 2;
$u = unpack 'v';
push @u, $u if $u < 0xFFFE;
} while $u < 0xFFFE;
while ($u != 0xFFFF) {
read $fh, $_, 2;
$u = unpack 'v';
warn 'Unicode sequence ignored' if $u == 0xFFFE;
}
$unicode[$i] = [@u];
$unilen += (scalar @u) - 1 if (scalar @u);
}
}
}
elsif (0x864ab572 == unpack 'V') { # psf2
read $fh, $_, 28 or die $!;
(my ($ver, $hlen, $flg), $length, my $size, $height, $width) = unpack 'V7';
die "Unknown version $ver\n" unless $ver == 0;
warn "Unexpected glyph size $size bytes for ${width}×$height px\n"
unless $size == $height * int(($width + 7) / 8);
read $fh, $_, $hlen - 32; # skip to data
read $fh, $_, $length * $size;
@glyphs = unpack "(a$size)$length";
if ($flg & PSF2_HAS_UNICODE_TABLE) {
my $buf = do { local $/; <$fh>; };
for my $i (0 .. $length - 1) {
$buf =~ m/\G([^\xfe\xff]*+)(?:\xfe[^\xfe\xff]++)*\xff/sg;
utf8::decode(my $str = $1);
$unicode[$i] = [map ord, split //, $str];
$unilen += (scalar @{$unicode[$i]}) - 1 if (scalar @{$unicode[$i]});
}
}
}
else {
die "Bad format\n";
}
print "STARTFONT 2.1\n";
printf "FONT %s\n", '-psf-';
printf "SIZE %u 72 72\n", $height;
printf "FONTBOUNDINGBOX %u %u 0 0\n", $width, $height;
printf "STARTPROPERTIES %u\n", 6 + 2 * !!@unicode;
printf "PIXEL_SIZE %u\n", $height;
printf "POINT_SIZE %u\n", 10 * $height;
printf "FONT_ASCENT %u\n", $height;
print "FONT_DESCENT 0\n";
print "RESOLUTION_X 72\n";
print "RESOLUTION_Y 72\n";
if (@unicode) {
print "CHARSET_REGISTRY \"ISO10646\"\n";
print "CHARSET_ENCODING \"1\"\n";
}
print "ENDPROPERTIES\n";
printf "CHARS %u\n", $length + $unilen;
for my $i (0 .. $length - 1) {
my @encodings = ($i);
my $is_unicode = 0;
if(@unicode && @{$unicode[$i]}) {
@encodings = @{$unicode[$i]};
$is_unicode = 1;
}
foreach my $e (@encodings) {
printf "STARTCHAR psf%03x-%04x\n", $i, $e;
if ($is_unicode) {
printf "ENCODING %u\n", $e;
}
else {
printf "ENCODING -1 %u\n", $e;
}
printf "SWIDTH %u 0\n", $width * 1000 / $height;
printf "DWIDTH %u 0\n", $width;
printf "BBX %u %u 0 0\n", $width, $height;
my $bw = (($width + 7) & ~7) >> 3;
printf "BITMAP\n%s\n", join "\n", map unpack('H*', $_), unpack "(a$bw)*", $glyphs[$i];
printf "ENDCHAR\n";
}
}
print "ENDFONT\n";
};
warn "$fn: $@" if $@;
last;
}

View File

@ -1,74 +0,0 @@
#!/usr/bin/python3
# Copyright (C) 2015 Susanne Oberhauser-Hirschoff <froh@suse.de>
# The MIT License applies (http://opensource.org/licenses/MIT)
"""start an xterm that looks like a linux console
# do this once, to let the xserver know about the fonts
xset fp+ $(pwd)
# for each font you want to try...
gunzip -c /usr/share/kbd/consolefonts/lat9w-16.psfu.gz | perl psf2bdf.pl > lat9w-16.bdf
sed -i -e s,-psf-,lat9w_16, lat9w-16.bdf
# update the fonts.dir file
mkfontdir
# notify X about the new font
xset fp rehash
# have a look :)
# start an xterm with the right colors and all, script is attached [3]
python3 xterm_linux_vt.py
"""
# from pprint import pprint as pp
default_kernel_vt_colors = {}
RGB = ("red", "grn", "blu")
for cname in RGB:
with open("/sys/module/vt/parameters/default_{}".format(cname)) as f:
colors = f.read().rstrip().split(',')
default_kernel_vt_colors[cname] = map(int, colors)
xterm_colors= list()
for r, g, b in zip(*(default_kernel_vt_colors[c] for c in RGB)):
xterm_colors.append("rgb:{r:02x}/{g:02x}/{b:02x}".format(**locals()))
def xtc(label, color):
return ("-xrm", "xterm*{label}: {color}".format(**locals()))
def xrm_color_options():
yield(xtc("foreground", xterm_colors[7]))
yield(xtc("background", xterm_colors[0]))
for i, c in enumerate(xterm_colors):
yield(xtc("color{}".format(i), c))
from itertools import chain
import os
xx = [
"xterm",
# console font
"-fn", "eurlatgr",
"-fullscreen",
# no scrollbar
"+sb",
# no border
"-b", "0",
# blinking underline cursor
"-bc", "-uc", "-bcf", "200", "-bcn", "200",
# intense colors for bold
"+bdc",
# intense for bold...
"-xrm", "xterm*boldMode: false",
]
import sys # for argv
sys.argv.pop(0) # strip command name
xx.extend(chain(*xrm_color_options()))
xx.extend(sys.argv)
os.execvp("xterm", xx)

View File

@ -1,44 +0,0 @@
-------------------------------------------------------------------
Tue May 18 10:05:59 UTC 2021 - okurz@suse.com
- Update to version 1.0:
* Handle glyphs without unicode mapping gracefully
* Fix generating psf2 fonts with multiple codepoints per glyph
* psf2bdf.pl: Support mapping multiple codepoints to a glyph
* Use eurlatgr as font
* Further cleanup of spec-file
* Cleanup spec-file (delete unused symbol; simplify)
* Delete old pre-SLE11 cruft
* Mark as noarch as there are only scripts
* Cleanup spec-file
* Add files from https://build.opensuse.org/package/show/devel:openQA/xterm-console
-------------------------------------------------------------------
Tue Jan 28 12:26:32 UTC 2020 - okurz@suse.com
- Update to version 1.0:
* Change package to use upstream on
https://github.com/os-autoinst/xterm_console
* Change to noarch as there are only scripts
* Delete old pre-SLE11 cruft
* Cleanup spec-file (delete unused symbol; simplify)
-------------------------------------------------------------------
Mon Jun 25 13:21:00 UTC 2018 - slindomansilla@suse.com
- Use supplemments to os-autoinst
When using svirt backend (s390x, XEN), xterm-console is needed.
It is expected the use of this backend only on special cases,
so this package is not added as required. But it may help to
mark it as supplement os os-autoinst.
-------------------------------------------------------------------
Wed Apr 29 08:55:11 UTC 2015 - coolo@suse.com
- remove nonexistant +itc option
-------------------------------------------------------------------
* Mon Apr 27 2015 - froh@suse.de
- initial version

View File

@ -1,73 +0,0 @@
#
# spec file for package xterm-console
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: xterm-console
Version: 1.0
Release: 0
Summary: A Linux vt console look-alike xterm wrapper
License: MIT
Group: System/X11/Utilities
URL: https://github.com/os-autoinst/xterm-console
Source: xterm-console
Source1: psf2bdf.pl
BuildRequires: bdftopcf
BuildRequires: fontpackages-devel
# the original consolefonts:
BuildRequires: kbd
Requires: fonts-config
# svirt, eg. s390x, xen
Supplements: os-autoinst
%reconfigure_fonts_prereq
BuildArch: noarch
%description
This package contains the basic X.Org terminal program.
%prep
%setup -q -c -T
cp %{SOURCE1} .
%build
chmod +x ./psf2bdf.pl
for font in %{_datadir}/kbd/consolefonts/*.psfu.gz; do
fontname="${font##*/}"
fontname="${fontname%.psfu.gz}"
gunzip -c $font | ./psf2bdf.pl | sed -e "s,FONT \+-psf-,FONT ${fontname}," > "$fontname".bdf
done
for i in *.bdf; do
bdftopcf "$i" | gzip -9 >"${i%.bdf}.pcf.gz"
done
%install
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/fonts/misc/
install -m 0755 %{SOURCE0} %{buildroot}%{_bindir}
install -m 0644 *.pcf.gz %{buildroot}%{_datadir}/fonts/misc/
%reconfigure_fonts_scriptlets
%files
%{_bindir}/xterm-console
%dir %{_datadir}/fonts/misc
%{_datadir}/fonts/misc/*.pcf.gz
%changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ce566cdc6d8f97bd3edc826fd903e63ff9afd8a04bb8dc5a975a529ed9fc6d8
size 10762

View File

@ -1,5 +0,0 @@
name: xterm_console
version: 1.0
mtime: 1621332343
commit: 758680e5ededc0072b8f9b86ee136ac9973b2ef3

View File

@ -1,73 +0,0 @@
#
# spec file for package xterm-console
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: xterm-console
Version: 1.0
Release: 0
Summary: A Linux vt console look-alike xterm wrapper
License: MIT
Group: System/X11/Utilities
URL: https://github.com/os-autoinst/xterm-console
Source: xterm-console
Source1: psf2bdf.pl
BuildRequires: bdftopcf
BuildRequires: fontpackages-devel
# the original consolefonts:
BuildRequires: kbd
Requires: fonts-config
# svirt, eg. s390x, xen
Supplements: os-autoinst
%reconfigure_fonts_prereq
BuildArch: noarch
%description
This package contains the basic X.Org terminal program.
%prep
%setup -q -c -T
cp %{SOURCE1} .
%build
chmod +x ./psf2bdf.pl
for font in %{_datadir}/kbd/consolefonts/*.psfu.gz; do
fontname="${font##*/}"
fontname="${fontname%.psfu.gz}"
gunzip -c $font | ./psf2bdf.pl | sed -e "s,FONT \+-psf-,FONT ${fontname}," > "$fontname".bdf
done
for i in *.bdf; do
bdftopcf "$i" | gzip -9 >"${i%.bdf}.pcf.gz"
done
%install
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/fonts/misc/
install -m 0755 %{SOURCE0} %{buildroot}%{_bindir}
install -m 0644 *.pcf.gz %{buildroot}%{_datadir}/fonts/misc/
%reconfigure_fonts_scriptlets
%files
%{_bindir}/xterm-console
%dir %{_datadir}/fonts/misc
%{_datadir}/fonts/misc/*.pcf.gz
%changelog

View File

@ -1,73 +0,0 @@
#
# spec file for package xterm-console
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: xterm-console
Version: 1.0
Release: 0
Summary: A Linux vt console look-alike xterm wrapper
License: MIT
Group: System/X11/Utilities
URL: https://github.com/os-autoinst/xterm-console
Source: xterm-console
Source1: psf2bdf.pl
BuildRequires: bdftopcf
BuildRequires: fontpackages-devel
# the original consolefonts:
BuildRequires: kbd
Requires: fonts-config
# svirt, eg. s390x, xen
Supplements: os-autoinst
%reconfigure_fonts_prereq
BuildArch: noarch
%description
This package contains the basic X.Org terminal program.
%prep
%setup -q -c -T
cp %{SOURCE1} .
%build
chmod +x ./psf2bdf.pl
for font in %{_datadir}/kbd/consolefonts/*.psfu.gz; do
fontname="${font##*/}"
fontname="${fontname%.psfu.gz}"
gunzip -c $font | ./psf2bdf.pl | sed -e "s,FONT \+-psf-,FONT ${fontname}," > "$fontname".bdf
done
for i in *.bdf; do
bdftopcf "$i" | gzip -9 >"${i%.bdf}.pcf.gz"
done
%install
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/fonts/misc/
install -m 0755 %{SOURCE0} %{buildroot}%{_bindir}
install -m 0644 *.pcf.gz %{buildroot}%{_datadir}/fonts/misc/
%reconfigure_fonts_scriptlets
%files
%{_bindir}/xterm-console
%dir %{_datadir}/fonts/misc
%{_datadir}/fonts/misc/*.pcf.gz
%changelog

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 10 13:51:54 UTC 2021 - Marius Kittler <marius.kittler@suse.com>
- Disable services again to allow submission to Factory
-------------------------------------------------------------------
Tue Jan 28 12:26:32 UTC 2020 - okurz@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package xterm-console
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed