From b2ffaa59b51c62132a2aaf302a56a79195e58742 Mon Sep 17 00:00:00 2001
From: Duncan Bellamy <dunk@denkimushi.com>
Date: Sun, 4 Sep 2022 06:56:05 +0000
Subject: [PATCH] community/apache-orc: upgrade to 1.8.0
https://orc.apache.org/releases/
---
community/apache-orc/APKBUILD | 9 +++-----
community/apache-orc/tests.patch | 37 --------------------------------
2 files changed, 3 insertions(+), 43 deletions(-)
delete mode 100644 community/apache-orc/tests.patch
diff --git a/community/apache-orc/APKBUILD b/community/apache-orc/APKBUILD
index 7d93fb53197f..b64e216c17d3 100644
--- a/community/apache-orc/APKBUILD
+++ b/community/apache-orc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
# based on arch linux PKGBUILD
pkgname=apache-orc
-pkgver=1.7.6
+pkgver=1.8.0
pkgrel=0
pkgdesc="the smallest, fastest columnar storage for Hadoop workloads"
url="https://orc.apache.org/"
@@ -21,9 +21,7 @@ makedepends="
zstd-dev
"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.apache.org/orc/orc-$pkgver/orc-$pkgver.tar.gz
- tests.patch
- "
+source="https://downloads.apache.org/orc/orc-$pkgver/orc-$pkgver.tar.gz"
builddir="$srcdir/orc-$pkgver"
build() {
@@ -56,6 +54,5 @@ package() {
}
sha512sums="
-e1bf7dacfdc57a536c8e7f2c7ce10d9fa3345e2f52b31dc63bbe1ba6f4fe0d1b13e6984e6ea1d8ad4a4e82d30f4a8b43a004fac09eb075a1234a016fbb60db05 orc-1.7.6.tar.gz
-0c2ac9d3756ad21f5222857d3f1a7e045686b330c6418e2c1d4a48ac5980cf58b95c3ee36cbdf43b9e04534c7269f680963ac3977b8f1877874338efe0a212f6 tests.patch
+1da2767df661a6161976922bac120d5163bb8e563d236f745f26105ca4c4f582b645e919d9c3c1cdc0b4d98e0f812074bc1b1859555ecbf04271e388e2769f95 orc-1.8.0.tar.gz
"
diff --git a/community/apache-orc/tests.patch b/community/apache-orc/tests.patch
deleted file mode 100644
index c76a44b0c59d..000000000000
--- a/community/apache-orc/tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/c++/test/CreateTestFiles.cc
-+++ b/c++/test/CreateTestFiles.cc
-@@ -45,20 +45,20 @@
- exit(1);
- }
- orc::proto::PostScript ps;
-- ps.set_footerlength(static_cast<uint64_t>(footer.ByteSize()));
-+ ps.set_footerlength(static_cast<uint64_t>(footer.ByteSizeLong()));
- ps.set_compression(orc::proto::NONE);
- ps.set_compressionblocksize(64*1024);
- for(size_t i=0; i < version.size(); ++i) {
- ps.add_version(version[i]);
- }
-- ps.set_metadatalength(static_cast<uint64_t>(metadata.ByteSize()));
-+ ps.set_metadatalength(static_cast<uint64_t>(metadata.ByteSizeLong()));
- ps.set_writerversion(writerVersion);
- ps.set_magic("ORC");
- if (!ps.SerializeToOstream(&output)) {
- std::cerr << "Failed to write postscript for " << filename << "\n";
- exit(1);
- }
-- output.put(static_cast<char>(ps.ByteSize()));
-+ output.put(static_cast<char>(ps.ByteSizeLong()));
- }
-
- /**
---- a/c++/test/TestBufferedOutputStream.cc
-+++ b/c++/test/TestBufferedOutputStream.cc
-@@ -110,7 +110,7 @@
-
- EXPECT_TRUE(ps.SerializeToZeroCopyStream(&bufStream));
- bufStream.flush();
-- EXPECT_EQ(ps.ByteSize(), memStream.getLength());
-+ EXPECT_EQ(ps.ByteSizeLong(), memStream.getLength());
-
- proto::PostScript ps2;
- ps2.ParseFromArray(
--
GitLab