[Patch sent to maintainer for comments on 2013-12-31 without response. Repeating it here for it not to get lost.] x11-toolkits/sdl_pango fails on 10 due to clang expecting a prototype and later detecting a conflict to the implicit definition: SDL_Pango.c:345:5: warning: implicit declaration of function 'SDLPango_CopyFTBitmapToSurface' is invalid in C99 [-Wimplicit-function-declaration] SDLPango_CopyFTBitmapToSurface( ^ SDL_Pango.c:661:1: error: conflicting types for 'SDLPango_CopyFTBitmapToSurface' SDLPango_CopyFTBitmapToSurface( ^ Remark: x11-toolkits/sdl_pango did build earlier on 10, but it fails now. Fix: With the patch attached, x11-toolkits/sdl_pango builds, packages, and runs (a port using it runs fine) on 10.0-RC4/amd64. Since the patch only declares a prototype exactly as the function is defined later in that file, it should be safe considering other FreeBSD versions. The patch is applied to a file with DOS linebreaks on does contain them from line 7 to line 17. In case this is lost here, I can upload it somewhere or mail it encoded differently. Patch attached with submission follows: How-To-Repeat: Try to build x11-toolkits/sdl_pango on 10.0-RC4/amd64.
Responsible Changed From-To: freebsd-ports-bugs->edwin edwin@mavetju.org => edwin@ (via the GNATS Auto Assign Tool)
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Maintainer of x11-toolkits/sdl_pango, Please note that PR ports/185558 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/185558 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
Author: rakuco Date: Sat Jan 25 21:26:25 2014 New Revision: 341112 URL: http://svnweb.freebsd.org/changeset/ports/341112 QAT: https://qat.redports.org/buildarchive/r341112/ Log: - Add a patch to fix the build with clang (a function is used before being declared). [1] - Support staging. - Set LICENSE. - Remove tab from the WWW line in pkg-descr. PR: ports/185558 [1] Submitted by: Jan Henrik Sylvester <me@janh.de> Approved by: maintainer timeout (18 days) MFH: 2014Q1 Added: head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c (contents, props changed) Modified: head/x11-toolkits/sdl_pango/Makefile head/x11-toolkits/sdl_pango/pkg-descr Modified: head/x11-toolkits/sdl_pango/Makefile ============================================================================== --- head/x11-toolkits/sdl_pango/Makefile Sat Jan 25 21:26:05 2014 (r341111) +++ head/x11-toolkits/sdl_pango/Makefile Sat Jan 25 21:26:25 2014 (r341112) @@ -14,6 +14,8 @@ PATCHFILES= SDL_Pango-0.1.2-API-adds.pat MAINTAINER= edwin@mavetju.org COMMENT= SDL_Pango is the SDL API to the Pango text rendering engine of GNOME 2.x +LICENSE= LGPL21 + USES= pkgconfig USE_AUTOTOOLS= libtool USE_SDL= sdl @@ -21,5 +23,4 @@ USE_GNOME= pango GNU_CONFIGURE= yes USE_LDCONFIG= yes -NO_STAGE= yes .include <bsd.port.mk> Added: head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 21:26:25 2014 (r341112) @@ -0,0 +1,14 @@ +--- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 ++++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 +@@ -330,6 +330,11 @@ + @param *rect [in] Draw on this area + @param baseline [in] Horizontal location of glyphs + */ ++void SDLPango_CopyFTBitmapToSurface( ++ const FT_Bitmap *bitmap, ++ SDL_Surface *surface, ++ const SDLPango_Matrix *matrix, ++ SDL_Rect *rect); + static void + drawGlyphString( + SDLPango_Context *context, Modified: head/x11-toolkits/sdl_pango/pkg-descr ============================================================================== --- head/x11-toolkits/sdl_pango/pkg-descr Sat Jan 25 21:26:05 2014 (r341111) +++ head/x11-toolkits/sdl_pango/pkg-descr Sat Jan 25 21:26:25 2014 (r341112) @@ -14,4 +14,4 @@ your support desk. You should carefully process. Author: NAKAMURA Ken'ichi <nakamura@sbp.fp.a.u-tokyo.ac.jp> -WWW: http://sdlpango.sourceforge.net/ +WWW: http://sdlpango.sourceforge.net/ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed. Thanks!
Author: rakuco Date: Sat Jan 25 21:41:14 2014 New Revision: 341114 URL: http://svnweb.freebsd.org/changeset/ports/341114 QAT: https://qat.redports.org/buildarchive/r341114/ Log: Hopefully fix `make patch' after r341112. src/SDL_Pango.c is CRLF-encoded; while we could use dos2unix here, the port's Makefile also fetches a patch from elsewhere that expects a CRLF-encoded file. PR: ports/185558 Modified: head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c (contents, props changed) Modified: head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c ============================================================================== --- head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 21:34:35 2014 (r341113) +++ head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 21:41:14 2014 (r341114) @@ -1,14 +1,14 @@ ---- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 -+++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 -@@ -330,6 +330,11 @@ - @param *rect [in] Draw on this area - @param baseline [in] Horizontal location of glyphs - */ -+void SDLPango_CopyFTBitmapToSurface( -+ const FT_Bitmap *bitmap, -+ SDL_Surface *surface, -+ const SDLPango_Matrix *matrix, -+ SDL_Rect *rect); - static void - drawGlyphString( - SDLPango_Context *context, +--- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 ++++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 +@@ -330,6 +330,11 @@ + @param *rect [in] Draw on this area + @param baseline [in] Horizontal location of glyphs + */ ++void SDLPango_CopyFTBitmapToSurface( ++ const FT_Bitmap *bitmap, ++ SDL_Surface *surface, ++ const SDLPango_Matrix *matrix, ++ SDL_Rect *rect); + static void + drawGlyphString( + SDLPango_Context *context, _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Author: rakuco Date: Sat Jan 25 21:56:28 2014 New Revision: 341117 URL: http://svnweb.freebsd.org/changeset/ports/341117 QAT: https://qat.redports.org/buildarchive/r341117/ Log: MFH: r341112 - Add a patch to fix the build with clang (a function is used before being declared). [1] - Support staging. - Set LICENSE. - Remove tab from the WWW line in pkg-descr. PR: ports/185558 [1] Submitted by: Jan Henrik Sylvester <me@janh.de> Approved by: maintainer timeout (18 days) Approved by: portmgr (antoine) Added: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c - copied unchanged from r341112, head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Modified: branches/2014Q1/x11-toolkits/sdl_pango/Makefile branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/sdl_pango/Makefile ============================================================================== --- branches/2014Q1/x11-toolkits/sdl_pango/Makefile Sat Jan 25 21:47:47 2014 (r341116) +++ branches/2014Q1/x11-toolkits/sdl_pango/Makefile Sat Jan 25 21:56:28 2014 (r341117) @@ -14,6 +14,8 @@ PATCHFILES= SDL_Pango-0.1.2-API-adds.pat MAINTAINER= edwin@mavetju.org COMMENT= SDL_Pango is the SDL API to the Pango text rendering engine of GNOME 2.x +LICENSE= LGPL21 + USES= pkgconfig USE_AUTOTOOLS= libtool USE_SDL= sdl @@ -21,5 +23,4 @@ USE_GNOME= pango GNU_CONFIGURE= yes USE_LDCONFIG= yes -NO_STAGE= yes .include <bsd.port.mk> Copied: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c (from r341112, head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 21:56:28 2014 (r341117, copy of r341112, head/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c) @@ -0,0 +1,14 @@ +--- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 ++++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 +@@ -330,6 +330,11 @@ + @param *rect [in] Draw on this area + @param baseline [in] Horizontal location of glyphs + */ ++void SDLPango_CopyFTBitmapToSurface( ++ const FT_Bitmap *bitmap, ++ SDL_Surface *surface, ++ const SDLPango_Matrix *matrix, ++ SDL_Rect *rect); + static void + drawGlyphString( + SDLPango_Context *context, Modified: branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr ============================================================================== --- branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr Sat Jan 25 21:47:47 2014 (r341116) +++ branches/2014Q1/x11-toolkits/sdl_pango/pkg-descr Sat Jan 25 21:56:28 2014 (r341117) @@ -14,4 +14,4 @@ your support desk. You should carefully process. Author: NAKAMURA Ken'ichi <nakamura@sbp.fp.a.u-tokyo.ac.jp> -WWW: http://sdlpango.sourceforge.net/ +WWW: http://sdlpango.sourceforge.net/ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Author: rakuco Date: Sat Jan 25 22:04:30 2014 New Revision: 341121 URL: http://svnweb.freebsd.org/changeset/ports/341121 QAT: https://qat.redports.org/buildarchive/r341121/ Log: MFH: r341114 Hopefully fix `make patch' after r341112. src/SDL_Pango.c is CRLF-encoded; while we could use dos2unix here, the port's Makefile also fetches a patch from elsewhere that expects a CRLF-encoded file. PR: ports/185558 Approved by: portmgr (antoine) Modified: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c ============================================================================== --- branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 22:03:15 2014 (r341120) +++ branches/2014Q1/x11-toolkits/sdl_pango/files/patch-src_SDL_Pango.c Sat Jan 25 22:04:30 2014 (r341121) @@ -1,14 +1,14 @@ ---- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 -+++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 -@@ -330,6 +330,11 @@ - @param *rect [in] Draw on this area - @param baseline [in] Horizontal location of glyphs - */ -+void SDLPango_CopyFTBitmapToSurface( -+ const FT_Bitmap *bitmap, -+ SDL_Surface *surface, -+ const SDLPango_Matrix *matrix, -+ SDL_Rect *rect); - static void - drawGlyphString( - SDLPango_Context *context, +--- src/SDL_Pango.c~ 2013-12-31 14:26:31.000000000 +0000 ++++ src/SDL_Pango.c 2013-12-31 14:22:36.000000000 +0000 +@@ -330,6 +330,11 @@ + @param *rect [in] Draw on this area + @param baseline [in] Horizontal location of glyphs + */ ++void SDLPango_CopyFTBitmapToSurface( ++ const FT_Bitmap *bitmap, ++ SDL_Surface *surface, ++ const SDLPango_Matrix *matrix, ++ SDL_Rect *rect); + static void + drawGlyphString( + SDLPango_Context *context, _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"