diff options
author | Manuel Reimer | 2024-04-24 20:05:21 +0200 |
---|---|---|
committer | Manuel Reimer | 2024-04-24 20:05:21 +0200 |
commit | 20fac54d63e97360d9fc860f4411b21209733825 (patch) | |
tree | 0abc65b1e510c811852425ab8c1c0301ded0417a | |
parent | 571889cca8945f3e0d511d1c9d820e7a61f32739 (diff) | |
download | aur-vdr-skindesigner.tar.gz |
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/8f17c2b7b4125592382d446256a9dfa084700f74)
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | vdr-skindesigner-libxml2_12.patch | 36 |
3 files changed, 46 insertions, 10 deletions
@@ -1,7 +1,7 @@ pkgbase = vdr-skindesigner pkgdesc = Highly customizable native true color skin for the Video Disc Recorder pkgver = 1.2.22 - pkgrel = 3 + pkgrel = 4 url = https://gitlab.com/kamel5/skindesigner install = vdr-skindesigner.install arch = x86_64 @@ -9,12 +9,12 @@ pkgbase = vdr-skindesigner arch = arm arch = armv6h arch = armv7h - license = GPL2 + license = GPL-2.0-or-later depends = git depends = librsvg depends = ttf-opensans depends = unzip - depends = vdr-api=2.6.6 + depends = vdr-api=2.6.7 depends = wget optdepends = vdr-scraper2vdr: To display scraped images in various EPG views (requires epgd) optdepends = vdr-tvscraper: To display scraped images in various EPG views @@ -37,11 +37,11 @@ pkgbase = vdr-skindesigner options = !emptydirs backup = etc/vdr/conf.avail/50-skindesigner.conf source = vdr-skindesigner-1.2.22.tar.bz2::https://gitlab.com/kamel5/skindesigner/-/archive/1.2.22/skindesigner-1.2.22.tar.bz2 - source = vdr-skindesigner-libxml2_12.patch::https://gitlab.com/kamel5/skindesigner/-/commit/71b3e514c6c7f8eb76751ce04f1e3dd8f3037b25.patch + source = vdr-skindesigner-libxml2_12.patch source = 99-skindesigner.conf source = 50-skindesigner.conf sha256sums = b37d2c5b9b9aa4bc3e12ce6cfe653bf6b218f1a44f948126849b12aa622d0ccf - sha256sums = c9a7d1e65fc558fda9d8107fafebcb06ec6bc18566f5ddc867d26c1a88cb7c7f + sha256sums = 8231317dad94a02349aaff78f7659d81264d357049047490a2fc3dba885e5f8b sha256sums = 25c1359cb6c61c3e7ebd6738fce6c21fa21f62ea4f274a522c30015210c3f4e5 sha256sums = dcd2381d49d79bbfbf9cd2a7bdd5ec24c1fc2c00b4e8e58b68c9afc874f6650e @@ -3,12 +3,12 @@ # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de> pkgname='vdr-skindesigner' pkgver=1.2.22 -pkgrel=3 -_vdrapi=2.6.6 +pkgrel=4 +_vdrapi=2.6.7 pkgdesc="Highly customizable native true color skin for the Video Disc Recorder" url="https://gitlab.com/kamel5/skindesigner" arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h') -license=('GPL2') +license=('GPL-2.0-or-later') depends=('git' 'librsvg' 'ttf-opensans' 'unzip' "vdr-api=${_vdrapi}" 'wget') optdepends=('vdr-scraper2vdr: To display scraped images in various EPG views (requires epgd)' 'vdr-tvscraper: To display scraped images in various EPG views') @@ -16,14 +16,14 @@ conflicts=(skindesigner-{blackhole,holo,metrixhd,nopacity,shady,shady_kiss,skine replaces=(skindesigner-{blackhole,holo,metrixhd,nopacity,shady,shady_kiss,skinelchi,tryouts}) _plugname=${pkgname//vdr-/} source=("$pkgname-$pkgver.tar.bz2::https://gitlab.com/kamel5/skindesigner/-/archive/$pkgver/skindesigner-$pkgver.tar.bz2" - "$pkgname-libxml2_12.patch::https://gitlab.com/kamel5/skindesigner/-/commit/71b3e514c6c7f8eb76751ce04f1e3dd8f3037b25.patch" + "$pkgname-libxml2_12.patch" '99-skindesigner.conf' "50-$_plugname.conf") install="$pkgname.install" backup=("etc/vdr/conf.avail/50-$_plugname.conf") options=('!emptydirs') sha256sums=('b37d2c5b9b9aa4bc3e12ce6cfe653bf6b218f1a44f948126849b12aa622d0ccf' - 'c9a7d1e65fc558fda9d8107fafebcb06ec6bc18566f5ddc867d26c1a88cb7c7f' + '8231317dad94a02349aaff78f7659d81264d357049047490a2fc3dba885e5f8b' '25c1359cb6c61c3e7ebd6738fce6c21fa21f62ea4f274a522c30015210c3f4e5' 'dcd2381d49d79bbfbf9cd2a7bdd5ec24c1fc2c00b4e8e58b68c9afc874f6650e') diff --git a/vdr-skindesigner-libxml2_12.patch b/vdr-skindesigner-libxml2_12.patch new file mode 100644 index 000000000000..3c03eccd0d39 --- /dev/null +++ b/vdr-skindesigner-libxml2_12.patch @@ -0,0 +1,36 @@ +From 71b3e514c6c7f8eb76751ce04f1e3dd8f3037b25 Mon Sep 17 00:00:00 2001 +From: kamel5 <vdr.kamel5 (at) gmx (dot) net> +Date: Thu, 4 Jan 2024 11:16:35 +0100 +Subject: [PATCH] Fix build error with xml2 version 2.12 + +--- + extensions/libxmlwrapper.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/extensions/libxmlwrapper.c b/extensions/libxmlwrapper.c +index 47bae91c..82304ac1 100644 +--- a/extensions/libxmlwrapper.c ++++ b/extensions/libxmlwrapper.c +@@ -1,7 +1,7 @@ + #include "helpers.h" + #include "libxmlwrapper.h" + +-void SkinDesignerXMLErrorHandler (void * userData, xmlErrorPtr error) { ++void SkinDesignerXMLErrorHandler (void * userData, const xmlErrorPtr error) { + esyslog("skindesigner: Error in XML: %s", error->message); + } + +@@ -10,8 +10,8 @@ cLibXMLWrapper::cLibXMLWrapper(void) { + doc = NULL; + root = NULL; + +- initGenericErrorDefaultFunc(NULL); +- xmlSetStructuredErrorFunc(NULL, SkinDesignerXMLErrorHandler); ++ xmlSetGenericErrorFunc(NULL, NULL); ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc)SkinDesignerXMLErrorHandler); + ctxt = xmlNewParserCtxt(); + } + +-- +GitLab + |