diff options
Diffstat (limited to 'graphics/libfpx/files')
| -rw-r--r-- | graphics/libfpx/files/Makefile.bsd | 7 | ||||
| -rw-r--r-- | graphics/libfpx/files/patch-null-casts | 25 |
2 files changed, 27 insertions, 5 deletions
diff --git a/graphics/libfpx/files/Makefile.bsd b/graphics/libfpx/files/Makefile.bsd index 62483f7c88c9..7565642489e7 100644 --- a/graphics/libfpx/files/Makefile.bsd +++ b/graphics/libfpx/files/Makefile.bsd @@ -8,12 +8,11 @@ LIBDIR = ${PREFIX}/lib INCSDIR = ${PREFIX}/include INCDIR = ${INCSDIR} # for pre-bsd.incs.mk API -NO_PROFILE= Don't want it -NOPROFILE= ${NO_PROFILE} +MK_PROFILE= no HAVES= -DHAVE_WCHAR_H -DHAVE_DLFCN_H \ -DHAVE_SYS_TIME_H \ -DHAVE_SYS_PARAM_H -DHAVE_SYS_MOUNT_H -CFLAGS+= ${HAVES} +CFLAGS+= ${HAVES} -Dregister= CPPS != find ${.CURDIR} -name \*.cpp -print # Some of the .cxx files are #include-ed into others, so can't use `find' here: @@ -23,7 +22,7 @@ OLESS := ascii.cxx cdocfile.cxx chinst.cxx dffuncs.cxx dfiter.cxx \ iter.cxx mem.cxx msf.cxx msfiter.cxx mstream.cxx page.cxx \ refilb.cxx rexpdf.cxx sstream.cxx storage.cxx time.cxx \ vect.cxx wchar.c -JPGS != find ${.CURDIR}/jpeg -name \*.c +JPGS != find ${.CURDIR}/jpeg -name \*.c -not -name dllmain.c CPPS += ${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS} diff --git a/graphics/libfpx/files/patch-null-casts b/graphics/libfpx/files/patch-null-casts index 918be6db3c39..d09109fefd34 100644 --- a/graphics/libfpx/files/patch-null-casts +++ b/graphics/libfpx/files/patch-null-casts @@ -1,5 +1,5 @@ --- oless/expdf.cxx 2013-09-02 11:47:00.000000000 -0400 -+++ oless/expdf.cxx 2014-02-14 14:29:24.000000000 -0500 ++++ oless/expdf.cxx 2018-01-20 19:59:14.495701000 -0500 @@ -610,5 +610,5 @@ olErr(EH_Err, STG_E_INVALIDFUNCTION); olChk(Validate()); @@ -21,3 +21,26 @@ + 0, &pstmsrc)); // It's a stream +@@ -1575,5 +1575,5 @@ + olMemTo(EH_pst, pstExp = new CExposedStream()); + olChkTo(EH_pstExp, pstExp->Init(pstDirect, this, +- df, pdfnName, (ULONG)NULL)); ++ df, pdfnName, 0)); + *ppStream = pstExp; + return S_OK; +@@ -1624,5 +1624,5 @@ + olMemTo(EH_pst, pstExp = new CExposedStream()); + olChkTo(EH_pstExp, pstExp->Init(pstDirect, this, +- df, pdfnName, (ULONG)NULL)); ++ df, pdfnName, 0)); + *ppStream = pstExp; + return S_OK; +--- oless/storage.cxx 2013-09-02 11:47:00.000000000 -0400 ++++ oless/storage.cxx 2018-01-20 20:03:24.664133000 -0500 +@@ -144,5 +144,5 @@ + + olChk(ValidateNameW(pwcsName, CBMAXPATHCOMPLEN)); +- olMem(pilb = new CFileILB(pwcsName, (DWORD)NULL, FALSE)); ++ olMem(pilb = new CFileILB(pwcsName, 0, FALSE)); + olChk(pilb->Open(STGM_READ)); + sc = GetScode( StgIsStorageILockBytes(pilb) ); |