Re: [PR PATCH] [Updated] Get rid of conflict generating libgee dependencies

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/pullmoll/void-packages gee
https://github.com/void-linux/void-packages/pull/18107

Get rid of conflict generating libgee dependencies
See #18105

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

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

From c1f0394be330b6b0c11e50a172d85d524998ca45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 8 Jan 2020 12:44:44 +0100
Subject: [PATCH 1/6] common/shlibs: remove duplicate for libgee-0.8.so.2

---
 common/shlibs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 611abc88b12..a4c337fb67d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -835,7 +835,6 @@ libgjs-gi.so gjs-0.7.11_1
 libgjs-dbus.so.0 gjs-0.7.11_1
 libtelepathy-glib.so.0 telepathy-glib-0.15.5_1
 libaccountsservice.so.0 accountsservice-0.6.4_1
-libgee-0.8.so.2 libgee-0.20.2_1
 libfolks.so.25 folks-0.9.5_1
 libfolks-telepathy.so.25 folks-0.9.5_1
 libfolks-eds.so.25 folks-0.9.5_1

From 0edb020968d798b3f24263add6cba9f529d639e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 8 Jan 2020 12:45:24 +0100
Subject: [PATCH 2/6] Venom: depend on libgee08-devel

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

diff --git a/srcpkgs/Venom/template b/srcpkgs/Venom/template
index 75508d4dc0e..ac57b740502 100644
--- a/srcpkgs/Venom/template
+++ b/srcpkgs/Venom/template
@@ -1,10 +1,10 @@
 # Template file for 'Venom'
 pkgname=Venom
 version=0.5.4
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="vala pkg-config glib-devel"
-makedepends="gtk+3-devel libgee-devel gspell-devel
+makedepends="gtk+3-devel libgee08-devel gspell-devel
  libcanberra-devel sqlcipher-devel json-glib-devel
  libsoup-devel toxcore-devel libsodium-devel
  opus-devel libvpx-devel gstreamer1-devel"

From b0e123771887132bd546597858e1644780af2f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 8 Jan 2020 12:46:16 +0100
Subject: [PATCH 3/6] gnome-calculator: depend on libgee08-devel

---
 srcpkgs/gnome-calculator/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 66b07ad01e4..0926e4935fd 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,11 +1,11 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
 version=3.35.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
-hostmakedepends="cmake glib-devel itstool pkg-config vala"
-makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee-devel
+hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
+makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
  libmpc-devel libsoup-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
 short_desc="GNOME calculator"

From 274a7245f358a1fd2c9813c3dabc7d7edb605e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 8 Jan 2020 12:46:53 +0100
Subject: [PATCH 4/6] gnome-2048: depend on libgee08-devel

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

diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template
index 91099f78502..34799561f2e 100644
--- a/srcpkgs/gnome-2048/template
+++ b/srcpkgs/gnome-2048/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-2048'
 pkgname=gnome-2048
 version=3.32.0
-revision=2
+revision=3
 build_style=meson
-hostmakedepends="glib-devel itstool pkg-config vala"
+hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="libglib-devel gtk+3-devel clutter-gtk-devel libgee-devel
  libgnome-games-support-devel"
 short_desc="2048 clone for GNOME"

From 63f5bd9a074404b5aad1e7956a5bb96b9fcdbf18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 8 Jan 2020 12:49:25 +0100
Subject: [PATCH 5/6] gitg: rebuild to fix dependency on libgee08

---
 srcpkgs/gitg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template
index a3381fdb3a7..6a4161155be 100644
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@@ -1,7 +1,7 @@
 # Template file for 'gitg'
 pkgname=gitg
 version=3.32.1
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="intltool pkg-config gobject-introspection vala glib-devel"
 makedepends="gtksourceview-devel libgit2-glib-devel libgee08-devel gtkspell3-devel

From db5df08110dc52c6039a48f1f6d0fedc1dcee7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 8 Jan 2020 12:50:01 +0100
Subject: [PATCH 6/6] rygel: rebuild to fix dependency on libgee08

---
 srcpkgs/rygel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index ea750c0664c..d28dbc2ce08 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -1,7 +1,7 @@
 # Template file for 'rygel'
 pkgname=rygel
 version=0.38.3
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=false -Dtests=false