[Git][debian-gis-team/osmpbf][master] 2 commits: Add patch to fix optimize_for warnings.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / osmpbf


Commits:
0c1a9300 by Bas Couwenberg at 2020-03-22T07:58:16+01:00
Add patch to fix optimize_for warnings.

- - - - -
596f3414 by Bas Couwenberg at 2020-03-22T07:58:16+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/optimize_for-LITE_RUNTIME.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+osmpbf (1.3.3-14) unstable; urgency=medium
+
+  * Add patch to fix optimize_for warnings.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 22 Mar 2020 07:49:45 +0100
+
 osmpbf (1.3.3-13) unstable; urgency=medium
 
   * Update gbp.conf for renamed branches.


=====================================
debian/patches/optimize_for-LITE_RUNTIME.patch
=====================================
@@ -0,0 +1,44 @@
+Description: Disable deprecated optimize_for = LITE_RUNTIME option.
+ Fixes warnings with protobuf >= 3.8.0:
+ .
+  The optimize_for = LITE_RUNTIME option is no longer supported by protobuf
+  Java code generator and is ignored--protoc will always generate full
+  runtime code for Java. To use Java Lite runtime, users should use the
+  Java Lite plugin instead. See:
+  https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/OSM-binary/pull/38
+
+--- a/src/fileformat.proto
++++ b/src/fileformat.proto
+@@ -17,7 +17,7 @@
+ 
+ syntax = "proto2";
+ 
+-option optimize_for = LITE_RUNTIME;
++//option optimize_for = LITE_RUNTIME;
+ option java_package = "crosby.binary";
+ package OSMPBF;
+ 
+--- a/src/osmformat.proto
++++ b/src/osmformat.proto
+@@ -17,7 +17,7 @@
+ 
+ syntax = "proto2";
+ 
+-option optimize_for = LITE_RUNTIME;
++//option optimize_for = LITE_RUNTIME;
+ option java_package = "crosby.binary";
+ package OSMPBF;
+ 
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -5,7 +5,7 @@ CXX      ?= g++
+ CXXFLAGS ?= -g
+ 
+ CXXFLAGS += -I../include -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long
+-LDFLAGS  += -L../src -pthread -lz -lprotobuf-lite -losmpbf
++LDFLAGS  += -L../src -pthread -lz -lprotobuf -losmpbf
+ 
+ .PHONY: clean install
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 copy-headers.patch
 proto2-syntax.patch
+optimize_for-LITE_RUNTIME.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/d5a15d0122a874367861733bd41846f5fc2fdf5c...596f341497e1d41681a6bde6bb6516195deeda15

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmpbf/-/compare/d5a15d0122a874367861733bd41846f5fc2fdf5c...596f341497e1d41681a6bde6bb6516195deeda15
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200322/a6dc29f0/attachment-0001.html>