aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Teterin <mi@FreeBSD.org>2020-03-18 06:19:14 +0800
committerMikhail Teterin <mi@FreeBSD.org>2020-03-18 06:19:14 +0800
commit55ae96f418d16b711f4853d366ffe02b33a5647d (patch)
tree65d555342cac2aeb43402b113d21ac636c455bb7
parentdb79f07b1d5ce2b33431694239fbda7df8460788 (diff)
downloadfreebsd-ports-gnome-55ae96f418d16b711f4853d366ffe02b33a5647d.tar.gz
freebsd-ports-gnome-55ae96f418d16b711f4853d366ffe02b33a5647d.tar.zst
freebsd-ports-gnome-55ae96f418d16b711f4853d366ffe02b33a5647d.zip
Unbreak the port for users of -Werror -- the code stopped qualifying
for WARNS=3 a while ago, because it relies on implicit copy-constructors, which are deprecated in some cases since c++11. Fix another kind of warning by correcting the indentation. No PORTREVISION bump because the changes are superficial -- resulting binary remains the same. Reported by: pkg-fallout Tested with: llvm10
-rw-r--r--graphics/libfpx/files/Makefile.bsd2
-rw-r--r--graphics/libfpx/files/patch-warnings20
2 files changed, 21 insertions, 1 deletions
diff --git a/graphics/libfpx/files/Makefile.bsd b/graphics/libfpx/files/Makefile.bsd
index 7565642489e7..783c645f5a89 100644
--- a/graphics/libfpx/files/Makefile.bsd
+++ b/graphics/libfpx/files/Makefile.bsd
@@ -2,7 +2,7 @@ LIB = fpx
INCS = fpxlib.h
SHLIB_MAJOR= 2
SHLIB_MINOR= 7
-WARNS= 3
+WARNS= 2
LIBDIR = ${PREFIX}/lib
INCSDIR = ${PREFIX}/include
diff --git a/graphics/libfpx/files/patch-warnings b/graphics/libfpx/files/patch-warnings
new file mode 100644
index 000000000000..a9de525cd133
--- /dev/null
+++ b/graphics/libfpx/files/patch-warnings
@@ -0,0 +1,20 @@
+Shift indentation to avoid the "misleading indentation" warning
+from LLVM10. I admit, that the original author's intent escapes
+me here, so I cannot tell, if we have an actual bug remaining
+in this code.
+
+ -mi
+
+--- fpx/ptil_fpx.cpp 2013-09-02 11:45:00.000000000 -0400
++++ fpx/ptil_fpx.cpp 2020-03-17 18:11:00.425447000 -0400
+@@ -1200,7 +1200,7 @@
+ pixelsSpace = tmpPixelSpace;
+ }
+- imageParam->GetContrast( &contrastValue);
+- Contrast( contrastValue, pixelsSpace, pixels, width * height);
+- }
++ imageParam->GetContrast( &contrastValue);
++ Contrast( contrastValue, pixelsSpace, pixels, width * height);
++ }
+ }
+