From 64dcee6008ce4d8704babb9a107fd0afdb6f4993 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 7 May 2020 20:19:55 -0700
Subject: catgirl: Update to latest git

---
 ...Mark-global-variables-as-extern-in-chat.h.patch | 31 ----------------------
 pkg/catgirl/src                                    |  2 +-
 pkg/catgirl/ver                                    |  2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 pkg/catgirl/patch/0002-Mark-global-variables-as-extern-in-chat.h.patch

(limited to 'pkg')

diff --git a/pkg/catgirl/patch/0002-Mark-global-variables-as-extern-in-chat.h.patch b/pkg/catgirl/patch/0002-Mark-global-variables-as-extern-in-chat.h.patch
deleted file mode 100644
index ac22cc6f..00000000
--- a/pkg/catgirl/patch/0002-Mark-global-variables-as-extern-in-chat.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1d3b42dc527cf6f5c23d741584990a95bd1cdfc0 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 7 May 2020 00:49:32 -0700
-Subject: [PATCH] Mark global variables as extern in chat.h
-
-This fixes the build with gcc 10, which enables -fno-common by
-default.
----
- chat.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/chat.h b/chat.h
-index e0266ef..5307f8b 100644
---- a/chat.h
-+++ b/chat.h
-@@ -162,9 +162,9 @@ void ircFormat(const char *format, ...)
- 	__attribute__((format(printf, 1, 2)));
- void ircClose(void);
- 
--uint execID;
--int execPipe[2];
--int utilPipe[2];
-+extern uint execID;
-+extern int execPipe[2];
-+extern int utilPipe[2];
- 
- enum { UtilCap = 16 };
- struct Util {
--- 
-2.26.2
-
diff --git a/pkg/catgirl/src b/pkg/catgirl/src
index f36b0dbd..bde0f47a 160000
--- a/pkg/catgirl/src
+++ b/pkg/catgirl/src
@@ -1 +1 @@
-Subproject commit f36b0dbd81a8082921f31f91d91b9a347e42c1f3
+Subproject commit bde0f47a70f71c86d90a0baadcfa8dc33a8fa4d2
diff --git a/pkg/catgirl/ver b/pkg/catgirl/ver
index af3125ec..efa57a89 100644
--- a/pkg/catgirl/ver
+++ b/pkg/catgirl/ver
@@ -1 +1 @@
-f36b0dbd81 r0
+bde0f47a70 r0
-- 
cgit v1.2.3