From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-office/magicpoint/files/50magicpoint-gentoo.el | 6 - .../magicpoint/files/magicpoint-1.11b-gentoo.diff | 37 ------ .../files/magicpoint-1.13a-libpng15.patch | 11 -- .../magicpoint-1.13a_p20121015-any-giflib.patch | 140 --------------------- .../magicpoint-1.13a_p20121015-draw-charset.patch | 11 -- ...cpoint-1.13a_p20121015-draw-stringtoolong.patch | 13 -- .../magicpoint-1.13a_p20121015-fontconfig.patch | 33 ----- .../magicpoint-1.13a_p20121015-gif-dimension.patch | 11 -- ...oint-1.13a_p20121015-implicit-declaration.patch | 136 -------------------- .../magicpoint-1.13a_p20121015-parse-empty.patch | 11 -- 10 files changed, 409 deletions(-) delete mode 100644 app-office/magicpoint/files/50magicpoint-gentoo.el delete mode 100644 app-office/magicpoint/files/magicpoint-1.11b-gentoo.diff delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-any-giflib.patch delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-charset.patch delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-stringtoolong.patch delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-gif-dimension.patch delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-implicit-declaration.patch delete mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-parse-empty.patch (limited to 'app-office/magicpoint/files') diff --git a/app-office/magicpoint/files/50magicpoint-gentoo.el b/app-office/magicpoint/files/50magicpoint-gentoo.el deleted file mode 100644 index 301fcb4d4bb6..000000000000 --- a/app-office/magicpoint/files/50magicpoint-gentoo.el +++ /dev/null @@ -1,6 +0,0 @@ - -;;; magicpoint site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(autoload 'mgp-mode "mgp-mode" "MagicPoint editor mode" t) -(add-to-list 'auto-mode-alist '("\\.mgp\\'" . mgp-mode)) diff --git a/app-office/magicpoint/files/magicpoint-1.11b-gentoo.diff b/app-office/magicpoint/files/magicpoint-1.11b-gentoo.diff deleted file mode 100644 index 8c0d454972a3..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.11b-gentoo.diff +++ /dev/null @@ -1,37 +0,0 @@ -diff -urN magicpoint-1.10a.ORIG/mgp.h magicpoint-1.10a/mgp.h ---- magicpoint-1.10a.ORIG/mgp.h 2003-06-06 16:18:25.000000000 +0900 -+++ magicpoint-1.10a/mgp.h 2003-09-02 04:24:56.000000000 +0900 -@@ -93,7 +93,7 @@ - #include "freetype.h" - - #ifndef FREETYPEFONTDIR --#define FREETYPEFONTDIR "/usr/local/share/fonts/ttf" -+#define FREETYPEFONTDIR "/usr/X11R6/lib/X11/fonts/truetype" - #endif - #endif /*FREETYPE*/ - -@@ -130,7 +130,7 @@ - #define UUDECODE "/usr/bin/uudecode" - #endif - #ifndef GUNZIP --#define GUNZIP "/usr/contrib/bin/gunzip" -+#define GUNZIP "/bin/gunzip" - #endif - - #define MAXPAGE 512 -diff -urN magicpoint-1.10a.ORIG/sample/default.mgp magicpoint-1.10a/sample/default.mgp ---- magicpoint-1.10a.ORIG/sample/default.mgp 2001-08-11 01:40:54.000000000 +0900 -+++ magicpoint-1.10a/sample/default.mgp 2003-09-02 04:24:56.000000000 +0900 -@@ -12,9 +12,9 @@ - %% into the "tfdir" directory above: - %% ftp://ftp.mew.org/pub/mgp/ttf-jp.tar.gz - %% --%deffont "standard" tfont "standard.ttf", tmfont "kochi-mincho.ttf" --%deffont "thick" tfont "thick.ttf", tmfont "goth.ttf" --%deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf" -+%deffont "standard" xfont "serif" "iso10646" -+%deffont "thick" xfont "sans-serif" "iso10646" -+%deffont "typewriter" xfont "monospace" "iso10646" - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %% - %% Default settings per each line numbers. diff --git a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch deleted file mode 100644 index 7990b4685544..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- image/png.c -+++ image/png.c -@@ -86,7 +86,7 @@ - return NULL; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - fclose(fp); - return NULL; diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-any-giflib.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-any-giflib.patch deleted file mode 100644 index 0e7903a8dcf0..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-any-giflib.patch +++ /dev/null @@ -1,140 +0,0 @@ ---- kit.orig/image/gif.c 2000-03-07 07:59:56.000000000 +0100 -+++ kit/image/gif.c 2016-01-12 17:35:49.792443794 +0100 -@@ -18,6 +18,18 @@ - #include "image.h" - #include - -+static void stderrGifError(GifFileType *gifp, int e) { -+#if defined(GIFLIB_MAJOR) /* added in 4.2.0 along with GifError{,String}() */ -+# if GIFLIB_MAJOR >= 5 -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString(gifp ? gifp->Error : e)); -+# else -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", GifErrorString()); -+# endif -+#else -+ PrintGifError(); -+#endif -+} -+ - static void - tellAboutImage(name, gifp) - char *name; -@@ -49,10 +61,17 @@ - GifFileType *GifFile; - ColorMapObject *ColorMap; - GifColorType *ColorMapEntry; -+ int gerr = 0; - -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 -+ GifFile = DGifOpenFileName(fullname, &gerr); -+#else - GifFile = DGifOpenFileName(fullname); -- if (GifFile == NULL) -+#endif -+ if (GifFile == NULL) { -+ stderrGifError(GifFile, gerr); - return NULL; -+ } - - if ((ScreenBuffer = (GifRowType *) - malloc(GifFile->SHeight * sizeof(GifRowType *))) == NULL) { -@@ -87,13 +106,13 @@ - /* Scan the content of the GIF file and load the image(s) in: */ - do { - if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) { -- PrintGifError(); -+ stderrGifError(GifFile, 0); - exit(-1); - } - switch (RecordType) { - case IMAGE_DESC_RECORD_TYPE: - if (DGifGetImageDesc(GifFile) == GIF_ERROR) { -- PrintGifError(); -+ stderrGifError(GifFile, 0); - exit(-1); - } - Row = GifFile->Image.Top; /* Image Position relative to Screen. */ -@@ -113,7 +132,7 @@ - j += InterlacedJumps[i]) { - if (DGifGetLine(GifFile, &ScreenBuffer[j][Col], - Width) == GIF_ERROR) { -- PrintGifError(); -+ stderrGifError(GifFile, 0); - exit(-1); - } - } -@@ -122,7 +141,7 @@ - for (i = 0; i < Height; i++) { - if (DGifGetLine(GifFile, &ScreenBuffer[Row++][Col], - Width) == GIF_ERROR) { -- PrintGifError(); -+ stderrGifError(GifFile, 0); - exit(-1); - } - } -@@ -131,7 +150,7 @@ - case EXTENSION_RECORD_TYPE: - /* Skip any extension blocks in file: */ - if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) { -- PrintGifError(); -+ stderrGifError(GifFile, 0); - exit(-1); - } - /* very adhoc transparency support */ -@@ -141,7 +160,7 @@ - } - while (Extension != NULL) { - if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) { -- PrintGifError(); -+ stderrGifError(GifFile, 0); - exit(-1); - } - } -@@ -179,8 +198,21 @@ - pixline[x] = GifRow[x]; - } - -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) -+ if (DGifCloseFile(GifFile, &gerr) == GIF_ERROR) { -+ stderrGifError(NULL, gerr); -+#else - if (DGifCloseFile(GifFile) == GIF_ERROR) { -- PrintGifError(); -+# if defined(GIFLIB_MAJOR) -+# if GIFLIB_MAJOR >= 5 -+ stderrGifError(GifFile, 0); -+# else -+ stderrGifError(NULL, GifError()); -+# endif -+# else -+ stderrGifError(NULL, 0); -+# endif -+#endif - exit(-1); - } - -@@ -195,12 +227,22 @@ - { - GifFileType *gifp; - int ret; -+ int gerr = 0; - -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 -+ gifp = DGifOpenFileName(fullname, &gerr); -+#else - gifp = DGifOpenFileName(fullname); -- if (gifp == NULL) -+#endif -+ if (gifp == NULL) { -+ stderrGifError(gifp, gerr); - ret = 0; -- else { -+ } else { -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) -+ DGifCloseFile(gifp, &gerr); -+#else - DGifCloseFile(gifp); -+#endif - tellAboutImage(name); - ret = 1; - } diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-charset.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-charset.patch deleted file mode 100644 index 056b7ef02d87..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-charset.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kit.orig/draw.c 2012-10-14 20:25:10.000000000 +0200 -+++ kit/draw.c 2016-01-12 16:45:54.123549077 +0100 -@@ -2847,7 +2847,7 @@ - char *seed; - char *registry; - -- if (code >= 0xa0 && ((!argregistry || !argregistry[0]) && mgp_charset)) -+ if (code >= 0xa0 && ((!argregistry || !argregistry[0]) && mgp_charset[0])) - registry = mgp_charset; - else - registry = argregistry; diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-stringtoolong.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-stringtoolong.patch deleted file mode 100644 index d965cb027cc0..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-draw-stringtoolong.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kit.orig/draw.c 2012-10-14 20:25:10.000000000 +0200 -+++ kit/draw.c 2016-01-12 18:01:53.090388852 +0100 -@@ -1379,6 +1379,10 @@ - } - - q = draw_fragment(state, p, q - p, registry, charset16); -+ if (q == p) { -+ fprintf(stderr, "String '%s' too long for window!\n", p); -+ exit(1); -+ } - - p = q; - } diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch deleted file mode 100644 index 9a49eb39282e..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ -# Bug #572658 ---- kit.orig/configure.in 2009-05-04 09:36:47.000000000 +0200 -+++ kit/configure.in 2016-01-23 04:25:17.047720246 +0100 -@@ -16,6 +16,7 @@ - AC_PROG_AWK - AC_PROG_YACC - AC_PROG_LEX -+PKG_PROG_PKG_CONFIG([0.22]) - AC_PATH_PROGS(mgp_cv_path_perl, perl5 perl, no) - AC_SUBST(mgp_cv_path_perl) - AC_PATH_PROGS(mgp_cv_path_uuencode, uuencode, no) -@@ -385,9 +386,9 @@ - if test "$mgp_use_xft2" = "yes"; then - AC_MSG_CHECKING(for xft2 library..) - AC_CHECK_LIB(Xft, XftFontOpen, -- [LIBS="$LIBS -lXft -lfontconfig" -+ [LIBS="$LIBS -lXft `pkg-config --libs fontconfig`" - AC_DEFINE(USE_XFT2) -- mgp_xft2_found=yes], [], [-lfontconfig]) -+ mgp_xft2_found=yes], [], [`pkg-config --libs fontconfig`]) - fi - fi - fi -@@ -507,6 +508,9 @@ - AC_DEFINE(USE_M17N) - OPTFLAGS="$OPTFLAGS `m17n-config X --cflags`" - LIBS="$LIBS `m17n-config X --libs` -lm17n-core" -+ if test "x$ac_cv_header_fontconfig_fontconfig_h" = "xyes"; then -+ LIBS="$LIBS `pkg-config --libs fontconfig`" -+ fi - fi - fi - diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-gif-dimension.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-gif-dimension.patch deleted file mode 100644 index c95aa2dae411..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-gif-dimension.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kit.orig/image/gif.c 2016-01-12 16:54:40.469530579 +0100 -+++ kit/image/gif.c 2016-01-12 16:56:10.676527408 +0100 -@@ -122,7 +122,7 @@ - if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth || - GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) { - fprintf(stderr, --"Image %d is not confined to screen dimension, aborted.\n"); -+"Image %s is not confined to screen dimension, aborted.\n", fullname); - exit(-2); - } - if (GifFile->Image.Interlace) { diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-implicit-declaration.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-implicit-declaration.patch deleted file mode 100644 index 141353953e00..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-implicit-declaration.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -ru kit.orig/contrib/xwintoppm/dsimple.c kit/contrib/xwintoppm/dsimple.c ---- kit.orig/contrib/xwintoppm/dsimple.c 1998-02-13 08:48:29.000000000 +0100 -+++ kit/contrib/xwintoppm/dsimple.c 2016-01-12 14:30:21.199834909 +0100 -@@ -48,10 +48,12 @@ - #endif - - extern Bool silent; -+extern void usage(); - unsigned long Resolve_Color(); - Pixmap Bitmap_To_Pixmap(); - Window Select_Window(); - void out(); -+void outl(); - void blip(); - Window Window_With_Name(); - void Fatal_Error(); -@@ -495,6 +497,7 @@ - * printf with up to 7 arguments. - */ - /* VARARGS1 */ -+void - outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6) - char *msg; - char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6; -diff -ru kit.orig/contrib/xwintoppm/xwintoppm.c kit/contrib/xwintoppm/xwintoppm.c ---- kit.orig/contrib/xwintoppm/xwintoppm.c 1998-08-26 07:30:16.000000000 +0200 -+++ kit/contrib/xwintoppm/xwintoppm.c 2016-01-12 14:29:46.892836115 +0100 -@@ -139,6 +139,13 @@ - extern int (*_XErrorFunction)(); - extern int _XDefaultError(); - -+void usage(); -+void Error(char *); -+void Window_Dump(Window, FILE *); -+extern void outl(); -+int Image_Size(XImage *); -+int Get_XColors(XWindowAttributes *, XColor **); -+ - static long parse_long (s) - char *s; - { -@@ -281,6 +288,7 @@ - * writting. - */ - -+void - Window_Dump(window, out) - Window window; - FILE *out; -@@ -609,6 +617,7 @@ - /* - * Report the syntax for calling xwd. - */ -+void - usage() - { - fprintf (stderr, -@@ -623,6 +632,7 @@ - * Error - Fatal xwd error. - */ - -+void - Error(string) - char *string; /* Error description string. */ - { -diff -ru kit.orig/ctlwords.c kit/ctlwords.c ---- kit.orig/ctlwords.c 1999-02-15 00:02:25.000000000 +0100 -+++ kit/ctlwords.c 2016-01-12 14:14:20.395868676 +0100 -@@ -24,6 +24,7 @@ - - #include - #include -+#include - - main(int argc, char *argv[]) - { -diff -ru kit.orig/draw.c kit/draw.c ---- kit.orig/draw.c 2012-10-14 20:25:10.000000000 +0200 -+++ kit/draw.c 2016-01-12 14:15:12.847866833 +0100 -@@ -140,6 +140,8 @@ - static void get_background_pixmap __P((struct ctrl *, struct render_state *)); - static void regist_background_pixmap __P((XImageInfo *, Image *)); - #ifdef MNG -+void mngload(char *, int, int, int, int); -+void mngpreload(struct render_state *, char *, int *, int *); - static void process_anim __P((struct render_state *, struct ctrl *)); - static void obj_draw_anim __P((struct render_state *, - u_int, u_int, struct render_object *)); -diff -ru kit.orig/image/image.h kit/image/image.h ---- kit.orig/image/image.h 2004-07-28 17:47:31.000000000 +0200 -+++ kit/image/image.h 2016-01-12 16:38:12.310565307 +0100 -@@ -10,6 +10,7 @@ - - #include "copyright.h" - #include -+#include - - #if defined(SYSV) || defined(VMS) || 1 - #include -diff -ru kit.orig/image/window.c kit/image/window.c ---- kit.orig/image/window.c 2004-07-28 17:47:31.000000000 +0200 -+++ kit/image/window.c 2016-01-12 14:19:03.347858732 +0100 -@@ -16,8 +16,8 @@ - #include - #include - #include --#ifdef SYSV --#include -+#ifdef HAVE_UNISTD_H -+# include - #endif - #if TIME_WITH_SYS_TIME - # include -@@ -32,9 +32,6 @@ - #if HAVE_SYS_SELECT_H - # include - #endif --#ifdef __APPLE__ --#include --#endif - - /* SUPPRESS 560 */ - -diff -ru kit.orig/mgp.h kit/mgp.h ---- kit.orig/mgp.h 2010-05-04 00:28:00.000000000 +0200 -+++ kit/mgp.h 2016-01-12 14:16:47.967863490 +0100 -@@ -831,6 +831,9 @@ - #ifndef HAVE_USLEEP - extern void usleep __P((u_int)); - #endif -+#ifndef HAVE_STRLCPY -+extern size_t strlcpy __P((char *, const char *, size_t)); -+#endif - - #ifdef FREETYPE - #define RASTERLIB diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-parse-empty.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-parse-empty.patch deleted file mode 100644 index f3d38ccde03a..000000000000 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-parse-empty.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kit.orig/parse.c 2010-05-04 00:28:00.000000000 +0200 -+++ kit/parse.c 2016-01-12 19:20:41.882222658 +0100 -@@ -1258,7 +1258,7 @@ - */ - { - int textseen; -- int contseen; -+ int contseen = 0; - for (page = 1; page <= maxpage; page++) { - line = page_attribute[page].pg_linenum; - for (l = 0; l <= line; l++) { -- cgit v1.2.3