diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /media-gfx/sam2p/files | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'media-gfx/sam2p/files')
-rw-r--r-- | media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch | 160 | ||||
-rw-r--r-- | media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch | 23 | ||||
-rw-r--r-- | media-gfx/sam2p/files/sam2p-build-fixes.patch | 53 |
3 files changed, 53 insertions, 183 deletions
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch deleted file mode 100644 index dfad65cc05d9..000000000000 --- a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch +++ /dev/null @@ -1,160 +0,0 @@ -Fix literal suffix errors in C++14, caused by missing spaces between -C-strings and macros. -See also: https://bugs.gentoo.org/show_bug.cgi?id=585630 - ---- a/configure.in -+++ b/configure.in -@@ -81,8 +81,6 @@ - dnl Checks for programs. - dnl AC_PROG_CC - AC_LANG_CPLUSPLUS --CXXFLAGS=" " --dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g' - CCC="$CCC g++" - dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX) - AC_PROG_CXX -@@ -216,7 +214,7 @@ - - dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot compute depends)]) - rm -f Makedep --AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)]) -+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)]) - AC_PTS_OK - echo "configure done. Now you should run: make; make install" - ---- a/gensio.cpp -+++ b/gensio.cpp -@@ -494,7 +494,7 @@ - - #if HAVE_PTS_POPEN - if (!tmpsname) { -- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; -+ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; - signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ - } else { - #else -@@ -622,7 +622,7 @@ - if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' */ - #if HAVE_PTS_POPEN - if (!tmpsname) { -- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; -+ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; - signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ - vi_precopy(); - in.vi_read(0,0); -@@ -730,12 +730,7 @@ - - /* --- */ - -- --#if HAVE_lstat_in_sys_stat --# define PTS_lstat lstat --#else - # define PTS_lstat stat --#endif - - /** @param fname must start with '/' (dir separator) - * @return true if file successfully created ---- a/in_ps.cpp -+++ b/in_ps.cpp -@@ -137,7 +137,7 @@ - // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury); - /* Dat: we must call translate _after_ setpagedevice (so it will take effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 12 22:49:07 CEST 2005 */ - sprintf(bboxline, -- "<</PageSize[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]>>setpagedevice\n" -+ "<</PageSize[%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g]>>setpagedevice\n" - /* removing /PageSize also cancels /a4, /a5 etc. */ - /* we need `currentmatrix ... setpagedevice setmatrix' because - * setpagedevice cancels the current transformation matrix so our -@@ -147,7 +147,7 @@ - "/setpagedevice{matrix currentmatrix exch " - "dup length dict copy dup /PageSize undef setpagedevice " - "setmatrix}bind def\n" -- "%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g translate\n" -+ "%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g translate\n" - , urx-llx, ury-lly, -llx, -lly); - } else { - Error::sev(Error::WARNING) << "in_eps_reader: missing EPS bbox" << (Error*)0; ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,7 @@ - export PERL_BADLANG - - CXXX=$(CXD_assert) --LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS) -+LDALL=$(LDXX) $(LDFLAGS) $(LIBS) - ifeq ($(ENABLE_DEBUG), no) - CXXX=$(CXD_no) - endif -@@ -51,8 +51,8 @@ - IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS)) - IDE_TARGETS_release := $(TARGETS) - --CXD_assert =$(CXX) -s -O2 --CXD_no =$(CXX) -s -DNDEBUG -O3 -+CXD_assert =$(CXX) -+CXD_no =$(CXX) -DNDEBUG - # CXD_yes =$(CXX) $(GFLAG) -lefence - CXD_yes =$(CXX) $(GFLAG) - CXD_checker=checkerg++ $(GFLAG) ---- a/minips.cpp -+++ b/minips.cpp -@@ -292,9 +292,9 @@ - void MiniPS::Real::dump(GenBuffer::Writable &out_, bool dumpPS_force) { - char buf[64]; /* Imp: should be enough?? */ - if (metric!=0 && (dumpPS_force || dumpPS)) { -- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g%s", d, me_psfactor[metric]); -+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g%s", d, me_psfactor[metric]); - } else { -- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d*me_factor[metric]); -+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d*me_factor[metric]); - } - out_ << buf; - } -@@ -1044,7 +1044,7 @@ - } else { - d = d < 0 ? 72.0 / -d : d / 72.0; - char buf[64]; /* Dat: enough */ -- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); -+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); - out << buf; - } - } -@@ -1093,7 +1093,7 @@ - out << (rounding>=2 && ll<0 ? 0 : ll); - } else { - char buf[64]; /* Dat: enough */ -- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); -+ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); - out << buf; - } - } ---- a/ps_tiny.c -+++ b/ps_tiny.c -@@ -151,7 +151,7 @@ - } - - static void erri(char const*msg1, char const*msg2) { -- fprintf(stderr, "%s: error at %"SLEN_P"u.%"SLEN_P"u.%"SLEN_P"u: %s%s\n", -+ fprintf(stderr, "%s: error at %" SLEN_P "u.%" SLEN_P "u.%" SLEN_P "u: %s%s\n", - PROGNAME, curline, curofs-leftofs+1, curofs, msg1, msg2?msg2:""); - exit(3); - } -@@ -230,7 +230,7 @@ - /** @param b: assume null-terminated @return true on error */ - static /*inline*/ sbool toInteger(char *s, psint_t *ret) { - int n=0; /* BUGFIX?? found by __CHECKER__ */ -- return sscanf(s, "%"SLEN_P"i%n", ret, &n)<1 || s[n]!='\0'; -+ return sscanf(s, "%" SLEN_P "i%n", ret, &n)<1 || s[n]!='\0'; - } - - /** @param b: assume null-terminated @return true on error */ -@@ -700,7 +700,7 @@ - getotag("Abbr"); - getkey("acount"); acount=getuintval(); - getkey("xcount"); xcount=getuintval(); -- sprintf(tmp,"%"SLEN_P"u dict%%</I>", acount+xcount); -+ sprintf(tmp,"%" SLEN_P "u dict%%</I>", acount+xcount); - setifmt(tmp,0); copy("I"); noifmt(); - gettagbeg(); - diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch deleted file mode 100644 index cb24dbda1bda..000000000000 --- a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 79a7de171f461a1c79089fa770f0da186e87c723 -Author: Peter Szabo <pts@fazekas.hu> -Date: Sun Apr 30 04:00:23 2017 +0200 - - fixed Perl 5.26 compatibility for perl -x (https://github.com/pts/sam2p/issues/2) - -diff --git a/Makefile b/Makefile -index 849b09d..1791a9c 100644 ---- a/Makefile -+++ b/Makefile -@@ -71,10 +71,10 @@ sam2p_version.h: debian/changelog - sam2p_main.o: sam2p_version.h - - xpmc.h: cols2.pl -- perl -x cols2.pl >xpmc.h -+ perl -x ./cols2.pl >xpmc.h - - #HQ=perl -e'$$_=join"",<STDIN>; s@([^\w\.\/\-])@sprintf"\\%03o",ord$$1@ge; print "\"$$_\"\n"' --HQ=perl -x hq.pl -+HQ=perl -x ./hq.pl - #%.tth: %.tte - # <$< >$@ $(HQ) - #%.tth: %.ttm diff --git a/media-gfx/sam2p/files/sam2p-build-fixes.patch b/media-gfx/sam2p/files/sam2p-build-fixes.patch new file mode 100644 index 000000000000..6a1c80175127 --- /dev/null +++ b/media-gfx/sam2p/files/sam2p-build-fixes.patch @@ -0,0 +1,53 @@ +Make stripping configurable, correct CC/CXX/CFLAGS/CXXFLAGS handling, add +missing include + +diff --git a/Makefile b/Makefile +index 1433167..38bb7cc 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force) + MAKE_DIST=000 + endif + ++GCC_STRIP ?= -s + BASH=bash + PERL_BADLANG=x + export PERL_BADLANG + + CXXX=$(CXD_assert) +-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS) ++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS) + ifeq ($(ENABLE_DEBUG), no) + CXXX=$(CXD_no) + endif +@@ -46,8 +47,8 @@ CXXX=$(CXD_checker) + LDALL=checkerg++ $(LDFLAGS) $(LIBS) + endif + +-CXXALL=$(CXXX) $(CXXFLAGS) $(CXXFLAGSB) +-CCALL =$(CXXX) $(CXXFLAGS) $(CXXFLAGSB) ++CXXALL=$(CXX) $(CXXFLAGS) $(CXXFLAGSB) ++CCALL =$(CC) $(CFLAGS) $(CXXFLAGSB) + CXDFAL=$(CXXFLAGS) $(CXXFLAGSB) $(LDFLAGS) $(LIBS) + + .PHONY: clean dist dist-noautoconf dist-more allclean distclean dist-install +@@ -67,7 +68,7 @@ ifeq ($(MAKE_DIST),) + # + # echo to config.h is needed to make config.h younger than config.h.in; + # configure doesn't change the timestamp of config.h if it's unchanged. +- Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h; ./configure MAKE=$(MAKE) --enable-gif --enable-lzw && echo "" >>config.h ++ Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h; + Makehelp:; + include Makehelp # Defines CXX. File generated by ./configure. + include Makedep # Contains ALL+=... . +@@ -101,8 +102,8 @@ IDE_MODES := release debug + IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS)) + IDE_TARGETS_release := $(TARGETS) + +-CXD_assert =$(CXX) -s -O2 +-CXD_no =$(CXX) -s -DNDEBUG -O3 ++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS) ++CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS) + # CXD_yes =$(CXX) $(GFLAG) -lefence + CXD_yes =$(CXX) $(GFLAG) + CXD_checker=checkerg++ $(GFLAG) |