Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] empathy: enchant2
@ 2021-03-19 18:30 Gottox
  2021-03-19 18:33 ` [PR PATCH] [Updated] " Gottox
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Gottox @ 2021-03-19 18:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

There is a new pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages empathy-enchant2
https://github.com/void-linux/void-packages/pull/29598

empathy: enchant2
Followup to https://github.com/void-linux/void-packages/pull/28963

A patch file from https://github.com/void-linux/void-packages/pull/29598.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-empathy-enchant2-29598.patch --]
[-- Type: text/x-diff, Size: 7650 bytes --]

From 34e18555e90415d30aa62cacc13f8abe442fe0eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 4 Mar 2021 09:36:27 +0100
Subject: [PATCH 1/3] minikube: update to 1.18.0.

fix crossbuild (fails due to kubernetes), remove git clone
---
 srcpkgs/k0s/files/k0s-worker/log/run | 2 ++
 srcpkgs/k0s/files/k0s/log/run        | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100755 srcpkgs/k0s/files/k0s-worker/log/run
 create mode 100755 srcpkgs/k0s/files/k0s/log/run

diff --git a/srcpkgs/k0s/files/k0s-worker/log/run b/srcpkgs/k0s/files/k0s-worker/log/run
new file mode 100755
index 000000000000..631eefd56802
--- /dev/null
+++ b/srcpkgs/k0s/files/k0s-worker/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.info -t k0s-worker
diff --git a/srcpkgs/k0s/files/k0s/log/run b/srcpkgs/k0s/files/k0s/log/run
new file mode 100755
index 000000000000..0830a180ac23
--- /dev/null
+++ b/srcpkgs/k0s/files/k0s/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.info -t k0s

From 8612d406c77abc956a7d3124857398b39acd515e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 8 Mar 2021 00:14:06 +0100
Subject: [PATCH 2/3] libupnp: update to 1.14.2.

---
 srcpkgs/libupnp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index 9adb5f00da65..a3285b742a4c 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libupnp'
 pkgname=libupnp
-version=1.14.0
+version=1.14.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://pupnp.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2"
-checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+checksum=ffe3045b91a4c951d105e0db98cd043341f1f4342ddaf23916e15a5792d5c270
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 

From 27675a97c2d6465bf1ccc9d4d3556174326fc44e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 19:28:43 +0100
Subject: [PATCH 3/3] empathy: Add patch for enchant2.

---
 .../{INSTALL.msg => files/README.voidlinux}   |  2 -
 srcpkgs/empathy/patches/enchant-2.patch       | 79 +++++++++++++++++++
 srcpkgs/empathy/template                      | 13 ++-
 3 files changed, 89 insertions(+), 5 deletions(-)
 rename srcpkgs/empathy/{INSTALL.msg => files/README.voidlinux} (76%)
 create mode 100644 srcpkgs/empathy/patches/enchant-2.patch

diff --git a/srcpkgs/empathy/INSTALL.msg b/srcpkgs/empathy/files/README.voidlinux
similarity index 76%
rename from srcpkgs/empathy/INSTALL.msg
rename to srcpkgs/empathy/files/README.voidlinux
index de8e50ea3da9..090705a4075f 100644
--- a/srcpkgs/empathy/INSTALL.msg
+++ b/srcpkgs/empathy/files/README.voidlinux
@@ -1,8 +1,6 @@
 Some optional packages must be installed for additional functionality:
 
-	- telepathy-butterfly for MSN support
 	- telepathy-gabble for XMPP/jabber support
 	- telepathy-haze for libpurple support
 	- telepathy-idle for IRC support
-	- telepathy-rakia for SIP support
 	- telepathy-salut for link-local XMPP support
diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch
new file mode 100644
index 000000000000..c2b3a50c038f
--- /dev/null
+++ b/srcpkgs/empathy/patches/enchant-2.patch
@@ -0,0 +1,79 @@
+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 <bigon@bigon.be>
+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 <bigon@bigon.be>
+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
index 4e01bad39a32..e039cdcf2176 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -1,21 +1,22 @@
 # Template file for 'empathy'
 pkgname=empathy
 version=3.12.14
-revision=2
+revision=3
 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"
+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
- enchant-devel NetworkManager-devel libchamplain-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"
@@ -24,8 +25,14 @@ 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
+patch_args=-Np1
 disable_parallel_build=yes
 
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
+	autoreconf -fi
+}
+
+post_install() {
+	vdoc $FILESDIR/README.voidlinux
 }

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Updated] empathy: enchant2
  2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
@ 2021-03-19 18:33 ` Gottox
  2021-03-19 19:00 ` Gottox
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-03-19 18:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages empathy-enchant2
https://github.com/void-linux/void-packages/pull/29598

empathy: enchant2
Followup to https://github.com/void-linux/void-packages/pull/28963

A patch file from https://github.com/void-linux/void-packages/pull/29598.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-empathy-enchant2-29598.patch --]
[-- Type: text/x-diff, Size: 5625 bytes --]

From 8d6bd45df8acf942b38ac606dba0fa9dc66359fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 19:28:43 +0100
Subject: [PATCH] empathy: Add patch for enchant2.

---
 .../{INSTALL.msg => files/README.voidlinux}   |  2 -
 srcpkgs/empathy/patches/enchant-2.patch       | 79 +++++++++++++++++++
 srcpkgs/empathy/template                      | 13 ++-
 3 files changed, 89 insertions(+), 5 deletions(-)
 rename srcpkgs/empathy/{INSTALL.msg => files/README.voidlinux} (76%)
 create mode 100644 srcpkgs/empathy/patches/enchant-2.patch

diff --git a/srcpkgs/empathy/INSTALL.msg b/srcpkgs/empathy/files/README.voidlinux
similarity index 76%
rename from srcpkgs/empathy/INSTALL.msg
rename to srcpkgs/empathy/files/README.voidlinux
index de8e50ea3da9..090705a4075f 100644
--- a/srcpkgs/empathy/INSTALL.msg
+++ b/srcpkgs/empathy/files/README.voidlinux
@@ -1,8 +1,6 @@
 Some optional packages must be installed for additional functionality:
 
-	- telepathy-butterfly for MSN support
 	- telepathy-gabble for XMPP/jabber support
 	- telepathy-haze for libpurple support
 	- telepathy-idle for IRC support
-	- telepathy-rakia for SIP support
 	- telepathy-salut for link-local XMPP support
diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch
new file mode 100644
index 000000000000..c2b3a50c038f
--- /dev/null
+++ b/srcpkgs/empathy/patches/enchant-2.patch
@@ -0,0 +1,79 @@
+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 <bigon@bigon.be>
+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 <bigon@bigon.be>
+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
index 4e01bad39a32..e039cdcf2176 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -1,21 +1,22 @@
 # Template file for 'empathy'
 pkgname=empathy
 version=3.12.14
-revision=2
+revision=3
 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"
+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
- enchant-devel NetworkManager-devel libchamplain-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"
@@ -24,8 +25,14 @@ 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
+patch_args=-Np1
 disable_parallel_build=yes
 
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
+	autoreconf -fi
+}
+
+post_install() {
+	vdoc $FILESDIR/README.voidlinux
 }

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Updated] empathy: enchant2
  2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
  2021-03-19 18:33 ` [PR PATCH] [Updated] " Gottox
@ 2021-03-19 19:00 ` Gottox
  2021-03-19 23:50 ` [PR REVIEW] " ericonr
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-03-19 19:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages empathy-enchant2
https://github.com/void-linux/void-packages/pull/29598

empathy: enchant2
Followup to https://github.com/void-linux/void-packages/pull/28963

A patch file from https://github.com/void-linux/void-packages/pull/29598.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-empathy-enchant2-29598.patch --]
[-- Type: text/x-diff, Size: 6378 bytes --]

From 8d6bd45df8acf942b38ac606dba0fa9dc66359fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 19:28:43 +0100
Subject: [PATCH 1/2] empathy: Add patch for enchant2.

---
 .../{INSTALL.msg => files/README.voidlinux}   |  2 -
 srcpkgs/empathy/patches/enchant-2.patch       | 79 +++++++++++++++++++
 srcpkgs/empathy/template                      | 13 ++-
 3 files changed, 89 insertions(+), 5 deletions(-)
 rename srcpkgs/empathy/{INSTALL.msg => files/README.voidlinux} (76%)
 create mode 100644 srcpkgs/empathy/patches/enchant-2.patch

diff --git a/srcpkgs/empathy/INSTALL.msg b/srcpkgs/empathy/files/README.voidlinux
similarity index 76%
rename from srcpkgs/empathy/INSTALL.msg
rename to srcpkgs/empathy/files/README.voidlinux
index de8e50ea3da9..090705a4075f 100644
--- a/srcpkgs/empathy/INSTALL.msg
+++ b/srcpkgs/empathy/files/README.voidlinux
@@ -1,8 +1,6 @@
 Some optional packages must be installed for additional functionality:
 
-	- telepathy-butterfly for MSN support
 	- telepathy-gabble for XMPP/jabber support
 	- telepathy-haze for libpurple support
 	- telepathy-idle for IRC support
-	- telepathy-rakia for SIP support
 	- telepathy-salut for link-local XMPP support
diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch
new file mode 100644
index 000000000000..c2b3a50c038f
--- /dev/null
+++ b/srcpkgs/empathy/patches/enchant-2.patch
@@ -0,0 +1,79 @@
+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 <bigon@bigon.be>
+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 <bigon@bigon.be>
+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
index 4e01bad39a32..e039cdcf2176 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -1,21 +1,22 @@
 # Template file for 'empathy'
 pkgname=empathy
 version=3.12.14
-revision=2
+revision=3
 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"
+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
- enchant-devel NetworkManager-devel libchamplain-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"
@@ -24,8 +25,14 @@ 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
+patch_args=-Np1
 disable_parallel_build=yes
 
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
+	autoreconf -fi
+}
+
+post_install() {
+	vdoc $FILESDIR/README.voidlinux
 }

From 0aa2e93664be7981d13f5827ed8627b5a198863b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 20:00:53 +0100
Subject: [PATCH 2/2] empathy: disable checks

---
 srcpkgs/empathy/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index e039cdcf2176..bdf201275130 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -28,6 +28,11 @@ checksum=7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3
 patch_args=-Np1
 disable_parallel_build=yes
 
+do_check() {
+	# Disable checks, the only work with an irc server in place.
+	:
+}
+
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
 	autoreconf -fi

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR REVIEW] empathy: enchant2
  2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
  2021-03-19 18:33 ` [PR PATCH] [Updated] " Gottox
  2021-03-19 19:00 ` Gottox
@ 2021-03-19 23:50 ` ericonr
  2021-03-20  6:25 ` [PR PATCH] [Updated] " Gottox
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-03-19 23:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29598#discussion_r598025419

Comment:
You can put `make_check=no` in the template directly.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Updated] empathy: enchant2
  2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
                   ` (2 preceding siblings ...)
  2021-03-19 23:50 ` [PR REVIEW] " ericonr
@ 2021-03-20  6:25 ` Gottox
  2021-03-21 21:17 ` Gottox
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-03-20  6:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages empathy-enchant2
https://github.com/void-linux/void-packages/pull/29598

empathy: enchant2
Followup to https://github.com/void-linux/void-packages/pull/28963

A patch file from https://github.com/void-linux/void-packages/pull/29598.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-empathy-enchant2-29598.patch --]
[-- Type: text/x-diff, Size: 6423 bytes --]

From 8d6bd45df8acf942b38ac606dba0fa9dc66359fe Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 19:28:43 +0100
Subject: [PATCH 1/2] empathy: Add patch for enchant2.

---
 .../{INSTALL.msg => files/README.voidlinux}   |  2 -
 srcpkgs/empathy/patches/enchant-2.patch       | 79 +++++++++++++++++++
 srcpkgs/empathy/template                      | 13 ++-
 3 files changed, 89 insertions(+), 5 deletions(-)
 rename srcpkgs/empathy/{INSTALL.msg => files/README.voidlinux} (76%)
 create mode 100644 srcpkgs/empathy/patches/enchant-2.patch

diff --git a/srcpkgs/empathy/INSTALL.msg b/srcpkgs/empathy/files/README.voidlinux
similarity index 76%
rename from srcpkgs/empathy/INSTALL.msg
rename to srcpkgs/empathy/files/README.voidlinux
index de8e50ea3da9..090705a4075f 100644
--- a/srcpkgs/empathy/INSTALL.msg
+++ b/srcpkgs/empathy/files/README.voidlinux
@@ -1,8 +1,6 @@
 Some optional packages must be installed for additional functionality:
 
-	- telepathy-butterfly for MSN support
 	- telepathy-gabble for XMPP/jabber support
 	- telepathy-haze for libpurple support
 	- telepathy-idle for IRC support
-	- telepathy-rakia for SIP support
 	- telepathy-salut for link-local XMPP support
diff --git a/srcpkgs/empathy/patches/enchant-2.patch b/srcpkgs/empathy/patches/enchant-2.patch
new file mode 100644
index 000000000000..c2b3a50c038f
--- /dev/null
+++ b/srcpkgs/empathy/patches/enchant-2.patch
@@ -0,0 +1,79 @@
+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 <bigon@bigon.be>
+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 <bigon@bigon.be>
+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
index 4e01bad39a32..e039cdcf2176 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -1,21 +1,22 @@
 # Template file for 'empathy'
 pkgname=empathy
 version=3.12.14
-revision=2
+revision=3
 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"
+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
- enchant-devel NetworkManager-devel libchamplain-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"
@@ -24,8 +25,14 @@ 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
+patch_args=-Np1
 disable_parallel_build=yes
 
 pre_configure() {
 	CFLAGS+=" -I$wrksrc/telepathy-account-widgets"
+	autoreconf -fi
+}
+
+post_install() {
+	vdoc $FILESDIR/README.voidlinux
 }

From 8ba91b359f5f66c402cc263f65b898fce54c10aa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 19 Mar 2021 20:00:53 +0100
Subject: [PATCH 2/2] empathy: disable checks

---
 srcpkgs/empathy/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index e039cdcf2176..1c70413842b3 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -27,6 +27,8 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3
 patch_args=-Np1
 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"

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: empathy: enchant2
  2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
                   ` (3 preceding siblings ...)
  2021-03-20  6:25 ` [PR PATCH] [Updated] " Gottox
@ 2021-03-21 21:17 ` Gottox
  2021-03-21 21:17 ` [PR REVIEW] " Gottox
  2021-03-22  1:04 ` [PR PATCH] [Merged]: " ericonr
  6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-03-21 21:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

New comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29598#issuecomment-803661449

Comment:
`yelp-tools` is used while autoreconf. So this package was missing in hostmakedepends.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR REVIEW] empathy: enchant2
  2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
                   ` (4 preceding siblings ...)
  2021-03-21 21:17 ` Gottox
@ 2021-03-21 21:17 ` Gottox
  2021-03-22  1:04 ` [PR PATCH] [Merged]: " ericonr
  6 siblings, 0 replies; 8+ messages in thread
From: Gottox @ 2021-03-21 21:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New review comment by Gottox on void-packages repository

https://github.com/void-linux/void-packages/pull/29598#discussion_r598339248

Comment:
fixed.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PR PATCH] [Merged]: empathy: enchant2
  2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
                   ` (5 preceding siblings ...)
  2021-03-21 21:17 ` [PR REVIEW] " Gottox
@ 2021-03-22  1:04 ` ericonr
  6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-03-22  1:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

There's a merged pull request on the void-packages repository

empathy: enchant2
https://github.com/void-linux/void-packages/pull/29598

Description:
Followup to https://github.com/void-linux/void-packages/pull/28963

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-03-22  1:04 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-19 18:30 [PR PATCH] empathy: enchant2 Gottox
2021-03-19 18:33 ` [PR PATCH] [Updated] " Gottox
2021-03-19 19:00 ` Gottox
2021-03-19 23:50 ` [PR REVIEW] " ericonr
2021-03-20  6:25 ` [PR PATCH] [Updated] " Gottox
2021-03-21 21:17 ` Gottox
2021-03-21 21:17 ` [PR REVIEW] " Gottox
2021-03-22  1:04 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).