[arch-commits] Commit in vocal/repos/community-x86_64 (4 files)
Balló György
bgyorgy at archlinux.org
Sat Apr 17 18:08:37 UTC 2021
Date: Saturday, April 17, 2021 @ 18:08:37
Author: bgyorgy
Revision: 919807
archrelease: copy trunk to community-x86_64
Added:
vocal/repos/community-x86_64/PKGBUILD
(from rev 919806, vocal/trunk/PKGBUILD)
vocal/repos/community-x86_64/remove-about.patch
(from rev 919806, vocal/trunk/remove-about.patch)
Deleted:
vocal/repos/community-x86_64/PKGBUILD
vocal/repos/community-x86_64/remove-about.patch
--------------------+
PKGBUILD | 74 ++++++++++++++++++++++++++----------------------
remove-about.patch | 78 +++++++++++++++++++++++++--------------------------
2 files changed, 80 insertions(+), 72 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-17 18:08:29 UTC (rev 919806)
+++ PKGBUILD 2021-04-17 18:08:37 UTC (rev 919807)
@@ -1,33 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Marcin Tydelski <marcin.tydelski at gmail.com>
-# Contributor: Nathan Dyer <https://github.com/nathandyer>
-
-pkgname=vocal
-pkgver=2.4.2
-pkgrel=3
-pkgdesc='Powerful, beautiful and simple podcast client for the modern free desktop'
-arch=(x86_64)
-url='https://vocalproject.net/'
-license=(GPL3)
-depends=(clutter-gst clutter-gtk granite gst-plugins-good gst-libav gvfs libnotify)
-makedepends=(cmake vala webkit2gtk)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/needle-and-thread/$pkgname/archive/$pkgver.tar.gz"
- "remove-about.patch")
-sha512sums=('2f5b09c1ca1c3a513c161d1973033d6ce3e2c6805f4390d2bc70764e95a5b1a1ed9e681d602d2a5be44cb145cbdb6885a7c8aff0a2005a24792171a200ae52de'
- 'f21019b38e91d56bab885b9975cb63dfc773a01463fa4d526264e4411670b4201b294f40c6211341febc9a28a3178b6547b231c6ddfa48589da1056c99718c3c')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- patch -Np1 < "$srcdir/remove-about.patch"
-}
-
-build() {
- cd $pkgname-$pkgver
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: vocal/repos/community-x86_64/PKGBUILD (from rev 919806, vocal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-17 18:08:37 UTC (rev 919807)
@@ -0,0 +1,41 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Marcin Tydelski <marcin.tydelski at gmail.com>
+# Contributor: Nathan Dyer <https://github.com/nathandyer>
+
+pkgname=vocal
+_id=com.github.needleandthread.vocal
+pkgver=2.4.2
+pkgrel=4
+pkgdesc='Powerful, beautiful and simple podcast client for Pantheon'
+arch=('x86_64')
+url='https://vocalproject.net/'
+license=('GPL3')
+depends=('clutter-gst' 'clutter-gtk' 'granite' 'gst-plugins-good' 'gst-libav' 'gvfs' 'libnotify')
+makedepends=('cmake' 'ninja' 'vala')
+source=("https://github.com/needle-and-thread/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+ 'remove-about.patch')
+sha256sums=('be1991f08db05feacad30a0f459002327ba5ff3cb04757383f1da62904acdb41'
+ '805613a82898c36ddd18a93aa034e87d771dade1382275537ba7b4c57c28dc6a')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix build with granite 6
+ patch -Np1 -i ../remove-about.patch
+
+ # Remove unused webkit2gtk dependency
+ sed -i 's/webkit2gtk-4.0//' CMakeLists.txt
+
+ # Fix metainfo file
+ sed -i "/<id>/a <launchable type=\"desktop-id\">$_id.desktop</launchable>" data/$_id.appdata.xml
+}
+
+build() {
+ cmake -S $pkgname-$pkgver -B build -G Ninja -DCMAKE_INSTALL_PREFIX='/usr'
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+ ln -s $_id "$pkgdir/usr/bin/$pkgname"
+}
Deleted: remove-about.patch
===================================================================
--- remove-about.patch 2021-04-17 18:08:29 UTC (rev 919806)
+++ remove-about.patch 2021-04-17 18:08:37 UTC (rev 919807)
@@ -1,39 +0,0 @@
-diff --git a/src/MainWindow.vala b/src/MainWindow.vala
-index 957b1f9..3bf5016 100644
---- a/src/MainWindow.vala
-+++ b/src/MainWindow.vala
-@@ -414,10 +414,6 @@ namespace Vocal {
- toolbar.import_podcasts_selected.connect (() => {
- import_podcasts();
- });
--
-- toolbar.about_selected.connect (() => {
-- controller.app.show_about (this);
-- });
-
- toolbar.theme_toggled.connect (() => {
- if (controller.settings.dark_mode_enabled) {
-diff --git a/src/Widgets/Toolbar.vala b/src/Widgets/Toolbar.vala
-index 1da6a48..403998e 100644
---- a/src/Widgets/Toolbar.vala
-+++ b/src/Widgets/Toolbar.vala
-@@ -38,7 +38,6 @@ namespace Vocal {
- public signal void seek_backward_selected();
- public signal void downloads_selected();
- public signal void check_for_updates_selected();
-- public signal void about_selected ();
- public signal void theme_toggled ();
-
- public Gtk.Menu menu;
-@@ -193,11 +192,6 @@ namespace Vocal {
- });
- //menu.add(donate);
-
-- var about = new Gtk.MenuItem.with_label (_("About"));
-- about.activate.connect (() => {
-- about_selected ();
-- });
-- menu.add (about);
- menu.show_all();
-
- // Create the AppMenu
Copied: vocal/repos/community-x86_64/remove-about.patch (from rev 919806, vocal/trunk/remove-about.patch)
===================================================================
--- remove-about.patch (rev 0)
+++ remove-about.patch 2021-04-17 18:08:37 UTC (rev 919807)
@@ -0,0 +1,39 @@
+diff --git a/src/MainWindow.vala b/src/MainWindow.vala
+index 957b1f9..3bf5016 100644
+--- a/src/MainWindow.vala
++++ b/src/MainWindow.vala
+@@ -414,10 +414,6 @@ namespace Vocal {
+ toolbar.import_podcasts_selected.connect (() => {
+ import_podcasts();
+ });
+-
+- toolbar.about_selected.connect (() => {
+- controller.app.show_about (this);
+- });
+
+ toolbar.theme_toggled.connect (() => {
+ if (controller.settings.dark_mode_enabled) {
+diff --git a/src/Widgets/Toolbar.vala b/src/Widgets/Toolbar.vala
+index 1da6a48..403998e 100644
+--- a/src/Widgets/Toolbar.vala
++++ b/src/Widgets/Toolbar.vala
+@@ -38,7 +38,6 @@ namespace Vocal {
+ public signal void seek_backward_selected();
+ public signal void downloads_selected();
+ public signal void check_for_updates_selected();
+- public signal void about_selected ();
+ public signal void theme_toggled ();
+
+ public Gtk.Menu menu;
+@@ -193,11 +192,6 @@ namespace Vocal {
+ });
+ //menu.add(donate);
+
+- var about = new Gtk.MenuItem.with_label (_("About"));
+- about.activate.connect (() => {
+- about_selected ();
+- });
+- menu.add (about);
+ menu.show_all();
+
+ // Create the AppMenu
More information about the arch-commits
mailing list