haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

protobuf: bump version.

Browse Source 
* SONAME change.
This commit is contained in:
Jerome Duval
2017-05-17 23:37:05 +02:00
parent 70716490e9
commit ed2a4f99d7
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dev-libs/protobuf/patches/protobuf-3.3.1.patchset Normal file
View File

@@ -0,0 +1,25 @@
From d2b4be799813318da7da076de1fe74461e08dad1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 17 May 2017 22:52:04 +0200
Subject: use Atomic32 on 32-bit.
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h
index 75aee30..13e23f6 100644
--- a/src/google/protobuf/stubs/atomicops.h
+++ b/src/google/protobuf/stubs/atomicops.h
@@ -89,7 +89,11 @@ typedef intptr_t Atomic64;
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.
+#if defined(__HAIKU__) && !defined(GOOGLE_PROTOBUF_ARCH_64_BIT)
+typedef Atomic32 AtomicWord;
+#else
typedef intptr_t AtomicWord;
+#endif
// Atomically execute:
// result = *ptr;
--
2.12.2

21
dev-libs/protobuf/protobuf-3.2.1.recipe → dev-libs/protobuf/protobuf-3.3.1.recipe
View File

@@ -10,7 +10,8 @@ COPYRIGHT="2008-2017 Google"
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="2eceab4cd58a73aadb7c84642838ee58c886e1f908acd45847a92b874d23c8ef"
CHECKSUM_SHA256="30f23a45c6f4515598702a6d19c4295ba92c4a635d7ad8d331a4db9fccff392d"
PATCHES="protobuf-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -18,9 +19,9 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
protobuf$secondaryArchSuffix =$portVersion
cmd:protoc$secondaryArchSuffix
lib:libprotobuf_lite$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libprotobuf$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libprotoc$secondaryArchSuffix = 12.0.0 compat >= 12
lib:libprotobuf_lite$secondaryArchSuffix = 13.0.1 compat >= 13
lib:libprotobuf$secondaryArchSuffix = 13.0.1 compat >= 13
lib:libprotoc$secondaryArchSuffix = 13.0.1 compat >= 13
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -28,9 +29,9 @@ REQUIRES="
PROVIDES_devel="
protobuf${secondaryArchSuffix}_devel = $portVersion
devel:libprotobuf_lite$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libprotobuf$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libprotoc$secondaryArchSuffix = 12.0.0 compat >= 12
devel:libprotobuf_lite$secondaryArchSuffix = 13.0.1 compat >= 13
devel:libprotobuf$secondaryArchSuffix = 13.0.1 compat >= 13
devel:libprotoc$secondaryArchSuffix = 13.0.1 compat >= 13
"
REQUIRES_devel="
protobuf$secondaryArchSuffix == $portVersion base
@@ -47,10 +48,10 @@ BUILD_PREREQUIRES="
"
defineDebugInfoPackage protobuf$secondaryArchSuffix \
$libDir/libprotobuf.so.12.0.0 \
$libDir/libprotoc.so.12.0.0
$libDir/libprotobuf.so.13.0.1 \
$libDir/libprotoc.so.13.0.1
# dashes are not allowed in provides so objcopy can't find:
# $libDir/libprotobuf_lite.so.12.0.0
# $libDir/libprotobuf_lite.so.13.0.1
BUILD()