From ef1f7a53282044ebe38a5d68bcf1fa3789bb1006 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 15:59:47 +0100 Subject: [PATCH 1/7] libzip: Strip trailing spaces --- libzip-0.10-1.bee | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libzip-0.10-1.bee b/libzip-0.10-1.bee index d85176dab..f44741e6e 100755 --- a/libzip-0.10-1.bee +++ b/libzip-0.10-1.bee @@ -19,7 +19,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { @@ -27,15 +27,15 @@ mee_build() { } mee_install() { - + bee_install - - - + + + mv -v ${D}${LIBDIR}/libzip/include/zipconf.h ${D}${INCLUDEDIR} rmdir -v ${D}${LIBDIR}/libzip/include rmdir -v ${D}${LIBDIR}/libzip - - + + } From 5212410a2de8f4beca08fd9d0b10b27b7e8ddc61 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 16:00:01 +0100 Subject: [PATCH 2/7] libzip: Remove blank line at end of file --- libzip-0.10-1.bee | 1 - 1 file changed, 1 deletion(-) diff --git a/libzip-0.10-1.bee b/libzip-0.10-1.bee index f44741e6e..712822e3a 100755 --- a/libzip-0.10-1.bee +++ b/libzip-0.10-1.bee @@ -38,4 +38,3 @@ mee_install() { } - From f020bb4bd4014283009bfea2a95fcafc52155db3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 16:12:24 +0100 Subject: [PATCH 3/7] libzip: Remove unneeded blank lines --- libzip-0.10-1.bee | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libzip-0.10-1.bee b/libzip-0.10-1.bee index 712822e3a..7e6273401 100755 --- a/libzip-0.10-1.bee +++ b/libzip-0.10-1.bee @@ -8,8 +8,6 @@ PATCHURL[0]="" # EXCLUDE="" - - mee_extract() { bee_extract ${@} } @@ -27,14 +25,9 @@ mee_build() { } mee_install() { - bee_install - - mv -v ${D}${LIBDIR}/libzip/include/zipconf.h ${D}${INCLUDEDIR} rmdir -v ${D}${LIBDIR}/libzip/include rmdir -v ${D}${LIBDIR}/libzip - - } From 07a68cfecc29698eec96af61c1a568b5b8fb3b8f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 16:36:37 +0100 Subject: [PATCH 4/7] libzip: Convert to versionless bee file --- libzip-0.10-1.bee => libzip.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libzip-0.10-1.bee => libzip.be0 (93%) diff --git a/libzip-0.10-1.bee b/libzip.be0 similarity index 93% rename from libzip-0.10-1.bee rename to libzip.be0 index 7e6273401..02d5a5935 100755 --- a/libzip-0.10-1.bee +++ b/libzip.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION libzip-0.10-1 + SRCURL[0]="http://nih.at/libzip/libzip-0.10.tar.bz2" PATCHURL[0]="" From 1540ee13e59e04eac1165ea6da516af6072b6c91 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 16:40:39 +0100 Subject: [PATCH 5/7] libzip: Use bee variable `PKGVERSION` --- libzip.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libzip.be0 b/libzip.be0 index 02d5a5935..9b018936a 100755 --- a/libzip.be0 +++ b/libzip.be0 @@ -2,7 +2,7 @@ # BEE_VERSION libzip-0.10-1 -SRCURL[0]="http://nih.at/libzip/libzip-0.10.tar.bz2" +SRCURL[0]="http://nih.at/libzip/libzip-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From 3b7c93d796ffdb2e8ef7448b48691ce477caa683 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 16:45:08 +0100 Subject: [PATCH 6/7] libzip: Update source URL to libzip.org --- libzip.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libzip.be0 b/libzip.be0 index 9b018936a..7c09a14ee 100755 --- a/libzip.be0 +++ b/libzip.be0 @@ -2,7 +2,7 @@ # BEE_VERSION libzip-0.10-1 -SRCURL[0]="http://nih.at/libzip/libzip-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://libzip.org/download/libzip-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From c48c1bf2cdd80e66fcbf6d942287521a4e742aa6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 11 Feb 2019 16:45:31 +0100 Subject: [PATCH 7/7] libzip: Update version from 0.10 to 1.5.1 The news are available [online][1]. Remove unneeded installation commands. Only Gzip and LZMA are available, use smaller LZMA compressed archive. [1]: https://libzip.org/news/ --- libzip.be0 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libzip.be0 b/libzip.be0 index 7c09a14ee..091f7abee 100755 --- a/libzip.be0 +++ b/libzip.be0 @@ -1,8 +1,8 @@ #!/bin/env beesh -# BEE_VERSION libzip-0.10-1 +# BEE_VERSION libzip-1.5.1-0 -SRCURL[0]="https://libzip.org/download/libzip-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://libzip.org/download/libzip-${PKGVERSION}.tar.xz" PATCHURL[0]="" @@ -28,8 +28,4 @@ mee_build() { mee_install() { bee_install - - mv -v ${D}${LIBDIR}/libzip/include/zipconf.h ${D}${INCLUDEDIR} - rmdir -v ${D}${LIBDIR}/libzip/include - rmdir -v ${D}${LIBDIR}/libzip }