Compare commits

...

14 Commits

Author SHA1 Message Date
915e20ecec automatic version update by autodist [release 26.1-1mamba;Fri Apr 05 2024] 2024-04-11 11:05:17 +02:00
7dd1bdd66e automatic version update by autodist [release 25.3-1mamba;Mon Feb 19 2024] 2024-02-23 09:36:43 +01:00
d75e092961 added python 3.10 subpackage [release 21.12-2mamba;Tue Jul 04 2023] 2024-01-06 10:33:07 +01:00
684ce7a1c7 automatic version update by autodist [release 21.12-1mamba;Sat Dec 17 2022] 2024-01-06 10:33:07 +01:00
8b80861a2e automatic version update by autodist [release 21.11-1mamba;Fri Dec 09 2022] 2024-01-06 10:33:07 +01:00
6ebeb0bdf4 automatic version update by autodist [release 21.10-1mamba;Thu Dec 01 2022] 2024-01-06 10:33:07 +01:00
23dc3b955e automatic version update by autodist [release 21.9-1mamba;Thu Oct 27 2022] 2024-01-06 10:33:07 +01:00
1b02d0b91b automatic version update by autodist [release 21.8-1mamba;Thu Oct 20 2022] 2024-01-06 10:33:07 +01:00
3c2e85a5a2 automatic version update by autodist [release 21.7-1mamba;Fri Sep 30 2022] 2024-01-06 10:33:07 +01:00
12dd519dad automatic version update by autodist [release 21.6-1mamba;Sat Sep 17 2022] 2024-01-06 10:33:07 +01:00
3e3508d1d0 automatic version update by autodist [release 21.5-1mamba;Wed Aug 10 2022] 2024-01-06 10:33:07 +01:00
b5af356e0d automatic version update by autodist [release 21.4-1mamba;Tue Jul 26 2022] 2024-01-06 10:33:07 +01:00
1a8ef2dd99 automatic version update by autodist [release 21.3-1mamba;Thu Jul 21 2022] 2024-01-06 10:33:07 +01:00
1967ae71c0 automatic version update by autodist [release 3.20.1-1mamba;Sat Apr 23 2022] 2024-01-06 10:33:07 +01:00
4 changed files with 160 additions and 42 deletions

View File

@ -0,0 +1,16 @@
diff -ruN a/python/setup.py b/python/setup.py
--- a/python/setup.py 2022-12-13 01:03:12.000000000 +0100
+++ b/python/setup.py 2023-04-06 22:12:36.199029178 +0200
@@ -220,10 +220,10 @@
return False
-if __name__ == '__main__':
+if True:
ext_module_list = []
warnings_as_errors = '--warnings_as_errors'
- if GetOptionFromArgv('--cpp_implementation'):
+ if True:
# Link libprotobuf.a and libprotobuf-lite.a statically with the
# extension. Note that those libraries have to be compiled with
# -fPIC for this to work.

View File

@ -0,0 +1,25 @@
From 2e62ef1eaa2e712afc5f87aa2c55d478fe96230d Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
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 0bb05e38fad..e5b2b2e4b3a 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 File

@ -0,0 +1,36 @@
diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
index 9b1de677b4f..276c99c489e 100644
--- a/cmake/libprotobuf-lite.cmake
+++ b/cmake/libprotobuf-lite.cmake
@@ -30,6 +30,7 @@ if(protobuf_BUILD_SHARED_LIBS)
endif()
set_target_properties(libprotobuf-lite PROPERTIES
VERSION ${protobuf_VERSION}
+ SOVERSION ${protobuf_VERSION_MINOR}
OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
index aa3efc9a68a..0f34d20b97d 100644
--- a/cmake/libprotobuf.cmake
+++ b/cmake/libprotobuf.cmake
@@ -33,6 +33,7 @@ if(protobuf_BUILD_SHARED_LIBS)
endif()
set_target_properties(libprotobuf PROPERTIES
VERSION ${protobuf_VERSION}
+ SOVERSION ${protobuf_VERSION_MINOR}
OUTPUT_NAME ${LIB_PREFIX}protobuf
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf ALIAS libprotobuf)
diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake
index 72b4a1abb92..91e8bbeb04e 100644
--- a/cmake/libprotoc.cmake
+++ b/cmake/libprotoc.cmake
@@ -24,6 +24,7 @@ endif()
set_target_properties(libprotoc PROPERTIES
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
VERSION ${protobuf_VERSION}
+ SOVERSION ${protobuf_VERSION_MINOR}
OUTPUT_NAME ${LIB_PREFIX}protoc
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotoc ALIAS libprotoc)

View File

@ -1,22 +1,26 @@
Name: protobuf
Version: 3.19.4
Version: 26.1
Release: 1mamba
Summary: A way of encoding structured data in an efficient yet extensible format
Group: Development/Tools
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/protocolbuffers/protobuf
Source: https://github.com/google/protobuf.git/v%{version}/protobuf-%{version}.tar.bz2
URL: https://protobuf.dev/
Source: https://github.com/protocolbuffers/protobuf.git/v%{version}/protobuf-%{version}.tar.bz2
Patch0: protobuf-24.3-pep517.patch
Patch1: protobuf-24.3-upstream-fix-Protobuf_PROTOC_EXECUTABLE.patch
Patch2: protobuf-25.3-soversion.patch
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libabseil-cpp-devel
BuildRequires: libgcc
BuildRequires: libpython3-devel
BuildRequires: libstdc++6-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Obsoletes: protobuf26 <= 3.15.8-2mamba
%description
Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats.
@ -24,6 +28,7 @@ Protocol Buffers are a way of encoding structured data in an efficient yet exten
%package -n lib%{name}
Group: System/Libraries
Summary: Shared libraries for %{name}
Obsoletes: libprotobuf26 <= 3.15.8-2mamba
%description -n lib%{name}
Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats.
@ -36,48 +41,34 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: protobuf-devel
Obsoletes: protobuf-devel < 3.17.0
Obsoletes: libprotobuf26-devel <= 3.15.8-2mamba
%description -n lib%{name}-devel
This package contains static libraries and header files needed for development of Protocol Buffer
%package -n python-%{name}
Summary: Python bindings for %{name}
Group: System/Libraries/Python
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description -n python-%{name}
This package contains the python bindings to %{protobuf} library.
%debug_package
%prep
%setup -q
./autogen.sh
#-D -T
#:<< _EOF
%define _default_patch_fuzz 2
#%patch 0 -p1 -b .pep517
%patch 1 -p1 -b .upstream-fix-Protobuf_PROTOC_EXECUTABLE
%patch 2 -p1 -b .soversion
%build
%configure
%cmake \
-Dprotobuf_BUILD_SHARED_LIBS=ON \
-Dprotobuf_USE_EXTERNAL_GTEST=ON \
-Dprotobuf_ABSL_PROVIDER=package
%make \
%ifarch arm
LDFLAGS="-latomic"
%endif
cd python
CFLAGS="%{optflags}" %{__python3} setup.py build
%cmake_build
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall
cd python
%{__python3} setup.py install \
-O1 --skip-build \
--root="%{buildroot}" \
--install-headers=%{python3_inc} \
--install-lib=%{python3_sitearch} \
--record=%{name}.filelist
sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist
%cmake_install
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -87,7 +78,7 @@ sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist
%files
%defattr(-,root,root)
%{_bindir}/protoc
%{_bindir}/protoc*
%files -n lib%{name}
%defattr(-,root,root)
@ -99,20 +90,70 @@ sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist
%defattr(-,root,root)
%dir %{_includedir}/google/protobuf
%{_includedir}/google/protobuf/*
%{_libdir}/libprotobuf*.a
%{_libdir}/libprotobuf*.la
%{_includedir}/java/core/src/main/resources/google/protobuf/java_features.proto
%{_includedir}/upb_generator/mangle.h
%{_includedir}/utf8_range.h
%{_includedir}/utf8_validity.h
%{_libdir}/libprotobuf*.so
%{_libdir}/libprotoc.a
%{_libdir}/libprotoc.la
%{_libdir}/libprotoc.so
%{_libdir}/libutf8_range.a
%{_libdir}/libutf8_validity.a
%dir %{_libdir}/cmake/protobuf
%{_libdir}/cmake/protobuf/protobuf-*.cmake
%dir %{_libdir}/cmake/utf8_range
%{_libdir}/cmake/utf8_range/utf8_range-*.cmake
%{_libdir}/pkgconfig/protobuf*.pc
%files -n python-%{name} -f python/%{name}.filelist
%defattr(-,root,root)
%dir %{python3_sitearch}/protobuf-%{version}-py*.egg-info
%{python3_sitearch}/protobuf-%{version}-py*.egg-info/*
%{_libdir}/pkgconfig/utf8_range.pc
%changelog
* Fri Apr 05 2024 Automatic Build System <autodist@openmamba.org> 26.1-1mamba
- automatic version update by autodist
* Mon Feb 19 2024 Automatic Build System <autodist@openmamba.org> 25.3-1mamba
- automatic version update by autodist
* Tue Jul 04 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 21.12-2mamba
- added python 3.10 subpackage
* Sat Dec 17 2022 Automatic Build System <autodist@mambasoft.it> 21.12-1mamba
- automatic version update by autodist
* Fri Dec 09 2022 Automatic Build System <autodist@mambasoft.it> 21.11-1mamba
- automatic version update by autodist
* Thu Dec 01 2022 Automatic Build System <autodist@mambasoft.it> 21.10-1mamba
- automatic version update by autodist
* Thu Oct 27 2022 Automatic Build System <autodist@mambasoft.it> 21.9-1mamba
- automatic version update by autodist
* Thu Oct 20 2022 Automatic Build System <autodist@mambasoft.it> 21.8-1mamba
- automatic version update by autodist
* Fri Sep 30 2022 Automatic Build System <autodist@mambasoft.it> 21.7-1mamba
- automatic version update by autodist
* Sat Sep 17 2022 Automatic Build System <autodist@mambasoft.it> 21.6-1mamba
- automatic version update by autodist
* Wed Aug 10 2022 Automatic Build System <autodist@mambasoft.it> 21.5-1mamba
- automatic version update by autodist
* Tue Jul 26 2022 Automatic Build System <autodist@mambasoft.it> 21.4-1mamba
- automatic version update by autodist
* Thu Jul 21 2022 Automatic Build System <autodist@mambasoft.it> 21.3-1mamba
- automatic version update by autodist
* Tue Jun 28 2022 Automatic Build System <autodist@mambasoft.it> 21.2-1mamba
- automatic version update by autodist
* Sun May 29 2022 Automatic Build System <autodist@mambasoft.it> 21.1-1mamba
- automatic version update by autodist
* Sat Apr 23 2022 Automatic Build System <autodist@mambasoft.it> 3.20.1-1mamba
- automatic version update by autodist
* Sat Jan 29 2022 Automatic Build System <autodist@mambasoft.it> 3.19.4-1mamba
- automatic version update by autodist