From c1f0394be330b6b0c11e50a172d85d524998ca45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 8 Jan 2020 12:44:44 +0100 Subject: [PATCH 1/7] 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?= Date: Wed, 8 Jan 2020 12:45:24 +0100 Subject: [PATCH 2/7] 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?= Date: Wed, 8 Jan 2020 12:46:16 +0100 Subject: [PATCH 3/7] 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 76474f300bf522d01d0bba501d0ad0086b9ada52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 8 Jan 2020 12:46:53 +0100 Subject: [PATCH 4/7] gnome-2048: depend on libgee08-devel --- srcpkgs/gnome-2048/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template index 91099f78502..38c206f5f77 100644 --- a/srcpkgs/gnome-2048/template +++ b/srcpkgs/gnome-2048/template @@ -1,10 +1,10 @@ # 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" -makedepends="libglib-devel gtk+3-devel clutter-gtk-devel libgee-devel +hostmakedepends="gettext glib-devel itstool pkg-config vala" +makedepends="libglib-devel gtk+3-devel clutter-gtk-devel libgee08-devel libgnome-games-support-devel" short_desc="2048 clone for GNOME" maintainer="Enno Boland " From 4e044ab769df022efe86f10c75d31d36b8a9e3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 8 Jan 2020 12:49:25 +0100 Subject: [PATCH 5/7] gitg: rebuild to fix dependency on libgee08 --- srcpkgs/gitg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template index a3381fdb3a7..6be8608c0b8 100644 --- a/srcpkgs/gitg/template +++ b/srcpkgs/gitg/template @@ -1,9 +1,9 @@ # 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" +hostmakedepends="intltool gettext glib-devel gobject-introspection pkg-config vala" makedepends="gtksourceview-devel libgit2-glib-devel libgee08-devel gtkspell3-devel webkit2gtk-devel libpeas-devel gsettings-desktop-schemas-devel libsecret-devel libdazzle-devel" From f908aa956d6291ec49b9c8b949b6db701538bcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 8 Jan 2020 12:50:01 +0100 Subject: [PATCH 6/7] 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 From f3bd9bcb6c7f3f3b937a19dfcff14d4f7176e3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 8 Jan 2020 13:57:33 +0100 Subject: [PATCH 7/7] libgee: remove in favour of libgee08 --- srcpkgs/libgee-devel | 1 - srcpkgs/libgee/template | 44 ----------------------------------------- srcpkgs/libgee/update | 1 - 3 files changed, 46 deletions(-) delete mode 120000 srcpkgs/libgee-devel delete mode 100644 srcpkgs/libgee/template delete mode 100644 srcpkgs/libgee/update diff --git a/srcpkgs/libgee-devel b/srcpkgs/libgee-devel deleted file mode 120000 index 30193f8878e..00000000000 --- a/srcpkgs/libgee-devel +++ /dev/null @@ -1 +0,0 @@ -libgee \ No newline at end of file diff --git a/srcpkgs/libgee/template b/srcpkgs/libgee/template deleted file mode 100644 index f27c052c19f..00000000000 --- a/srcpkgs/libgee/template +++ /dev/null @@ -1,44 +0,0 @@ -# Template file for 'libgee' -pkgname=libgee -version=0.20.2 -revision=1 -build_style=gnu-configure -build_helper="gir" -configure_args="--disable-static $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool glib-devel $(vopt_if vala vala)" -makedepends="libglib-devel" -short_desc="GObject collection library" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="http://live.gnome.org/Libgee" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9e035c4b755f46bfae70ba81cdcf8328b03f554373cec8c816e8b5680f85353c - -# Package build options -build_options="gir vala" -build_options_default="gir vala" - -post_install() { - if [ "$build_option_gir" -a "$CROSS_BUILD" ]; then - mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/share/gir-1.0 \ - ${DESTDIR}/usr/share - - mv ${DESTDIR}/usr/${XBPS_CROSS_TRIPLET}/usr/lib/girepository-1.0 \ - ${DESTDIR}/usr/lib - fi -} - -libgee-devel_package() { - depends="glib-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - if [ "$build_option_vala" ]; then - vmove usr/share/vala - fi - } -} diff --git a/srcpkgs/libgee/update b/srcpkgs/libgee/update deleted file mode 100644 index dae839ea1fd..00000000000 --- a/srcpkgs/libgee/update +++ /dev/null @@ -1 +0,0 @@ -ignore='0.[^6]*'