From owner-svn-ports-head@FreeBSD.ORG Thu Dec 19 19:16:56 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org 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 ESMTPS id 2E06B7F4; Thu, 19 Dec 2013 19:16:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 198761F6A; Thu, 19 Dec 2013 19:16:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJJGtgu066078; Thu, 19 Dec 2013 19:16:55 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJJGtHh066076; Thu, 19 Dec 2013 19:16:55 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312191916.rBJJGtHh066076@svn.freebsd.org> From: Pawel Pekala Date: Thu, 19 Dec 2013 19:16:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336948 - in head/x11/xorg-edit: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 19:16:56 -0000 Author: pawel Date: Thu Dec 19 19:16:55 2013 New Revision: 336948 URL: http://svnweb.freebsd.org/changeset/ports/336948 Log: - Fix build with clang - Support staging PR: ports/184828 Submitted by: KATO Tsuguru Added: head/x11/xorg-edit/files/ head/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp (contents, props changed) Modified: head/x11/xorg-edit/Makefile Modified: head/x11/xorg-edit/Makefile ============================================================================== --- head/x11/xorg-edit/Makefile Thu Dec 19 19:04:25 2013 (r336947) +++ head/x11/xorg-edit/Makefile Thu Dec 19 19:16:55 2013 (r336948) @@ -15,10 +15,10 @@ LICENSE= GPLv3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes +USES= dos2unix gmake DOS2UNIX_GLOB= *.cpp *.h USE_WX= 2.6+ WX_UNICODE= yes -USES= dos2unix gmake PLIST_FILES= bin/xorg-edit \ lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \ @@ -34,7 +34,6 @@ PLIST_DIRS= lib/xorg-edit/options/device DESKTOP_ENTRIES="Xorg Edit" "" "" "${PORTNAME}" "Settings;" true -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's|^CXX =|CXX ?=| ; \ @@ -58,15 +57,15 @@ do-configure: @${ECHO_CMD} ' $$(MAKE) -C xorgedit' >> ${WRKSRC}/Makefile do-install: - (cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${PREFIX}/bin) - @${MKDIR} ${PREFIX}/lib/xorg-edit + (cd ${WRKDIR} && ${INSTALL_SCRIPT} xorg-edit ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit (cd ${WRKSRC} && ${INSTALL_PROGRAM} xorg-edit \ - ${PREFIX}/lib/xorg-edit) - @${MKDIR} ${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES + ${STAGEDIR}${PREFIX}/lib/xorg-edit) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES (cd ${WRKSRC}/de_DE/LC_MESSAGES && ${INSTALL_DATA} ${PORTNAME}.mo \ - ${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES) - @${MKDIR} ${PREFIX}/lib/xorg-edit/options/devices + ${STAGEDIR}${PREFIX}/lib/xorg-edit/de_DE/LC_MESSAGES) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices (cd ${WRKSRC}/options/devices && ${INSTALL_DATA} *.xml \ - ${PREFIX}/lib/xorg-edit/options/devices) + ${STAGEDIR}${PREFIX}/lib/xorg-edit/options/devices) .include Added: head/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xorg-edit/files/patch-xorgedit__guiframe.cpp Thu Dec 19 19:16:55 2013 (r336948) @@ -0,0 +1,54 @@ +--- xorgedit/guiframe.cpp.orig ++++ xorgedit/guiframe.cpp +@@ -182,8 +182,13 @@ + otherSectionTab = new wxPanel(layout); // iles/modules/extensions/dri tab panel + wxBoxSizer *otherSectionTabSizer=new wxBoxSizer(wxVERTICAL); + ++#ifdef __clang__ ++ wxString *tempList = new wxString[devListSize+1]; // initial list for combo und choice elements ++ wxString *optList = new wxString[optListSize]; // initial list for option combo und choice elements ++#else + wxString tempList[devListSize+1]; // initial list for combo und choice elements + wxString optList[optListSize]; // initial list for option combo und choice elements ++#endif + + optList[0]=_("----------"); + optList[1]=_("Add Option"); +@@ -821,6 +826,11 @@ + if (ShowError()) return; + } + SetSaved(true); ++ ++#ifdef __clang__ ++ delete[] optList; ++ delete[] tempList; ++#endif + } + + const bool GuiFrame::CreateBackup(void) const +@@ -1832,8 +1842,13 @@ + + warningText->SetLabel(_("Warning: Improper use of this tool can cause damage to your\nxorg.conf and may not start your Xserver.\nYou must restart X to take the changes effect.")); + ++#ifdef __clang__ ++ wxString *tempList = new wxString[devListSize+1]; // initial list for combo und choice elements ++ wxString *optList = new wxString[optListSize]; // initial list for option combo und choice elements ++#else + wxString tempList[devListSize+1]; // initial list for combo und choice elements + wxString optList[optListSize]; // initial list for option combo und choice elements ++#endif + unsigned int offset=0; + unsigned int i; + +@@ -2269,6 +2284,11 @@ + + driBox->SetLabel(_("DRI")); + return(false); ++ ++#ifdef __clang__ ++ delete[] optList; ++ delete[] tempList; ++#endif + } + + void GuiFrame::SetSaved(const bool save)