diff --git a/common/shlibs b/common/shlibs index 0f9c75af44b..3d2c9c5c15c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3009,7 +3009,7 @@ libbearssl.so.0 bearssl-0.3_1 libXfont2.so.2 libXfont2-2.0.1_1 libqalculate.so.22 libqalculate-3.20.1_1 libweston-9.so.0 weston-9.0.0_1 -libostree-1.so.1 libostree-2020.8_2 +libostree-1.so.1 ostree-2023.1_1 librhash.so.0 rhash-1.3.4_1 libserialport.so.0 libserialport-0.1.1_1 libsigrok.so.4 libsigrok-0.5.0_1 diff --git a/srcpkgs/libostree b/srcpkgs/libostree new file mode 120000 index 00000000000..2b45c40f923 --- /dev/null +++ b/srcpkgs/libostree @@ -0,0 +1 @@ +ostree \ No newline at end of file diff --git a/srcpkgs/libostree-devel b/srcpkgs/libostree-devel index 99e305f43c5..2b45c40f923 120000 --- a/srcpkgs/libostree-devel +++ b/srcpkgs/libostree-devel @@ -1 +1 @@ -libostree \ No newline at end of file +ostree \ No newline at end of file diff --git a/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch b/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch deleted file mode 100644 index e5ea3c16b92..00000000000 --- a/srcpkgs/libostree/patches/fix-tests-musl-error-strings.patch +++ /dev/null @@ -1,12 +0,0 @@ -glibc's and musl's strerror for EOVERFLOW are different... - ---- a/tests/test-commit-timestamp.sh -+++ b/tests/test-commit-timestamp.sh -@@ -40,6 +40,6 @@ - ${CMD_PREFIX} ostree --repo=./testrepo show env > show-env.txt - rm -rf testrepo testrepo-files - assert_file_has_content_literal commit-invalid.txt 'Failed to convert SOURCE_DATE_EPOCH' --assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH: Numerical result out of range' -+assert_file_has_content_literal commit-overflowing.txt 'Parsing SOURCE_DATE_EPOCH:' - assert_file_has_content_literal show-env.txt 'Date: 2009-02-13 23:31:30 +0000' - echo "ok commit with env timestamp" diff --git a/srcpkgs/libostree/patches/gir-cross.patch b/srcpkgs/ostree/patches/gir-cross.patch similarity index 100% rename from srcpkgs/libostree/patches/gir-cross.patch rename to srcpkgs/ostree/patches/gir-cross.patch diff --git a/srcpkgs/libostree/patches/musl-fixes.patch b/srcpkgs/ostree/patches/musl-fixes.patch similarity index 100% rename from srcpkgs/libostree/patches/musl-fixes.patch rename to srcpkgs/ostree/patches/musl-fixes.patch diff --git a/srcpkgs/libostree/template b/srcpkgs/ostree/template similarity index 79% rename from srcpkgs/libostree/template rename to srcpkgs/ostree/template index 4e907d2785c..2e75e690df1 100644 --- a/srcpkgs/libostree/template +++ b/srcpkgs/ostree/template @@ -1,7 +1,7 @@ -# Template file for 'libostree' -pkgname=libostree -version=2022.7 -revision=2 +# Template file for 'ostree' +pkgname=ostree +version=2023.1 +revision=1 build_style=gnu-configure build_helper="gir" configure_args=" @@ -20,13 +20,19 @@ license="LGPL-2.0-or-later" homepage="https://ostree.readthedocs.io/en/latest/" changelog="https://github.com/ostreedev/ostree/releases" distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz" -checksum=8be2a9261c94e8b9ec4113380ffc480f8598245fb321a009bad4fae4b822411f +checksum=dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 build_options="gir" build_options_default="gir" post_install() { - vinstall bash/ostree 644 usr/share/bash-completion/completions + vcompletion bash/ostree bash +} + +libostree_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta } libostree-devel_package() {