Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages / 
protobuf


Commits:
b10a5357 by Christian Heusel at 2025-03-11T15:50:25+01:00
upgpkg: 30.0-2: Build with bazelisk

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = protobuf
        pkgdesc = Protocol Buffers - Google's data interchange format
        pkgver = 30.0
-       pkgrel = 1
+       pkgrel = 2
        url = https://developers.google.com/protocol-buffers/
        arch = x86_64
        license = BSD-3-Clause
@@ -9,7 +9,7 @@ pkgbase = protobuf
        checkdepends = python-numpy
        makedepends = cmake
        makedepends = gtest
-       makedepends = jdk-openjdk
+       makedepends = bazelisk
        makedepends = python-build
        makedepends = python-installer
        makedepends = python-setuptools
@@ -25,11 +25,9 @@ pkgbase = protobuf
        source = 
https://github.com/protocolbuffers/protobuf/archive/v30.0/protobuf-30.0.tar.gz
        source = protobuf-fix-build-type-none.patch
        source = protobuf-25.3-ruby-disable-LTO.patch
-       source = 
https://github.com/bazelbuild/bazel/releases/download/7.1.2/bazel_nojdk-7.1.2-linux-x86_64
        sha512sums = 
7acdf9b3754aec1032ebcfe764cd13e6530a4da6d64197cab498b206b6ea91d7a1afc9a97e3d2c8654d5c6291ffaa050916faa2eb5e9e223fd35aa0ec162ebdd
        sha512sums = 
18bc71031bbcbc3810a9985fa670465040f06a6c104ab8079b56bdfc499bb6cec40805a0cefd455031142490a576dc60aa8000523877ac0353b93558e9beabbd
        sha512sums = 
1ebdea4e533ee0f71baf1b3fe2623ca723b36a08c6b97475ea5996b10aeb6873cf94d9120596ddd1216bd2f6feb991f8c33078e8104008a5078ace5be5431efd
-       sha512sums = 
d1f985d6f7962da9dee352d73abd246f9ebcbc7263b5f8e2578ba46eba037ce00fe2d15bb65ba104d1afc5ad1da81dc9650801230d5c29e4a005f91f6c855fdf
 
 pkgname = protobuf
        provides = libprotoc.so


=====================================
PKGBUILD
=====================================
@@ -11,7 +11,7 @@
 pkgbase='protobuf'
 pkgname=('protobuf' 'python-protobuf' 'ruby-google-protobuf')
 pkgver=30.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Protocol Buffers - Google's data interchange format"
 arch=('x86_64')
 url='https://developers.google.com/protocol-buffers/'
@@ -25,7 +25,7 @@ depends=(
 makedepends=(
   'cmake'
   'gtest'
-  'jdk-openjdk'
+  'bazelisk'
   'python-build'
   'python-installer'
   'python-setuptools'
@@ -43,25 +43,21 @@ source=(
   protobuf-fix-build-type-none.patch
   # https://github.com/protocolbuffers/protobuf/issues/11935
   $pkgbase-25.3-ruby-disable-LTO.patch
-  
https://github.com/bazelbuild/bazel/releases/download/7.1.2/bazel_nojdk-7.1.2-linux-x86_64
 )
 
sha512sums=('7acdf9b3754aec1032ebcfe764cd13e6530a4da6d64197cab498b206b6ea91d7a1afc9a97e3d2c8654d5c6291ffaa050916faa2eb5e9e223fd35aa0ec162ebdd'
             
'18bc71031bbcbc3810a9985fa670465040f06a6c104ab8079b56bdfc499bb6cec40805a0cefd455031142490a576dc60aa8000523877ac0353b93558e9beabbd'
-            
'1ebdea4e533ee0f71baf1b3fe2623ca723b36a08c6b97475ea5996b10aeb6873cf94d9120596ddd1216bd2f6feb991f8c33078e8104008a5078ace5be5431efd'
-            
'd1f985d6f7962da9dee352d73abd246f9ebcbc7263b5f8e2578ba46eba037ce00fe2d15bb65ba104d1afc5ad1da81dc9650801230d5c29e4a005f91f6c855fdf')
+            
'1ebdea4e533ee0f71baf1b3fe2623ca723b36a08c6b97475ea5996b10aeb6873cf94d9120596ddd1216bd2f6feb991f8c33078e8104008a5078ace5be5431efd')
 
 options=(!lto)
 
 _gemname=google-protobuf
 
 prepare() {
-  install -Dm755 "${srcdir}"/bazel_nojdk-7.1.2-linux-x86_64 bazel/bazel
-  export PATH="${srcdir}/bazel:$PATH"
+  cd "$pkgname-$pkgver"
   bazel --version
 
-
-  patch -d $pkgname-$pkgver -p1 < protobuf-fix-build-type-none.patch # Fix 
cmake config compatibility mode
-  patch -d $pkgbase-$pkgver -p1 < $pkgbase-25.3-ruby-disable-LTO.patch
+  patch -p1 < ../protobuf-fix-build-type-none.patch # Fix cmake config 
compatibility mode
+  patch -p1 < ../$pkgbase-25.3-ruby-disable-LTO.patch
 }
 
 build() {



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf/-/commit/b10a5357ceb4cec7786b95541ef689ef61291423

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf/-/commit/b10a5357ceb4cec7786b95541ef689ef61291423
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to