From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 24 03:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CC293237 for ; Sat, 24 Aug 2013 03:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AB1852789 for ; Sat, 24 Aug 2013 03:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7O3o0pf049702 for ; Sat, 24 Aug 2013 03:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7O3o0oK049701; Sat, 24 Aug 2013 03:50:00 GMT (envelope-from gnats) Resent-Date: Sat, 24 Aug 2013 03:50:00 GMT Resent-Message-Id: <201308240350.r7O3o0oK049701@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0249C20B; Sat, 24 Aug 2013 03:46:32 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.117.29]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B44E02777; Sat, 24 Aug 2013 03:46:31 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1VD4nt-0006Q8-Si; Sat, 24 Aug 2013 07:46:21 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 76CFFA83; Sat, 24 Aug 2013 07:46:21 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 5A4CCF65; Sat, 24 Aug 2013 07:46:21 +0400 (MSK) Message-Id: <20130824034621.5A4CCF65@hades.panopticon> Date: Sat, 24 Aug 2013 07:46:21 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/181498: [PATCH] games/pingus: fix build with clang, install icon Cc: acm@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Aug 2013 03:50:00 -0000 >Number: 181498 >Category: ports >Synopsis: [PATCH] games/pingus: fix build with clang, install icon >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 24 03:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 9.1-RELEASE-p4 amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0 r251956: Tue Jun 18 21:41:37 MSK >Description: - Fix build with clang with two new patches - Install icon and use it in a .desktop file - While here, use space in WWW: and remove library version from LIB_DEPENDS FYI, pingus 0.7.6 is out: http://pingus.seul.org/download.html Port maintainer (acm@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- pingus-0.7.2_11.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 325285) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= pingus PORTVERSION= 0.7.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://pingus.seul.org/files/ @@ -12,7 +12,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ boost_regex:${PORTSDIR}/devel/boost-libs \ - physfs.1:${PORTSDIR}/devel/physfs + physfs:${PORTSDIR}/devel/physfs USE_BZIP2= yes USES= iconv @@ -21,7 +21,7 @@ with_linuxevdev=0 USE_SDL= sdl image mixer -DESKTOP_ENTRIES= "Pingus" "${COMMENT}" "" \ +DESKTOP_ENTRIES= "Pingus" "${COMMENT}" "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ "pingus" "" false PLIST= ${WRKDIR}/pkg-plist @@ -33,6 +33,7 @@ pre-install: @${RM} -f ${PLIST} @${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST} + @${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST} @cd ${WRKSRC}/data && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST} @@ -44,5 +45,6 @@ ${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \; ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico ${PREFIX}/share/pixmaps/${PORTNAME}.ico .include Index: files/patch-src-editor-editor__screen.hpp =================================================================== --- files/patch-src-editor-editor__screen.hpp (revision 0) +++ files/patch-src-editor-editor__screen.hpp (working copy) @@ -0,0 +1,11 @@ +--- src/editor/editor_screen.hpp.orig 2007-09-30 20:07:08.000000000 +0400 ++++ src/editor/editor_screen.hpp 2013-08-23 23:08:40.689231327 +0400 +@@ -27,7 +27,7 @@ + + class DrawingContext; + class FileDialog; +-class GUI::GUIManager; ++namespace GUI { class GUIManager; } + class Pathname; + + namespace Editor { Property changes on: files/patch-src-editor-editor__screen.hpp ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-src-lisp-getters.hpp =================================================================== --- files/patch-src-lisp-getters.hpp (revision 0) +++ files/patch-src-lisp-getters.hpp (working copy) @@ -0,0 +1,11 @@ +--- src/lisp/getters.hpp.orig 2007-08-17 20:20:09.000000000 +0400 ++++ src/lisp/getters.hpp 2013-08-09 13:42:19.551761882 +0400 +@@ -30,7 +30,7 @@ + if(lisp->get_list_size() != 2) + return false; + +- const Lisp* el = lisp->get_list_elem(1); ++ const Lisp* el = lisp->get_list_elem(1).get(); + return get(el, val); + } + Property changes on: files/patch-src-lisp-getters.hpp ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: pkg-descr =================================================================== --- pkg-descr (revision 325285) +++ pkg-descr (working copy) @@ -2,4 +2,4 @@ currently 22 playable levels and runs under a wide variety of operating systems (FreeBSD, Linux, Windows, etc.) -WWW: http://pingus.seul.org/ +WWW: http://pingus.seul.org/ --- pingus-0.7.2_11.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: