Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
4a81915dc3 |
2 changed files with 31 additions and 122 deletions
|
|
@ -1,28 +0,0 @@
|
|||
#
|
||||
# Since https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/197e9d055f3cd351
|
||||
# XawListChange() want the second argument to be (const char **) instead of (char **).
|
||||
#
|
||||
# To avoid compiler issues when -Wcompatible-pointer-types just cast it to (void *) .
|
||||
#
|
||||
|
||||
diff -Nrup xawtv-3.107/x11/propwatch.c xawtv-3.107-OK/x11/propwatch.c
|
||||
--- xawtv-3.107/x11/propwatch.c 2020-05-16 02:32:25.000000000 +0300
|
||||
+++ xawtv-3.107-OK/x11/propwatch.c 2024-01-30 04:16:55.411559253 +0300
|
||||
@@ -316,7 +316,7 @@ RebuildList(void)
|
||||
for (i=0, this=watchlist; this!=NULL; i++, this=this->next)
|
||||
str_list[i] = this->text;
|
||||
qsort(str_list,str_count,sizeof(char*),cmp);
|
||||
- XawListChange(bl,str_count ? str_list : &empty,
|
||||
+ XawListChange(bl,(void *)(str_count ? str_list : &empty),
|
||||
str_count ? str_count : 1,1000,1);
|
||||
}
|
||||
|
||||
@@ -495,7 +495,7 @@ ProcessPropertyChange(Display *dpy, XEve
|
||||
AddWatch(dpy,event->xproperty.window, i);
|
||||
else {
|
||||
Update(dpy,event->xproperty.window,event->xproperty.atom);
|
||||
- XawListChange(bl,str_list,str_count,1000,1);
|
||||
+ XawListChange(bl,(void *)str_list,str_count,1000,1);
|
||||
}
|
||||
}
|
||||
}
|
||||
119
xawtv.spec
119
xawtv.spec
|
|
@ -3,17 +3,14 @@
|
|||
Summary: TV applications for video4linux compliant devices
|
||||
Name: xawtv
|
||||
Version: 3.107
|
||||
Release: 18%{?dist}
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://linuxtv.org/wiki/index.php/Xawtv
|
||||
|
||||
Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2
|
||||
Patch0: xawtv-strsignal.patch
|
||||
Patch1: xawtv-3.107-XawListChange.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc
|
||||
BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel
|
||||
BuildRequires: libXft-devel, libXinerama-devel
|
||||
BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel
|
||||
|
|
@ -32,7 +29,7 @@ BuildRequires: ImageMagick desktop-file-utils libappstream-glib
|
|||
BuildRequires: libv4l-devel
|
||||
BuildRequires: perl-interpreter
|
||||
|
||||
Requires: polkit xorg-x11-fonts-misc hicolor-icon-theme
|
||||
Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme
|
||||
|
||||
%description
|
||||
Xawtv is a simple xaw-based TV program which uses the bttv driver or
|
||||
|
|
@ -60,8 +57,7 @@ which support teletext.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P0 -p1
|
||||
%patch -P1 -p1
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon"
|
||||
|
|
@ -93,58 +89,45 @@ done
|
|||
|
||||
# v4l-conf stuff
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libexecdir} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir} \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \
|
||||
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_libexecdir}/
|
||||
cat >v4l-conf.pam <<!
|
||||
#%%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
auth required pam_console.so
|
||||
account required pam_permit.so
|
||||
session required pam_permit.so
|
||||
session optional pam_xauth.so
|
||||
!
|
||||
install -m 0644 v4l-conf.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/v4l-conf
|
||||
|
||||
cat >v4l-conf.sh <<EOF
|
||||
#!/bin/sh
|
||||
exec %{_bindir}/pkexec %{_libexecdir}/v4l-conf
|
||||
EOF
|
||||
install -p -m 755 v4l-conf.sh $RPM_BUILD_ROOT%{_bindir}/v4l-conf
|
||||
|
||||
cat >v4l-conf.policy <<EOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE policyconfig PUBLIC
|
||||
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
|
||||
<policyconfig>
|
||||
|
||||
<vendor>XawTV Project</vendor>
|
||||
<vendor_url>%{url}</vendor_url>
|
||||
|
||||
<action id="org.fedoraproject.v4l.conf.pkexec.run">
|
||||
|
||||
<description>Run v4l-conf with privileges required</description>
|
||||
<message>Authentication is required for privileged operations of v4l-conf</message>
|
||||
<defaults>
|
||||
<allow_any>no</allow_any>
|
||||
<allow_inactive>no</allow_inactive>
|
||||
<allow_active>yes</allow_active>
|
||||
</defaults>
|
||||
<annotate key="org.freedesktop.policykit.exec.path">%{_libexecdir}/v4l-conf</annotate>
|
||||
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
||||
</action>
|
||||
|
||||
</policyconfig>
|
||||
EOF
|
||||
install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.fedoraproject.v4l.conf.policy
|
||||
cat >v4l-conf.apps <<!
|
||||
SESSION=true
|
||||
USER=root
|
||||
PROGRAM=%{_sbindir}/v4l-conf
|
||||
!
|
||||
install -p -m 0644 v4l-conf.apps $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/v4l-conf
|
||||
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/
|
||||
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf
|
||||
|
||||
%files
|
||||
%doc README TODO contrib/frequencies*
|
||||
%license COPYING
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/v4l-conf
|
||||
%config(noreplace) %{_sysconfdir}/security/console.apps/v4l-conf
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/motv
|
||||
%exclude %{_bindir}/mtt
|
||||
%{_libexecdir}/*
|
||||
%{_sbindir}/*
|
||||
%{_libdir}/xawtv
|
||||
%{_datadir}/xawtv
|
||||
%{_datadir}/X11/app-defaults/Xawtv
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
%{_datadir}/appdata/%{name}.appdata.xml
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/polkit-1/actions/*
|
||||
%{_mandir}/man?/*
|
||||
%exclude %{_mandir}/man1/motv.1*
|
||||
%exclude %{_mandir}/man1/mtt.1*
|
||||
|
|
@ -170,52 +153,6 @@ install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/or
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jan 24 2025 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.107-15
|
||||
- switch to PolicyKit (#502723)
|
||||
- avoid /usr/sbin dir (#2341562)
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 3.107-13
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jan 30 2024 Dmitry Butskoy <Dmitry@Butskoy.name> - 3.107-11
|
||||
- fix incompatible pointer types warnings (#2261796)
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.107-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue