public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Sandro Mani <manisandro@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/mingw-protobuf] rawhide: Update to 33.5
Date: Thu, 02 Jul 2026 08:24:19 GMT [thread overview]
Message-ID: <178298065908.1.8194588264252220132.rpms-mingw-protobuf-80a53a3f0c1a@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/mingw-protobuf
Branch : rawhide
Commit : 80a53a3f0c1a32cb0fc99be3b399d7461dab0c5e
Author : Sandro Mani <manisandro@gmail.com>
Date : 2026-07-02T10:23:49+02:00
Stats : +159/-71 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/mingw-protobuf/c/80a53a3f0c1a32cb0fc99be3b399d7461dab0c5e?branch=rawhide
Log:
Update to 33.5
---
diff --git a/.gitignore b/.gitignore
index 27f572c..24808e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/protobuf-3.19.0-all.tar.gz
/protobuf-3.19.4-all.tar.gz
/protobuf-3.19.6-all.tar.gz
+/protobuf-33.5-all.tar.gz
diff --git a/mingw-protobuf.spec b/mingw-protobuf.spec
index 8fc8d61..9b5aa46 100644
--- a/mingw-protobuf.spec
+++ b/mingw-protobuf.spec
@@ -3,25 +3,27 @@
%global pkgname protobuf
Name: mingw-%{pkgname}
-Version: 3.19.6
-Release: 11%{?dist}
+Version: 33.5
+Release: 1%{?dist}
Summary: MinGW Windows protobuf library
BuildArch: noarch
License: BSD-3-Clause
URL: https://github.com/protocolbuffers/protobuf
Source0: https://github.com/protocolbuffers/protobuf/archive/v%{version}/%{pkgname}-%{version}-all.tar.gz
+# Add version suffix to dlls
+Patch0: protobuf_dllver.patch
+BuildRequires: cmake
+BuildRequires: ninja-build
-BuildRequires: autoconf automake libtool
-BuildRequires: gcc-c++
-BuildRequires: make
-
-BuildRequires: mingw32-filesystem >= 102
+BuildRequires: mingw32-abseil-cpp
+BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-zlib
-BuildRequires: mingw64-filesystem >= 102
+BuildRequires: mingw64-abseil-cpp
+BuildRequires: mingw64-filesystem
BuildRequires: mingw64-gcc-c++
BuildRequires: mingw64-zlib
@@ -32,54 +34,54 @@ MinGW Windows protobuf library.
%package -n mingw32-%{pkgname}
-Summary: MinGW Windows protobuf library
-# Ensure packages stay in sync
-Requires: protobuf-compiler = %{version}
+Summary: MinGW Windows protobuf library
+BuildArch: noarch
+Obsoletes: mingw32-%{pkgname}-static < 33.5-1
+Provides: mingw32-%{pkgname}-static = %{version}-%{release}
%description -n mingw32-%{pkgname}
MinGW Windows protobuf library.
+%package -n mingw32-%{pkgname}-lite
+Summary: MinGW Windows protobuf LITE_RUNTIME library
+BuildArch: noarch
-%package -n mingw32-%{pkgname}-static
-Summary: Static version of the MinGW Windows protobuf library
-Requires: mingw32-%{pkgname} = %{version}-%{release}
-
-%description -n mingw32-%{pkgname}-static
-Static version of the MinGW Windows protobuf library.
-
-
-%package -n mingw32-%{pkgname}-tools
-Summary: MinGW Windows protobuf library tools
-
-%description -n mingw32-%{pkgname}-tools
-MinGW Windows protobuf library tools.
+%description -n mingw32-%{pkgname}-lite
+MinGW Windows protobuf LITE_RUNTIME library.
+%package -n mingw32-%{pkgname}-compiler
+Summary: MinGW Windows protobuf library compiler executables
+BuildArch: noarch
+Obsoletes: mingw32-%{pkgname}-tools < 33.5-1
+Provides: mingw32-%{pkgname}-tools = %{version}-%{release}
+%description -n mingw32-%{pkgname}-compiler
+MinGW Windows protobuf library compiler executables.
%package -n mingw64-%{pkgname}
-Summary: MinGW Windows protobuf library
-# Ensure packages stay in sync
-Requires: protobuf-compiler = %{version}
-
+Summary: MinGW Windows protobuf library
+BuildArch: noarch
+Obsoletes: mingw64-%{pkgname}-static < 33.5-1
+Provides: mingw64-%{pkgname}-static = %{version}-%{release}
%description -n mingw64-%{pkgname}
MinGW Windows protobuf library.
+%package -n mingw64-%{pkgname}-lite
+Summary: MinGW Windows protobuf LITE_RUNTIME library
+BuildArch: noarch
-%package -n mingw64-%{pkgname}-static
-Summary: Static version of the MinGW Windows protobuf library
-Requires: mingw64-%{pkgname} = %{version}-%{release}
-
-%description -n mingw64-%{pkgname}-static
-Static version of the MinGW Windows protobuf library.
-
+%description -n mingw64-%{pkgname}-lite
+MinGW Windows protobuf LITE_RUNTIME library.
-%package -n mingw64-%{pkgname}-tools
-Summary: MinGW Windows protobuf library tools
-
-%description -n mingw64-%{pkgname}-tools
-MinGW Windows protobuf library tools.
+%package -n mingw64-%{pkgname}-compiler
+Summary: MinGW Windows protobuf library compiler executables
+BuildArch: noarch
+Obsoletes: mingw64-%{pkgname}-tools < 33.5-1
+Provides: mingw64-%{pkgname}-tools = %{version}-%{release}
+%description -n mingw64-%{pkgname}-compiler
+MinGW Windows protobuf library compiler executables.
%{?mingw_debug_package}
@@ -89,60 +91,94 @@ MinGW Windows protobuf library tools.
%build
-./autogen.sh
-%mingw_configure
-%mingw_make_build
+%mingw_cmake -Dprotobuf_ABSL_PROVIDER=package \
+ -Dprotobuf_BUILD_TESTS:BOOL=OFF \
+ -GNinja
+%mingw_ninja
%install
-%mingw_make_install
-
-# Delete *.la files
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+%mingw_ninja_install
+%mingw_debug_install_post
%files -n mingw32-%{pkgname}
%license LICENSE
-%{mingw32_bindir}/libprotobuf-30.dll
-%{mingw32_bindir}/libprotobuf-lite-30.dll
-%{mingw32_bindir}/libprotoc-30.dll
+%{mingw32_bindir}/libprotobuf-33.5.0.dll
+%{mingw32_bindir}/libprotoc-33.5.0.dll
+%{mingw32_bindir}/libutf8_range-33.5.0.dll
+%{mingw32_bindir}/libutf8_validity-33.5.0.dll
%dir %{mingw32_includedir}/google
%{mingw32_includedir}/google/protobuf/
-%{mingw32_libdir}/pkgconfig/protobuf-lite.pc
-%{mingw32_libdir}/pkgconfig/protobuf.pc
+%{mingw32_includedir}/upb/
+%{mingw32_includedir}/utf8_range.h
+%{mingw32_includedir}/utf8_validity.h
+%{mingw32_libdir}/cmake/protobuf/
+%{mingw32_libdir}/cmake/utf8_range/
%{mingw32_libdir}/libprotobuf-lite.dll.a
%{mingw32_libdir}/libprotobuf.dll.a
%{mingw32_libdir}/libprotoc.dll.a
+%{mingw32_libdir}/libupb.a
+%{mingw32_libdir}/libutf8_range.dll.a
+%{mingw32_libdir}/libutf8_validity.dll.a
+%{mingw32_libdir}/pkgconfig/protobuf-lite.pc
+%{mingw32_libdir}/pkgconfig/protobuf.pc
+%{mingw32_libdir}/pkgconfig/upb.pc
+%{mingw32_libdir}/pkgconfig/utf8_range.pc
+%files -n mingw32-%{pkgname}-lite
+%license LICENSE
+%{mingw32_bindir}/libprotobuf-lite-33.5.0.dll
-%files -n mingw32-%{pkgname}-static
-%{mingw32_libdir}/libprotobuf-lite.a
-%{mingw32_libdir}/libprotobuf.a
-%{mingw32_libdir}/libprotoc.a
-
-%files -n mingw32-%{pkgname}-tools
-%{mingw32_bindir}/i686-w64-mingw32-protoc.exe
+%files -n mingw32-%{pkgname}-compiler
+%license LICENSE
+%{mingw32_bindir}/protoc-gen-upb.exe
+%{mingw32_bindir}/protoc-gen-upb.exe-%{version}.0
+%{mingw32_bindir}/protoc-gen-upb_minitable.exe
+%{mingw32_bindir}/protoc-gen-upb_minitable.exe-%{version}.0
+%{mingw32_bindir}/protoc-gen-upbdefs.exe
+%{mingw32_bindir}/protoc-gen-upbdefs.exe-%{version}.0
+%{mingw32_bindir}/protoc.exe
+%{mingw32_bindir}/protoc.exe-%{version}.0
%files -n mingw64-%{pkgname}
%license LICENSE
-%{mingw64_bindir}/libprotobuf-30.dll
-%{mingw64_bindir}/libprotobuf-lite-30.dll
-%{mingw64_bindir}/libprotoc-30.dll
+%{mingw64_bindir}/libprotobuf-33.5.0.dll
+%{mingw64_bindir}/libprotoc-33.5.0.dll
+%{mingw64_bindir}/libutf8_range-33.5.0.dll
+%{mingw64_bindir}/libutf8_validity-33.5.0.dll
%dir %{mingw64_includedir}/google
%{mingw64_includedir}/google/protobuf/
-%{mingw64_libdir}/pkgconfig/protobuf-lite.pc
-%{mingw64_libdir}/pkgconfig/protobuf.pc
+%{mingw64_includedir}/upb/
+%{mingw64_includedir}/utf8_range.h
+%{mingw64_includedir}/utf8_validity.h
+%{mingw64_libdir}/cmake/protobuf/
+%{mingw64_libdir}/cmake/utf8_range/
%{mingw64_libdir}/libprotobuf-lite.dll.a
%{mingw64_libdir}/libprotobuf.dll.a
%{mingw64_libdir}/libprotoc.dll.a
+%{mingw64_libdir}/libupb.a
+%{mingw64_libdir}/libutf8_range.dll.a
+%{mingw64_libdir}/libutf8_validity.dll.a
+%{mingw64_libdir}/pkgconfig/protobuf-lite.pc
+%{mingw64_libdir}/pkgconfig/protobuf.pc
+%{mingw64_libdir}/pkgconfig/upb.pc
+%{mingw64_libdir}/pkgconfig/utf8_range.pc
-%files -n mingw64-%{pkgname}-static
-%{mingw64_libdir}/libprotobuf-lite.a
-%{mingw64_libdir}/libprotobuf.a
-%{mingw64_libdir}/libprotoc.a
+%files -n mingw64-%{pkgname}-lite
+%license LICENSE
+%{mingw64_bindir}/libprotobuf-lite-33.5.0.dll
-%files -n mingw64-%{pkgname}-tools
-%{mingw64_bindir}/x86_64-w64-mingw32-protoc.exe
+%files -n mingw64-%{pkgname}-compiler
+%license LICENSE
+%{mingw64_bindir}/protoc-gen-upb.exe
+%{mingw64_bindir}/protoc-gen-upb.exe-%{version}.0
+%{mingw64_bindir}/protoc-gen-upb_minitable.exe
+%{mingw64_bindir}/protoc-gen-upb_minitable.exe-%{version}.0
+%{mingw64_bindir}/protoc-gen-upbdefs.exe
+%{mingw64_bindir}/protoc-gen-upbdefs.exe-%{version}.0
+%{mingw64_bindir}/protoc.exe
+%{mingw64_bindir}/protoc.exe-%{version}.0
%changelog
diff --git a/protobuf_dllver.patch b/protobuf_dllver.patch
new file mode 100644
index 0000000..9ad22d9
--- /dev/null
+++ b/protobuf_dllver.patch
@@ -0,0 +1,51 @@
+diff -rupN --no-dereference protobuf-33.5/cmake/libprotobuf.cmake protobuf-33.5-new/cmake/libprotobuf.cmake
+--- protobuf-33.5/cmake/libprotobuf.cmake 2026-01-29 20:43:18.000000000 +0100
++++ protobuf-33.5-new/cmake/libprotobuf.cmake 2026-07-02 09:12:02.106015837 +0200
+@@ -43,6 +43,9 @@ set_target_properties(libprotobuf PROPER
+ CXX_VISIBILITY_PRESET hidden
+ VISIBILITY_INLINES_HIDDEN ON
+ )
++if(MINGW)
++set_target_properties(libprotobuf PROPERTIES SUFFIX "-${protobuf_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++endif(MINGW)
+ add_library(protobuf::libprotobuf ALIAS libprotobuf)
+
+ target_link_libraries(libprotobuf PUBLIC utf8_validity)
+diff -rupN --no-dereference protobuf-33.5/cmake/libprotobuf-lite.cmake protobuf-33.5-new/cmake/libprotobuf-lite.cmake
+--- protobuf-33.5/cmake/libprotobuf-lite.cmake 2026-01-29 20:43:18.000000000 +0100
++++ protobuf-33.5-new/cmake/libprotobuf-lite.cmake 2026-07-02 09:12:02.107173204 +0200
+@@ -41,6 +41,9 @@ set_target_properties(libprotobuf-lite P
+ CXX_VISIBILITY_PRESET hidden
+ VISIBILITY_INLINES_HIDDEN ON
+ )
++if(MINGW)
++set_target_properties(libprotobuf-lite PROPERTIES SUFFIX "-${protobuf_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++endif(MINGW)
+ add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
+
+ target_link_libraries(libprotobuf-lite PRIVATE utf8_validity)
+diff -rupN --no-dereference protobuf-33.5/cmake/libprotoc.cmake protobuf-33.5-new/cmake/libprotoc.cmake
+--- protobuf-33.5/cmake/libprotoc.cmake 2026-01-29 20:43:18.000000000 +0100
++++ protobuf-33.5-new/cmake/libprotoc.cmake 2026-07-02 09:12:02.106567606 +0200
+@@ -34,4 +34,7 @@ set_target_properties(libprotoc PROPERTI
+ CXX_VISIBILITY_PRESET hidden
+ VISIBILITY_INLINES_HIDDEN ON
+ )
++if(MINGW)
++set_target_properties(libprotoc PROPERTIES SUFFIX "-${protobuf_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++endif(MINGW)
+ add_library(protobuf::libprotoc ALIAS libprotoc)
+diff -rupN --no-dereference protobuf-33.5/third_party/utf8_range/CMakeLists.txt protobuf-33.5-new/third_party/utf8_range/CMakeLists.txt
+--- protobuf-33.5/third_party/utf8_range/CMakeLists.txt 2026-01-29 20:43:18.000000000 +0100
++++ protobuf-33.5-new/third_party/utf8_range/CMakeLists.txt 2026-07-02 09:12:02.106922920 +0200
+@@ -27,6 +27,10 @@ set_target_properties(utf8_validity PROP
+ VERSION ${protobuf_VERSION}
+ OUTPUT_NAME ${LIB_PREFIX}utf8_validity
+ )
++if(MINGW)
++set_target_properties(utf8_range PROPERTIES SUFFIX "-${protobuf_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++set_target_properties(utf8_validity PROPERTIES SUFFIX "-${protobuf_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++endif(MINGW)
+
+ target_include_directories(utf8_validity PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
diff --git a/sources b/sources
index 1627aff..c0eba1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (protobuf-3.19.6-all.tar.gz) = 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
+SHA512 (protobuf-33.5-all.tar.gz) = 71110cd2cbf9f2e7f1bda4eed346ad6cad84a05ab0214d1e0880afc20a788f43176e2ccc8ac284eab38ec21578db147c2837b58789baf2823e4615d4b3557937
reply other threads:[~2026-07-02 8:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178298065908.1.8194588264252220132.rpms-mingw-protobuf-80a53a3f0c1a@fedoraproject.org \
--to=manisandro@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox