From 10fab791788034df5f4935f299fe1bb8e31bac5d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 1 Oct 2022 14:45:54 +0200 Subject: [PATCH] empathy: remove package * uses libsoup2, archived upstream --- srcpkgs/empathy/files/README.voidlinux | 6 -- srcpkgs/empathy/patches/enchant-2.patch | 79 ------------------------- srcpkgs/empathy/template | 39 ------------ srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 srcpkgs/empathy/files/README.voidlinux delete mode 100644 srcpkgs/empathy/patches/enchant-2.patch delete mode 100644 srcpkgs/empathy/template diff --git a/srcpkgs/empathy/files/README.voidlinux b/srcpkgs/empathy/files/README.voidlinux deleted file mode 100644 index 090705a4075f..000000000000 --- a/srcpkgs/empathy/files/README.voidlinux +++ /dev/null @@ -1,6 +0,0 @@ -Some optional packages must be installed for additional functionality: - - - telepathy-gabble for XMPP/jabber support - - telepathy-haze for libpurple support - - telepathy-idle for IRC support - - telepathy-salut for link-local XMPP support diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch deleted file mode 100644 index c2b3a50c038f..000000000000 --- a/srcpkgs/empathy/patches/enchant-2.patch +++ /dev/null @@ -1,79 +0,0 @@ -Source: https://gitlab.gnome.org/GNOME/empathy/-/merge_requests/3 -Upstream: no, because upstream is completely abandoned - -From f42c415154c797a1b3fbddde60ad8fedb2eda988 Mon Sep 17 00:00:00 2001 -From: Laurent Bigonville -Date: Tue, 7 Jan 2020 11:09:26 +0100 -Subject: [PATCH 1/2] libempathy-gtk: Stop using deprecated enchant function - -Replace enchant_dict_add_to_pwl() by enchant_dict_add() and bump minimal -version accordingly ---- - configure.ac | 2 +- - libempathy-gtk/empathy-spell.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7aeb6b31c..4bf2d4d0c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0 - GOA_REQUIRED=3.5.1 - - # Optional deps --ENCHANT_REQUIRED=1.2.0 -+ENCHANT_REQUIRED=1.4.0 - GEOCLUE_REQUIRED=2.1.0 - GEOCODE_GLIB_REQUIRED=0.99.1 - ISO_CODES_REQUIRED=0.35 -diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c -index 27f27f902..bb0159fd8 100644 ---- a/libempathy-gtk/empathy-spell.c -+++ b/libempathy-gtk/empathy-spell.c -@@ -424,7 +424,7 @@ empathy_spell_add_to_dictionary (const gchar *code, - if (lang == NULL) - return; - -- enchant_dict_add_to_pwl (lang->speller, word, strlen (word)); -+ enchant_dict_add (lang->speller, word, strlen (word)); - } - - #else /* not HAVE_ENCHANT */ --- -GitLab - - -From 6c12a411274acf86e494b36704abb8e18b56642e Mon Sep 17 00:00:00 2001 -From: Laurent Bigonville -Date: Tue, 7 Jan 2020 11:38:13 +0100 -Subject: [PATCH 2/2] configure.ac: Switch to enchant-2 - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4bf2d4d0c..14f83c852 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0 - GOA_REQUIRED=3.5.1 - - # Optional deps --ENCHANT_REQUIRED=1.4.0 -+ENCHANT_REQUIRED=2.1.1 - GEOCLUE_REQUIRED=2.1.0 - GEOCODE_GLIB_REQUIRED=0.99.1 - ISO_CODES_REQUIRED=0.35 -@@ -307,7 +307,7 @@ AC_ARG_ENABLE(spell, - if test "x$enable_spell" != "xno"; then - PKG_CHECK_MODULES(ENCHANT, - [ -- enchant >= $ENCHANT_REQUIRED, -+ enchant-2 >= $ENCHANT_REQUIRED, - iso-codes >= $ISO_CODES_REQUIRED - ], have_enchant="yes", have_enchant="no") - --- -GitLab - diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template deleted file mode 100644 index 34319aa881c6..000000000000 --- a/srcpkgs/empathy/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'empathy' -pkgname=empathy -version=3.12.14 -revision=4 -build_style=gnu-configure -configure_args=" - --enable-gst-1.0=yes --enable-gudev=yes --enable-spell=yes - --disable-schemas-compile --disable-static --enable-goa=no - --enable-ubuntu-online-accounts=no --enable-geocode=yes - --enable-location=yes --enable-nautilus-sendto=no --enable-map=yes" -hostmakedepends="pkg-config intltool itstool glib-devel libxslt geoclue2 - autoconf automake libtool gettext-devel yelp-tools" -makedepends=" - libcanberra-devel clutter-gst-devel clutter-gtk-devel - telepathy-glib-devel telepathy-logger-devel libnotify-devel - telepathy-farstream-devel telepathy-mission-control-devel - evolution-data-server-devel geocode-glib-devel folks-devel - webkit2gtk-devel libgudev-devel pulseaudio-devel cheese-devel - enchant2-devel NetworkManager-devel libchamplain-devel - gnutls-devel gsettings-desktop-schemas-devel geoclue2-devel iso-codes" -depends="gsettings-desktop-schemas>=3.12 iso-codes" -short_desc="GNOME instant messaging client using the Telepathy framework" -maintainer="Orphaned " -license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="http://live.gnome.org/Empathy" -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3 -disable_parallel_build=yes -# Disable checks, the only work with an irc server in place. -make_check=no - -pre_configure() { - CFLAGS+=" -I$wrksrc/telepathy-account-widgets" - autoreconf -fi -} - -post_install() { - vdoc $FILESDIR/README.voidlinux -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 574d278136fb..bbd204314d5b 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -85,6 +85,7 @@ replaces=" electron7<=7.3.3_1 electron9<=9.4.1_1 emacs-gtk2<=27.2_1 + empathy<=3.12.14_4 enventor<=1.0.0_2 epstopdf<=2.27_3 flickcurl-devel<=1.26_4