From 7327f1a2f0b667699e88b97595375ccad6108485 Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 13 Jun 2022 10:47:58 +0200 Subject: Replace png null macros Imported patch from Fedora diff --git a/xcf2png.c b/xcf2png.c index 4afe78d..90374d7 100644 --- a/xcf2png.c +++ b/xcf2png.c @@ -78,9 +78,9 @@ init_output(void) outfile = openout(flatspec.output_filename); libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING, - png_voidp_NULL, + (png_voidp)NULL, my_error_callback, - png_error_ptr_NULL); + (png_error_ptr)NULL); if( !libpng ) FatalUnexpected(_("Couldn't initialize libpng library")); -- 2.45.2 From f43d8ddad6f30887b251dbc0edbb8d4ae8fb904d Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 13 Jun 2022 10:53:01 +0200 Subject: Fix sed replacement error patch Imported patch from Fedora diff --git a/Makefile.in b/Makefile.in index 56d821b..331349e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,14 +90,13 @@ testscale$e: testscale.$o install: all for p in $(BINARIES) ; do \ - case $$p in xcfview) strip= ;; *) strip=-s ;; esac ; \ - $(INSTALL_PROGRAM) $$strip $$p \ - $(DESTDIR)$(bindir)/`echo $$p | $(SED) $(program_transform_name)` \ + $(INSTALL_PROGRAM) $$p \ + $(DESTDIR)$(bindir)/$$p \ || exit 1 ;\ done for m in $(MANPAGES) ; do \ $(INSTALL_DATA) $$m \ - $(DESTDIR)$(mandir)/man1/`echo $$m | $(SED) $(program_transform_name)` \ + $(DESTDIR)$(mandir)/man1/$$m \ || exit 1 ; \ done for lang in $(LINGUAS) ; do \ -- 2.45.2