third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix_macOS_0.27

Browse Source
This commit is contained in:
clanmills 2020-03-28 08:08:28 +00:00
parent 698b418f73
commit 7658d8aefd
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README-CONAN.md
View File

@ -572,7 +572,7 @@ You must tell CMake to link Adobe's library:
```bash
$ cmake .. -DEXIV2_ENABLE_EXTERNAL_XMP=On # -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release
```
**MacOS-X** users should use the cmake _**Xcode**_ Generator
**macOS** users should use the cmake _**Xcode**_ Generator
```bash
$ cmake .. -DEXIV2_ENABLE_EXTERNAL_XMP=On -G Xcode

2
cmake/packaging.cmake
View File

@ -9,7 +9,7 @@ set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) "/.git/" "/build/" "\
if ( MSVC )
set(CPACK_GENERATOR ZIP) # use .zip - less likely to damage bin/exiv2.dll permissions
else()
set(CPACK_GENERATOR TGZ) # MinGW/Cygwin/Linux/MacOS-X etc use .tar.gz
set(CPACK_GENERATOR TGZ) # MinGW/Cygwin/Linux/macOS etc use .tar.gz
endif()
set (BS "") # Bit Size

4
man/man1/exiv2.1
View File

@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH EXIV2 1 "March 22, 2020"
.TH EXIV2 1 "March 28, 2020"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -196,7 +196,7 @@ Show the program version and exit.
When \fB\-V\fP is combined with \fB\-v\fP (Verbose version), build information
is printed to standard output along with a list of shared libraries which
have been loaded into memory. Verbose version is supported on Windows
(MSVC, Cygwin and MinGW builds), MacOSX and Linux and is provided
(MSVC, Cygwin and MinGW builds), macOS and Linux and is provided
for test and debugging.
.TP
.B \-v

4
releasenotes/Darwin/ReadMe.txt
View File

@ -1,5 +1,5 @@
MacOS-X (Darwin) Exiv2 v0.27.2 Bundle
-----------------------------------------
macOS (Darwin) Exiv2 v0.27.2 Bundle
-----------------------------------
Structure of the bundle
-----------------------

2
src/actions.cpp
View File

@ -2023,7 +2023,7 @@ namespace {
#if defined(_MSC_VER) || defined(__MINGW__)
static CRITICAL_SECTION cs;
#else
/* Unix/Linux/Cygwin/MacOSX */
/* Unix/Linux/Cygwin/macOS */
#include <pthread.h>
/* This is the critical section object (statically allocated). */
#if defined(__APPLE__)

2
src/basicio.cpp
View File

@ -279,7 +279,7 @@ namespace Exiv2 {
{
#if defined(__APPLE__)
# if defined(EXV_UNICODE_PATH)
# error No xattr API for MacOS X with unicode support
# error No xattr API for macOS with unicode support
# endif
ssize_t namebufSize = ::listxattr(src.p_->path_.c_str(), 0, 0, 0);
if (namebufSize < 0) {

2
test/build-test.py
View File

@ -81,7 +81,7 @@ def apple(dict):
# , 'libstdc++.6.dylib' # I suspect this is only with GCC (Xcode4 and earlier)
] ;
# which version of MacOS-X ?
# which version of macOS ?
os_major=int(os.uname()[2].split('.')[0])
os_minor=int(os.uname()[2].split('.')[1])
NC=13;ML=12;LION=11;SL=10;LEO=9;

2
test/functions.source
View File

@ -420,7 +420,7 @@ copyVideoFiles ()
checkSum()
{
# cygwin checksum: http://esrg.sourceforge.net/utils_win_up/md5sum/
# macosx - built/installed coreutils 8.25 http://ftp.gnu.org/gnu/coreutils/
# macos - built/installed coreutils 8.25 http://ftp.gnu.org/gnu/coreutils/
platform=$(uname)
if [ "$platform" == 'NetBSD' -o "$platform" == 'FreeBSD' ]; then
md5 -q $1