sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade from 1.3.1-3 to 1.3.1-4. The only real change (outside of the auto* nonsense) is the

Browse source 
restoration of the padding at the end of CDirEntry.

Clang++ used to flag it as unused private field, which lead to its removal (incorrectly) -- and
this new release from upstream restores the padding. It is still flagged by clang++ so a new patch
attempts to suppress that.
This commit is contained in:
Mikhail Teterin 2014-02-14 16:57:27 +00:00
parent c8058284a4
commit 14783492d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=344284
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
graphics/libfpx/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= libfpx PORTNAME= libfpx
DISTVERSION= 1.3.1-3 DISTVERSION= 1.3.1-4
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= http://imagemagick.mirrorcatalogs.com/delegates/ \ MASTER_SITES= http://imagemagick.mirrorcatalogs.com/delegates/ \
http://www.imagemagick.org/download/delegates/ \ http://www.imagemagick.org/download/delegates/ \
@ -17,7 +17,6 @@ MAINTAINER= mi@aldan.algebra.com
COMMENT= Library routines for working with Flashpix images COMMENT= Library routines for working with Flashpix images
USE_XZ= yes USE_XZ= yes
MAKE_JOBS_UNSAFE=yes
PLIST_FILES= lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h PLIST_FILES= lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h
USE_LDCONFIG= yes USE_LDCONFIG= yes

4
graphics/libfpx/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (libfpx-1.3.1-3.tar.xz) = cb82d8d90a0f195abcb6c0f1dc4cf181e9569f8f28d96969ed8378938641847a SHA256 (libfpx-1.3.1-4.tar.xz) = 638875039246e11a3646ca34c2c8f1f790c54aa00b878301bb127f30eeea7b5d
SIZE (libfpx-1.3.1-3.tar.xz) = 1892860 SIZE (libfpx-1.3.1-4.tar.xz) = 1896560

10
graphics/libfpx/files/patch-c++
View file

@ -1,10 +0,0 @@
--- oless/h/owchar.h 2013-09-03 13:38:08.000000000 -0400
+++ oless/h/owchar.h 2013-09-11 18:31:34.000000000 -0400
@@ -24,6 +24,6 @@
#include <stdarg.h>
-
#ifdef __cplusplus
+#include <string>
extern "C" {
#endif

15
graphics/libfpx/files/patch-unused-padding Normal file
View file

@ -0,0 +1,15 @@
The padding is important (earlier versions tried to remove it leading to peril),
but clang++ complains about it. Mark it as __unused to prevent that...
--- oless/h/dir.hxx 2014-02-12 08:14:24.000000000 -0500
+++ oless/h/dir.hxx 2014-02-14 11:36:59.000000000 -0500
@@ -142,5 +142,9 @@
inline void SetBitFlags(BYTE bValue, BYTE bMask);
- BYTE _bpad[CBDIRPAD]; // do not remove, bad things will happen!
+ BYTE _bpad[CBDIRPAD] // do not remove, bad things will happen!
+#ifdef __clang__
+ __unused
+#endif
+ ;
};