[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    buc pushed to xawtv (epel7).  "fix fbtv console font"
From:       notifications () fedoraproject ! org
Date:       2018-05-31 22:21:33
Message-ID: 20180531222133.B3BF260567D8 () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

Notification time stamped 2018-05-31 22:21:31 UTC

From b2c5a8ee8288307b88455bde7db50825a1c52bdb Mon Sep 17 00:00:00 2001
From: buc <buc@grad.stu.neva.ru>
Date: May 31 2018 22:21:13 +0000
Subject: fix fbtv console font


---

diff --git a/xawtv-3.103-consolefont.patch b/xawtv-3.103-consolefont.patch
new file mode 100644
index 0000000..bdf5236
--- /dev/null
+++ b/xawtv-3.103-consolefont.patch
@@ -0,0 +1,15 @@
+diff -Nrbu xawtv-3.103/console/fs.c xawtv-3.103-OK/console/fs.c
+--- xawtv-3.103/console/fs.c	2013-04-02 17:19:10.000000000 +0400
++++ xawtv-3.103-OK/console/fs.c	2018-06-01 00:55:06.010404262 +0300
+@@ -198,6 +198,11 @@
+ /* load console font file                                             */
+ 
+ static char *default_font[] = {
++
++    /* Fedora's default console font, which is still in psf1 format */
++    "/usr/lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz",
++    "/lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz",
++
+     /* why the heck every f*cking distribution picks another
+        location for these fonts ??? */
+     "/usr/share/consolefonts/lat1-16.psf",
diff --git a/xawtv-3.103-sysmacros.patch b/xawtv-3.103-sysmacros.patch
new file mode 100644
index 0000000..67647a5
--- /dev/null
+++ b/xawtv-3.103-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -Nrbu xawtv-3.103/common/get_media_devices.c \
xawtv-3.103-OK/common/get_media_devices.c +--- \
xawtv-3.103/common/get_media_devices.c	2018-03-18 02:04:48.031773214 +0300 ++++ \
xawtv-3.103-OK/common/get_media_devices.c	2018-03-18 02:08:44.862810567 +0300 +@@ \
-21,6 +21,7 @@ + 
+ #include <stdio.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <string.h>
diff --git a/xawtv.spec b/xawtv.spec
index a319860..b1c37bf 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -3,7 +3,7 @@
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.103
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://linuxtv.org/wiki/index.php/Xawtv
@@ -19,6 +19,8 @@ Patch6: \
0006-get_media_devices.c-Remove-superfluous-add-end-of-fu.patch  Patch7: \
0007-mtt-Fix-mtt-not-being-able-to-tune-tv-channels.patch  Patch8: \
0008-Add-desktop-and-appdata-files-for-xawtv-motv-and-mtt.patch  Patch9: \
0009-alevtd-Drop-supplementary-group-IDs-when-dropping-pr.patch +Patch10: \
xawtv-3.103-sysmacros.patch +Patch11: xawtv-3.103-consolefont.patch
 
 BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel
 BuildRequires: libXft-devel, libXinerama-devel
@@ -27,7 +29,7 @@ BuildRequires: libXxf86dga-devel, libXv-devel
 BuildRequires: motif-devel
 %{?with_quicktime:BuildRequires: libquicktime-devel}
 
-BuildRequires: ncurses-devel, fileutils, libjpeg-devel, libpng-devel
+BuildRequires: ncurses-devel, coreutils, libjpeg-devel, libpng-devel
 BuildRequires: alsa-lib-devel
 %ifnarch s390 s390x
 BuildRequires: libdv-devel
@@ -74,6 +76,8 @@ which support teletext.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 
 %build
@@ -83,7 +87,8 @@ make %{?_smp_mflags} verbose=yes
 
 
 %install
-%make_install SUID_ROOT=""
+make DESTDIR=$RPM_BUILD_ROOT SUID_ROOT="" install
+
 %if %{without quicktime}
 rm -f $RPM_BUILD_ROOT%{_bindir}/showqt
 %endif
@@ -183,6 +188,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun  1 2018 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.103-9
+- fix default console font for fbtv(1) (#1406549)
+
 * Mon Feb 15 2016 Hans de Goede <hdegoede@redhat.com> - 3.103-8
 - Bring in several bugfix patch from upstream
 - Fix crash with saa7134 driver (rhbz#1305389)


	https://src.fedoraproject.org/rpms/xawtv/c/b2c5a8ee8288307b88455bde7db50825a1c52bdb?branch=epel7
 _______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/scm-commits@lists.fedoraproject.org/message/DF6QRBF62HATUHJ3VQ5U3CDNKCVLC5VT/



[prev in list] [next in list] [prev in thread] [next in thread]