diff options
| -rw-r--r-- | fiv-io-cmm.c | 3 | ||||
| -rw-r--r-- | fiv-io.c | 3 | ||||
| -rw-r--r-- | fiv-view.c | 3 | ||||
| -rwxr-xr-x | msys2-configure.sh | 13 | ||||
| -rwxr-xr-x | msys2-install.sh | 6 |
5 files changed, 19 insertions, 9 deletions
diff --git a/fiv-io-cmm.c b/fiv-io-cmm.c index b131acf..8a8b8dc 100644 --- a/fiv-io-cmm.c +++ b/fiv-io-cmm.c @@ -400,7 +400,8 @@ fiv_io_cmm_argb32_premultiply(FivIoCmm *self, #else // ! HAVE_LCMS2 || LCMS_VERSION < 2130 static void -fiv_io_cmm_argb32(FivIoCmm *, FivIoImage *, FivIoProfile *, FivIoProfile *) +fiv_io_cmm_argb32(G_GNUC_UNUSED FivIoCmm *self, G_GNUC_UNUSED FivIoImage *image, + G_GNUC_UNUSED FivIoProfile *source, G_GNUC_UNUSED FivIoProfile *target) { // TODO(p): Unpremultiply, transform, repremultiply. Or require lcms2>=2.13. } @@ -61,6 +61,9 @@ #ifdef HAVE_LIBTIFF #include <tiff.h> #include <tiffio.h> +#ifndef TIFF_TMSIZE_T_MAX +#define TIFF_TMSIZE_T_MAX ((tmsize_t) (SIZE_MAX >> 1)) +#endif #endif // HAVE_LIBTIFF #ifdef HAVE_GDKPIXBUF #include <gdk-pixbuf/gdk-pixbuf.h> @@ -646,7 +646,8 @@ reload_screen_cms_profile(FivView *self, GdkWindow *window) gchar *data = NULL; gsize length = 0; if (g_file_get_contents(path, &data, &length, NULL)) - self->screen_cms_profile = fiv_io_profile_new(data, length); + self->screen_cms_profile = fiv_io_cmm_get_profile( + fiv_io_cmm_get_default(), data, length); g_free(data); } g_free(path); diff --git a/msys2-configure.sh b/msys2-configure.sh index 2f43d0d..7b7724e 100755 --- a/msys2-configure.sh +++ b/msys2-configure.sh @@ -75,10 +75,15 @@ extract() { --exclude '*/share/man' --exclude '*/share/doc' done < db.want - bsdtar -xf exiftool.tar.gz - mv Image-ExifTool-*/exiftool bin - mv Image-ExifTool-*/lib/* lib/perl5/site_perl - rm -rf Image-ExifTool-* + # Don't require Perl, which may not exist anymore on i686: + # https://github.com/msys2/MINGW-packages/pull/20085 + if [ -d lib/perl5 ] + then + bsdtar -xf exiftool.tar.gz + mv Image-ExifTool-*/exiftool bin + mv Image-ExifTool-*/lib/* lib/perl5/site_perl + rm -rf Image-ExifTool-* + fi } configure() { diff --git a/msys2-install.sh b/msys2-install.sh index da2d2f1..4cebb73 100755 --- a/msys2-install.sh +++ b/msys2-install.sh @@ -12,15 +12,15 @@ fi # Copy binaries we directly or indirectly depend on. cp -p "$msys2_root"/bin/*.dll . -cp -p "$msys2_root"/bin/wperl.exe . -cp -p "$msys2_root"/bin/exiftool . +cp -p "$msys2_root"/bin/wperl.exe . || : +cp -p "$msys2_root"/bin/exiftool . || : # The console helper is only useful for debug builds. cp -p "$msys2_root"/bin/gspawn-*-helper*.exe . cp -pR "$msys2_root"/etc/ . mkdir -p lib cp -pR "$msys2_root"/lib/gdk-pixbuf-2.0/ lib -cp -pR "$msys2_root"/lib/perl5/ lib +cp -pR "$msys2_root"/lib/perl5/ lib || : mkdir -p share/glib-2.0/schemas cp -pR "$msys2_root"/share/glib-2.0/schemas/*.Settings.* share/glib-2.0/schemas mkdir -p share/icons |