(net/corebird) Updated 1.7.3 (failing to package) to 1.7.4

(pkgsrc)
 - Add adhoc patch to make it build.

(upstream)
Changelog:
 - Fix tweet sending on 32bit architectures. #795 Wtf.
 - Fix a few spelling mistakes. #798
 - Work around a GTK+ bug increasing the window size
   when typing DMs. #796
 - Prevent the list statuses page from automatically focusing
   the delete button, potentially resulting in accidentally
   deleted lists. #811
 - Show a language selection context menu in the
   compose text view. #812

8 files changed, 97 insertions, 14 deletions

diff --git a/net/corebird/Makefile b/net/corebird/Makefile
index 95dced751c9..20d866da6b9 100644
--- a/net/corebird/Makefile
+++ b/net/corebird/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2020/06/02 08:24:29 adam Exp $
+# $NetBSD: Makefile,v 1.58 2020/08/02 22:15:05 mef Exp $
 
-DISTNAME=	corebird-1.7.3
-PKGREVISION=	21
+DISTNAME=	corebird-1.7.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=baedert/}
 GITHUB_PROJECT=	corebird
@@ -16,7 +15,7 @@ LICENSE=	gnu-gpl-v3
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gettext-m4 pkg-config gmake msgfmt
+USE_TOOLS+=	gettext pkg-config gmake msgfmt
 
 .include "options.mk"
 
diff --git a/net/corebird/PLIST b/net/corebird/PLIST
index 54185f38ae4..bae052028bf 100644
--- a/net/corebird/PLIST
+++ b/net/corebird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/09/09 06:18:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/08/02 22:15:05 mef Exp $
 bin/corebird
 man/man1/corebird.1
 share/applications/org.baedert.corebird.desktop
@@ -43,6 +43,7 @@ share/locale/pt_BR/LC_MESSAGES/corebird.mo
 share/locale/ro/LC_MESSAGES/corebird.mo
 share/locale/ru/LC_MESSAGES/corebird.mo
 share/locale/sr/LC_MESSAGES/corebird.mo
+share/locale/sr@latin/LC_MESSAGES/corebird.mo
 share/locale/tr/LC_MESSAGES/corebird.mo
 share/locale/uk_UA/LC_MESSAGES/corebird.mo
 share/locale/zh_CN/LC_MESSAGES/corebird.mo
diff --git a/net/corebird/distinfo b/net/corebird/distinfo
index 6d988411e16..80233425637 100644
--- a/net/corebird/distinfo
+++ b/net/corebird/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.15 2017/11/27 23:53:54 ryoon Exp $
+$NetBSD: distinfo,v 1.16 2020/08/02 22:15:05 mef Exp $
 
-SHA1 (corebird-1.7.3.tar.xz) = f4024f31c1643a085f0ac131af9054f36f9faaff
-RMD160 (corebird-1.7.3.tar.xz) = 0968f745ff58d97a1a493677557da6280c0fe6dc
-SHA512 (corebird-1.7.3.tar.xz) = 1b963742acdc327231e7885ec08a9a6ee551d23436360e5282b07754489dc42a8d1779824f2ee9d6f1448a088d978404db8e0ea05f7c66d8f08301113eecdb2b
-Size (corebird-1.7.3.tar.xz) = 705080 bytes
+SHA1 (corebird-1.7.4.tar.xz) = 80d9db6926091b49515e4bb27e52d818fbbea31d
+RMD160 (corebird-1.7.4.tar.xz) = 13d80f64680bb06145bbe31da7990e548f25a553
+SHA512 (corebird-1.7.4.tar.xz) = ad50130b7a7fa32a5629889ee9758bbbf4d622f503a7f935b73c64a8e7cb5e1ec44df2202c3d82e04afe4865c08b671286a445d327af3b4fd1d7c732fb62ebdd
+Size (corebird-1.7.4.tar.xz) = 712704 bytes
 SHA1 (patch-data_Makefile.am) = cebf21049f03cdcca06b476040125edcdc86d675
-SHA1 (patch-data_Makefile.in) = 8ed5776f7b694a7cf574f5e8097811eb7cd060b4
-SHA1 (patch-po_Makevars) = 7d1f0dcef0caf53d6fa1187306d6264c158b8210
+SHA1 (patch-data_Makefile.in) = ae084a61f3bed3177f5c43deb9cc967e2b2009f6
+SHA1 (patch-po_Makevars) = bb845edd686fc8550bddee25ae00efe88f4c1fdd
+SHA1 (patch-src_Corebird.vala) = 4355468778dada39c27527de7344507ba1b92f8f
+SHA1 (patch-src_DefaultTimeline.vala) = 7e7299b350acca1ba53a036d5a4f55bb4aa4e8ef
+SHA1 (patch-src_MainWindow.vala) = 909b0fe8f5e1af9d6508483dcf6962a5df5e5e15
diff --git a/net/corebird/patches/patch-data_Makefile.in b/net/corebird/patches/patch-data_Makefile.in
index 7681068ea2e..94613c5bfb4 100644
--- a/net/corebird/patches/patch-data_Makefile.in
+++ b/net/corebird/patches/patch-data_Makefile.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-data_Makefile.in,v 1.2 2017/01/14 09:28:41 ryoon Exp $
+$NetBSD: patch-data_Makefile.in,v 1.3 2020/08/02 22:15:05 mef Exp $
+
+* Workarounf for a lack of 'msgfmt --xml' and 'msgfmt --desktop'
 
 --- data/Makefile.in.orig	2017-01-08 09:02:29.000000000 +0000
 +++ data/Makefile.in
diff --git a/net/corebird/patches/patch-po_Makevars b/net/corebird/patches/patch-po_Makevars
index 6ace6cbeb1e..2c69e088722 100644
--- a/net/corebird/patches/patch-po_Makevars
+++ b/net/corebird/patches/patch-po_Makevars
@@ -1,4 +1,7 @@
-$NetBSD: patch-po_Makevars,v 1.1 2016/10/01 13:05:15 joerg Exp $
+$NetBSD: patch-po_Makevars,v 1.2 2020/08/02 22:15:05 mef Exp $
+
+   Pretend that the gettext catalogs don't use modern fancy features, since
+   pkgsrc's msgfmt wrapper will strip them as needed.
 
 --- po/Makevars.orig	2016-09-30 11:50:33.000000000 +0000
 +++ po/Makevars
diff --git a/net/corebird/patches/patch-src_Corebird.vala b/net/corebird/patches/patch-src_Corebird.vala
new file mode 100644
index 00000000000..b5303478c58
--- /dev/null
+++ b/net/corebird/patches/patch-src_Corebird.vala
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_Corebird.vala,v 1.1 2020/08/02 22:15:05 mef Exp $
+
+Corebird.vala:414.40-414.46: error: Assignment: Cannot convert from `GLib.List<Gtk.Window>' to `GLib.List<weak Gtk.Window>?'
+    unowned GLib.List<weak Gtk.Window> windows = this.get_windows ();
+                                       ^^^^^^^
+Corebird.vala:431.40-431.46: error: Assignment: Cannot convert from `GLib.List<Gtk.Window>' to `GLib.List<weak Gtk.Window>?'
+    unowned GLib.List<weak Gtk.Window> windows = this.get_windows ();
+                                       ^^^^^^^
+Corebird.vala:399.40-399.46: error: Assignment: Cannot convert from `GLib.List<Gtk.Window>' to `GLib.List<weak Gtk.Window>?'
+    unowned GLib.List<weak Gtk.Window> windows = this.get_windows ();
+
+--- src/Corebird.vala.orig	2020-08-02 21:40:54.883977490 +0000
++++ src/Corebird.vala
+@@ -396,7 +396,7 @@ public class Corebird : Gtk.Application 
+    */
+   public bool is_window_open_for_screen_name (string screen_name,
+                                               out MainWindow? window = null) {
+-    unowned GLib.List<weak Gtk.Window> windows = this.get_windows ();
++    unowned GLib.List<Gtk.Window> windows = this.get_windows ();
+     foreach (Gtk.Window win in windows) {
+       if (win is MainWindow) {
+         if (((MainWindow)win).account.screen_name == screen_name) {
+@@ -411,7 +411,7 @@ public class Corebird : Gtk.Application 
+ 
+   public bool is_window_open_for_user_id (int64 user_id,
+                                           out MainWindow? window = null) {
+-    unowned GLib.List<weak Gtk.Window> windows = this.get_windows ();
++    unowned GLib.List<Gtk.Window> windows = this.get_windows ();
+     foreach (Gtk.Window win in windows) {
+       if (win is MainWindow) {
+         if (((MainWindow)win).account.id == user_id) {
+@@ -428,7 +428,7 @@ public class Corebird : Gtk.Application 
+    * Quits the application, saving all open windows and their geometries.
+    */
+   private void quit_application () {
+-    unowned GLib.List<weak Gtk.Window> windows = this.get_windows ();
++    unowned GLib.List<Gtk.Window> windows = this.get_windows ();
+     string[] startup_accounts = Settings.get ().get_strv ("startup-accounts");
+     if (startup_accounts.length == 1 && startup_accounts[0] == "")
+       startup_accounts.resize (0);
diff --git a/net/corebird/patches/patch-src_DefaultTimeline.vala b/net/corebird/patches/patch-src_DefaultTimeline.vala
new file mode 100644
index 00000000000..dd5b495c079
--- /dev/null
+++ b/net/corebird/patches/patch-src_DefaultTimeline.vala
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_DefaultTimeline.vala,v 1.1 2020/08/02 22:15:05 mef Exp $
+
+DefaultTimeline.vala:50.3-50.24: error: Creation method of abstract class cannot be public.
+  public DefaultTimeline (int id) {
+  ^^^^^^^^^^^^^^^^^^^^^^
+Compilation failed: 1 error(s), 0 warning(s)
+
+--- src/DefaultTimeline.vala.orig	2018-03-01 18:54:45.000000000 +0000
++++ src/DefaultTimeline.vala
+@@ -47,7 +47,7 @@ public abstract class DefaultTimeline : 
+   private double last_value = 0.0;
+ 
+ 
+-  public DefaultTimeline (int id) {
++  protected DefaultTimeline (int id) {
+     this.id = id;
+     this.hscrollbar_policy = Gtk.PolicyType.NEVER;
+     this.scrolled_to_start.connect (handle_scrolled_to_start);
diff --git a/net/corebird/patches/patch-src_MainWindow.vala b/net/corebird/patches/patch-src_MainWindow.vala
new file mode 100644
index 00000000000..fc9e56e3565
--- /dev/null
+++ b/net/corebird/patches/patch-src_MainWindow.vala
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_MainWindow.vala,v 1.1 2020/08/02 22:15:05 mef Exp $
+
+MainWindow.vala:438.40-438.41: error: Assignment: Cannot convert from `GLib.List<Gtk.Window>' to `GLib.List<weak Gtk.Window>?'
+    unowned GLib.List<weak Gtk.Window> ws = this.application.get_windows ();
+
+
+--- src/MainWindow.vala.orig	2020-08-02 21:40:19.483990912 +0000
++++ src/MainWindow.vala
+@@ -435,7 +435,7 @@ public class MainWindow : Gtk.Applicatio
+     if (account == null)
+       return Gdk.EVENT_PROPAGATE;
+ 
+-    unowned GLib.List<weak Gtk.Window> ws = this.application.get_windows ();
++    unowned GLib.List<Gtk.Window> ws = this.application.get_windows ();
+     debug("Windows: %u", ws.length ());
+ 
+     string[] startup_accounts = Settings.get ().get_strv ("startup-accounts");