pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xfstt Remove gcc-2.95 patches.
details: https://anonhg.NetBSD.org/pkgsrc/rev/6b48a598375a
branches: trunk
changeset: 641588:6b48a598375a
user: wiz <wiz%pkgsrc.org@localhost>
date: Wed Nov 12 15:24:16 2014 +0000
description:
Remove gcc-2.95 patches.
Remove patch-aa and replace with SUBST_SED in Makefile.
diffstat:
x11/xfstt/Makefile | 7 +-
x11/xfstt/distinfo | 18 +-
x11/xfstt/patches/patch-af | 352 ------------
x11/xfstt/patches/patch-ag | 125 ----
x11/xfstt/patches/patch-ah | 16 -
x11/xfstt/patches/patch-ai | 1220 --------------------------------------------
x11/xfstt/patches/patch-aj | 129 ----
x11/xfstt/patches/patch-ak | 42 -
x11/xfstt/patches/patch-al | 25 -
x11/xfstt/patches/patch-am | 72 --
x11/xfstt/patches/patch-an | 16 -
x11/xfstt/patches/patch-ao | 16 -
x11/xfstt/patches/patch-ap | 43 -
x11/xfstt/patches/patch-aq | 14 -
x11/xfstt/patches/patch-ar | 16 -
x11/xfstt/patches/patch-as | 31 -
x11/xfstt/patches/patch-at | 81 --
17 files changed, 4 insertions(+), 2219 deletions(-)
diffs (truncated from 2312 to 300 lines):
diff -r e1e541ae2c37 -r 6b48a598375a x11/xfstt/Makefile
--- a/x11/xfstt/Makefile Wed Nov 12 15:19:11 2014 +0000
+++ b/x11/xfstt/Makefile Wed Nov 12 15:24:16 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2014/11/12 15:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2014/11/12 15:24:16 wiz Exp $
DISTNAME= xfstt-1.9.1
CATEGORIES= x11 net fonts
@@ -30,8 +30,8 @@
share/examples/xfstt
SUBST_CLASSES+= paths
-SUBST_FILES.paths= doc/FAQ doc/xfstt.1x
-SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_FILES.paths= doc/FAQ
+SUBST_SED.paths= -e 's,/usr,${PREFIX},g'
SUBST_STAGE.paths= post-patch
do-install:
@@ -47,5 +47,4 @@
.include "../../x11/fontsproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff -r e1e541ae2c37 -r 6b48a598375a x11/xfstt/distinfo
--- a/x11/xfstt/distinfo Wed Nov 12 15:19:11 2014 +0000
+++ b/x11/xfstt/distinfo Wed Nov 12 15:24:16 2014 +0000
@@ -1,23 +1,7 @@
-$NetBSD: distinfo,v 1.13 2014/11/12 15:19:03 wiz Exp $
+$NetBSD: distinfo,v 1.14 2014/11/12 15:24:16 wiz Exp $
SHA1 (xfstt-1.9.1.tar.xz) = bae76366a84babc2d63d674864d66efa77fda626
RMD160 (xfstt-1.9.1.tar.xz) = d38e480011a19b5537aa914ec5ace01b26b7f203
Size (xfstt-1.9.1.tar.xz) = 210704 bytes
-SHA1 (patch-aa) = 8210f3929c4adbe5d2a0bdae8bfd4a1b704d1013
SHA1 (patch-ab) = 78dc21537e86e5533e747e7bab3e5280087fa43b
SHA1 (patch-ac) = c9bfc230c6be8872da329da8ab54363b7f87cdea
-SHA1 (patch-af) = e742a5461925c72e5647b8cfa8e83d1de77ac231
-SHA1 (patch-ag) = 270ba4fcaecc289c8b170792481f8353d54498e2
-SHA1 (patch-ah) = f563d157e5f23c3badb4e10de77e4db633b072ca
-SHA1 (patch-ai) = 04f35f960614df376960d1ff1e1d410120c0598e
-SHA1 (patch-aj) = 5afb7cacfdfa542701ca29ee2d78fa98050c6df8
-SHA1 (patch-ak) = 72cf7c168e9684aabb0ff95b9bff752c888151fb
-SHA1 (patch-al) = 7e766d1a52b7c5c2183d67db1da759b170007c66
-SHA1 (patch-am) = 4424107b9c2b8c9167560733ef1ce89d2e86fa09
-SHA1 (patch-an) = 1936547506bb83e50d9cbf7579df2f18e695ac29
-SHA1 (patch-ao) = 8be98e207b5e709dea51d33b26595dafc508c1df
-SHA1 (patch-ap) = 83d5c81bfe6fb7e78794792cf37b7a63575cef22
-SHA1 (patch-aq) = 71b49c068ce83706f5cbcda8adfa8df6b3d24e06
-SHA1 (patch-ar) = b909ab488f71045eb1b60fba33297c8245441d60
-SHA1 (patch-as) = fac3a5e2664b55289ffeb2947bf1c6d4a6afb2dc
-SHA1 (patch-at) = 4a8416c983d25f4ef118bf073c035626ee28b8c5
diff -r e1e541ae2c37 -r 6b48a598375a x11/xfstt/patches/patch-af
--- a/x11/xfstt/patches/patch-af Wed Nov 12 15:19:11 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,352 +0,0 @@
-$NetBSD: patch-af,v 1.2 2012/06/13 08:15:14 mef Exp $
-
-Convert varargs-macros to old-style macros, to make the package
-compile when using gcc 2.95.
-
---- src/xfstt.cc.orig 2012-03-21 02:23:17.000000000 +0900
-+++ src/xfstt.cc 2012-06-13 11:47:32.000000000 +0900
-@@ -436,7 +436,7 @@
- } else
- mapIndex = 0;
-
-- debug("match\t\"%s\"\n", buf0 + 1);
-+ debug1("match\t\"%s\"\n", buf0 + 1);
-
- *buf0 = buf - buf0;
- return *buf0 + 1;
-@@ -495,7 +495,7 @@
- strncpy(buf, (char *)&fn, sizeof(fn));
- strncpy(buf + sizeof(fn), fontName, ttfn->nameLen);
- buf[fn.nameLen] = 0;
-- debug("ListFont \"%s\"\n", buf);
-+ debug1("ListFont \"%s\"\n", buf);
-
- return fn.nameLen + 1;
- }
-@@ -509,7 +509,7 @@
- if (fid == xfs->fid)
- return xfs;
-
-- debug("fid = %ld not found!\n", fid);
-+ debug1("fid = %ld not found!\n", fid);
-
- return 0;
- }
-@@ -529,7 +529,7 @@
- openFont(TTFont *ttFont, FontParams *fp, Rasterizer *raster,
- int fid, Encoding *encoding)
- {
-- debug("point %d, pixel %d, res %d\n",
-+ debug3("point %d, pixel %d, res %d\n",
- fp->point[0], fp->pixel[0], fp->resolution[0]);
-
- if (!ttFont)
-@@ -587,7 +587,7 @@
- fp->point[3] = (fp->pixel[3] * 72 + 36) / fp->resolution[1];
- }
-
-- debug("point %d, pixel %d, res %d\n", fp->point[0], fp->pixel[0],
-+ debug3("point %d, pixel %d, res %d\n", fp->point[0], fp->pixel[0],
- fp->resolution[0]);
-
- // init rasterizer
-@@ -630,7 +630,7 @@
- return 0;
-
- // parse attributes
-- debug("point %d, pixel %d, res %d\n",
-+ debug3("point %d, pixel %d, res %d\n",
- fp->point[0], fp->pixel[0], fp->resolution[0]);
-
- int m_index = 0, p_index = 0, r_index = 0;
-@@ -769,8 +769,8 @@
- if (!encoding)
- encoding = encodings[0];
-
-- debug("\nopenXLFD(\"%s\"), %s\n", xlfdName, encoding->Name.c_str());
-- debug("size %d, resx %d, resy %d\n",
-+ debug2("\nopenXLFD(\"%s\"), %s\n", xlfdName, encoding->Name.c_str());
-+ debug3("size %d, resx %d, resy %d\n",
- fp->point[0], fp->resolution[0], fp->resolution[1]);
-
- TTFNdata* ttfn = (TTFNdata *)(infoBase + sizeof(TTFNheader));
-@@ -1047,7 +1047,7 @@
- conn.sd_max = conn.sd_list[n];
- }
-
-- debug("connection setup (sockets = %d)\n", conn.sd_list_used);
-+ debug1("connection setup (sockets = %d)\n", conn.sd_list_used);
-
- return 0;
- }
-@@ -1074,7 +1074,7 @@
- }
- }
-
-- debug("accept(%d) = %d\n", conn.sd_list[n], sd);
-+ debug2("accept(%d) = %d\n", conn.sd_list[n], sd);
-
- return sd;
- }
-@@ -1097,9 +1097,9 @@
- return 0;
- }
-
-- debug("%s endian connection\n",
-+ debug1("%s endian connection\n",
- (req->byteOrder == 'l') ? "little" : "big");
-- debug("version %d.%d\n", req->major_version, req->minor_version);
-+ debug2("version %d.%d\n", req->major_version, req->minor_version);
-
- if ((req->byteOrder == 'l' && (*(uint32_t *)req & 0xff) != 'l') ||
- (req->byteOrder == 'B' && ((*(uint32_t *)req >> 24) & 0xff) != 'B'))
-@@ -1150,7 +1150,7 @@
-
- register uint8_t *p, *end = fe->bitmaps + fe->bmplen;
- if ((fe->bmpFormat ^ hint) & BitmapFormatMaskByte) {
-- debug("slpswap SLP=%d\n", LOGSLP);
-+ debug1("slpswap SLP=%d\n", LOGSLP);
- p = fe->bitmaps;
- switch (LOGSLP) {
- case 3:
-@@ -1182,7 +1182,7 @@
- }
-
- if ((format != LOGSLP) && ((hint & BitmapFormatByteOrderMask) == 0)) {
-- debug("fmtswap SLP=%d -> fmt=%d\n", LOGSLP, format);
-+ debug2("fmtswap SLP=%d -> fmt=%d\n", LOGSLP, format);
- p = fe->bitmaps;
- if (LOGSLP == 3 && format == 4) {
- for (; p < end; p += 2)
-@@ -1246,7 +1246,7 @@
- int size = client.req.length << 2;
-
- if (size < expected_size) {
-- debug("packet size mismatch: %d received bytes, "
-+ debug2("packet size mismatch: %d received bytes, "
- "%d expected bytes\n", size, expected_size);
- fs_client_error(client, FSBadLength);
- return 0;
-@@ -1277,14 +1277,14 @@
- #ifdef DEBUG
- debug("===STARTREQ=========== %d\n", l);
- for (i = 0; i < sz_fsReq; ++i)
-- debug("%02X ", client.buf[i]);
-+ debug1("%02X ", client.buf[i]);
- debug("\n");
- sync();
- #endif
-
- int size = client.req.length << 2;
- if (size > MAXREQSIZE) {
-- debug("too much data: %d bytes (max=%d)\n",
-+ debug2("too much data: %d bytes (max=%d)\n",
- size, MAXREQSIZE);
- fs_client_error(client, FSBadLength);
- break;
-@@ -1298,13 +1298,13 @@
-
- #ifdef DEBUG
- for (i = sz_fsReq; i < size; ++i) {
-- debug("%02X ", client.buf[i]);
-+ debug1("%02X ", client.buf[i]);
- if ((i & 3) == 3)
- debug(" ");
- if ((i & 15) == (15 - sz_fsReq))
- debug("\n");
- }
-- debug("\n===ENDREQ============= %d\n", size);
-+ debug1("\n===ENDREQ============= %d\n", size);
- sync();
- #endif
-
-@@ -1382,12 +1382,12 @@
- {
- fsSetEventMaskReq *req = (fsSetEventMaskReq *)client.buf;
- client.event_mask = req->event_mask;
-- debug("FS_SetEventMask %04X\n", client.event_mask);
-+ debug1("FS_SetEventMask %04X\n", client.event_mask);
- }
- break;
-
- case FS_GetEventMask:
-- debug("FS_GetEventMask = %04X\n", client.event_mask);
-+ debug1("FS_GetEventMask = %04X\n", client.event_mask);
- {
- fsGetEventMaskReply reply;
- reply.type = FS_Reply;
-@@ -1441,7 +1441,7 @@
-
- fsResolution *res = (fsResolution *)(req + 1);
-
-- debug("FS_SetResolution * %d\n", numres);
-+ debug1("FS_SetResolution * %d\n", numres);
- for (; --numres >= 0; ++res) {
- if (!defaultres) {
- fp0.resolution[0] = res->x_resolution;
-@@ -1450,7 +1450,7 @@
- res->point_size /= 10;
- fp0.point[0] = fp0.point[1] = res->point_size;
- fp0.point[2] = fp0.point[3] = 0;
-- debug("xres = %d, yres = %d, size = %d\n",
-+ debug3("xres = %d, yres = %d, size = %d\n",
- res->x_resolution, res->y_resolution,
- res->point_size / 10);
- }
-@@ -1489,7 +1489,7 @@
- break;
-
- pattern[req->nbytes] = 0;
-- debug("FS_ListFonts \"%s\" * %ld\n",
-+ debug2("FS_ListFonts \"%s\" * %ld\n",
- pattern, req->maxNames);
-
- fsListFontsReply reply;
-@@ -1523,7 +1523,7 @@
- buf += len;
- ++reply.nFonts;
- }
-- debug("Found %ld fonts\n", reply.nFonts);
-+ debug1("Found %ld fonts\n", reply.nFonts);
- reply.length = (sizeof(reply) + (buf - client.replybuf)
- + 3) >> 2;
-
-@@ -1562,7 +1562,7 @@
- fsOpenBitmapFontReq *req = (fsOpenBitmapFontReq *)client.buf;
- char *fontName = (char *)(req + 1) + 1;
- fontName[*(uint8_t *)(req + 1)] = 0;
-- debug("FS_OpenBitmapFont \"%s\"", fontName);
-+ debug1("FS_OpenBitmapFont \"%s\"", fontName);
-
- raster->format = (req->format_hint >> 8) & 3;
- if (req->format_hint & 0x0c)
-@@ -1585,7 +1585,7 @@
- fs_client_error(client, FSBadName);
- debug(" not found\n");
- }
-- debug("fhint = %04lX, fmask = %04lX, fid = %ld\n",
-+ debug3("fhint = %04lX, fmask = %04lX, fid = %ld\n",
- req->format_hint, req->format_mask, req->fid);
- }
- break;
-@@ -1593,7 +1593,7 @@
- case FS_QueryXInfo:
- {
- fsQueryXInfoReq *req = (fsQueryXInfoReq *)client.buf;
-- debug("FS_QueryXInfo fid = %ld\n", req->id);
-+ debug1("FS_QueryXInfo fid = %ld\n", req->id);
-
- struct {
- fsQueryXInfoReply s1;
-@@ -1625,10 +1625,10 @@
- reply.s1.font_hdr_char_range_max_char_low
Home |
Main Index |
Thread Index |
Old Index