Date: Sunday, May 2, 2021 @ 08:30:22 Author: bgyorgy Revision: 926080
upgpkg: griffith 0.17-2: Fix run if gtk4 is installed Added: griffith/trunk/0001-Add-AppStream-metadata-file.patch griffith/trunk/0001-Add-missing-Gtk-version-declaration.patch Modified: griffith/trunk/PKGBUILD Deleted: griffith/trunk/griffith.appdata.xml ------------------------------------------------+ 0001-Add-AppStream-metadata-file.patch | 86 +++++++++++++++++++++++ 0001-Add-missing-Gtk-version-declaration.patch | 25 ++++++ PKGBUILD | 26 ++++-- griffith.appdata.xml | 28 ------- 4 files changed, 128 insertions(+), 37 deletions(-) Added: 0001-Add-AppStream-metadata-file.patch =================================================================== --- 0001-Add-AppStream-metadata-file.patch (rev 0) +++ 0001-Add-AppStream-metadata-file.patch 2021-05-02 08:30:22 UTC (rev 926080) @@ -0,0 +1,86 @@ +From 2e669e04574d319804fd4393c173611d998308ee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Sun, 2 May 2021 09:53:41 +0200 +Subject: [PATCH] Add AppStream metadata file + +It's useful for software catalogs to display detailed information about this application. +--- + Makefile | 5 ++++- + data/griffith.appdata.xml | 28 ++++++++++++++++++++++++++++ + 2 files changed, 32 insertions(+), 1 deletion(-) + create mode 100644 data/griffith.appdata.xml + +diff --git a/Makefile b/Makefile +index afb4f9b..b511c68 100755 +--- a/Makefile ++++ b/Makefile +@@ -33,6 +33,7 @@ IMPORTPLUGINSDIR = $(PLUGINSDIR)/imp + EXTENSIONSPLUGINSDIR = $(PLUGINSDIR)/extensions + TPLDIR = $(DATADIR)/export_templates + APPLICATIONSDIR = $(PREFIX)/share/applications ++METAINFODIR = $(PREFIX)/share/metainfo + ICONDIR = $(PREFIX)/share/icons/hicolor/scalable/apps + LOCALEDIR = $(PREFIX)/share/locale + BASHCOMPDIR = $(PREFIX)/share/bash-completion/completions +@@ -54,7 +55,7 @@ install: + @echo "^^^^^^^^^^^^^^^^^^^" + $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(LIBDIR)/db \ + $(PLUGINSDIR) $(MOVIEPLUGINSDIR) $(EXPORTPLUGINSDIR) $(IMPORTPLUGINSDIR) $(EXTENSIONSPLUGINSDIR) \ +- $(FONTSDIR) $(APPLICATIONSDIR) $(ICONDIR) $(TPLDIR) \ ++ $(FONTSDIR) $(APPLICATIONSDIR) $(METAINFODIR) $(ICONDIR) $(TPLDIR) \ + $(IMAGESDIR) $(GLADEDIR) $(BASHCOMPDIR) + $(INSTALL) -m 755 griffith $(LIBDIR) + $(INSTALL) -m 644 lib/*.py $(LIBDIR) +@@ -69,6 +70,7 @@ install: + $(INSTALL) -m 644 images/*.png $(IMAGESDIR) + $(INSTALL) -m 644 images/griffith.svg $(ICONDIR) + $(INSTALL) -m 644 data/griffith.desktop $(APPLICATIONSDIR) ++ $(INSTALL) -m 644 data/griffith.appdata.xml $(METAINFODIR) + $(INSTALL) -m 644 data/bash_completion $(BASHCOMPDIR)/griffith + + # installing language files +@@ -106,6 +108,7 @@ uninstall: + ${RM} -r $(DATADIR) + ${RM} -r $(ICONDIR)/griffith.svg + ${RM} -r $(APPLICATIONSDIR)/griffith.desktop ++ ${RM} -r $(METAINFODIR)/griffith.appdata.xml + for lang in $(LANGUAGES); do \ + ${RM} -r $(LOCALEDIR)/$$lang/LC_MESSAGES/griffith.mo; \ + done +diff --git a/data/griffith.appdata.xml b/data/griffith.appdata.xml +new file mode 100644 +index 0000000..c7a696c +--- /dev/null ++++ b/data/griffith.appdata.xml +@@ -0,0 +1,28 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<component type="desktop"> ++ <id>griffith.desktop</id> ++ <metadata_license>CC0-1.0</metadata_license> ++ <project_license>GPL-2.0</project_license> ++ <name>Griffith</name> ++ <summary>Movie collection manager</summary> ++ <description> ++ <p>Griffith is a film collection manager with ease of use in mind.</p> ++ <ul> ++ <li>Fetch film information from the web using a plugin system</li> ++ <li>Automatic numbering</li> ++ <li>Backup/restore functions</li> ++ <li>Exports listings to PDF and CSV files</li> ++ <li>Generates a PDF with film's cover</li> ++ <li>Clone film information</li> ++ <li>Loans management</li> ++ <li>View filtering</li> ++ </ul> ++ </description> ++ <screenshots> ++ <screenshot type="default"> ++ <image>https://screenshots.debian.net/shrine/screenshot/22/simage/large-0cde3999904a6899300369f586e363dc.png</image> ++ </screenshot> ++ </screenshots> ++ <url type="homepage">https://gitlab.com/Strit/griffith</url> ++ <url type="bugtracker">https://gitlab.com/Strit/griffith/issues</url> ++</component> +-- +2.31.1 + Added: 0001-Add-missing-Gtk-version-declaration.patch =================================================================== --- 0001-Add-missing-Gtk-version-declaration.patch (rev 0) +++ 0001-Add-missing-Gtk-version-declaration.patch 2021-05-02 08:30:22 UTC (rev 926080) @@ -0,0 +1,25 @@ +From df76d3c7b72e1126af7a8f80b4048d199a88321d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Sun, 2 May 2021 07:47:05 +0000 +Subject: [PATCH] Add missing Gtk version declaration + +Otherwise it fails to run if gtk4 is installed on the system. +--- + griffith | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/griffith b/griffith +index f62e719..0b2287b 100755 +--- a/griffith ++++ b/griffith +@@ -86,6 +86,7 @@ if len(missing) > 0: + del missing + + # other imports ++gi.require_version('Gtk', '3.0') + from gi.repository import Gtk + import add + import config +-- +2.31.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-02 08:29:41 UTC (rev 926079) +++ PKGBUILD 2021-05-02 08:30:22 UTC (rev 926080) @@ -11,19 +11,27 @@ pkgname=griffith pkgver=0.17 -pkgrel=1 -pkgdesc="Movie collection manager application" -arch=(any) -url="https://gitlab.com/Strit/griffith"; -license=(GPL2) -depends=(gtkspell3 python-chardet python-gobject python-pillow python-reportlab python-sqlalchemy) +pkgrel=2 +pkgdesc='Movie collection manager application' +arch=('any') +url='https://gitlab.com/Strit/griffith' +license=('GPL2') +depends=('gtkspell3' 'python-chardet' 'python-gobject' 'python-pillow' 'python-reportlab' + 'python-sqlalchemy') source=("https://gitlab.com/Strit/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz"; - "griffith.appdata.xml") + '0001-Add-missing-Gtk-version-declaration.patch' + '0001-Add-AppStream-metadata-file.patch') sha256sums=('e7d49717adc934801a0d810525f2b203b20672c18b4da889018121ef9019bc68' - '2556b99b18e2d53ca1e96c9d0edded9673c80020f9f832faf343eb1a71632f20') + '896aae0fc40de117f478e6b1bbc037178b885ca8ed4f649b5d4bc2258de68205' + '938dd09f8855d1731927cf265916b46f623a20d5aa2772949d58789be01ddb74') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../0001-Add-missing-Gtk-version-declaration.patch + patch -Np1 -i ../0001-Add-AppStream-metadata-file.patch +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml" } Deleted: griffith.appdata.xml =================================================================== --- griffith.appdata.xml 2021-05-02 08:29:41 UTC (rev 926079) +++ griffith.appdata.xml 2021-05-02 08:30:22 UTC (rev 926080) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component type="desktop"> - <id>griffith.desktop</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0</project_license> - <name>Griffith</name> - <summary>Movie collection manager</summary> - <description> - <p>Griffith is a film collection manager with ease of use in mind.</p> - <ul> - <li>Fetch film information from the web using a plugin system</li> - <li>Automatic numbering</li> - <li>Backup/restore functions</li> - <li>Exports listings to PDF and CSV files</li> - <li>Generates a PDF with film's cover</li> - <li>Clone film information</li> - <li>Loans management</li> - <li>View filtering</li> - </ul> - </description> - <screenshots> - <screenshot type="default"> - <image>https://screenshots.debian.net/screenshots/000/000/022/large.png</image> - </screenshot> - </screenshots> - <url type="homepage">https://gitlab.com/Strit/griffith</url> - <url type="bugtracker">https://gitlab.com/Strit/griffith/issues</url> -</component>
