diff --git a/network/misc/protobuf/actions.py b/network/misc/protobuf/actions.py
index 04b6b3ceca..f0e8682ead 100644
--- a/network/misc/protobuf/actions.py
+++ b/network/misc/protobuf/actions.py
@@ -9,29 +9,34 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import cmaketools
WorkDir="%s" % get.srcDIR()
def setup():
# create a folder for python3 build
- shelltools.copy("python/", "python3/")
+ # shelltools.copy("python/", "python3/")
# suppress compiler warnings
pisitools.cxxflags.add("-Wno-stringop-overflow -Wno-unused-function -Wno-deprecated-declarations")
shelltools.export("PTHREAD_LIBS", "-lpthread")
- shelltools.system("./autogen.sh")
- autotools.autoreconf("-vif")
- autotools.configure("--disable-static")
+ # shelltools.system("./autogen.sh")
+ # autotools.autoreconf("-vif")
+ cmaketools.configure("-D CMAKE_BUILD_TYPE=None \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D protobuf_BUILD_SHARED_LIBS=ON \
+ -D protobuf_USE_EXTERNAL_GTEST=ON \
+ -D protobuf_ABSL_PROVIDER=package")
# fix unused direct dependency analysis
- pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+ # pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
def build():
- autotools.make()
+ cmaketools.make()
+ # shelltools.cd("python")
+ # pythonmodules.compile()
+ # shelltools.cd("..")
shelltools.cd("python")
- pythonmodules.compile()
- shelltools.cd("..")
- shelltools.cd("python3")
pythonmodules.compile(pyVer="3")
shelltools.cd("..")
@@ -46,15 +51,15 @@ def build():
# shelltools.cd("..")
def install():
- autotools.install()
+ cmaketools.install()
+ # shelltools.cd("python")
+ # pythonmodules.install()
+ # shelltools.cd("..")
shelltools.cd("python")
- pythonmodules.install()
- shelltools.cd("..")
- shelltools.cd("python3")
pythonmodules.install(pyVer="3")
shelltools.cd("..")
pisitools.insinto("/usr/share/vim/vimfiles/syntax/", "editors/proto.vim")
pisitools.insinto("/usr/share/emacs/site-lisp/", "editors/protobuf-mode.el")
- pisitools.dodoc("CHANGES.txt", "CONTRIBUTORS.txt", "LICENSE", "README.md")
+ pisitools.dodoc("LICENSE", "CONTRIBUTORS.txt", "LICENSE", "README.md")
diff --git a/network/misc/protobuf/pspec.xml b/network/misc/protobuf/pspec.xml
index 280f357e29..8cd8a9d1e1 100644
--- a/network/misc/protobuf/pspec.xml
+++ b/network/misc/protobuf/pspec.xml
@@ -13,13 +13,15 @@
library
Google's data interchange format
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.
- https://github.com/protocolbuffers/protobuf/archive/v3.21.12.tar.gz
+ https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.25.4.tar.gz
+ cmake
python-wheel
python-devel
python3-devel
python-setuptools
python3-setuptools
+ abseil-cpp-devel
@@ -29,6 +31,7 @@
zlib
libgcc
+ abseil-cpp
/usr/share/doc
@@ -36,6 +39,8 @@
/usr/share/vim
/usr/share/emacs
/usr/lib/libproto*
+ /usr/lib/libutf8_range.a
+ /usr/lib/libutf8_validity.a
@@ -44,14 +49,17 @@
Development files for protobuf
protobuf
+ abseil-cpp-devel
/usr/lib/pkgconfig
+ /usr/lib/cmake
+ /usr/include
/usr/include/google/protobuf
-
+
python3-protobuf
@@ -77,6 +85,13 @@
+
+ 2024-07-27
+ 3.25.4
+ Version bump.
+ Pisi Linux Community
+ admin@pisilinux.org
+
2023-11-04
3.21.12