Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages /
protobuf
Commits:
5c366e53 by Christian Heusel at 2024-09-11T13:36:52+02:00
upgpkg: 28.0-2: download patch to fix repro issue
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + protobuf-fix-build-type-none.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = protobuf
pkgdesc = Protocol Buffers - Google's data interchange format
pkgver = 28.0
- pkgrel = 1
+ pkgrel = 2
url = https://developers.google.com/protocol-buffers/
arch = x86_64
license = BSD-3-Clause
@@ -23,10 +23,10 @@ pkgbase = protobuf
depends = abseil-cpp
options = !lto
source =
https://github.com/protocolbuffers/protobuf/archive/v28.0/protobuf-28.0.tar.gz
- source =
https://github.com/protocolbuffers/protobuf/commit/2e62ef1e.patch
+ source = protobuf-fix-build-type-none.patch
source = protobuf-25.3-ruby-disable-LTO.patch
sha512sums =
8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1
- sha512sums =
f42d9bd702abe2c7fc4dcb07d050376287ac60b0b7e2fde0d7a9e9df24a620866bee5fd7de2e3b216095376de47e1fe7443cca74c9a9e85c1a0bc42e8973a280
+ sha512sums =
18bc71031bbcbc3810a9985fa670465040f06a6c104ab8079b56bdfc499bb6cec40805a0cefd455031142490a576dc60aa8000523877ac0353b93558e9beabbd
sha512sums =
1ebdea4e533ee0f71baf1b3fe2623ca723b36a08c6b97475ea5996b10aeb6873cf94d9120596ddd1216bd2f6feb991f8c33078e8104008a5078ace5be5431efd
pkgname = protobuf
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@
pkgbase='protobuf'
pkgname=('protobuf' 'python-protobuf' 'ruby-google-protobuf')
pkgver=28.0
-pkgrel=1
+pkgrel=2
pkgdesc="Protocol Buffers - Google's data interchange format"
arch=('x86_64')
url='https://developers.google.com/protocol-buffers/'
@@ -38,10 +38,10 @@ checkdepends=(
python-numpy
)
source=(https://github.com/protocolbuffers/protobuf/archive/v$pkgver/$pkgname-$pkgver.tar.gz
- https://github.com/protocolbuffers/protobuf/commit/2e62ef1e.patch
+ protobuf-fix-build-type-none.patch
$pkgbase-25.3-ruby-disable-LTO.patch) #
https://github.com/protocolbuffers/protobuf/issues/11935
sha512sums=('8745f625ac781f3bbefe9494cbf570143d38aecc1521edef7a52ffb403b8be24df2c71f4f2410b5a5b78a0f3e8a38a7d19be2cf916b1b9125349d2da18262cd1'
-
'f42d9bd702abe2c7fc4dcb07d050376287ac60b0b7e2fde0d7a9e9df24a620866bee5fd7de2e3b216095376de47e1fe7443cca74c9a9e85c1a0bc42e8973a280'
+
'18bc71031bbcbc3810a9985fa670465040f06a6c104ab8079b56bdfc499bb6cec40805a0cefd455031142490a576dc60aa8000523877ac0353b93558e9beabbd'
'1ebdea4e533ee0f71baf1b3fe2623ca723b36a08c6b97475ea5996b10aeb6873cf94d9120596ddd1216bd2f6feb991f8c33078e8104008a5078ace5be5431efd')
options=(!lto)
@@ -49,7 +49,7 @@ options=(!lto)
_gemname=google-protobuf
prepare() {
- patch -d $pkgname-$pkgver -p1 < 2e62ef1e.patch # Fix cmake config
compatibility mode
+ 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
}
=====================================
protobuf-fix-build-type-none.patch
=====================================
@@ -0,0 +1,25 @@
+From 2e62ef1eaa2e712afc5f87aa2c55d478fe96230d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <[email protected]>
+Date: Wed, 5 Jul 2023 13:03:11 +0200
+Subject: [PATCH] Handle BUILD_TYPE=None in protobuf-module.cmake
+
+Fixes Protobuf_PROTOC_EXECUTABLE being undefined in that case.
+---
+ cmake/protobuf-module.cmake.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cmake/protobuf-module.cmake.in b/cmake/protobuf-module.cmake.in
+index 0bb05e38fad8..e5b2b2e4b3af 100644
+--- a/cmake/protobuf-module.cmake.in
++++ b/cmake/protobuf-module.cmake.in
+@@ -153,6 +153,10 @@ if(NOT Protobuf_PROTOC_EXECUTABLE AND TARGET
protobuf::protoc)
+ get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
+ IMPORTED_LOCATION_NOCONFIG)
+ endif()
++ if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
++ get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
++ IMPORTED_LOCATION_NONE)
++ endif()
+ endif()
+
+ # Version info variable
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf/-/commit/5c366e537977266033d6ab55b4bd8022a3e38ee1
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf/-/commit/5c366e537977266033d6ab55b4bd8022a3e38ee1
You're receiving this email because of your account on gitlab.archlinux.org.
