From 4e85fa0fb9c160475dd4dcefdf4e03640e983912 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sun, 13 Sep 2020 18:11:54 -0700 Subject: [PATCH 1/2] remove: libhandy1-0.90.0 --- srcpkgs/libhandy1-devel | 1 - srcpkgs/libhandy1/template | 42 -------------------------------------- srcpkgs/libhandy1/update | 2 -- 3 files changed, 45 deletions(-) delete mode 120000 srcpkgs/libhandy1-devel delete mode 100644 srcpkgs/libhandy1/template delete mode 100644 srcpkgs/libhandy1/update diff --git a/srcpkgs/libhandy1-devel b/srcpkgs/libhandy1-devel deleted file mode 120000 index 133e5d4d748..00000000000 --- a/srcpkgs/libhandy1-devel +++ /dev/null @@ -1 +0,0 @@ -libhandy1 \ No newline at end of file diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template deleted file mode 100644 index 191e698b0d6..00000000000 --- a/srcpkgs/libhandy1/template +++ /dev/null @@ -1,42 +0,0 @@ -# Template file for 'libhandy1' -pkgname=libhandy1 -version=0.90.0 -revision=1 -wrksrc="libhandy-${version}" -build_style=meson -build_helper="gir" -# tests need X anyway, so no need to build them -configure_args="-Dexamples=false -Dtests=false $(vopt_bool gir vapi) - -Dglade_catalog=$(vopt_if glade enabled disabled) - -Dintrospection=$(vopt_if gir enabled disabled)" -hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)" -makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)" -short_desc="Library full of GTK+ widgets for mobile phones" -maintainer="Orphaned " -license="LGPL-2.0-or-later" -homepage="https://source.puri.sm/Librem5/libhandy" -distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz" -checksum=6ab0869a3aa483298ea20ec89d4c14c38ba4de416b33181d21e15a6039df5985 - -build_options="gir glade" -desc_option_glade="Generate glade modules and catalog files" -build_options_default="gir glade" - -libhandy1-devel_package() { - depends="${sourcepkg}>=${version}_${revision} gtk+3-devel" - conflicts="libhandy-devel>=0" - short_desc+=" - development files" - pkg_install() { - vmove "usr/lib/*.so" - vmove usr/include - vmove usr/lib/pkgconfig - if [ "$build_option_glade" ]; then - vmove usr/lib/glade - vmove usr/share/glade - fi - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - vmove usr/share/vala - fi - } -} diff --git a/srcpkgs/libhandy1/update b/srcpkgs/libhandy1/update deleted file mode 100644 index bbea94b75ae..00000000000 --- a/srcpkgs/libhandy1/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://source.puri.sm/Librem5/libhandy/tags" -pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")' From 52414fc20bc493ada173cb53ca47383030e21ea2 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sun, 13 Sep 2020 18:12:11 -0700 Subject: [PATCH 2/2] libhandy: update to 1.0.0 --- common/shlibs | 3 +-- srcpkgs/libhandy/template | 11 +++++------ srcpkgs/libhandy/update | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index ec8310df7b3..1db221699df 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3562,8 +3562,7 @@ libauparse.so.0 libauparse-2.8.4_1 libOpenCL.so.1 ocl-icd-2.2.12_1 liburiparser.so.1 uriparser-0.8.6_1 libcpptest.so.1 cpptest-2.0.0_1 -libhandy-0.0.so.0 libhandy-0.0.3_1 -libhandy-1.so.0 libhandy1-0.90.0_1 +libhandy-1.so.0 libhandy-1.0.0_1 libswitchboard-2.0.so.0 switchboard-2.3.2_1 libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template index 38672f1fb6e..ba6db6ac9d8 100644 --- a/srcpkgs/libhandy/template +++ b/srcpkgs/libhandy/template @@ -1,8 +1,7 @@ # Template file for 'libhandy' pkgname=libhandy -version=0.0.13 +version=1.0.0 revision=1 -wrksrc="libhandy-v${version}" build_style=meson build_helper="gir" # tests need X anyway, so no need to build them @@ -11,12 +10,12 @@ configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi) -Dintrospection=$(vopt_if gir enabled disabled)" hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)" makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)" -short_desc="Library full of GTK+ widgets for mobile phones" +short_desc="Building blocks for modern adaptive GNOME apps" maintainer="Orphaned " license="LGPL-2.0-or-later" -homepage="https://source.puri.sm/Librem5/libhandy" -distfiles="https://source.puri.sm/Librem5/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz" -checksum=138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37 +homepage="https://gitlab.gnome.org/GNOME/libhandy" +distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=dc1fff98cbc72a492d1adb489ee1b00e43ab4ac14c983c855ef3df435bbbda27 build_options="gir vala glade" desc_option_glade="Generate glade modules and catalog files" diff --git a/srcpkgs/libhandy/update b/srcpkgs/libhandy/update index bbea94b75ae..a32ea128f7f 100644 --- a/srcpkgs/libhandy/update +++ b/srcpkgs/libhandy/update @@ -1,2 +1,2 @@ -site="https://source.puri.sm/Librem5/libhandy/tags" +site="https://gitlab.gnome.org/GNOME/libhandy/tags" pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")'