[arch-commits] Commit in tvtime/repos (5 files)

Felix Yan felixonmars at archlinux.org
Tue Jul 7 13:41:00 UTC 2020


    Date: Tuesday, July 7, 2020 @ 13:41:00
  Author: felixonmars
Revision: 658560

archrelease: copy trunk to community-staging-x86_64

Added:
  tvtime/repos/community-staging-x86_64/
  tvtime/repos/community-staging-x86_64/0001-Fix-AppStream-metadata-validation.patch
    (from rev 658559, tvtime/trunk/0001-Fix-AppStream-metadata-validation.patch)
  tvtime/repos/community-staging-x86_64/0001-Fix-warning-implicit-declaration-of-function-minor-m.patch
    (from rev 658559, tvtime/trunk/0001-Fix-warning-implicit-declaration-of-function-minor-m.patch)
  tvtime/repos/community-staging-x86_64/PKGBUILD
    (from rev 658559, tvtime/trunk/PKGBUILD)
  tvtime/repos/community-staging-x86_64/freetype.patch
    (from rev 658559, tvtime/trunk/freetype.patch)

-----------------------------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch                    |   42 ++++++++
 0001-Fix-warning-implicit-declaration-of-function-minor-m.patch |   31 +++++
 PKGBUILD                                                        |   52 ++++++++++
 freetype.patch                                                  |   30 +++++
 4 files changed, 155 insertions(+)

Copied: tvtime/repos/community-staging-x86_64/0001-Fix-AppStream-metadata-validation.patch (from rev 658559, tvtime/trunk/0001-Fix-AppStream-metadata-validation.patch)
===================================================================
--- community-staging-x86_64/0001-Fix-AppStream-metadata-validation.patch	                        (rev 0)
+++ community-staging-x86_64/0001-Fix-AppStream-metadata-validation.patch	2020-07-07 13:41:00 UTC (rev 658560)
@@ -0,0 +1,42 @@
+From ba3d59b0bd56573e95e0c4b44e06984da37e2384 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Tue, 25 Dec 2018 11:23:55 +0100
+Subject: [PATCH] Fix AppStream metadata validation
+
+---
+ docs/tvtime.appdata.xml | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/docs/tvtime.appdata.xml b/docs/tvtime.appdata.xml
+index 0c216ab..c575618 100644
+--- a/docs/tvtime.appdata.xml
++++ b/docs/tvtime.appdata.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <component type="desktop">
+-  <id>tvtime.desktop</id>
++  <id>net.sourceforge.tvtime</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <project_license>GPL-2.0+</project_license>
+   <name>TVtime Television Viewer</name>
+@@ -19,9 +19,14 @@
+     </ul>
+   </description>
+   <url type="homepage">http://tvtime.sourceforge.net/</url>
++  <launchable type="desktop-id">tvtime.desktop</launchable>
+   <screenshots>
+-    <screenshot type="default">http://tvtime.sourceforge.net/screenshot-small.jpg</screenshot>
+-    <screenshot>http://tvtime.sourceforge.net/screenshots/15-sep-03-shot3.jpg</screenshot>
++    <screenshot type="default">
++      <image>http://tvtime.sourceforge.net/screenshot-small.jpg</image>
++    </screenshot>
++    <screenshot>
++      <image>http://tvtime.sourceforge.net/screenshots/15-sep-03-shot3.jpg</image>
++    </screenshot>
+   </screenshots>
+-  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
++  <update_contact>jwrdegoede_at_fedoraproject.org</update_contact>
+ </component>
+-- 
+2.20.1
+

Copied: tvtime/repos/community-staging-x86_64/0001-Fix-warning-implicit-declaration-of-function-minor-m.patch (from rev 658559, tvtime/trunk/0001-Fix-warning-implicit-declaration-of-function-minor-m.patch)
===================================================================
--- community-staging-x86_64/0001-Fix-warning-implicit-declaration-of-function-minor-m.patch	                        (rev 0)
+++ community-staging-x86_64/0001-Fix-warning-implicit-declaration-of-function-minor-m.patch	2020-07-07 13:41:00 UTC (rev 658560)
@@ -0,0 +1,31 @@
+From bfa96fec44b7db78b43b9b8d20d7ca02616f70ed Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Mon, 13 Aug 2018 17:41:57 +0200
+Subject: Fix: "warning: implicit declaration of function 'minor' / 'major'"
+ errors
+
+Fix the "warning: implicit declaration of function 'minor' / 'major'"
+compiler warnings which ultimately lead to the following build error:
+
+src/get_media_devices.c:522: undefined reference to `major'
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ src/get_media_devices.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/get_media_devices.c b/src/get_media_devices.c
+index 619734ea..453b0677 100644
+--- a/src/get_media_devices.c
++++ b/src/get_media_devices.c
+@@ -23,6 +23,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <malloc.h>
+-- 
+2.11.0
+

Copied: tvtime/repos/community-staging-x86_64/PKGBUILD (from rev 658559, tvtime/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 13:41:00 UTC (rev 658560)
@@ -0,0 +1,52 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: thefatprecious <marty at loomar.com>
+
+pkgname=tvtime
+pkgver=1.0.11
+pkgrel=4
+pkgdesc="High quality television application for use with video capture cards"
+arch=('x86_64')
+url='https://linuxtv.org/'
+license=('GPL')
+depends=('alsa-lib' 'freetype2' 'hicolor-icon-theme' 'libxinerama' 'libxml2' 'libxss' 'libxv' 'libxxf86vm')
+makedepends=('imagemagick')
+source=("https://linuxtv.org/downloads/$pkgname/$pkgname-$pkgver.tar.gz"
+        "tvtime-icon-100x100.png::https://git.linuxtv.org/tvtime.git/plain/docs/tvtime-icon-100x100.png?id=v$pkgver"
+        freetype.patch
+        0001-Fix-warning-implicit-declaration-of-function-minor-m.patch
+        0001-Fix-AppStream-metadata-validation.patch)
+sha256sums=('403bf2106578b1f3d6ce70bc08654f7a90753f19e27b4cc170bc636307cdc78c'
+            'b6342cebcf981f3e2119c36e74403d2b4f6f73910fc4b84925a1df038ddc37f1'
+            'a29e800114d35c5b2bec24b637fb6ac861f1f2246ecf1437fe4aaab6df6eb040'
+            '11dfd5b00554a304bde8b7a31ec15c6a3bf320b83d607e17c4e327dc7b36ad12'
+            '40f7c01dadcc8521ac3ce9cbc269829868383396f4c511a47538bccf9b5952f4')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix build
+  patch -Np1 -i ../0001-Fix-warning-implicit-declaration-of-function-minor-m.patch
+  patch -Np1 -i ../freetype.patch
+
+  # Fix AppStream metadata
+  patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+  sed -i 's|$(datadir)/appdata|$(datadir)/metainfo|' docs/Makefile.{am,in}
+
+  autoreconf -fi
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 docs/html/default.tvtime.xml "$pkgdir"/usr/share/tvtime/default.tvtime.xml
+  install -dm755 "$pkgdir"/usr/share/icons/hicolor/{64x64,96x96}/apps/
+  convert ../tvtime-icon-100x100.png +set date:create +set date:modify -resize 64x64 -alpha on "$pkgdir/usr/share/icons/hicolor/64x64/apps/tvtime.png"
+  convert ../tvtime-icon-100x100.png +set date:create +set date:modify -resize 96x96 -alpha on "$pkgdir/usr/share/icons/hicolor/96x96/apps/tvtime.png"
+}

Copied: tvtime/repos/community-staging-x86_64/freetype.patch (from rev 658559, tvtime/trunk/freetype.patch)
===================================================================
--- community-staging-x86_64/freetype.patch	                        (rev 0)
+++ community-staging-x86_64/freetype.patch	2020-07-07 13:41:00 UTC (rev 658560)
@@ -0,0 +1,30 @@
+Description: Use pkg-config for finding freetype
+Author: Adrian Bunk <bunk at debian.org>
+Bug-Debian: https://bugs.debian.org/892455
+
+--- tvtime-1.0.11.orig/configure.ac
++++ tvtime-1.0.11/configure.ac
+@@ -71,10 +71,7 @@ dnl ------------------------------------
+ dnl freetype
+ dnl ---------------------------------------------
+ dnl Test for freetype
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "$FREETYPE_CONFIG" = "no" ; then
+-  AC_MSG_ERROR(freetype2 needed and freetype-config not found)
+-fi
++PKG_CHECK_MODULES(TTF, freetype2)
+ 
+ dnl ---------------------------------------------
+ dnl libxml2
+--- tvtime-1.0.11.orig/src/Makefile.am
++++ tvtime-1.0.11/src/Makefile.am
+@@ -19,9 +19,6 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+ tmpdir = /tmp
+ localedir = $(datadir)/locale
+ 
+-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
+-TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
+-
+ # Set the following if you want to specify an additional font directory
+ # FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
+ 


More information about the arch-commits mailing list