[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/files/
commit: 013e029fbbd3a42dbb2c90512af276ab28754769 Author: Michael Orlitzky gentoo org> AuthorDate: Sun Sep 3 21:26:37 2017 + Commit: Michael Orlitzky gentoo org> CommitDate: Sun Sep 3 21:34:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013e029f app-text/htmldoc: remove unused patches. Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-text/htmldoc/files/htmldoc-break.patch | 30 - app-text/htmldoc/files/htmldoc-destdir.patch | 91 2 files changed, 121 deletions(-) diff --git a/app-text/htmldoc/files/htmldoc-break.patch b/app-text/htmldoc/files/htmldoc-break.patch deleted file mode 100644 index 33c4aaef544..000 --- a/app-text/htmldoc/files/htmldoc-break.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur htmldoc-1.8.29b/Makefile.in htmldoc-1.8.29c/Makefile.in htmldoc-1.8.29b/Makefile.in2016-04-13 17:02:29.706811414 + -+++ htmldoc-1.8.29c/Makefile.in2016-04-13 17:03:37.713630261 + -@@ -39,7 +39,7 @@ - all: Makedefs Makefile config.h htmldoc.list - for dir in $(DIRS); do\ - echo Making all in $$dir...;\ -- (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || break;\ -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || exit 1;\ - done - - -@@ -50,7 +50,7 @@ - clean: - for dir in $(DIRS); do\ - echo Cleaning in $$dir...;\ -- (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || break;\ -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || exit 1;\ - done - $(RM) *.bak - $(RM) *.bck -@@ -77,7 +77,7 @@ - $(MAKE) all - for dir in $(INSTALLDIRS); do\ - echo Installing in $$dir...;\ -- (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || break;\ -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || exit 1;\ - done - - diff --git a/app-text/htmldoc/files/htmldoc-destdir.patch b/app-text/htmldoc/files/htmldoc-destdir.patch deleted file mode 100644 index 488bb0beb31..000 --- a/app-text/htmldoc/files/htmldoc-destdir.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -Naur htmldoc-1.8.29/data/Makefile htmldoc-1.8.29b/data/Makefile htmldoc-1.8.29/data/Makefile 2011-12-23 06:23:11.0 + -+++ htmldoc-1.8.29b/data/Makefile 2016-04-13 16:59:35.074270457 + -@@ -41,11 +41,11 @@ - # - - install: -- if [ ! -d $(datadir)/htmldoc/data ]; then\ -- $(MKDIR) $(datadir)/htmldoc/data;\ -+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ -+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ - fi -- $(CP) $(FILES) $(datadir)/htmldoc/data -- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* -+ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* - - - # -diff -Naur htmldoc-1.8.29/doc/Makefile htmldoc-1.8.29b/doc/Makefile htmldoc-1.8.29/doc/Makefile2016-01-02 22:58:41.0 + -+++ htmldoc-1.8.29b/doc/Makefile 2016-04-13 16:57:46.628550948 + -@@ -45,16 +45,16 @@ - # - - install: $(DOCUMENTS) -- if test ! -d $(datadir)/doc/htmldoc; then\ -- $(MKDIR) $(datadir)/doc/htmldoc;\ -+ if test ! -d $(DESTDIR)$(datadir)/doc/htmldoc; then\ -+ $(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\ - fi -- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc -- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* -- if test ! -d $(mandir)/man1; then\ -- $(MKDIR) $(mandir)/man1;\ -+ $(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/* -+ if test ! -d $(DESTDIR)$(mandir)/man1; then\ -+ $(MKDIR) $(DESTDIR)$(mandir)/man1;\ - fi -- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 -- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 -+ $(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1 -+ $(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1 - - - # -diff -Naur htmldoc-1.8.29/fonts/Makefile htmldoc-1.8.29b/fonts/Makefile htmldoc-1.8.29/fonts/Makefile 2011-12-23 06:23:11.0 + -+++ htmldoc-1.8.29b/fonts/Makefile 2016-04-13 16:56:35.317733427 + -@@ -62,15 +62,15 @@ - # - - install: -- echo "Installing font files in $(datadir)/htmldoc/fonts..." -- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ -- $(MKDIR) $(datadir)/htmldoc/fonts;\ -+ echo "Installing font files in $(DESTDIR)$(datadir)/htmldoc/fonts..." -+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/fonts ]; then\ -+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\ - fi - for font in $(FONTS); do \ -- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ -- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ -+ $(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \ -+ $(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \ - done -- $(CHMOD) ugo+r
[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/files/
commit: 03051a29e85276b1bbc05ce58e07a6d1bc1348f0
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Aug 19 13:00:32 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Sep 2 14:46:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03051a29
app-text/htmldoc: remove unused patches
app-text/htmldoc/files/htmldoc-1.8.27-crash.patch | 11 --
app-text/htmldoc/files/htmldoc-fortify-fail.patch | 21
app-text/htmldoc/files/htmldoc-libpng15.patch | 116 -
.../htmldoc/files/htmldoc-sscanf-overflows.patch | 38 ---
4 files changed, 186 deletions(-)
diff --git a/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
b/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
deleted file mode 100644
index b339904ae41..000
--- a/app-text/htmldoc/files/htmldoc-1.8.27-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
htmldoc/ps-pdf.cxx 2006-08-01 18:58:50.0 +0200
-+++ htmldoc/ps-pdf.cxx 2008-04-26 21:19:49.0 +0200
-@@ -3624,7 +3624,7 @@
- * Get the width of the page number, leave room for three dots...
- */
-
-- if (heading >= 0)
-+ if (heading >= 0 && heading < num_headings)
- {
- hpage = heading_pages[heading];
- numberwidth = get_width((uchar *)pages[hpage].page_text,
diff --git a/app-text/htmldoc/files/htmldoc-fortify-fail.patch
b/app-text/htmldoc/files/htmldoc-fortify-fail.patch
deleted file mode 100644
index 32ec8873567..000
--- a/app-text/htmldoc/files/htmldoc-fortify-fail.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur htmldoc-1.8.27~/htmldoc/ps-pdf.cxx htmldoc-1.8.27/htmldoc/ps-pdf.cxx
htmldoc-1.8.27~/htmldoc/ps-pdf.cxx 2009-08-13 19:32:21.846860508 -0400
-+++ htmldoc-1.8.27/htmldoc/ps-pdf.cxx 2009-08-13 19:40:29.185857503 -0400
-@@ -8619,7 +8619,7 @@
- return (NULL);
- }
- // Safe because buffer is allocated...
--strcpy((char *)r->data.text.buffer, (char *)data);
-+memcpy((char *)r->data.text.buffer, (char *)data, strlen((char
*)data));
- get_color(_htmlTextColor, r->data.text.rgb);
- break;
- case RENDER_IMAGE :
-@@ -8640,7 +8640,7 @@
- return (NULL);
- }
- // Safe because buffer is allocated...
--strcpy((char *)r->data.link, (char *)data);
-+memcpy((char *)r->data.link, (char *)data, strlen((char *)data));
- break;
- }
-
diff --git a/app-text/htmldoc/files/htmldoc-libpng15.patch
b/app-text/htmldoc/files/htmldoc-libpng15.patch
deleted file mode 100644
index 7b834c304d2..000
--- a/app-text/htmldoc/files/htmldoc-libpng15.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-http://bugs.gentoo.org/385521
-http://www.htmldoc.org/str.php?L243+P0+S-2+C0+I0+E0+M10+Q
-
htmldoc/image.cxx
-+++ htmldoc/image.cxx
-@@ -1472,6 +1472,9 @@ image_load_png(image_t *img, /* I - Imag
- png_bytep *rows; /* PNG row pointers */
- uchar *inptr, /* Input pixels */
- *outptr;/* Output pixels */
-+ png_bytep trans_alpha;
-+ int num_trans;
-+ png_color_16p trans_color;
-
-
- /*
-@@ -1499,7 +1502,7 @@ image_load_png(image_t *img, /* I - Imag
-
- rows = NULL;
-
-- if (setjmp(pp->jmpbuf))
-+ if (setjmp(png_jmpbuf(pp)))
- {
- progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
-
-@@ -1526,7 +1529,7 @@ image_load_png(image_t *img, /* I - Imag
-
- png_read_info(pp, info);
-
-- if (info->color_type & PNG_COLOR_MASK_PALETTE)
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
- {
- png_set_expand(pp);
-
-@@ -1535,15 +1538,15 @@ image_load_png(image_t *img, /* I - Imag
- if (Encryption)
- img->use ++;
- }
-- else if (info->bit_depth < 8)
-+ else if (png_get_bit_depth(pp, info) < 8)
- {
- png_set_packing(pp);
- png_set_expand(pp);
- }
-- else if (info->bit_depth == 16)
-+ else if (png_get_bit_depth(pp, info) == 16)
- png_set_strip_16(pp);
-
-- if (info->color_type & PNG_COLOR_MASK_COLOR)
-+ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
- {
- depth = 3;
- img->depth = gray ? 1 : 3;
-@@ -1554,10 +1557,11 @@ image_load_png(image_t *img, /* I - Imag
- img->depth = 1;
- }
-
-- img->width = info->width;
-- img->height = info->height;
-+ img->width = png_get_image_width(pp, info);
-+ img->height = png_get_image_height(pp, info);
-
-- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
-+ png_get_tRNS(pp, info, _alpha, _trans, _color);
-+ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
- {
- if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
- image_need_mask(img, 8);
-@@ -1571,14 +1575,14 @@ image_load_png(image_t *img, /* I - Imag
-
- #ifdef DEBUG
- printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d,
img->depth=%d\n",
-- info->color_type, depth, img->width, img->height, img->depth);
-- if
