Skip to content

Commit 082517e

Browse files
committed
Merge branch 'master' of https://github.com/mm2/Little-CMS
2 parents ba0c2b4 + 00ff4b7 commit 082517e

10 files changed

Lines changed: 13 additions & 676 deletions

File tree

Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif
2323
SUBDIRS = src include utils/tificc utils/transicc utils/linkicc utils/jpgicc utils/psicc testbed $(USER_PLUGINS)
2424

2525
# Additional files to distribute
26-
EXTRA_DIST = AUTHORS COPYING ChangeLog doc Projects include bin Lib INSTALL README.md autogen.sh lcms2.pc.in plugins
26+
EXTRA_DIST = AUTHORS LICENSE ChangeLog doc Projects include bin Lib plugins INSTALL README.md autogen.sh lcms2.pc.in fuzzers meson_options.txt Projects setup cmake CMakeLists.txt SECURITY.md
2727

2828
pkgconfigdir = $(libdir)/pkgconfig
2929
pkgconfig_DATA = lcms2.pc
@@ -32,6 +32,7 @@ pkgconfig_DATA = lcms2.pc
3232
# Make sure get rid of VC stuff...
3333
clean-local:
3434
rm -rf autom4te.cache
35+
rm -rf plugins/Makefile
3536
find Projects -name "*.user" | xargs rm -rf
3637
find Projects -name "Release" | xargs rm -rf
3738
find Projects -name "Debug" | xargs rm -rf

Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ USER_PLUGINS = $(am__append_1) $(am__append_2)
406406
SUBDIRS = src include utils/tificc utils/transicc utils/linkicc utils/jpgicc utils/psicc testbed $(USER_PLUGINS)
407407

408408
# Additional files to distribute
409-
EXTRA_DIST = AUTHORS COPYING ChangeLog doc Projects include bin Lib INSTALL README.md autogen.sh lcms2.pc.in plugins
409+
EXTRA_DIST = AUTHORS LICENSE ChangeLog doc Projects include bin Lib plugins INSTALL README.md autogen.sh lcms2.pc.in fuzzers meson_options.txt Projects setup cmake CMakeLists.txt SECURITY.md
410410
pkgconfigdir = $(libdir)/pkgconfig
411411
pkgconfig_DATA = lcms2.pc
412412
all: all-recursive
@@ -919,6 +919,7 @@ uninstall-am: uninstall-pkgconfigDATA
919919
# Make sure get rid of VC stuff...
920920
clean-local:
921921
rm -rf autom4te.cache
922+
rm -rf plugins/Makefile
922923
find Projects -name "*.user" | xargs rm -rf
923924
find Projects -name "Release" | xargs rm -rf
924925
find Projects -name "Debug" | xargs rm -rf

SECURITY.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Security Policy
22

3+
## Using GitHub security advisory
4+
5+
**Please contact me instead. Security advisories are immediatly deleted without checking due to high level of SPAM received.**
6+
37
## Supported Versions
48

59
Security updates are applied only to the latest release.
@@ -21,7 +25,5 @@ That is, you got a patch from upstream that upstream claims to be reasonably tes
2125
Please understand that this is a lot of work, and obviously it can fail as well, so the “no guarantee” clause of MIT license applies. If you choose to
2226
redistribute such patches, please make sure to include the mail, or at least the MIT license. By including the MIT license you prevent to get in legal trouble.
2327

24-
## Using GitHub security advisory
2528

26-
Please contact me instead. Security advisories are immediatly deleted without checking due to high level of SPAM received.
2729

configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2808,8 +2808,8 @@ ac_cxx_conftest_cxx11_main='
28082808
}
28092809
{
28102810
// Unicode literals
2811-
char const *utf8 = u8"UTF-8 string \u2500";
2812-
char16_t const *utf16 = u"UTF-8 string \u2500";
2811+
auto const *utf8 = u8"UTF-8 string \u2500";
2812+
char16_t const *utf16 = u"UTF-16 string \u2500";
28132813
char32_t const *utf32 = U"UTF-32 string \u2500";
28142814
}
28152815
'
@@ -3024,7 +3024,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
30243024
# Libtool library revision control info
30253025
#
30263026
LIBRARY_CURRENT=2
3027-
LIBRARY_REVISION=18
3027+
LIBRARY_REVISION=19
30283028
LIBRARY_AGE=0
30293029

30303030

0 commit comments

Comments
 (0)