summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew O'Neill2017-04-25 18:37:58 -0400
committerAndrew O'Neill2017-04-25 18:40:34 -0400
commit3b46150fd882cbdc4738f6da219a8b97d47b3483 (patch)
treee7bf04ee610bf1c2af84cbe8a88e7f3847c6fb3c
parentf59a9e4ec947d3fac2a9a877bda0b44a23ac2547 (diff)
downloadaur-3b46150fd882cbdc4738f6da219a8b97d47b3483.tar.gz
Include patch to allow build to succeed against latest vala
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
-rw-r--r--feedreader.patch19
3 files changed, 33 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1dca38d339ec..d86b9957cba7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = feedreader
pkgdesc = FeedReader is a modern desktop application designed to complement existing web-based RSS accounts.
pkgver = 2.0.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jangernert/FeedReader
arch = i686
arch = x86_64
@@ -22,7 +22,9 @@ pkgbase = feedreader
depends = curl
conflicts = feedreader-git
source = https://github.com/jangernert/FeedReader/archive/v2.0.2.tar.gz
+ source = feedreader.patch
sha256sums = 949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261
+ sha256sums = f25076b3d4f7fcff933cbc672be532bdfe46f732a066574078752db690321473
pkgname = feedreader
diff --git a/PKGBUILD b/PKGBUILD
index a50499ac1837..0fae0d856922 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=feedreader
pkgver=2.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="FeedReader is a modern desktop application designed to complement existing web-based RSS accounts."
arch=('i686' 'x86_64')
url="https://github.com/jangernert/FeedReader"
@@ -14,8 +14,16 @@ license=('GPL3')
conflicts=("$pkgname-git")
depends=('sqlite3' 'gtk3' 'webkit2gtk' 'libnotify' 'libsoup' 'libgee' 'json-glib' 'libsecret' 'libpeas' 'gnome-online-accounts' 'curl')
makedepends=('vala' 'gobject-introspection' 'cmake')
-source=("$url/archive/v$pkgver.tar.gz")
-sha256sums=('949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261')
+source=("$url/archive/v$pkgver.tar.gz"
+ "$pkgname.patch")
+sha256sums=('949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261'
+ 'f25076b3d4f7fcff933cbc672be532bdfe46f732a066574078752db690321473')
+
+prepare() {
+ cd FeedReader-$pkgver
+
+ patch -p0 -i ../$pkgname.patch
+}
build() {
cd FeedReader-$pkgver
diff --git a/feedreader.patch b/feedreader.patch
new file mode 100644
index 000000000000..4e861d41bd18
--- /dev/null
+++ b/feedreader.patch
@@ -0,0 +1,19 @@
+--- Constants.vala.in 2017-04-25 18:21:42.896579773 -0400
++++ Constants.vala.in.b 2017-04-25 18:21:09.976531526 -0400
+@@ -43,11 +43,11 @@ namespace FeedReader {
+ }
+
+ public class MediaButton : GLib.Object {
+- public const string PLAY = N_("Play");
+- public const string PAUSE = N_("Pause");
+- public const string MUTE = N_("Mute");
+- public const string UNMUTE = N_("Unmute");
+- public const string CLOSE = N_("Close");
++ public const string PLAY = ("Play");
++ public const string PAUSE = ("Pause");
++ public const string MUTE = ("Mute");
++ public const string UNMUTE = ("Unmute");
++ public const string CLOSE = ("Close");
+ }
+
+ public class Constants : GLib.Object {