[arch-commits] Commit in devede/trunk (3 files)

[Balló György]

    Date: Saturday, May 1, 2021 @ 23:04:00
  Author: bgyorgy
Revision: 926063

Use patch for metainfo

Added:
  devede/trunk/0001-Add-AppStream-metadata-file.patch
Modified:
  devede/trunk/PKGBUILD
Deleted:
  devede/trunk/devedeng.appdata.xml

----------------------------------------+
 0001-Add-AppStream-metadata-file.patch |   52 +++++++++++++++++++++++++++++++
 PKGBUILD                               |   32 ++++++++-----------
 devedeng.appdata.xml                   |   19 -----------
 3 files changed, 67 insertions(+), 36 deletions(-)

Added: 0001-Add-AppStream-metadata-file.patch
===================================================================
--- 0001-Add-AppStream-metadata-file.patch	                        (rev 0)
+++ 0001-Add-AppStream-metadata-file.patch	2021-05-01 23:04:00 UTC (rev 926063)
@@ -0,0 +1,52 @@
+From b8383c69ce421685828e82683a8959d40e214820 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sun, 2 May 2021 00:56:42 +0200
+Subject: [PATCH] Add AppStream metadata file
+
+It's useful for software catalogs to display detailed information about this application.
+---
+ data/devedeng.appdata.xml | 19 +++++++++++++++++++
+ setup.py                  |  1 +
+ 2 files changed, 20 insertions(+)
+ create mode 100644 data/devedeng.appdata.xml
+
+diff --git a/data/devedeng.appdata.xml b/data/devedeng.appdata.xml
+new file mode 100644
+index 0000000..3a9414c
+--- /dev/null
++++ b/data/devedeng.appdata.xml
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop-application">
++  <id>com.rastersoft.devedeng</id>
++  <launchable type="desktop-id">devede_ng.py.desktop</launchable>
++  <name>DevedeNG</name>
++  <summary>Allows to create video CDs and DVDs, suitable to be reproduced in home DVD players</summary>
++  <metadata_license>CC0-1.0</metadata_license>
++  <project_license>GPL-3.0</project_license>
++  <description>
++    <p>DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD), suitables for home players, from any number of video files, in any of the formats supported by Mplayer.</p>
++  </description>
++  <screenshots>
++    <screenshot type="default">
++      <image>https://rastersoft.com/imagen/devede.png</image>
++    </screenshot>
++  </screenshots>
++  <url type="bugtracker">https://gitlab.com/rastersoft/devedeng/issues</url>
++  <url type="homepage">https://rastersoft.com/programas/devede.html</url>
++</component>
+diff --git a/setup.py b/setup.py
+index db3ef99..1fd63a6 100755
+--- a/setup.py
++++ b/setup.py
+@@ -14,6 +14,7 @@ except:
+ def get_data_files():
+     data_files = [
+         (os.path.join('share', 'applications'), ['data/devede_ng.py.desktop']),
++        (os.path.join('share', 'metainfo'), ['data/devedeng.appdata.xml']),
+         (os.path.join('share', 'pixmaps'), ['data/devedeng.svg']),
+         (os.path.join('share', 'icons', 'hicolor',
+                       'scalable', 'apps'), ['data/devedeng_icon.svg']),
+-- 
+2.31.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-01 22:39:56 UTC (rev 926062)
+++ PKGBUILD	2021-05-01 23:04:00 UTC (rev 926063)
@@ -10,29 +10,27 @@
 pkgrel=2
 pkgdesc='Program to create VideoDVDs and CDs'
 arch=('any')
-url="https://rastersoft.com/programas/devede.html"
+url='https://rastersoft.com/programas/devede.html'
 license=('GPL3')
-depends=('gtk3' 'python-cairo' 'python-gobject' 'python-setuptools' 'ffmpeg' 'cdrtools' 'dvdauthor' 'vcdimager')
-makedepends=(git)
-_commit=6fb3a369cdd742b74fbed29c91f2b935e0608645  # tags/4.16.0
-source=("git+https://gitlab.com/rastersoft/devedeng#commit=$_commit"
-        devedeng.appdata.xml)
-sha256sums=('SKIP'
-            'f7f4118256cff880004c0eff9be56239dea427ccd83d56a4c838cf17197528ea')
+depends=('gtk3' 'python-cairo' 'python-gobject' 'python-setuptools' 'ffmpeg' 'cdrtools' 'dvdauthor'
+         'vcdimager')
+source=("https://gitlab.com/rastersoft/$_pkgname/-/archive/$pkgver/$_pkgname-$pkgver.tar.gz"
+        '0001-Add-AppStream-metadata-file.patch')
+sha256sums=('722d6c72d30b1c2bf3ac958b4671b36c51c1c6702f92eda5e3b8069ec76d5e45'
+            'a1a96a46b5cb437bbfaa3ccf343039350f0c553cf853dbe2788345212fcdd951')
 
-pkgver() {
-  cd $_pkgname
-  git describe --tags | sed 's/-/+/g'
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../0001-Add-AppStream-metadata-file.patch
+  sed -i "/share', 'pixmaps/d" setup.py
 }
 
 build() {
-  cd $_pkgname
-  python3 setup.py build
+  cd $_pkgname-$pkgver
+  python setup.py build
 }
 
 package() {
-  cd $_pkgname
-  python3 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 ../$_pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$_pkgname.appdata.xml"
-  rm -r "$pkgdir/usr/share/pixmaps/"
+  cd $_pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }

Deleted: devedeng.appdata.xml
===================================================================
--- devedeng.appdata.xml	2021-05-01 22:39:56 UTC (rev 926062)
+++ devedeng.appdata.xml	2021-05-01 23:04:00 UTC (rev 926063)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>com.rastersoft.devedeng</id>
-  <launchable type="desktop-id">devede_ng.py.desktop</launchable>
-  <name>DevedeNG</name>
-  <summary>Allows to create video CDs and DVDs, suitable to be reproduced in home DVD players</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0</project_license>
-  <description>
-    <p>DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD), suitables for home players, from any number of video files, in any of the formats supported by Mplayer.</p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>http://rastersoft.com/imagen/devede.png</image>
-    </screenshot>
-  </screenshots>
-  <url type="bugtracker">https://gitlab.com/rastersoft/devedeng/issues</url>
-  <url type="homepage">http://rastersoft.com/programas/devede.html</url>
-</component>