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

Balló György bgyorgy at archlinux.org
Mon Mar 9 02:09:18 UTC 2020


    Date: Monday, March 9, 2020 @ 02:09:17
  Author: bgyorgy
Revision: 592729

upgpkg: mailnag 1.3.0+49+g1ec3bc9-1: Update to latest git snapshot in order to use python3

Modified:
  mailnag/trunk/PKGBUILD
Deleted:
  mailnag/trunk/0001-Don-t-use-legacy-path-for-appdata-file.patch
  mailnag/trunk/0001-Update-appdata-file-to-the-latest-standard.patch

-------------------------------------------------------+
 0001-Don-t-use-legacy-path-for-appdata-file.patch     |   25 ------
 0001-Update-appdata-file-to-the-latest-standard.patch |   63 ----------------
 PKGBUILD                                              |   33 +++-----
 3 files changed, 14 insertions(+), 107 deletions(-)

Deleted: 0001-Don-t-use-legacy-path-for-appdata-file.patch
===================================================================
--- 0001-Don-t-use-legacy-path-for-appdata-file.patch	2020-03-09 01:41:16 UTC (rev 592728)
+++ 0001-Don-t-use-legacy-path-for-appdata-file.patch	2020-03-09 02:09:17 UTC (rev 592729)
@@ -1,25 +0,0 @@
-From 85d38e50a9d2e5435f25a6915df5e34df3b2d2f6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Wed, 17 Apr 2019 22:08:06 +0200
-Subject: [PATCH] Don't use legacy path for appdata file
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index bfb0cf5..4be0101 100755
---- a/setup.py
-+++ b/setup.py
-@@ -118,7 +118,7 @@ setup(name=PACKAGE_NAME,
- 	data_files=[('share/mailnag', glob.glob('data/*.ui')),
- 		('share/mailnag', ['data/mailnag.ogg']),
- 		('share/mailnag', ['data/mailnag.png']),
--		('share/appdata', ['data/mailnag.appdata.xml']),
-+		('share/metainfo', ['data/mailnag.appdata.xml']),
- 		('share/applications', [os.path.join(BUILD_PATCH_DIR, 'mailnag.desktop'), os.path.join(BUILD_PATCH_DIR, 'mailnag-config.desktop')])],
- 	cmdclass={'build': BuildData, 
- 			'install_data': InstallData,
--- 
-2.21.0
-

Deleted: 0001-Update-appdata-file-to-the-latest-standard.patch
===================================================================
--- 0001-Update-appdata-file-to-the-latest-standard.patch	2020-03-09 01:41:16 UTC (rev 592728)
+++ 0001-Update-appdata-file-to-the-latest-standard.patch	2020-03-09 02:09:17 UTC (rev 592729)
@@ -1,63 +0,0 @@
-From c06864d5880ca973139b56ca0a11ad9cbe6a6f9c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Wed, 17 Apr 2019 22:59:19 +0200
-Subject: [PATCH] Update appdata file to the latest standard
-
-And fix desktop file name.
----
- data/mailnag.appdata.xml | 27 ++++++++++++++++++++-------
- 1 file changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/data/mailnag.appdata.xml b/data/mailnag.appdata.xml
-index f735140..a039f69 100644
---- a/data/mailnag.appdata.xml
-+++ b/data/mailnag.appdata.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2015 Patrick Ulbrich <zulu99 at gmx.net> -->
--<application>
--  <id type="desktop">mailnag-config.desktop</id>
-+<component type="desktop">
-+  <id>mailnag.desktop</id>
-   <metadata_license>CC0-1.0</metadata_license>
-   <project_license>GPL-2.0+</project_license>
-   <translation type="gettext">mailnag</translation>
-@@ -9,17 +9,30 @@
-   <summary>An extensible mail notification daemon</summary>
-   <summary xml:lang="de">Ein erweiterbarer Benachrichtigungsdienst</summary>
-   <description>
-+    <p>
-       Mailnag is a daemon program that checks POP3 and IMAP servers for new mail.
-       On mail arrival it performs various actions provided by plugins.
-       Mailnag comes with a set of desktop-independent default plugins for
-       visual/sound notifications, script execution etc. and can be extended
-       with additional plugins easily.
-+    </p>
-   </description>
-   <screenshots>
--    <screenshot type="default">https://raw.githubusercontent.com/pulb/mailnag-design/master/Screenshots/mailnag-config.png</screenshot>
--    <screenshot>https://raw.githubusercontent.com/pulb/mailnag-design/master/Screenshots/mailnag-gnome-shell2.png</screenshot>
--    <screenshot>https://raw.githubusercontent.com/pulb/mailnag-design/master/Screenshots/mailnag-gnome-shell.png</screenshot>
-+    <screenshot type="default">
-+      <image>https://raw.githubusercontent.com/pulb/mailnag-design/master/Screenshots/mailnag-config.png</image>
-+    </screenshot>
-+    <screenshot>
-+      <image>https://raw.githubusercontent.com/pulb/mailnag-design/master/Screenshots/mailnag-gnome-shell2.png</image>
-+    </screenshot>
-+    <screenshot>
-+      <image>https://raw.githubusercontent.com/pulb/mailnag-design/master/Screenshots/mailnag-gnome-shell.png</image>
-+    </screenshot>
-   </screenshots>
-   <url type="homepage">https://www.github.com/pulb/mailnag/</url>
--  <updatecontact>zulu99 at gmx.net</updatecontact>
--</application>
-+  <update_contact>zulu99 at gmx.net</update_contact>
-+  <developer_name>Patrick Ulbrich</developer_name>
-+  <url type="bugtracker">https://github.com/pulb/mailnag/issues</url>
-+  <url type="donation">https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8F5FNJ3U4N7AW</url>
-+  <url type="help">https://github.com/pulb/mailnag/wiki</url>
-+  <url type="translate">https://translations.launchpad.net/mailnag</url>
-+</component>
--- 
-2.21.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-09 01:41:16 UTC (rev 592728)
+++ PKGBUILD	2020-03-09 02:09:17 UTC (rev 592729)
@@ -3,36 +3,31 @@
 # Contributor: rasmus <rasmus . pank at gmail . com>
 
 pkgname=mailnag
-pkgver=1.3.0
+pkgver=1.3.0+49+g1ec3bc9
 pkgrel=1
 pkgdesc="Extensible mail notification daemon"
 arch=('any')
 url="https://github.com/pulb/mailnag"
 license=('GPL')
-depends=('gst-plugins-base' 'gtk3' 'libnotify' 'python2-dbus' 'python2-gobject' 'python2-xdg')
-optdepends=('gnome-keyring: safe password storage in GNOME'
-            'mailnag-goa-plugin: GNOME Online Accounts integration'
+depends=('gst-plugins-base' 'gtk3' 'libnotify' 'libsecret' 'python-dbus' 'python-gobject' 'python-xdg')
+makedepends=(git)
+optdepends=('mailnag-goa-plugin: GNOME Online Accounts integration'
             'mailnag-gnome-shell: GNOME Shell integration')
-source=("$pkgname-$pkgver::https://github.com/pulb/$pkgname/archive/v$pkgver.tar.gz"
-        0001-Don-t-use-legacy-path-for-appdata-file.patch
-        0001-Update-appdata-file-to-the-latest-standard.patch)
-sha256sums=('3a81c1b5627557bad60357f430a1e4e8c455ae4a71b5764960a57d699abae532'
-            'edf642f0488937086a9451515feb4db0e8b3d9e6c1ff6f6e896537992050c945'
-            '006a11c846074d6683b01252afff5c780838d5da4a169fe5cae28d6f19c53dfd')
+_commit=1ec3bc945efde6dfad8d9dec183b74d9ab7758bb  # master
+source=("git+https://github.com/pulb/mailnag.git#commit=$_commit")
+sha256sums=('SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Appstream fixes
-  patch -Np1 -i ../0001-Don-t-use-legacy-path-for-appdata-file.patch
-  patch -Np1 -i ../0001-Update-appdata-file-to-the-latest-standard.patch
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
 build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
+  cd $pkgname
+  python setup.py build
 }
 
 package() {
-  cd $pkgname-$pkgver
-  python2 setup.py install --root="$pkgdir" --optimize=1
+  cd $pkgname
+  python setup.py install --root="$pkgdir" --optimize=1
 }



More information about the arch-commits mailing list