From 07784f7eba2d49d1100a22eae4a257d3ded8bb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 21 Apr 2024 11:50:48 +0700
Subject: [PATCH] telepathy-salut: drop package

---
 srcpkgs/removed-packages/template             |  1 +
 srcpkgs/telepathy-salut/patches/python3.patch | 97 -------------------
 srcpkgs/telepathy-salut/template              | 19 ----
 srcpkgs/telepathy-salut/update                |  1 -
 4 files changed, 1 insertion(+), 117 deletions(-)
 delete mode 100644 srcpkgs/telepathy-salut/patches/python3.patch
 delete mode 100644 srcpkgs/telepathy-salut/template
 delete mode 120000 srcpkgs/telepathy-salut/update

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8fc26c6e77f..db2c553a8a3 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -692,6 +692,7 @@ replaces="
  taizen<=0.0.0.20180808_4
  tekaim<=1.6.0_5
  telepathy-gabble<=0.18.4_4
+ telepathy-salut<=0.8.1_20
  terminal_markdown_viewer<=1.6.3_4
  tilp2<=1.18_2
  tlsdate<=0.0.13_16
diff --git a/srcpkgs/telepathy-salut/patches/python3.patch b/srcpkgs/telepathy-salut/patches/python3.patch
deleted file mode 100644
index fa6fb6253c4..00000000000
--- a/srcpkgs/telepathy-salut/patches/python3.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/tools/libglibcodegen.py
-+++ b/tools/libglibcodegen.py
-@@ -55,9 +55,8 @@
-     return camelcase_to_lower(s).upper()
- 
- 
--def cmp_by_name(node1, node2):
--    return cmp(node1.getAttributeNode("name").nodeValue,
--               node2.getAttributeNode("name").nodeValue)
-+def key_by_name(node):
-+    return node.getAttributeNode("name").nodeValue
- 
- 
- def dbus_gutils_wincaps_to_uscore(s):
-@@ -191,6 +191,9 @@
-         self.remaining = string
- 
-     def next(self):
-+        return self.__next__()
-+
-+    def __next__(self):
-         if self.remaining == '':
-             raise StopIteration
- 
-@@ -297,7 +297,7 @@
-         return ("GHashTable *", "DBUS_TYPE_G_STRING_STRING_HASHTABLE", "BOXED", False)
-     elif s[:2] == 'a{':  #some arbitrary hash tables
-         if s[2] not in ('y', 'b', 'n', 'q', 'i', 'u', 's', 'o', 'g'):
--            raise Exception, "can't index a hashtable off non-basic type " + s
-+            raise Exception("can't index a hashtable off non-basic type " + s)
-         first = type_to_gtype(s[2])
-         second = type_to_gtype(s[3:-1])
-         return ("GHashTable *", "(dbus_g_type_get_map (\"GHashTable\", " + first[1] + ", " + second[1] + "))", "BOXED", False)
-@@ -312,7 +312,7 @@
-         return ("GValueArray *", gtype, "BOXED", True)
- 
-     # we just don't know ..
--    raise Exception, "don't know the GType for " + s
-+    raise Exception("don't know the GType for " + s)
- 
- 
- def xml_escape(s):
---- a/tools/glib-signals-marshal-gen.py
-+++ b/tools/glib-signals-marshal-gen.py
-@@ -41,12 +41,12 @@
-         for signal in signals:
-             self.do_signal(signal)
- 
--        all = self.marshallers.keys()
-+        all = list(self.marshallers.keys())
-         all.sort()
-         for marshaller in all:
-             rhs = self.marshallers[marshaller]
-             if not marshaller.startswith('g_cclosure'):
--                print 'VOID:' + ','.join(rhs)
-+                print('VOID:' + ','.join(rhs))
- 
- if __name__ == '__main__':
-     argv = sys.argv[1:]
---- a/tools/glib-ginterface-gen.py
-+++ b/tools/glib-ginterface-gen.py
-@@ -26,7 +26,7 @@
- import os.path
- import xml.dom.minidom
- 
--from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \
-+from libglibcodegen import Signature, type_to_gtype, key_by_name, \
-         camelcase_to_lower, NS_TP, dbus_gutils_wincaps_to_uscore, \
-         signal_to_marshal_name, method_to_glue_marshal_name
- 
-@@ -620,7 +620,7 @@
-         self.b('')
- 
-         nodes = self.dom.getElementsByTagName('node')
--        nodes.sort(cmp_by_name)
-+        nodes.sort(key=key_by_name)
- 
-         for node in nodes:
-             self.do_node(node)
-@@ -639,7 +639,7 @@
- 
- 
- def cmdline_error():
--    print """\
-+    print("""\
- usage:
-     gen-ginterface [OPTIONS] xmlfile Prefix_
- options:
-@@ -659,7 +659,7 @@
-             void symbol (DBusGMethodInvocation *context)
-         and return some sort of "not implemented" error via
-             dbus_g_method_return_error (context, ...)
--"""
-+""")
-     sys.exit(1)
- 
- 
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
deleted file mode 100644
index badc020f1b6..00000000000
--- a/srcpkgs/telepathy-salut/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'telepathy-salut'
-pkgname=telepathy-salut
-version=0.8.1
-revision=20
-build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=gnutls
- --disable-avahi-tests --disable-static"
-hostmakedepends="pkg-config python3 xmldiff glib-devel"
-makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- gnutls-devel libuuid-devel sqlite-devel"
-depends="avahi"
-short_desc="Link-local XMPP connection manager for Telepathy"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://telepathy.freedesktop.org"
-distfiles="https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-$version.tar.gz"
-checksum=70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e
-lib32disabled=yes
-nocross="can't find wocky.h"
diff --git a/srcpkgs/telepathy-salut/update b/srcpkgs/telepathy-salut/update
deleted file mode 120000
index cd1c10cdc77..00000000000
--- a/srcpkgs/telepathy-salut/update
+++ /dev/null
@@ -1 +0,0 @@
-../telepathy-glib/update
\ No newline at end of file