Bug 188286 - [PATCH] games/openpref fix build with clang
Summary: [PATCH] games/openpref fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-games (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-04-05 15:10 UTC by Pawel Pekala
Modified: 2014-04-21 23:10 UTC (History)
0 users

See Also:


Attachments
file.diff (836 bytes, patch)
2014-04-05 15:10 UTC, Pawel Pekala
no flags Details | Diff
openpref.diff (3.02 KB, patch)
2014-04-17 10:11 UTC, Rusmir Dusko
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Pawel Pekala freebsd_committer freebsd_triage 2014-04-05 15:10:01 UTC
Add simple patch to fix build with clang compiler

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-05 15:10:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->games

games@ wants this category PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-05 15:10:08 UTC
Maintainer of games/openpref,

Please note that PR ports/188286 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/188286

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-05 15:10:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Rusmir Dusko freebsd_committer freebsd_triage 2014-04-17 10:11:00 UTC
This patch for src/util/debug.cpp is very good, I have added some more

- Bump PORTREVISION, for LICENSE adding
- Add license (GPLv3)
- Change Desktop entry file
- Use PLIST_FILES and PLIST_DIRS instead of pkg-plist
- Add DOCS and Option
- Mute MKDIR
- Install icon in ${PREFIX}/share/pixmaps for Desktop entry file
- Add patch, fix build with Clang compiler [1]
- Change pkg-descr, use whitespace instead of tabulator

Submitted by:	pawel@ [1]

-- 
Best regards,
Rusmir Dusko
Comment 5 Rusmir Dusko freebsd_committer freebsd_triage 2014-04-21 23:01:26 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 6 dfilter service freebsd_committer freebsd_triage 2014-04-21 23:03:38 UTC
Author: nemysis
Date: Mon Apr 21 22:03:34 2014
New Revision: 351725
URL: http://svnweb.freebsd.org/changeset/ports/351725
QAT: https://qat.redports.org/buildarchive/r351725/

Log:
  - Bump PORTREVISION, for LICENSE adding
  - Add license (GPLv3)
  - Change Desktop entry file
  - Use PLIST_FILES and PLIST_DIRS instead of pkg-plist
  - Add DOCS and Option
  - Mute MKDIR
  - Install icon in ${PREFIX}/share/pixmaps for Desktop entry file
  - Add patch, fix build with Clang compiler [1]
  - Change pkg-descr, use whitespace instead of tabulator
  
  PR:		ports/188286
  Submitted by:	pawel@ [1]

Added:
  head/games/openpref/files/
  head/games/openpref/files/patch-src__util__debug.cpp   (contents, props changed)
Deleted:
  head/games/openpref/pkg-plist
Modified:
  head/games/openpref/Makefile
  head/games/openpref/pkg-descr

Modified: head/games/openpref/Makefile
==============================================================================
--- head/games/openpref/Makefile	Mon Apr 21 21:56:54 2014	(r351724)
+++ head/games/openpref/Makefile	Mon Apr 21 22:03:34 2014	(r351725)
@@ -3,24 +3,38 @@
 
 PORTNAME=	openpref
 PORTVERSION=	0.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	annulen@yandex.ru
 COMMENT=	Preferans game
 
+LICENSE=	GPLv3
+
 USES=		qmake
 USE_QT4=	corelib gui moc_build rcc_build uic_build
 MAKE_JOBS_UNSAFE=	yes
 
-DESKTOP_ENTRIES="OpenPref" "${COMMENT}" "${DATADIR}/openpref.png" \
-		"openpref" "Game;CardGame;" true
+PLIST_FILES=	bin/${PORTNAME} \
+		%%DATADIR%%/i18n/${PORTNAME}_ru.qm \
+		share/pixmaps/${PORTNAME}.png
+PLIST_DIRS=	%%DATADIR%%/i18n %%DATADIR%%
+
+PORTDOCS=	AUTHORS BUGS NEWS README THANKS
+OPTIONS_DEFINE=	DOCS
+
+DESKTOP_ENTRIES="OpenPref" "" "${PORTNAME}" \
+		"${PORTNAME}" "Game;CardGame;" ""
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/openpref ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${DATADIR}/i18n
-	${INSTALL_DATA} ${WRKSRC}/openpref_ru.qm ${STAGEDIR}${DATADIR}/i18n
-	${INSTALL_DATA} ${WRKSRC}/pics/openpref.png ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_ru.qm ${STAGEDIR}${DATADIR}/i18n/
+	${INSTALL_DATA} ${WRKSRC}/pics/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/games/openpref/files/patch-src__util__debug.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/openpref/files/patch-src__util__debug.cpp	Mon Apr 21 22:03:34 2014	(r351725)
@@ -0,0 +1,10 @@
+--- ./src/util/debug.cpp.orig	2014-04-05 15:33:31.000000000 +0200
++++ ./src/util/debug.cpp	2014-04-05 15:34:06.000000000 +0200
+@@ -20,6 +20,7 @@
+  *      http://www.gnu.org/licenses 
+  */
+ 
++#include <time.h>
+ #include <QFile>
+ 
+ #include "debug.h"

Modified: head/games/openpref/pkg-descr
==============================================================================
--- head/games/openpref/pkg-descr	Mon Apr 21 21:56:54 2014	(r351724)
+++ head/games/openpref/pkg-descr	Mon Apr 21 22:03:34 2014	(r351725)
@@ -3,4 +3,4 @@ Preferans (also known as Preference). It
 Qt4 framework and is portable between many operating systems including
 Windows and major Unix flavours.
 
-WWW:	http://openpref.sourceforge.net
+WWW: http://openpref.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"