From 824375360953d8861aac9cf0e42194236ff94a85 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 25 Jan 2017 12:08:46 +0100 Subject: [PATCH 1/3] protobuf: Convert to versionless bee file --- protobuf-2.4.1-0.bee => protobuf.be0 | 2 ++ 1 file changed, 2 insertions(+) rename protobuf-2.4.1-0.bee => protobuf.be0 (98%) diff --git a/protobuf-2.4.1-0.bee b/protobuf.be0 similarity index 98% rename from protobuf-2.4.1-0.bee rename to protobuf.be0 index 67afe7d7a..6e9876d4a 100755 --- a/protobuf-2.4.1-0.bee +++ b/protobuf.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION protobuf-2.4.1-0 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 8311627b5e98c210e8a1a7793866961d1236e73f Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 25 Jan 2017 12:13:02 +0100 Subject: [PATCH 2/3] protobuf: Update url to github and https --- protobuf.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protobuf.be0 b/protobuf.be0 index 6e9876d4a..3dc6c412c 100755 --- a/protobuf.be0 +++ b/protobuf.be0 @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="http://protobuf.googlecode.com/files/protobuf-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://github.com/google/protobuf/releases/download/v${PKGVERSION}/protobuf-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 2e3acd82e6ba92111ad6f0c46f6a9e8a1b0ca659 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 25 Jan 2017 12:14:22 +0100 Subject: [PATCH 3/3] protobuf: Update version from 2.4.1 to 3.1.0 We need to change the URL a bit: In this release they didn't add a tar.bz2 format archive. The archives automatically generated by github for the release dont exist in .bz2 format - just zip and tar.gz Morover, autotools fails for us for not yet clear reasons (configure not run after autogen?). Anyway, they added language variants including c++ in which already include the configure script. So we take this. --- protobuf.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf.be0 b/protobuf.be0 index 3dc6c412c..63b05ed69 100755 --- a/protobuf.be0 +++ b/protobuf.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION protobuf-2.4.1-0 +# BEE_VERSION protobuf-3.1.0-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,7 +9,7 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://github.com/google/protobuf/releases/download/v${PKGVERSION}/protobuf-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://github.com/google/protobuf/releases/download/v${PKGVERSION}/protobuf-cpp-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array.