From ceb03534dd77b352f9978d990930b437af8f6e14 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 7 Jun 2018 08:59:38 +0200 Subject: [PATCH] Revert "appstream-glib: update to 0.7.9." This reverts commit 5f35a4522583fd1e7656da25988b5745aa93bba8. Broken. --- common/shlibs | 4 ++-- srcpkgs/appstream-glib/template | 23 ++++------------------- srcpkgs/libappstream-builder | 1 - srcpkgs/libappstream-glib | 1 - 4 files changed, 6 insertions(+), 23 deletions(-) delete mode 120000 srcpkgs/libappstream-builder delete mode 120000 srcpkgs/libappstream-glib diff --git a/common/shlibs b/common/shlibs index f019cdbabb..36a5378b50 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2923,8 +2923,8 @@ libsuperlu.so.5 superlu-5.2.1_1 libgosu.so.0 gosu-0.12.0_1 libyara.so.3 libyara-3.5.0_1 libgcab-1.0.so.0 gcab-0.7_1 -libappstream-glib.so.8 libappstream-glib-0.7.9_1 -libappstream-builder.so.8 libappstream-builder-0.7.9_1 +libappstream-glib.so.8 appstream-glib-0.6.13_1 +libappstream-builder.so.8 appstream-glib-0.6.13_1 libflatpak.so.0 flatpak-0.9.3_2 libnanomsg.so.5 nanomsg-1.1.3_1 libindicator3.so.7 libindicator-12.10.1_1 diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template index 29dac31757..c24f8a7d2d 100644 --- a/srcpkgs/appstream-glib/template +++ b/srcpkgs/appstream-glib/template @@ -1,6 +1,6 @@ # Template file for 'appstream-glib' pkgname=appstream-glib -version=0.7.9 +version=0.7.8 revision=1 build_style=meson configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://people.freedesktop.org/~hughsient/appstream-glib/" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" -checksum=278331da5049067f076330962400e680234b2e0ecbe6fa5d4668040ae0a88c47 +checksum=eb0e2cfd5a6070615efea4c87b1fc539f4566085aa5f5b41945f679d9d61dd4c build_options="gir" if [ -z "$CROSS_BUILD" ]; then @@ -28,9 +28,8 @@ post_install() { } appstream-glib-devel_package() { - depends="libappstream-glib-${version}_${revision} gcab-devel gdk-pixbuf-devel - libarchive-devel libsoup-devel libyaml-devel - libappstream-builder-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} gcab-devel gdk-pixbuf-devel + libarchive-devel libsoup-devel libyaml-devel" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -43,17 +42,3 @@ appstream-glib-devel_package() { fi } } - -libappstream-glib_package() { - short_desc+=" - appstream-glib library" - pkg_install() { - vmove "usr/lib/libappstream-glib.so.*" - } -} - -libappstream-builder_package() { - short_desc+=" - appstream-builder library" - pkg_install() { - vmove "usr/lib/libappstream-builder.so.*" - } -} diff --git a/srcpkgs/libappstream-builder b/srcpkgs/libappstream-builder deleted file mode 120000 index a9ae197f2f..0000000000 --- a/srcpkgs/libappstream-builder +++ /dev/null @@ -1 +0,0 @@ -appstream-glib \ No newline at end of file diff --git a/srcpkgs/libappstream-glib b/srcpkgs/libappstream-glib deleted file mode 120000 index a9ae197f2f..0000000000 --- a/srcpkgs/libappstream-glib +++ /dev/null @@ -1 +0,0 @@ -appstream-glib \ No newline at end of file