Upgrade to protobuf 24.4 #6310

AndrewShkrob · 2023-10-14T02:00:06Z

biodranik commented

2023-10-14 02:00:06 +00:00

(Migrated from github.com)

Is based on and closes #5557

Contains additional iOS fixes and a newer protobuf version

Requres https://github.com/organicmaps/kothic/pull/27 to be merged

Is based on and closes #5557 Contains additional iOS fixes and a newer protobuf version Requres https://github.com/organicmaps/kothic/pull/27 to be merged

AndrewShkrob reviewed 2023-10-14 08:48:53 +00:00

3party/protobuf/CMakeLists.txt

AndrewShkrob commented

2023-10-14 08:48:53 +00:00

set(protobuf_VERSION "24.4")

```suggestion set(protobuf_VERSION "24.4") ```

vng (Migrated from github.com) reviewed 2023-10-14 12:27:18 +00:00

qt/main.cpp

					
				@ -252,0 +251,4 @@

				      }

				      catch (std::exception & e)

				      {

				        QMessageBox msgBox;

vng (Migrated from github.com) commented

2023-10-14 12:24:42 +00:00

Why additional indent here?

biodranik (Migrated from github.com) reviewed 2023-10-15 07:22:43 +00:00

3party/protobuf/CMakeLists.txt

biodranik (Migrated from github.com) commented

2023-10-15 07:22:43 +00:00

@AndrewShkrob I don't like updating it manually every time. Can it be automated? Is it needed at all?

biodranik (Migrated from github.com) reviewed 2023-10-15 07:42:51 +00:00

qt/main.cpp

					
				@ -252,0 +251,4 @@

				      }

				      catch (std::exception & e)

				      {

				        QMessageBox msgBox;

biodranik (Migrated from github.com) commented

2023-10-15 07:42:51 +00:00

Indent looks ok:

Indent looks ok: <img width="790" alt="image" src="https://github.com/organicmaps/organicmaps/assets/170263/dfa4ef59-77d7-4331-abfc-fb512a77faab">

pastk reviewed 2023-10-15 07:43:48 +00:00

AndrewShkrob reviewed 2023-10-15 10:12:41 +00:00

3party/protobuf/CMakeLists.txt

AndrewShkrob commented

2023-10-15 10:12:41 +00:00

This line is required:

set_target_properties(libprotobuf-lite PROPERTIES
    VERSION ${protobuf_VERSION}
    OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
    DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}"
    # For -fvisibility=hidden and -fvisibility-inlines-hidden
    C_VISIBILITY_PRESET hidden
    CXX_VISIBILITY_PRESET hidden
    VISIBILITY_INLINES_HIDDEN ON
)

I think it's not a big deal to update the version each time you update the version...
But if you don't like it, you can set any dummy value here, for example, "OrganicMaps", or the commit hash of the protobuf repo.

There is also another way. The version of protobuf is stored in 3party/protobuf/protobuf/version.json:

{
    "24.x": {
        "protoc_version": "24.4",
        "lts": false,
        "date": "2023-10-03",
        "languages": {
            "cpp": "4.24.4",
            "csharp": "3.24.4",
            "java": "3.24.4",
            "javascript": "3.24.4",
            "objectivec": "3.24.4",
            "php": "3.24.4",
            "python": "4.24.4",
            "ruby": "3.24.4"
        }
    }
}

We can write a script to fetch "protoc_version", but I think it's an overcomplication.

This line is required: ```cmake set_target_properties(libprotobuf-lite PROPERTIES VERSION ${protobuf_VERSION} OUTPUT_NAME ${LIB_PREFIX}protobuf-lite DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}" # For -fvisibility=hidden and -fvisibility-inlines-hidden C_VISIBILITY_PRESET hidden CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN ON ) ``` I think it's not a big deal to update the version each time you update the version... But if you don't like it, you can set any dummy value here, for example, `"OrganicMaps"`, or the commit hash of the protobuf repo. There is also another way. The version of protobuf is stored in `3party/protobuf/protobuf/version.json`: ```json { "24.x": { "protoc_version": "24.4", "lts": false, "date": "2023-10-03", "languages": { "cpp": "4.24.4", "csharp": "3.24.4", "java": "3.24.4", "javascript": "3.24.4", "objectivec": "3.24.4", "php": "3.24.4", "python": "4.24.4", "ruby": "3.24.4" } } } ``` We can write a script to fetch `"protoc_version"`, but I think it's an overcomplication.

This repo is archived. You cannot comment on pull requests.

No reviewers