v8.2

3 files changed, 18 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fd08ae69de0..7ebafbce4a46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = or-tools
 	pkgdesc = Google's Operations Research tools.
-	pkgver = 8.0
+	pkgver = 8.2
 	pkgrel = 1
 	url = https://github.com/google/or-tools
 	arch = x86_64
@@ -8,17 +8,15 @@ pkgbase = or-tools
 	makedepends = cmake
 	makedepends = pkgconf
 	makedepends = git
+	makedepends = abseil-cpp=20200923.3
 	depends = gcc-libs
 	depends = protobuf
 	depends = gflags
 	depends = google-glog
 	depends = coin-or-cbc
 	depends = protobuf
-	conflicts = python-or-tools
-	source = https://github.com/google/or-tools/archive/v8.0.tar.gz
-	source = pkg-conf.patch
-	sha256sums = ac01d7ebde157daaeb0e21ce54923a48e4f1d21faebd0b08a54979f150f909ee
-	sha256sums = 2fc50395b8d835543df1172f3b1cddeac2d50b1d8fb7916d4268d6b3b21230a3
+	source = https://github.com/google/or-tools/archive/v8.2.tar.gz
+	sha256sums = cf40715fa5cfeee88e2c8f5583465182c8dedf60b4eb7c4a967b32ff61ac4302
 
 pkgname = or-tools
 
diff --git a/PKGBUILD b/PKGBUILD
index 88e66d46dfb7..284b2beaa31c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,21 @@
 # Maintainer: Aleksandar Trifunović <akstrfn at gmail dot com>
 
 pkgname=or-tools
-pkgver=8.0
+pkgver=8.2
 pkgrel=1
 pkgdesc="Google's Operations Research tools."
 arch=('x86_64')
 url="https://github.com/google/or-tools"
 license=('Apache')
 depends=('gcc-libs' 'protobuf' 'gflags' 'google-glog' 'coin-or-cbc' 'protobuf')
-makedepends=('cmake' 'pkgconf' 'git')
-source=("https://github.com/google/or-tools/archive/v${pkgver}.tar.gz"
-        "pkg-conf.patch")
-sha256sums=('ac01d7ebde157daaeb0e21ce54923a48e4f1d21faebd0b08a54979f150f909ee'
-            '2fc50395b8d835543df1172f3b1cddeac2d50b1d8fb7916d4268d6b3b21230a3')
-
-conflicts=('python-or-tools') # because it copies libortools.so to usr/lib
+# abseil fixed version since it breaks stuff
+makedepends=('cmake' 'pkgconf' 'git' 'abseil-cpp=20200923.3')
+source=("https://github.com/google/or-tools/archive/v${pkgver}.tar.gz")
+sha256sums=('cf40715fa5cfeee88e2c8f5583465182c8dedf60b4eb7c4a967b32ff61ac4302')
 
 prepare() {
     cd "$pkgname-$pkgver"
-    patch -Np1 -i "$srcdir/pkg-conf.patch"
-    cmake -H. -Bbuild \
+    cmake -S. -Bbuild \
         -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
         -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
         -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
@@ -30,19 +26,20 @@ prepare() {
         -DUSE_SCIP=OFF \
         -DBUILD_SAMPLES=OFF \
         -DBUILD_EXAMPLES=OFF \
-        -DBUILD_absl=ON
+        -DBUILD_CXX_EXAMPLES=OFF
 }
 
 build() {
     cd "$pkgname-$pkgver"
-    cmake --build build
+    cmake --build build -- "${MAKEFLAGS}"
 }
 
-#protobuf test fails
-#check() {
-#    cd "$pkgname-$pkgver"
-#    cmake --build build -- test
-#}
+# https://github.com/google/or-tools/issues/2395
+# for testing also build examples
+# check() {
+#     cd "$pkgname-$pkgver/build"
+#     ctest --parallel `nproc`
+# }
 
 package() {
     cmake --build "$pkgname-$pkgver/build" -- DESTDIR="$pkgdir" install
diff --git a/pkg-conf.patch b/pkg-conf.patch
deleted file mode 100644
index d06e4c47bcfc..000000000000
--- a/pkg-conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
-index 4315cd044..90c13e588 100644
---- a/cmake/cpp.cmake
-+++ b/cmake/cpp.cmake
-@@ -267,12 +267,12 @@ foreach(PROTO_FILE IN LISTS proto_files)
-   #message(STATUS "protoc src: ${PROTO_SRC}")
-   add_custom_command(
-     OUTPUT ${PROTO_SRC} ${PROTO_HDR}
--    COMMAND protobuf::protoc
-+    COMMAND /usr/bin/protoc
-     "--proto_path=${PROJECT_SOURCE_DIR}"
-     ${PROTO_DIRS}
-     "--cpp_out=${PROJECT_BINARY_DIR}"
-     ${PROTO_FILE}
--    DEPENDS ${PROTO_FILE} protobuf::protoc
-+    DEPENDS ${PROTO_FILE} /usr/bin/protoc
-     COMMENT "Generate C++ protocol buffer for ${PROTO_FILE}"
-     VERBATIM)
-   list(APPEND PROTO_HDRS ${PROTO_HDR})