From 803c22bd46d92b7fa12f0fb4ac7c1eaa8d799f9f Mon Sep 17 00:00:00 2001 From: Giuseppe Fierro Date: Wed, 6 Jan 2021 14:12:47 +0100 Subject: [PATCH 1/2] evolution: remove deprecated dependency gtkhtml Close: #27714 --- srcpkgs/evolution/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 77cfb0bd126..103eaa8383a 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,14 +1,14 @@ # Template file for 'evolution' pkgname=evolution version=3.38.0 -revision=1 +revision=2 build_style=cmake build_helper="gir qemu" configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_WEATHER=ON" hostmakedepends="gobject-introspection intltool itstool pkg-config glib-devel" makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel - evolution-data-server-devel gspell-devel gtkhtml-devel libcanberra-devel + evolution-data-server-devel gspell-devel libcanberra-devel libgweather-devel libnotify-devel webkit2gtk-devel ytnef-devel gnome-desktop-devel" depends="gnome-keyring" @@ -29,7 +29,7 @@ fi evolution-devel_package() { depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel - gtkhtml-devel ${sourcepkg}>=${version}_${revision}" + ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From fe6faf80dcbc30340c6c3091169bd749ee362923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 7 Jan 2021 21:03:12 +0700 Subject: [PATCH 2/2] gtkhtml: remove package --- common/shlibs | 2 -- srcpkgs/gtkhtml-devel | 1 - srcpkgs/gtkhtml/patches/fix-test-suite.patch | 11 ------ srcpkgs/gtkhtml/template | 37 -------------------- srcpkgs/libgtkhtml | 1 - srcpkgs/removed-packages/template | 5 ++- 6 files changed, 4 insertions(+), 53 deletions(-) delete mode 120000 srcpkgs/gtkhtml-devel delete mode 100644 srcpkgs/gtkhtml/patches/fix-test-suite.patch delete mode 100644 srcpkgs/gtkhtml/template delete mode 120000 srcpkgs/libgtkhtml diff --git a/common/shlibs b/common/shlibs index a60e1becef3..bfffb675aea 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1007,8 +1007,6 @@ libIcePatch2.so.35 libIce-3.5.0_1 libIceDB.so.35 libIce-3.5.0_1 libIceXML.so.35 libIce-3.5.0_1 libvdpau.so.1 libvdpau-0.4.1_1 -libgtkhtml-4.0.so.0 libgtkhtml-4.2.1_1 -libgtkhtml-editor-4.0.so.0 libgtkhtml-4.2.1_1 libgsm.so.1 libgsm-1.0.13_13 libcgroup.so.1 libcgroup-0.37.1_1 libxdg-basedir.so.1 libxdg-basedir-1.1.1_1 diff --git a/srcpkgs/gtkhtml-devel b/srcpkgs/gtkhtml-devel deleted file mode 120000 index 81f1e9464ca..00000000000 --- a/srcpkgs/gtkhtml-devel +++ /dev/null @@ -1 +0,0 @@ -gtkhtml \ No newline at end of file diff --git a/srcpkgs/gtkhtml/patches/fix-test-suite.patch b/srcpkgs/gtkhtml/patches/fix-test-suite.patch deleted file mode 100644 index ffa14b2ffbb..00000000000 --- a/srcpkgs/gtkhtml/patches/fix-test-suite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtkhtml/test-suite.c 2013-12-13 22:58:34.000000000 +0100 -+++ gtkhtml/test-suite.c 2018-03-10 20:06:41.119449731 +0100 -@@ -545,7 +545,7 @@ - flow_levels = HTML_CLUEFLOW (HTML_CLUE (HTML_CLUE (e->clue)->head)->head)->levels; - - /* test if levels are OK */ -- if (!flow_levels || !flow_levels->len == 1 || flow_levels->data[0] != HTML_LIST_TYPE_BLOCKQUOTE_CITE) -+ if (!flow_levels || flow_levels->len != 1 || flow_levels->data[0] != HTML_LIST_TYPE_BLOCKQUOTE_CITE) - return FALSE; - - return TRUE; diff --git a/srcpkgs/gtkhtml/template b/srcpkgs/gtkhtml/template deleted file mode 100644 index 63055bd304a..00000000000 --- a/srcpkgs/gtkhtml/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'gtkhtml' -pkgname=gtkhtml -version=4.10.0 -revision=1 -build_style=gnu-configure -make_build_args="V=1" -hostmakedepends="pkg-config intltool" -makedepends="gtk+3-devel enchant-devel ORBit2-devel - libsoup-gnome-devel gsettings-desktop-schemas-devel - gsettings-desktop-schemas iso-codes" -depends="gsettings-desktop-schemas iso-codes" -short_desc="Layout engine written in C using the GTK+ widget toolkit" -maintainer="Orphaned " -homepage="http://www.gnome.org" -license="GPL-2" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3 - -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" glib-devel" -fi - -libgtkhtml_package() { - short_desc+=" - runtime libraries" - pkg_install() { - vmove "usr/lib/*.so.*" - } -} -gtkhtml-devel_package() { - depends="libgtkhtml>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/libgtkhtml b/srcpkgs/libgtkhtml deleted file mode 120000 index 81f1e9464ca..00000000000 --- a/srcpkgs/libgtkhtml +++ /dev/null @@ -1 +0,0 @@ -gtkhtml \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index ff1327d3238..fa868ec108f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=3 +revision=4 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -30,6 +30,9 @@ replaces=" go1.4-bootstrap<=20171003_2 goffice0.8<=0.8.17_6 grv<=0.3.1_3 + gtkhtml<=4.10.0_1 + gtkhtml-devel<=4.10.0_1 + libgtkhtml<=4.10.0_1 httperf<=0.9.0_9 isl16<=0.16_2 keepassx<=0.4.4_2